Просмотр исходного кода

ignore profiles with custom kernel configs in the image builder itself

SVN-Revision: 6342
Felix Fietkau 19 лет назад
Родитель
Сommit
804bfa954d
2 измененных файлов с 8 добавлено и 4 удалено
  1. 4 3
      scripts/metadata.pl
  2. 4 1
      target/imagebuilder/files/Makefile

+ 4 - 3
scripts/metadata.pl

@@ -149,9 +149,10 @@ sub gen_target_mk() {
   define Profile/$conf\_$profile->{id}
   define Profile/$conf\_$profile->{id}
     ID:=$profile->{id}
     ID:=$profile->{id}
     NAME:=$profile->{name}
     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}))"
 \$(eval \$(call AddProfile,$conf\_$profile->{id}))"
 		}
 		}
 		print "
 		print "

+ 4 - 1
target/imagebuilder/files/Makefile

@@ -34,6 +34,7 @@ IPKG:= \
 define Profile/Default
 define Profile/Default
   ID:=
   ID:=
   NAME:=
   NAME:=
+  KCONFIG:=
   PACKAGES:=
   PACKAGES:=
 endef
 endef
 
 
@@ -46,8 +47,10 @@ define AddProfile
     endif
     endif
 	$(ID)_NAME:=$(NAME)
 	$(ID)_NAME:=$(NAME)
 	$(ID)_PACKAGES:=$(PACKAGES)
 	$(ID)_PACKAGES:=$(PACKAGES)
-    PROFILE_LIST += \
+    ifneq ($(KCONFIG),)
+      PROFILE_LIST += \
   		echo '$(ID):'; [ -z '$(NAME)' ] || echo '	$(NAME)'; echo '	Packages: $(PACKAGES)';
   		echo '$(ID):'; [ -z '$(NAME)' ] || echo '	$(NAME)'; echo '	Packages: $(PACKAGES)';
+    endif
   endif
   endif
 endef
 endef