diff options
author | Sam Ravnborg <sam@mars.ravnborg.org> | 2004-10-27 01:50:54 +0200 |
---|---|---|
committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2004-10-27 01:50:54 +0200 |
commit | 6a7cb7739139cd5994a2be73e9c4088a70a568c2 (patch) | |
tree | 183b00d4f9ed52d3fde756c19cc72c5fd03b8b40 /scripts | |
parent | 403f291258456ffc3beb40bc92c0006569e20bc0 (diff) | |
parent | 1ceee1b789e4c34b677eacabc39d99b0d6132d0f (diff) | |
download | history-6a7cb7739139cd5994a2be73e9c4088a70a568c2.tar.gz |
Merge bk://linux-sam.bkbits.net/kbuild
into mars.ravnborg.org:/home/sam/bk/to-linus
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/Makefile.modinst | 5 | ||||
-rw-r--r-- | scripts/basic/docproc.c | 19 | ||||
-rw-r--r-- | scripts/kconfig/confdata.c | 16 | ||||
-rwxr-xr-x | scripts/kernel-doc | 2 |
4 files changed, 32 insertions, 10 deletions
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst index b9ab77d5dd27de..ba47b7fcb1404b 100644 --- a/scripts/Makefile.modinst +++ b/scripts/Makefile.modinst @@ -19,7 +19,10 @@ __modinst: $(modules) quiet_cmd_modules_install = INSTALL $@ cmd_modules_install = mkdir -p $(2); cp $@ $(2) -modinst_dir = $(MODLIB)/$(if $(filter ../% /%,$@),extra/,kernel/$(@D)) +# Modules built outside the kernel source tree go into extra by default +INSTALL_MOD_DIR ?= extra + +modinst_dir = $(MODLIB)/$(if $(filter ../% /%,$@),$(INSTALL_MOD_DIR)/,kernel/$(@D)) $(modules): $(call cmd,modules_install,$(modinst_dir)) diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c index d28f883cb37ac7..cb02baa63256ba 100644 --- a/scripts/basic/docproc.c +++ b/scripts/basic/docproc.c @@ -79,6 +79,7 @@ void exec_kernel_doc(char **svec) { pid_t pid; int ret; + char real_filename[PATH_MAX + 1]; /* Make sure output generated so far are flushed */ fflush(stdout); switch(pid=fork()) { @@ -86,8 +87,13 @@ void exec_kernel_doc(char **svec) perror("fork"); exit(1); case 0: - execvp(KERNELDOCPATH KERNELDOC, svec); - perror("exec " KERNELDOCPATH KERNELDOC); + memset(real_filename, 0, sizeof(real_filename)); + strncat(real_filename, getenv("SRCTREE"), PATH_MAX); + strncat(real_filename, KERNELDOCPATH KERNELDOC, + PATH_MAX - strlen(real_filename)); + execvp(real_filename, svec); + fprintf(stderr, "exec "); + perror(real_filename); exit(1); default: waitpid(pid, &ret ,0); @@ -160,12 +166,17 @@ void find_export_symbols(char * filename) struct symfile *sym; char line[MAXLINESZ]; if (filename_exist(filename) == NULL) { + char real_filename[PATH_MAX + 1]; + memset(real_filename, 0, sizeof(real_filename)); + strncat(real_filename, getenv("SRCTREE"), PATH_MAX); + strncat(real_filename, filename, + PATH_MAX - strlen(real_filename)); sym = add_new_file(filename); - fp = fopen(filename, "r"); + fp = fopen(real_filename, "r"); if (fp == NULL) { fprintf(stderr, "docproc: "); - perror(filename); + perror(real_filename); } while(fgets(line, MAXLINESZ, fp)) { char *p; diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 7b6285e7c8f9b3..b5f2fc031503c3 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -270,6 +270,8 @@ int conf_write(const char *name) int type, l; const char *str; time_t now; + int use_timestamp = 1; + char *env; dirname[0] = 0; if (name && name[0]) { @@ -306,22 +308,28 @@ int conf_write(const char *name) sym = sym_lookup("KERNELRELEASE", 0); sym_calc_value(sym); time(&now); + env = getenv("KCONFIG_NOTIMESTAMP"); + if (env && *env) + use_timestamp = 0; + fprintf(out, "#\n" "# Automatically generated make config: don't edit\n" "# Linux kernel version: %s\n" - "# %s" + "%s%s" "#\n", sym_get_string_value(sym), - ctime(&now)); + use_timestamp ? "# " : "", + use_timestamp ? ctime(&now) : ""); if (out_h) fprintf(out_h, "/*\n" " * Automatically generated C config: don't edit\n" " * Linux kernel version: %s\n" - " * %s" + "%s%s" " */\n" "#define AUTOCONF_INCLUDED\n", sym_get_string_value(sym), - ctime(&now)); + use_timestamp ? " * " : "", + use_timestamp ? ctime(&now) : ""); if (!sym_change_count) sym_clear_all_valid(); diff --git a/scripts/kernel-doc b/scripts/kernel-doc index aa7ffee63b4507..767cb2365a8236 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -1531,7 +1531,7 @@ sub process_state3_type($$) { } sub process_file($) { - my ($file) = @_; + my ($file) = "$ENV{'SRCTREE'}@_"; my $identifier; my $func; my $initial_section_counter = $section_counter; |