diff options
author | Chris Larson <kergoth@openedhand.com> | 2006-09-19 09:04:09 +0000 |
---|---|---|
committer | Chris Larson <kergoth@openedhand.com> | 2006-09-19 09:04:09 +0000 |
commit | 4fa2d11bb1fdb58ff426114169583672fc3d65b8 (patch) | |
tree | 0bd4952bbe057c3dc219be7e371a6a9d496c6535 /meta/conf/machine/include | |
parent | 04f695333350e31fa87b7822c17a073af73fcd84 (diff) | |
download | openembedded-core-4fa2d11bb1fdb58ff426114169583672fc3d65b8.tar.gz openembedded-core-4fa2d11bb1fdb58ff426114169583672fc3d65b8.tar.bz2 openembedded-core-4fa2d11bb1fdb58ff426114169583672fc3d65b8.tar.xz openembedded-core-4fa2d11bb1fdb58ff426114169583672fc3d65b8.zip |
Sync up.. all the deb/dpkg changes which I have locally are now in svn.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@728 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf/machine/include')
-rw-r--r-- | meta/conf/machine/include/ixp4xx.conf | 10 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-iwmmxt.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/zaurus-clamshell.conf | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/meta/conf/machine/include/ixp4xx.conf b/meta/conf/machine/include/ixp4xx.conf index 93befb92c..e545bbc1c 100644 --- a/meta/conf/machine/include/ixp4xx.conf +++ b/meta/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_EXTRA_ARCHS +# PACKAGE_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_EXTRA_ARCHS} ${MACHINE}" +# ipkgarchs="all any noarch ${TARGET_ARCH} ${PACKAGE_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_EXTRA_ARCHS = "ixp4xx ${MACHINE} \ +PACKAGE_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)) \ @@ -141,12 +141,12 @@ IPKG_EXTRA_ARCHS = "ixp4xx ${MACHINE} \ bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes')} \ ${MACHINE_ARCH} ${MACHINE}${ARCH_BYTE_SEX}" -# IPKG_ARCH_LIST [not used] +# PACKAGE_ARCH_LIST [not used] # This is used to override the ipkgarchs settings in rootfs_ipk.bbclass, allowing # 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_EXTRA_ARCHS}" +PACKAGE_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${PACKAGE_EXTRA_ARCHS}" #------------------------------------------------------------------------------- # Package versions diff --git a/meta/conf/machine/include/tune-iwmmxt.conf b/meta/conf/machine/include/tune-iwmmxt.conf index 990aee54b..f9c8e7f5c 100644 --- a/meta/conf/machine/include/tune-iwmmxt.conf +++ b/meta/conf/machine/include/tune-iwmmxt.conf @@ -1,6 +1,6 @@ # Configurations for the Intel PXA27x Appications Processor Family. # Please use tune-xscale for PXA255/PXA26x based processors. -IPKG_EXTRA_ARCHS += "iwmmxt" +PACKAGE_EXTRA_ARCHS += "iwmmxt" TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt" PACKAGE_ARCH = "iwmmxt" diff --git a/meta/conf/machine/include/zaurus-clamshell.conf b/meta/conf/machine/include/zaurus-clamshell.conf index e600a4926..3c02f7bfd 100644 --- a/meta/conf/machine/include/zaurus-clamshell.conf +++ b/meta/conf/machine/include/zaurus-clamshell.conf @@ -1,5 +1,5 @@ TARGET_ARCH = "arm" -IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" |