diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-02-22 02:27:01 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-02-22 02:27:01 +0000 |
| commit | 6bf50a5091bb7a97fda04115df5eee28efafaca5 (patch) | |
| tree | 8e38bf369fe942c92ad7aa3af5fb7b4eae07f96a | |
| parent | c753ab262efc3bc5403edba60732708ac9221a5b (diff) | |
| download | upstream-6bf50a5091bb7a97fda04115df5eee28efafaca5.tar.gz upstream-6bf50a5091bb7a97fda04115df5eee28efafaca5.tar.bz2 upstream-6bf50a5091bb7a97fda04115df5eee28efafaca5.zip | |
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-x | scripts/metadata.pl | 2 | ||||
| -rw-r--r-- | 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),) |