]> git.openpandora.org Git - openembedded.git/commitdiff
Convert IPKG_ARCHS -> PACKAGE_ARCHS, IPKG_EXTRA_ARCHS -> PACKAGE_EXTRA_ARCHS in prepa...
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 20 Nov 2006 11:04:45 +0000 (11:04 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Mon, 20 Nov 2006 11:04:45 +0000 (11:04 +0000)
64 files changed:
classes/multimachine.bbclass
classes/package_ipk.bbclass
classes/packaged-staging.bbclass
classes/rootfs_ipk.bbclass
conf/bitbake.conf
conf/distro/openmn.conf
conf/distro/unslung.conf
conf/documentation.conf
conf/machine/a780.conf
conf/machine/akita.conf
conf/machine/blueangel.conf
conf/machine/colinux.conf
conf/machine/compulab-pxa270.conf
conf/machine/db1200.conf
conf/machine/devkitidp-pxa255.conf
conf/machine/dht-walnut.conf
conf/machine/efika.conf
conf/machine/ep93xx.conf
conf/machine/epia.conf
conf/machine/guinness.conf
conf/machine/h1910.conf
conf/machine/h1940.conf
conf/machine/h2200.conf
conf/machine/h3600.conf
conf/machine/h3900.conf
conf/machine/h4000.conf
conf/machine/h5xxx.conf
conf/machine/h6300.conf
conf/machine/htcuniversal.conf
conf/machine/hx2000.conf
conf/machine/hx4700.conf
conf/machine/include/ixp4xx.conf
conf/machine/include/tune-iwmmxt.conf
conf/machine/include/zaurus-clamshell.conf
conf/machine/ipaq-pxa270.conf
conf/machine/ixp4xx.conf
conf/machine/lite5200.conf
conf/machine/logicpd-pxa270.conf
conf/machine/magician.conf
conf/machine/mainstone.conf
conf/machine/mtx-1.conf
conf/machine/mtx-2.conf
conf/machine/mtx-3.conf
conf/machine/mx31ads.conf
conf/machine/navman-icn330.conf
conf/machine/netbook-pro.conf
conf/machine/nokia770.conf
conf/machine/omap1510inn.conf
conf/machine/omap1610h2.conf
conf/machine/omap1710h3.conf
conf/machine/omap2420h4.conf
conf/machine/omap5912osk.conf
conf/machine/palmld.conf
conf/machine/poodle.conf
conf/machine/qemuarm.conf
conf/machine/rb500.conf
conf/machine/smdk2440.conf
conf/machine/spitz.conf
conf/machine/tosa.conf
conf/machine/triton.conf
conf/machine/wrap.conf
conf/machine/x86.conf
packages/meta/meta-sdk.bb
packages/meta/meta-toolchain.bb

index d63aeb6d733de22de726dabf8909e3e9827daae6..4187a00ec3b65c0f627637602021ee374b7d3d50 100644 (file)
@@ -17,7 +17,7 @@ def multi_machine_after_parse(d):
 
         # We could look for != PACKAGE_ARCH here but how to choose 
         # if multiple differences are present?
-        # Look through IPKG_ARCHS for the priority order?
+        # Look through PACKAGE_ARCHS for the priority order?
         if pkgarch and pkgarch == macharch:
             multiarch = macharch
 
index 47cff1d27c4f2405750c4115d9d1c6d604c2ec7b..02bac7d62b3b2336a2ca50dc11966d9c77d894ea 100644 (file)
@@ -30,9 +30,9 @@ python package_ipk_install () {
        # Generate ipk.conf if it or the stamp doesnt exist
        conffile = os.path.join(stagingdir,"ipkg.conf")
        if not  os.access(conffile, os.R_OK):
-               ipkg_archs = bb.data.getVar('IPKG_ARCHS',d)
+               ipkg_archs = bb.data.getVar('PACKAGE_ARCHS',d)
                if ipkg_archs is None:
-                       bb.error("IPKG_ARCHS missing")
+                       bb.error("PACKAGE_ARCHS missing")
                        raise FuncFailed
                ipkg_archs = ipkg_archs.split()
                arch_priority = 1
index 9aba940da486c6926bba0fe8f8d57846adfc8e29..4b4ebb58bff4548c4f954768621f5142cbf8546e 100644 (file)
@@ -113,7 +113,7 @@ do_stage_prepend() {
                rm ${DEPLOY_DIR_PSTAGE}/ipkg.conf
        fi
 
-       ipkgarchs="${BUILD_ARCH} all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${IPKG_EXTRA_ARCHS} ${MACHINE}"
+       ipkgarchs="${BUILD_ARCH} all any noarch ${TARGET_ARCH} ${PACKAGE_ARCHS} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}"
        priority=1
        for arch in $ipkgarchs; do
                echo "arch $arch $priority" >> ${DEPLOY_DIR_PSTAGE}/ipkg.conf
index c4b299187418168f2e08354d7f3cad940f632f46..8020fd0ca38aad99dda2a26f85a01da14dd21fc3 100644 (file)
@@ -42,7 +42,7 @@ real_do_rootfs () {
        fi
        mkdir -p ${T}
        echo "src oe file:${DEPLOY_DIR_IPK}" > ${T}/ipkg.conf
-       ipkgarchs="${IPKG_ARCHS}"
+       ipkgarchs="${PACKAGE_ARCHS}"
        priority=1
        for arch in $ipkgarchs; do
                echo "arch $arch $priority" >> ${T}/ipkg.conf
index 7da0a9a28d1c850dea216c7a1a45aa263b444f43..b2d7e2b8756ccc4e5bce901923290ad5b6462509 100644 (file)
@@ -57,7 +57,7 @@ TARGET_CC_ARCH = ""
 
 PACKAGE_ARCH = "${HOST_ARCH}"
 MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"
-IPKG_ARCHS = "all any noarch ${TARGET_ARCH} ${IPKG_EXTRA_ARCHS} ${MACHINE}"
+PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}"
 
 ##################################################################
 # Date/time variables.
index 8118acb1dabd1ee4157803ec8f0cda0c7d26e13c..9de6c7d9e11011253db4806353f96c1c849c64ef 100644 (file)
@@ -12,7 +12,7 @@ TARGET_OS = "linux"
 
 INHERIT += "package_ipk"
 INHERIT += "debian"
-IPKG_EXTRA_ARCHS = "armv5te openmn"
+PACKAGE_EXTRA_ARCHS = "armv5te openmn"
 
 FEED_URIS  = "mnci54##http://www.mn-solutions.de/feed/mnci54/base"
 
index 541eaef852ddde3a5b8d13f8d32c121123f8b65f..892c589389327150771b47b728a30bbc80243fb6 100644 (file)
@@ -26,7 +26,7 @@ THUMB_INTERWORK = "no"
 # to armeb - this makes this stuff independent of changes in machine/nslu2.conf
 TARGET_ARCH = "armeb"
 PACKAGE_ARCH = "${TARGET_ARCH}"
-# IPKG_EXTRA_ARCHS has the full list of supported architectures (from nslu2.conf)
+# PACKAGE_EXTRA_ARCHS has the full list of supported architectures (from nslu2.conf)
 
 # match the optimisation settings to that which has traditionally been used
 # in unslung
index 9996b27d488814c7fd4b17bc44c9c605ffe63a7b..62622ea25557d6f97fed7627d6dc6871cec2d750 100644 (file)
@@ -38,8 +38,8 @@ PACKAGE_ARCH[doc] = 'The architecture needed for using a resulting package. If y
 machine dependant configuration options in your bitbake file add a \
 PACKAGE_ARCH  = "${MACHINE_ARCH}" to the file.'
 
-IPKG_ARCHS[doc] = 'A list of architectures compatible with the given target in order of priority'
-IPKG_EXTRA_ARCHS[doc] = 'Set this variable to add extra architectures to the list of supported architectures'
+PACKAGE_ARCHS[doc] = 'A list of architectures compatible with the given target in order of priority'
+PACKAGE_EXTRA_ARCHS[doc] = 'Set this variable to add extra architectures to the list of supported architectures'
 
 DATE[doc] = "The date the build was started Ymd"
 TIME[doc] = "The time the build was started HMS"
index 6b6e5a8ea983812a3c51ba0a00718ad274fadfec..a62fafbc390569b97cc6956bf205fb4e37a7f735 100644 (file)
@@ -5,7 +5,7 @@
 require conf/machine/include/motorola-ezx.conf
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
index e14efa76a00da48f1ea8e09296e2a90f1f8bf42c..27695be4bb3f2b7f84c8ce5242728876875bd951 100644 (file)
@@ -5,7 +5,7 @@
 include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-2.6.conf
 
-IPKG_EXTRA_ARCHS += "iwmmxt" 
+PACKAGE_EXTRA_ARCHS += "iwmmxt" 
 IMAGE_FSTYPES ?= "jffs2"
 
 ROOT_FLASH_SIZE = "58"
index 979c002d11643e912310a347f709197bfd2b3b59..dd079c244b40deb5ab806658f6978b9060971600 100644 (file)
@@ -7,7 +7,7 @@ KERNEL ?= "kernel26"
 OVERRIDES =. "${KERNEL}:"
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel_kernel26 = "xanadux-ba-2.6"
 PREFERRED_PROVIDER_virtual/kernel = "xanadux-ba-2.6"
index 556944ef8ebd7f120b0aa705e0431b052684d777..31e55e924f29fa4fb7431ec74fb76cd90d04a830 100644 (file)
@@ -3,6 +3,6 @@
 #@DESCRIPTION: Machine configuration for Cooperative Linux running on an x86 compatible PC
 
 TARGET_ARCH = "i686"
-IPKG_EXTRA_ARCHS = "i386 x86"
+PACKAGE_EXTRA_ARCHS = "i386 x86"
 PREFERRED_PROVIDER_virtual/kernel = "linux-colinux"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules"
index 38bc90005022f9fd63301484b3cc298785b60672..b49bf48d07fc42d04e274342b052d5e7c27a361e 100644 (file)
@@ -7,7 +7,7 @@ PREFERRED_VERSION_logicpd-pxa270 = "2.6.17"
 GUI_MACHINE_CLASS = "bigscreen"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
-IPKG_EXTRA_ARCHS = "armv4 armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
 include conf/machine/include/tune-xscale.conf
 
index d46636cccf231347937de301c519958382887f67..efa45f6a2a0f058a7e881c58ec86a5e03b50d487 100644 (file)
@@ -1,7 +1,7 @@
 # Alchemy db1200
 
 TARGET_ARCH = "mipsel"
-IPKG_ARCHS = "${TARGET_ARCH} ${MACHINE}"
+PACKAGE_ARCHS = "${TARGET_ARCH} ${MACHINE}"
 
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
index 6bc632dbdd0581ca1325ca5a1b2b9d2be055cbdd..7d19d0243939eff5a3c650fa34d7b9e208398f9c 100644 (file)
@@ -5,7 +5,7 @@
 TARGET_ARCH = "arm"
 
 GUI_MACHINE_CLASS = "bigscreen"
-IPKG_EXTRA_ARCHS = "armv5te"
+PACKAGE_EXTRA_ARCHS = "armv5te"
 
 PREFERRED_PROVIDER_virtual/bootloader = "uboot-${MACHINE}"
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
index 68b754f2d3e6f336cd8b07121e9278595f5f6336..eae1a3433da7413ec0d75c391ca464c7ec8dbb47 100644 (file)
@@ -1,5 +1,5 @@
 TARGET_ARCH = "powerpc"
-IPKG_ARCHS = "all powerpc ${MACHINE}"
+PACKAGE_ARCHS = "all powerpc ${MACHINE}"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-dht-walnut"
 
index 2faf6ebed9b28536b3230c2212595c5dbdd30b92..33fac1ae6a6d754d65cc5c697fa7f62e0dbe5c7f 100644 (file)
@@ -4,7 +4,7 @@
 
 
 TARGET_ARCH = "powerpc"
-IPKG_EXTRA_ARCHS = "ppc"
+PACKAGE_EXTRA_ARCHS = "ppc"
 
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
index 82905dd0891c49543aaace46a41e640d6f997250..67efb585c1e3779bdbe4f386026d97aa8d55f122 100644 (file)
@@ -4,7 +4,7 @@
 
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4t"
+PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
index e82da27574cb23ef8e2b6cece7d7b07dadd6855f..08f12a0ac669d6e87e342a9f305c2e8ad52d33ae 100644 (file)
@@ -7,7 +7,7 @@ udevdir = "/dev"
 OLDEST_KERNEL = "2.6.5"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
-IPKG_EXTRA_ARCHS = "i386"
+PACKAGE_EXTRA_ARCHS = "i386"
 
 include conf/machine/include/tune-c3.conf
 
index 4890f3cecd86c7ce8530070aab69cedab4f3d6b0..bcbd6e80235a54519a1c6a6896e8ba08c26f67de 100644 (file)
@@ -5,7 +5,7 @@
 # i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
 TARGET_ARCH = "i686"
 
-IPKG_EXTRA_ARCHS = "x86 i386 i486 i586"
+PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
 PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
 
 # todo: convert to task-base
index a2c4a9c10e95124efc27eab0b92b02c58b9fcea4..c8b2fad2fd1407f6eb2b22614b87cb09764a75bf 100644 (file)
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 
 require conf/machine/include/tune-xscale.conf
 
index 1ea4a68639b3f9dc72bb5101a10e096acfb82c90..08104624caf54291b8bf8d0a8cb10f65bf597535 100644 (file)
@@ -2,7 +2,7 @@
 #@NAME: h1940
 #@DESCRIPTION: Machine configuration for the HP iPAQ h1930 and h1940
 
-IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 TARGET_ARCH = "arm"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-h1940"
index 8a6cee312c14214a5f0a000ae899cb594d8e893c..91c733b1915f65a582ba23b27f192f6e8ae2f32c 100644 (file)
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 
 #Compile with armv5te optimizations, incompatible with armv4(t) cpus
 require conf/machine/include/tune-xscale.conf
index 14a9bb6ba5d265f61271504b7513a96415edc448..104d518ad3a2db9b414ff2eec5504b31c19d984e 100644 (file)
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "ipaqsa"
+PACKAGE_EXTRA_ARCHS = "ipaqsa"
 
 require conf/machine/include/tune-strongarm.conf
 
index 61024584b596d8c0ca6ecc822f014a44187ca3f8..f00dc9eb96c1951086962e68ebe027e5dfc2687e 100644 (file)
@@ -10,7 +10,7 @@ INHERIT += "linux-kernel-base"
 OVERRIDES =. "${KERNEL}:"
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
 PREFERRED_PROVIDER_virtual/kernel_kernel26 = "linux-handhelds-2.6"
index f2ecbc588369bb2b7c4395c6ac902fdced48676c..4eef599aafc3c1ea6ca1324b2be2ef99bac28185 100644 (file)
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 
 require conf/machine/include/tune-xscale.conf
 
index 941d08c013c9e607a5f700e3f17c0db0628b50ca..5aac579e91521da5c885f15386dfb6084ec65636 100644 (file)
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 
 require conf/machine/include/tune-xscale.conf
 
index 8cce5f61b9128e5edc41503e3858bfaf7b4d2b5f..f793b49c70407f3ec311e7257dca6bd8d068294e 100644 (file)
@@ -7,7 +7,7 @@
 #
 TARGET_ARCH = "arm"
 PACKAGE_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "arm armv4 armv4t"
+PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t"
 
 #Use OMAP 1510 cpu specifig arm9tdmi options for gcc
 require conf/machine/include/tune-arm9tdmi.conf
index 4366cb16df958f3617540ab4044efa73dbdbb935..efb92518a506f3043f5398118a36c09cb70923c6 100644 (file)
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "ipaqpxa armv4t armv5te iwmmxt"
+PACKAGE_EXTRA_ARCHS = "ipaqpxa armv4t armv5te iwmmxt"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.conf
index da2e466425100931c2ad4cabec808f54204dc11e..25f093e1b88d1e89624bd6763a6e1bdd18c65e34 100644 (file)
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the hx2000 iPAQs with a pxa27x CPU 
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
 
index d43d16fb466b9042c21f54bd6b70ac44e853a694..3a9422096861d7ca07b995d7f7ae5664ed5a6cd1 100644 (file)
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.conf
index 541d350f21271a0e08c82fbe3f6d999454c17983..190ebe1c8c2aaa0da541af9cdd684b793cf7b342 100644 (file)
@@ -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)) \
@@ -146,7 +146,7 @@ IPKG_EXTRA_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_EXTRA_ARCHS}"
+IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${PACKAGE_EXTRA_ARCHS}"
 
 #-------------------------------------------------------------------------------
 # Board defaults
index 990aee54bc0201a3d97c3ee4fdf017079b03d81d..8376faca74a8d9135803f6864f68a890dc32b19c 100644 (file)
@@ -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"
 TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt"
 PACKAGE_ARCH = "iwmmxt"
+PACKAGE_EXTRA_ARCHS += "iwmmxt"
 
index e600a4926dfa4e334a6ecabd131941fa0cf35df5..3c02f7bfd937f7c44b178a8e6d65d137838442d3 100644 (file)
@@ -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"
 
index b3db5c82683aa960d6af48c38485be45c7a61cfd..afc1318f4007cbe4863f2bb8d1e5163236ba1bb8 100644 (file)
@@ -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 hx47xx ipaq
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 
index c3e56067cdad006175f46511284eaf96f731a1b4..dc174b8e35bdf028c810beba6c08d52400469395 100644 (file)
@@ -6,4 +6,4 @@ MACHINE_FEATURES = "kernel26 usbhost ext2"
 
 include conf/machine/include/ixp4xx.conf
 
-IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xx${ARCH_BYTE_SEX}"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xx${ARCH_BYTE_SEX}"
index cd943f7e65f8ceb54005b7041b77bcfbf91d9b71..3cbc44485d314ef8df7a82f92def689096df5ac3 100644 (file)
@@ -1,5 +1,5 @@
 TARGET_ARCH = "powerpc"
-IPKG_EXTRA_ARCHS = "ppc"
+PACKAGE_EXTRA_ARCHS = "ppc"
 UBOOT_MACHINE = "Lite5200"
 SERIAL_CONSOLE="38400 ttyS0"
 
index efb19aea93f8e6c90d1b664df1ab45334bffa5d4..dc41e7c2fddd3bb4018c068ef3cd7af02a29adb5 100644 (file)
@@ -7,7 +7,7 @@ PREFERRED_VERSION_logicpd-pxa270 = "2.6.17-rc5"
 GUI_MACHINE_CLASS = "smallscreen"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
-IPKG_EXTRA_ARCHS = "armv4 armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
 include conf/machine/include/tune-xscale.conf
 
index d2cc9b1f4968f9793267cf2271244a9b2dd1ffdf..e5138be1c87bfd329b8fc7feaf79c38238736b86 100644 (file)
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.conf
index 72a305df382984c274ddd6046af47d7506c40683..914022c7bc2f8bc948d2ec481e2e434cda2b0e90 100644 (file)
@@ -5,7 +5,7 @@
 TARGET_ARCH = "arm"
 
 GUI_MACHINE_CLASS = "smallscreen"
-IPKG_EXTRA_ARCHS = "armv5te"
+PACKAGE_EXTRA_ARCHS = "armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
index 73500b501df6def6082da33feade568ea514e807..33a69f45b3ab66521409e55470bf657d5b541488 100644 (file)
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the mtx-1 (aka MeshCube)
 
 TARGET_ARCH = "mipsel"
-IPKG_ARCHS = "all mipsel ${MACHINE}"
+PACKAGE_ARCHS = "all mipsel ${MACHINE}"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-1"
 
index d3e15afc9ec5aa956d40dc89a46d52b774b18473..438c1fed79dd7ef3038f73a698ad1e633b7652bb 100644 (file)
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the mtx-2 (aka SurfBox 2nd generation)
 
 TARGET_ARCH = "mipsel"
-IPKG_ARCHS = "all mipsel ${MACHINE}"
+PACKAGE_ARCHS = "all mipsel ${MACHINE}"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-2"
 
index bdd39ab57fa6c3f0982495b57acdd93e7f99ae2a..dd848ea021f0ab20d56dd400f2d5642da927f8ea 100644 (file)
@@ -9,7 +9,7 @@
 # For compiling the kernel, ARCH will be derived form it by kernel-arch.bbclass 
 TARGET_ARCH = "arm"
 
-IPKG_ARCHS = "all arm ${MACHINE}"
+PACKAGE_ARCHS = "all arm ${MACHINE}"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3"
 
index 4b3fff70613d92b0d087d8756b036573d5957678..33456a4b0358d6a2ef211649ff2acbb0a9a1cabc 100644 (file)
@@ -8,7 +8,7 @@ TARGET_FPU_arm = "hard"
 MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget"
 
 GUI_MACHINE_CLASS = "smallscreen"
-IPKG_EXTRA_ARCHS = "arm armv4t armv5te armv6"
+PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te armv6"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
index 79bafd12303d97ff698e7a4ad788545a1f056a8b..c5fbdf2e9753222c7ab8fcea6d34d5a3b1b170e6 100644 (file)
@@ -8,7 +8,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 
 #Compile with armv5te optimizations, incompatible with armv4(t) cpus
 require conf/machine/include/tune-xscale.conf
index 095cd95d312ac1d29e7844c09f25d72ccc8704b0..1048cb1d6c3ae9a1dddc4a4032cf0569c98820df 100755 (executable)
@@ -5,7 +5,7 @@
 INHERIT += "linux-kernel-base"
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "arm armv4 armv4t armv5te"
+PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
index aa57bb45637e5f08dc4b648cf4da36cec5bba42f..6bde574d029ea3cdebf90a7ac309fd107bdf205f 100644 (file)
@@ -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 armv4t armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
 PREFERRED_PROVIDER_virtual/bootloader = ""
index bd367d43a0195221f89c57d20b937510a1837032..51d5b12f9d2d99161a3979cfa1ea62ce44acc680 100644 (file)
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv5te"
+PACKAGE_EXTRA_ARCHS = "armv5te"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6"
index bd367d43a0195221f89c57d20b937510a1837032..51d5b12f9d2d99161a3979cfa1ea62ce44acc680 100644 (file)
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv5te"
+PACKAGE_EXTRA_ARCHS = "armv5te"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6"
index bd367d43a0195221f89c57d20b937510a1837032..51d5b12f9d2d99161a3979cfa1ea62ce44acc680 100644 (file)
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv5te"
+PACKAGE_EXTRA_ARCHS = "armv5te"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6"
index 514069264e2d74f73c4eca22777cd12b89235d00..70a3082956cbe4f96303c1cc735a71e16b829b82 100644 (file)
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv5te armv6te"
+PACKAGE_EXTRA_ARCHS = "armv5te armv6te"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6"
index c6bb20948a5476cae74d289a72521a25ca54375f..f8a3472f78c5b58c491ea08aa23bed62c02b346c 100644 (file)
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the OMAP Starter Kit with a 5912 processor
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv5te"
+PACKAGE_EXTRA_ARCHS = "armv5te"
 
 HOTPLUG = "udev"
 
index 35a31aa00bf8de1d96fbdbf181ab2037238d043c..ef8f4ca57b4ec0ddb07a0132dbeaf025b03ec153 100644 (file)
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the Palm LifeDrive
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "arm armv4t armv5te"
+PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "hackndev-2.6trunk"
 
index fc8fb718f27078b015c936c54246f4deab4b60f7..c904372535d4c861e286c01eddbc96b788b696a3 100644 (file)
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
 MACHINE_KERNEL_VERSION ?= "2.4"
 include conf/machine/include/poodle-${MACHINE_KERNEL_VERSION}.conf
index c32353f01e5cbab6b952b27c4392c2a6d1314d63..d67acac50fb0117f5f59f37f147532416c1e181c 100644 (file)
@@ -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
index aec2a8f726d186f20c44597421e184ca1a201a38..ab669aee4963e29284c5a0a1d23acb3fe549e433 100644 (file)
@@ -4,5 +4,5 @@
 
 TARGET_ARCH = "mipsel"
 TARGET_CC_ARCH = "-Os -mips2"
-IPKG_ARCHS = "all mipsel ${MACHINE}"
+PACKAGE_ARCHS = "all mipsel ${MACHINE}"
 PREFERRED_PROVIDER_virtual/kernel = "linux-rb500"
index 04694cd3d364f52e05eb013255bbb199a55e7f17..c054cf6195c7163acd76ef4e38f491c1d5bbdbeb 100644 (file)
@@ -4,7 +4,7 @@
 
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4t"
+PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-smdk2440"
 
index 5434efbaf6dccf23f1e72b40ad4fa064947c9f0b..2c4e10935ee9735206f783b566fcef11a1720e68 100644 (file)
@@ -7,7 +7,7 @@ include conf/machine/include/zaurus-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"
index e7f2aa204acf29c6d5225c30c308b71bba15fe2c..1d7b04e24e00c42a1abf8c0ae86ac525514a39b6 100644 (file)
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
 MACHINE_KERNEL_VERSION ?= "2.6"
 include conf/machine/include/tosa-${MACHINE_KERNEL_VERSION}.conf
index 671def34c3efc2b0f66c8f175314a393956cf8e9..685dcd91fbaca24c40d8a7123e1684cb92e0aada 100644 (file)
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the XScale based triton boards from KaRo Electronics 
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv5te"
+PACKAGE_EXTRA_ARCHS = "armv5te"
 PREFERRED_PROVIDER_virtual/kernel = "triton-kernel"
 
 BOOTSTRAP_EXTRA_RDEPENDS = "virtual/kernel"
index 1073259e7a029f0dc669d5d09fd5474b7e60b295..592be8dd3c0de6d9de5d350a7bb855ddc3eeb145 100644 (file)
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the PC Engines WRAP (Wireless Router Application Platform) boards.
 
 TARGET_ARCH = "i486"
-IPKG_EXTRA_ARCHS = "i386"
+PACKAGE_EXTRA_ARCHS = "i386"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-wrap-geode"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
index 0953f6d0414edab7efa11497edec9315083ab966..b2147f2c0d8df11c1784d33e4bfd52e5641b0474 100644 (file)
@@ -5,7 +5,7 @@
 # i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
 TARGET_ARCH = "i486"
 # TARGET_VENDOR = "-oe"
-IPKG_EXTRA_ARCHS = "x86"
+PACKAGE_EXTRA_ARCHS = "x86"
 PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
 # todo: convert to task-base
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
index 0714e506b7c9de7a81332b9ad78b65f74064ff0a..35ea8630c95c337e7540d06427c8ff289513b78d 100644 (file)
@@ -42,7 +42,7 @@ EOF
         cat <<EOF >${SDK_DIR}/ipkg-target.conf
 src oe file:${DEPLOY_DIR_IPK}
 EOF
-       ipkgarchs="${IPKG_ARCHS}"
+       ipkgarchs="${PACKAGE_ARCHS}"
         priority=1
         for arch in $ipkgarchs; do
                 echo "arch $arch $priority" >> ${SDK_DIR}/ipkg-target.conf
index 45ce8520dfd619d5a337c6af5f3ef15f4ee69041..f3a0332ac7c923c0f8ebffe950d7bb13b0636fe5 100644 (file)
@@ -39,7 +39,7 @@ EOF
         cat <<EOF >${SDK_DIR}/ipkg-target.conf
 src oe file:${DEPLOY_DIR_IPK}
 EOF
-       ipkgarchs="${IPKG_ARCHS}"
+       ipkgarchs="${PACKAGE_ARCHS}"
         priority=1
         for arch in $ipkgarchs; do
                 echo "arch $arch $priority" >> ${SDK_DIR}/ipkg-target.conf