From e2ea34b1e3675f0f0b8b1b3c05ee7f9590c773f5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 27 May 2006 09:55:35 +0000 Subject: Clean up IPKG_ARCHS as it was being used inconsistently, often with duplication. Create IPKG_EXTRA_ARCHS to add to the standard variable. Update documentation.conf with the details. --- conf/machine/include/ixp4xx.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'conf/machine/include/ixp4xx.conf') diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf index 2dab2e2e40..93befb92ce 100644 --- a/conf/machine/include/ixp4xx.conf +++ b/conf/machine/include/ixp4xx.conf @@ -111,7 +111,7 @@ TARGET_PACKAGE_ARCH = "${TARGET_PACKAGE_ARCH_BASE}${BYTE_SEX_CHAR}" # because everything built here is no more specific than that. MACHINE_ARCH = "ixp4xx${ARCH_BYTE_SEX}" -# IPKG_ARCHS +# IPKG_EXTRA_ARCHS # The full list of package architectures which should run on the system. # This takes into account both the board level issues and the INPUTS set # by the distro. The arm list is derived from the architecture settings @@ -126,12 +126,12 @@ THUMB_ARCHITECTURES = "thumbe${BYTE_SEX_CHAR} thumbv4t${BYTE_SEX_CHAR} thumbv5t$ # NOTE: this list contains just the things which rootfs_ipk.bbclass does # not add, rootfs_ipk.bbclass evaluates: # -# ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}" +# ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_EXTRA_ARCHS} ${MACHINE}" # # This is a priority ordered list - most desireable architecture at the end, # so put _ARCHITECTURES at the end and, if # THUMB_INTERWORK precede this with the other architectures. -IPKG_ARCHS = "ixp4xx ${MACHINE} \ +IPKG_EXTRA_ARCHS = "ixp4xx ${MACHINE} \ ${@(lambda arch_thumb, arch_arm, is_arm, interwork: \ (interwork and (is_arm and arch_thumb or arch_arm) + ' ' or '') \ + '${TARGET_ARCH} ' + (is_arm and arch_arm or arch_thumb)) \ @@ -146,7 +146,7 @@ IPKG_ARCHS = "ixp4xx ${MACHINE} \ # the removal of the raw "${MACHINE}" from the end of the list. ${MACHINE} and # ixp4xx are included at the start (lower priority) as the non-byte-sex specific # versions. -IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_ARCHS}" +IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_EXTRA_ARCHS}" #------------------------------------------------------------------------------- # Package versions -- cgit v1.2.3