From c47abdea2537894021c7c2c73ab6c1394a2d9d6a Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 6 Apr 2016 21:53:19 +0200 Subject: [PATCH] include/target.mk: default to CPU_TYPE for the package architecture Use the more specific CPU_TYPE designation as default package architecture and only fall back to ARCH if no specific CPU_TYPE is set. This means that e.g. ar71xx packages will use "74kc" as architecture, not "mips" which is a precondition for sharing packages between targets. Signed-off-by: Jo-Philipp Wich --- include/target.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/target.mk b/include/target.mk index 76fbd99423..a9d4c5db05 100644 --- a/include/target.mk +++ b/include/target.mk @@ -1,5 +1,6 @@ # # Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2016 LEDE Project # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -280,7 +281,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-Arch-Packages: $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(if $(CPU_TYPE),$(CPU_TYPE),$(ARCH)))'; \ echo 'Target-Features: $(FEATURES)'; \ echo 'Target-Depends: $(DEPENDS)'; \ echo 'Target-Optimization: $(if $(CFLAGS),$(CFLAGS),$(DEFAULT_CFLAGS))'; \ -- 2.25.1