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

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 4a05628..063524a 100755 (executable)
--- 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 b36e2f2..8b386a3 100644 (file)
--- 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