From: nbd Date: Thu, 22 Feb 2007 02:27:01 +0000 (+0000) Subject: rename the Profile template that the image builder uses to prevent name conflicts... X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=d84816a3222a29f84c205732ec7dad6b32d1f072 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 --- diff --git a/scripts/metadata.pl b/scripts/metadata.pl index 7514a1713..d27cd8e59 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 eae3697e8..b36e2f2e3 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),)