KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

target/sdk: use .config instead of unconditionally enabling all build dirs

Browse source 
Call make defconfig on every build to catch newly added packages

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 39913
This commit is contained in:
Felix Fietkau 2014-03-13 12:12:58 +00:00
parent fd27fb770d
commit ee4110aff0
3 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/toplevel.mk
View file

@ -156,6 +156,15 @@ prereq:: prepare-tmpinfo .config
@+$(MAKE) -r -s tmp/.prereq-build $(PREP_MK) @+$(MAKE) -r -s tmp/.prereq-build $(PREP_MK)
@+$(NO_TRACE_MAKE) -r -s $@ @+$(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 @+$(PREP_MK) $(NO_TRACE_MAKE) -r -s prereq
@( \ @( \
@ -167,6 +176,8 @@ prereq:: prepare-tmpinfo .config
) )
@+$(ULIMIT_FIX) $(SUBMAKE) -r $@ @+$(ULIMIT_FIX) $(SUBMAKE) -r $@
endif
help: help:
cat README cat README

7
package/Makefile
View file

@ -10,11 +10,8 @@ curdir:=package
-include $(TMP_DIR)/.packagedeps -include $(TMP_DIR)/.packagedeps
$(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m)) $(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))
$(curdir)/builddirs-install:=. $(curdir)/builddirs-install:=.
ifeq ($(SDK),1) $(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m))
else $(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
$(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m))
$(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
endif
ifneq ($(IGNORE_ERRORS),) ifneq ($(IGNORE_ERRORS),)
package-y-filter := $(package-y) package-y-filter := $(package-y)
package-m-filter := $(filter-out $(package-y),$(package-m)) package-m-filter := $(filter-out $(package-y),$(package-m))

9
target/sdk/convert-config.pl
View file

@ -1,6 +1,13 @@
#!/usr/bin/env perl #!/usr/bin/env perl
use strict; use strict;
print <<EOF;
config ALL
bool
default y
EOF
while (<>) { while (<>) {
chomp; chomp;
next unless /^CONFIG_([^=]+)=(.*)$/; next unless /^CONFIG_([^=]+)=(.*)$/;
@ -9,6 +16,8 @@ while (<>) {
my $val = $2; my $val = $2;
my $type; my $type;
next if $var eq 'ALL';
if ($val eq 'y') { if ($val eq 'y') {
$type = "bool"; $type = "bool";
} elsif ($val eq 'm') { } elsif ($val eq 'm') {