summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-02-22 02:27:01 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-02-22 02:27:01 +0000
commitd84816a3222a29f84c205732ec7dad6b32d1f072 (patch)
tree8e38bf369fe942c92ad7aa3af5fb7b4eae07f96a
parent7923c5e52ca085c54dd63c17671556a7ec4b4152 (diff)
rename the Profile template that the image builder uses to prevent name conflicts with the template that the kernel uses
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6336 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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 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),)