fixing build system overhaul fallout...

diff --git a/Makefile b/Makefile
index 4b49208d1a323900059faab42b7e3b739957ba61..d85eb8a6359a0fa2c029fe4364da414467a21937 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -565,7 +565,7 @@ busybox-all  := $(core-y) $(libs-y)
 # Rule to link busybox - also used during CONFIG_KALLSYMS
 # May be overridden by arch/$(ARCH)/Makefile
 quiet_cmd_busybox__ ?= LINK    $@
-      cmd_busybox__ ?= scripts/trylink $(CC) -o $@ \
+      cmd_busybox__ ?= $(srctree)/scripts/trylink $(CC) -o $@ \
       -Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \
       -Wl,--start-group $(busybox-all) -Wl,--end-group \
 
@@ -798,10 +798,10 @@ include/config/MARKER: scripts/basic/split-include include/autoconf.h
        @echo '  SPLIT   include/autoconf.h -> include/config/*'
        @scripts/basic/split-include include/autoconf.h include/config
        @echo '  GEN     include/bbconfigopts.h'
-       @scripts/mkconfigs >include/bbconfigopts.h
+       @$(srctree)/scripts/mkconfigs >include/bbconfigopts.h
        @$(MAKE) $(build)=scripts
        @echo '  GEN     include/usage_compressed.h'
-       @scripts/usage_compressed include/usage_compressed.h scripts
+       @$(srctree)/scripts/usage_compressed include/usage_compressed.h scripts
        @touch $@
 
 # Generate some files

diff --git a/Makefile.custom b/Makefile.custom
index 6880b97d6ceb14b93db58c40e8243bd079b4eb35..c0984e17a9915a20314ba770d377eeaae73e6703 100644 (file)
--- a/Makefile.custom
+++ b/Makefile.custom
@@ -78,7 +78,7 @@ baseline: busybox_unstripped
 
 .PHONY: objsizes
 objsizes: busybox_unstripped
-       $(SHELL) $(srctree)/scripts/objsizes
+       $(srctree)/scripts/objsizes
 
 # Documentation Targets
 .PHONY: doc

diff --git a/include/bb_config.h b/include/bb_config.h
index beec07cba2f73c22294f85d24a825d22a670bb21..1f96026fd3fda47c3568a8a0123c83d744b08143 100644 (file)
--- a/include/bb_config.h
+++ b/include/bb_config.h
@@ -2,6 +2,12 @@
  * which depend on other symbols, which themself are off.
  * Provide them here by hand. Need a better idea. */
 
+#ifndef ENABLE_FEATURE_GUNZIP_UNCOMPRESS
+#define ENABLE_FEATURE_GUNZIP_UNCOMPRESS 0
+#define    USE_FEATURE_GUNZIP_UNCOMPRESS(...)
+#define   SKIP_FEATURE_GUNZIP_UNCOMPRESS(...) __VA_ARGS__
+#endif
+
 #ifndef ENABLE_KILLALL5
 #define ENABLE_KILLALL5 0
 #define    USE_KILLALL5(...)

diff --git a/scripts/mkmakefile b/scripts/mkmakefile
new file mode 100755 (executable)
index 0000000..7f9d544
--- /dev/null
+++ b/scripts/mkmakefile
@@ -0,0 +1,36 @@
+#!/bin/sh
+# Generates a small Makefile used in the root of the output
+# directory, to allow make to be started from there.
+# The Makefile also allow for more convinient build of external modules
+
+# Usage
+# $1 - Kernel src directory
+# $2 - Output directory
+# $3 - version
+# $4 - patchlevel
+
+
+test ! -r $2/Makefile -o -O $2/Makefile || exit 0
+echo "  GEN     $2/Makefile"
+
+cat << EOF > $2/Makefile
+# Automatically generated by $0: don't edit
+
+VERSION = $3
+PATCHLEVEL = $4
+
+KERNELSRC    := $1
+KERNELOUTPUT := $2
+
+MAKEFLAGS += --no-print-directory
+
+.PHONY: all \$(MAKECMDGOALS)
+
+all:
+       \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT)
+
+Makefile:;
+
+\$(filter-out all Makefile,\$(MAKECMDGOALS)) %/:
+       \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@
+EOF