mirror of
https://git.yoctoproject.org/poky
synced 2026-06-04 02:00:04 +00:00
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
This commit is contained in:
Chris Larson
@@ -5,7 +5,7 @@
|
||||
include conf/machine/include/zaurus-clamshell.conf
|
||||
include conf/machine/include/zaurus-clamshell-2.6.conf
|
||||
|
||||
IPKG_EXTRA_ARCHS += "iwmmxt"
|
||||
PACKAGE_EXTRA_ARCHS += "iwmmxt"
|
||||
IMAGE_FSTYPES ?= "jffs2"
|
||||
|
||||
ROOT_FLASH_SIZE = "58"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#@NAME: Nokia 770 internet tablet
|
||||
#@DESCRIPTION: Machine configuration for the Compulab CM-X270
|
||||
TARGET_ARCH = "arm"
|
||||
IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te iwmmxt"
|
||||
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te iwmmxt"
|
||||
|
||||
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU devices
|
||||
|
||||
TARGET_ARCH = "arm"
|
||||
IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700"
|
||||
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700"
|
||||
|
||||
#use this for a hx2xxx ipaq
|
||||
PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#@NAME: Nokia 770 internet tablet
|
||||
#@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet
|
||||
TARGET_ARCH = "arm"
|
||||
IPKG_EXTRA_ARCHS = "armv4 armv5te"
|
||||
PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
|
||||
|
||||
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
|
||||
PREFERRED_PROVIDER_virtual/bootloader = ""
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation
|
||||
|
||||
TARGET_ARCH = "arm"
|
||||
IPKG_EXTRA_ARCHS = "armv4 armv5te"
|
||||
PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
|
||||
|
||||
require conf/machine/include/qemu.conf
|
||||
require conf/machine/include/tune-arm926ejs.conf
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
TARGET_ARCH = "i586"
|
||||
TARGET_VENDOR = "-oe"
|
||||
IPKG_EXTRA_ARCHS = "x86"
|
||||
PACKAGE_EXTRA_ARCHS = "x86"
|
||||
|
||||
require conf/machine/include/qemu.conf
|
||||
# require conf/machine/include/tune-arm926ejs.conf
|
||||
|
||||
@@ -7,7 +7,7 @@ include conf/machine/include/zaurus-clamshell-2.6.conf
|
||||
|
||||
PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
|
||||
|
||||
IPKG_EXTRA_ARCHS += "iwmmxt"
|
||||
PACKAGE_EXTRA_ARCHS += "iwmmxt"
|
||||
IMAGE_FSTYPES ?= "tar.gz"
|
||||
|
||||
ROOT_FLASH_SIZE = "100"
|
||||
|
||||
Reference in New Issue
Block a user