diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-05-27 21:49:50 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-05-27 21:49:50 +0000 |
| commit | 3097ab0f62233dc336dfe611fef4b8b633355190 (patch) | |
| tree | 8173abc003c9703cf625d4e100f57d3d5141177d /openembedded/conf/machine/include/ixp4xx.conf | |
| parent | b77fcc05cacdf70819cc226d53156a9e70e84e04 (diff) | |
| download | openembedded-core-3097ab0f62233dc336dfe611fef4b8b633355190.tar.gz openembedded-core-3097ab0f62233dc336dfe611fef4b8b633355190.tar.bz2 openembedded-core-3097ab0f62233dc336dfe611fef4b8b633355190.tar.xz openembedded-core-3097ab0f62233dc336dfe611fef4b8b633355190.zip | |
Sync conf and classes with OE - changes have been tested and don't affect poky
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@446 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/conf/machine/include/ixp4xx.conf')
| -rw-r--r-- | openembedded/conf/machine/include/ixp4xx.conf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/openembedded/conf/machine/include/ixp4xx.conf b/openembedded/conf/machine/include/ixp4xx.conf index 639bf4a74..93befb92c 100644 --- a/openembedded/conf/machine/include/ixp4xx.conf +++ b/openembedded/conf/machine/include/ixp4xx.conf @@ -62,7 +62,7 @@ IXP4XX_SUFFIX = "${MACHINE_ARCH}" # arm/thumb interworking are enabled in the inputs. OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}" -OVERRIDES = "local:${MACHINE}:ixp4xx:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}:build-${BUILD_OS}" +OVERRIDES = "local:${MACHINE}:ixp4xx:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}:build-${BUILD_OS}:fail-fast" # TARGET_CC_ARCH # TARGET_CC_KERNEL_ARCH @@ -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 <ARM_INSTRUCTION_SET>_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 |