aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-09-12 20:49:54 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-09-12 20:49:54 +0000
commit064e7c8f00ebc1721553c0fcb312f809b00e179a (patch)
treea12eb3995a6a04ae7ee0fa2f876de77c22a91ca2
parent78539bfa4f6e2af404934fee326d607e6414980e (diff)
downloadupstream-064e7c8f00ebc1721553c0fcb312f809b00e179a.tar.gz
upstream-064e7c8f00ebc1721553c0fcb312f809b00e179a.tar.bz2
upstream-064e7c8f00ebc1721553c0fcb312f809b00e179a.zip
Implement an ARCH_PACKAGES variable which defaults to BOARD but can be overridden on a per-subtarget basis. This is intended for targets such as adm5120 and malta which support both big and little endianess and will replace the target specific exceptions in package-defaults and Image Builder.
SVN-Revision: 23029
-rw-r--r--include/package-defaults.mk6
-rw-r--r--include/target.mk1
-rw-r--r--rules.mk1
-rwxr-xr-xscripts/metadata.pl10
4 files changed, 15 insertions, 3 deletions
diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 649f409f50..f17653b7fe 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -23,10 +23,10 @@ define Package/Default
else
VERSION:=$(PKG_RELEASE)
endif
- ifneq ($(CONFIG_TARGET_adm5120),y)
- PKGARCH:=$(BOARD)
+ ifneq ($(ARCH_PACKAGES),)
+ PKGARCH:=$(ARCH_PACKAGES)
else
- PKGARCH:=$(BOARD)_$(ARCH)
+ PKGARCH:=$(BOARD)
endif
PRIORITY:=optional
DEFAULT:=
diff --git a/include/target.mk b/include/target.mk
index d49714c353..9744a7ca7e 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -178,6 +178,7 @@ define BuildTargets/DumpCurrent
echo 'Target-Name: $(BOARDNAME)$(if $(SUBTARGETS),$(if $(SUBTARGET),))'; \
echo 'Target-Path: $(subst $(TOPDIR)/,,$(PWD))'; \
echo 'Target-Arch: $(ARCH)'; \
+ echo 'Target-Arch-Packages: $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD))'; \
echo 'Target-Features: $(FEATURES)'; \
echo 'Target-Depends: $(DEPENDS)'; \
echo 'Target-Optimization: $(if $(CFLAGS),$(CFLAGS),$(DEFAULT_CFLAGS))'; \
diff --git a/rules.mk b/rules.mk
index 1ce28e1bba..e07b06c2e5 100644
--- a/rules.mk
+++ b/rules.mk
@@ -31,6 +31,7 @@ strip_last=$(patsubst %.$(lastword $(subst .,$(space),$(1))),%,$(1))
_SINGLE=export MAKEFLAGS=$(space);
CFLAGS:=
ARCH:=$(subst i486,i386,$(subst i586,i386,$(subst i686,i386,$(call qstrip,$(CONFIG_ARCH)))))
+ARCH_PACKAGES:=$(call qstrip,$(CONFIG_TARGET_ARCH_PACKAGES))
BOARD:=$(call qstrip,$(CONFIG_TARGET_BOARD))
TARGET_OPTIMIZATION:=$(call qstrip,$(CONFIG_TARGET_OPTIMIZATION))
TARGET_SUFFIX=$(call qstrip,$(CONFIG_TARGET_SUFFIX))
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 336605f7b0..2e90257270 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -49,6 +49,7 @@ sub parse_target_metadata() {
/^Target-Name:\s*(.+)\s*$/ and $target->{name} = $1;
/^Target-Path:\s*(.+)\s*$/ and $target->{path} = $1;
/^Target-Arch:\s*(.+)\s*$/ and $target->{arch} = $1;
+ /^Target-Arch-Packages:\s*(.+)\s*$/ and $target->{arch_packages} = $1;
/^Target-Features:\s*(.+)\s*$/ and $target->{features} = [ split(/\s+/, $1) ];
/^Target-Depends:\s*(.+)\s*$/ and $target->{depends} = [ split(/\s+/, $1) ];
/^Target-Description:/ and $target->{desc} = get_multiline(*FILE);
@@ -335,6 +336,15 @@ EOF
$target->{subtarget} or print "\t\tdefault \"".$target->{board}."\" if TARGET_".$target->{conf}."\n";
}
print <<EOF;
+config TARGET_ARCH_PACKAGES
+ string
+
+EOF
+ foreach my $target (@target) {
+ next if @{$target->{subtargets}} > 0;
+ print "\t\tdefault \"".($target->{arch_packages} || $target->{board})."\" if TARGET_".$target->{conf}."\n";
+ }
+ print <<EOF;
config DEFAULT_TARGET_OPTIMIZATION
string