From 5281d134cdf4bedc756a3e3e9e2d63a31b7674aa Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 22 Feb 2007 02:27:01 +0000
Subject: [PATCH] rename the Profile template that the image builder uses to
prevent name conflicts with the template that the kernel uses
SVN-Revision: 6336
---
scripts/metadata.pl | 2 +-
target/imagebuilder/files/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 7514a17135..d27cd8e59d 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 eae3697e81..b36e2f2e31 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),)
--
GitLab