summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-02-22 02:27:01 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-02-22 02:27:01 +0000
commit5281d134cdf4bedc756a3e3e9e2d63a31b7674aa (patch)
treef0ae39e523b1e3b5b2e38ecd590bd04c41284ad7
parentf393bed10e090c5880bf45c65258c9e4c9946833 (diff)
downloadmtk-20170518-5281d134cdf4bedc756a3e3e9e2d63a31b7674aa.zip
mtk-20170518-5281d134cdf4bedc756a3e3e9e2d63a31b7674aa.tar.gz
mtk-20170518-5281d134cdf4bedc756a3e3e9e2d63a31b7674aa.tar.bz2
rename the Profile template that the image builder uses to prevent name conflicts with the template that the kernel uses
SVN-Revision: 6336
-rwxr-xr-xscripts/metadata.pl2
-rw-r--r--target/imagebuilder/files/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 7514a17..d27cd8e 100755
--- a/scripts/metadata.pl
+++ b/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)
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index eae3697..b36e2f2 100644
--- a/target/imagebuilder/files/Makefile
+++ b/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),)