浏览代码

rename the Profile template that the image builder uses to prevent name conflicts with the template that the kernel uses

SVN-Revision: 6336
Felix Fietkau 19 年之前
父节点
当前提交
5281d134cd
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      scripts/metadata.pl
  2. 1 1
      target/imagebuilder/files/Makefile

+ 1 - 1
scripts/metadata.pl

@@ -151,7 +151,7 @@ sub gen_target_mk() {
     PACKAGES:=".join(" ", @{$profile->{packages}})."
   endef";
   $profiles_eval .= "
-\$(eval \$(call Profile,$conf\_$profile->{id}))"
+\$(eval \$(call AddProfile,$conf\_$profile->{id}))"
 		}
 		print "
 ifeq (\$(CONFIG_LINUX_$conf),y)

+ 1 - 1
target/imagebuilder/files/Makefile

@@ -37,7 +37,7 @@ define Profile/Default
   PACKAGES:=
 endef
 
-define Profile
+define AddProfile
   $(eval $(call Profile/Default))
   $(eval $(call Profile/$(1)))
   ifneq ($(ID),)