diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2014-03-13 12:12:58 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2014-03-13 12:12:58 +0000 |
| commit | b07e567e6cc425b2293fbc83c187c1558fdf186b (patch) | |
| tree | 07d6fc0552fea718c9c1017c66159914cba63e6b | |
| parent | 4b07676d91294bca0ebafb9424320238c005f302 (diff) | |
target/sdk: use .config instead of unconditionally enabling all build dirs
Call make defconfig on every build to catch newly added packages
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39913 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/toplevel.mk | 11 | ||||
| -rw-r--r-- | package/Makefile | 7 | ||||
| -rwxr-xr-x | target/sdk/convert-config.pl | 9 |
3 files changed, 22 insertions, 5 deletions
diff --git a/include/toplevel.mk b/include/toplevel.mk index 23d70ac81a..10b81049c5 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -156,6 +156,15 @@ prereq:: prepare-tmpinfo .config @+$(MAKE) -r -s tmp/.prereq-build $(PREP_MK) @+$(NO_TRACE_MAKE) -r -s $@ +ifeq ($(SDK),1) + +%:: + @+$(PREP_MK) $(NO_TRACE_MAKE) -r -s prereq + @./scripts/config/conf --defconfig=.config Config.in + @+$(ULIMIT_FIX) $(SUBMAKE) -r $@ + +else + %:: @+$(PREP_MK) $(NO_TRACE_MAKE) -r -s prereq @( \ @@ -167,6 +176,8 @@ prereq:: prepare-tmpinfo .config ) @+$(ULIMIT_FIX) $(SUBMAKE) -r $@ +endif + help: cat README diff --git a/package/Makefile b/package/Makefile index d46cb2ca0e..3b4eecdf0b 100644 --- a/package/Makefile +++ b/package/Makefile @@ -10,11 +10,8 @@ curdir:=package -include $(TMP_DIR)/.packagedeps $(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m)) $(curdir)/builddirs-install:=. -ifeq ($(SDK),1) -else - $(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m)) - $(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m)) -endif +$(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m)) +$(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m)) ifneq ($(IGNORE_ERRORS),) package-y-filter := $(package-y) package-m-filter := $(filter-out $(package-y),$(package-m)) diff --git a/target/sdk/convert-config.pl b/target/sdk/convert-config.pl index 9fd2c362e6..243de0b87b 100755 --- a/target/sdk/convert-config.pl +++ b/target/sdk/convert-config.pl @@ -1,6 +1,13 @@ #!/usr/bin/env perl use strict; +print <<EOF; +config ALL + bool + default y + +EOF + while (<>) { chomp; next unless /^CONFIG_([^=]+)=(.*)$/; @@ -9,6 +16,8 @@ while (<>) { my $val = $2; my $type; + next if $var eq 'ALL'; + if ($val eq 'y') { $type = "bool"; } elsif ($val eq 'm') { |