diff options
| author | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2002-06-05 02:19:54 -0500 |
|---|---|---|
| committer | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2002-06-05 02:19:54 -0500 |
| commit | d02c2b1fb2c663f4486834f7d8f43b1db7172fa2 (patch) | |
| tree | 9ac07d46d646c15d05c9ce21e902ca03bcd825d9 | |
| parent | 4a2fa6ce790dd9291e83e121fe6a6eb4c8fa1450 (diff) | |
kbuild: Fix calling of scripts
We source some scripts, but still pass parameters to them, e.g.
. mk_version_h $@ $(KERNELRELEASE) $(VERSION) ...
This does not work for all kinds of /bin/sh (it does for bash, that's
why I did not notice).
The fix is easy: Just mark the scripts executable and call instead of
source them.
Unfortunately, patch(1) doesn't understand about propagating chmod.
bk does, so changing the tree isn't hard, and we introduce an explicit
chmod a+x executed during the build for propagating this change into
those trees which get "traditionally" patched up.
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | init/Makefile | 2 | ||||
| -rw-r--r-- | scripts/Makefile | 16 | ||||
| -rwxr-xr-x[-rw-r--r--] | scripts/docgen | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | scripts/gen-all-syms | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | scripts/kernel-doc | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | scripts/mkcompile_h | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | scripts/mkversion_h | 0 |
8 files changed, 16 insertions, 9 deletions
@@ -295,12 +295,15 @@ include/linux/autoconf.h: .config # this Makefile include/linux/version.h: Makefile - @. scripts/mkversion_h $@ $(KERNELRELEASE) $(VERSION) $(PATCHLEVEL) $(SUBLEVEL) + @scripts/mkversion_h $@ $(KERNELRELEASE) $(VERSION) $(PATCHLEVEL) $(SUBLEVEL) # Helpers built in scripts/ # --------------------------------------------------------------------------- -scripts/mkdep scripts/split-include : FORCE +scripts/mkdep scripts/split-include : scripts ; + +.PHONY: scripts +scripts: @$(MAKE) -C scripts # Generate dependencies diff --git a/init/Makefile b/init/Makefile index bf5e11dc2ce9..455416572bac 100644 --- a/init/Makefile +++ b/init/Makefile @@ -22,4 +22,4 @@ $(TOPDIR)/include/linux/compile.h: ../include/linux/compile.h ; # actual file if its content has changed. ../include/linux/compile.h: FORCE - @. ../scripts/mkcompile_h $@ "$(ARCH)" "$(CONFIG_SMP)" "$(CC) $(CFLAGS)" + @../scripts/mkcompile_h $@ "$(ARCH)" "$(CONFIG_SMP)" "$(CC) $(CFLAGS)" diff --git a/scripts/Makefile b/scripts/Makefile index 0c1ef38ca7ec..c4c86002e762 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -2,7 +2,12 @@ # always needed # --------------------------------------------------------------------------- -all: mkdep split-include +# The following temporary rule will make sure that people's +# trees get updated to the right permissions, since patch(1) +# can't do it +CHMOD_FILES := docgen gen-all-syms kernel-doc mkcompile_h mkversion_h makelst + +all: mkdep split-include $(CHMOD_FILES) mkdep: mkdep.c $(HOSTCC) $(HOSTCFLAGS) -o $@ $< @@ -10,6 +15,9 @@ mkdep: mkdep.c split-include: split-include.c $(HOSTCC) $(HOSTCFLAGS) -o $@ $< +$(CHMOD_FILES): FORCE + @chmod a+x $@ + # xconfig # --------------------------------------------------------------------------- @@ -44,15 +52,11 @@ tkparse.o tkcond.o tkgen.o: %.o: %.c # DocBook stuff # --------------------------------------------------------------------------- -doc-progs: docproc docgen gen-all-syms kernel-doc +doc-progs: docproc docproc: docproc.c $(HOSTCC) $(HOSTCFLAGS) -o $@ $< -docgen gen-all-syms kernel-doc: FORCE - chmod 755 $@ - - include $(TOPDIR)/Rules.make # we don't have automatic deps for host programs diff --git a/scripts/docgen b/scripts/docgen index a7183053d28f..a7183053d28f 100644..100755 --- a/scripts/docgen +++ b/scripts/docgen diff --git a/scripts/gen-all-syms b/scripts/gen-all-syms index b15b160040e8..b15b160040e8 100644..100755 --- a/scripts/gen-all-syms +++ b/scripts/gen-all-syms diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 028e5a33ac42..028e5a33ac42 100644..100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h index e18fc4f263e3..e18fc4f263e3 100644..100755 --- a/scripts/mkcompile_h +++ b/scripts/mkcompile_h diff --git a/scripts/mkversion_h b/scripts/mkversion_h index dd8c5eb6d7dd..dd8c5eb6d7dd 100644..100755 --- a/scripts/mkversion_h +++ b/scripts/mkversion_h |
