diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-02-22 04:03:35 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-02-22 04:03:35 +0000 |
| commit | c6d265f356980b1dffc9f1bdb464f5e76f7b714f (patch) | |
| tree | 0fa77c919e9532a5d33b937a826c3f447660587c | |
| parent | 76ba15fe00dba92f5e415d47c481d28ba7e5e206 (diff) | |
| download | upstream-c6d265f356980b1dffc9f1bdb464f5e76f7b714f.tar.gz upstream-c6d265f356980b1dffc9f1bdb464f5e76f7b714f.tar.bz2 upstream-c6d265f356980b1dffc9f1bdb464f5e76f7b714f.zip | |
ignore profiles with custom kernel configs in the image builder itself
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6342 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | scripts/metadata.pl | 7 | ||||
| -rw-r--r-- | target/imagebuilder/files/Makefile | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl index 4a05628a54..063524a67b 100755 --- a/scripts/metadata.pl +++ b/scripts/metadata.pl @@ -149,9 +149,10 @@ sub gen_target_mk() { define Profile/$conf\_$profile->{id} ID:=$profile->{id} NAME:=$profile->{name} - PACKAGES:=".join(" ", @{$profile->{packages}})." - endef"; - $profiles_eval .= " + PACKAGES:=".join(" ", @{$profile->{packages}})."\n"; + $profile->{kconfig} and $profiles_def .= " KCONFIG:=1\n"; + $profiles_def .= " endef"; + $profiles_eval .= " \$(eval \$(call AddProfile,$conf\_$profile->{id}))" } print " diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index b36e2f2e31..8b386a33c6 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -34,6 +34,7 @@ IPKG:= \ define Profile/Default ID:= NAME:= + KCONFIG:= PACKAGES:= endef @@ -46,8 +47,10 @@ define AddProfile endif $(ID)_NAME:=$(NAME) $(ID)_PACKAGES:=$(PACKAGES) - PROFILE_LIST += \ + ifneq ($(KCONFIG),) + PROFILE_LIST += \ echo '$(ID):'; [ -z '$(NAME)' ] || echo ' $(NAME)'; echo ' Packages: $(PACKAGES)'; + endif endif endef |