[oe-commits] org.oe.dev Convert IPKG_ARCHS -> PACKAGE_ARCHS, IPKG_EXTRA_ARCHS -> PACKAGE_EXTRA_ARCHS in preparation for deb handling

rpurdie commit openembedded-commits at lists.openembedded.org
Mon Nov 20 11:08:40 UTC 2006 

Convert IPKG_ARCHS -> PACKAGE_ARCHS, IPKG_EXTRA_ARCHS -> PACKAGE_EXTRA_ARCHS in preparation for deb handling

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: eb2dfd860b1bdb49e043ad3db6e8c0233a4c6f04
ViewMTN: http://monotone.openembedded.org/revision.psp?id=eb2dfd860b1bdb49e043ad3db6e8c0233a4c6f04
Files:
1
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
Diffs:

#
# mt diff -rd7191428f52c2687ab37fb8004679b1113861df0 -reb2dfd860b1bdb49e043ad3db6e8c0233a4c6f04
#
# 
# 
# patch "classes/multimachine.bbclass"
#  from [39bec0079b9e0bad6abd2637e242bb97bb66cce2]
#    to [c75808c11d01fe1057e53269f8da5b6ce04dc1aa]
# 
# patch "classes/package_ipk.bbclass"
#  from [25329a5477253bdcdb72f43a093cba57c0bf6f14]
#    to [5d149a3ccb468f3ee0310fc0c2fb61e5485bd3e1]
# 
# patch "classes/packaged-staging.bbclass"
#  from [6a63817669b82c9ebe654871409eb1ebf9b74cab]
#    to [eecd4b2075ad18ef09bf96702dc11c61515865f1]
# 
# patch "classes/rootfs_ipk.bbclass"
#  from [5eced81bb739614c780abd2178041f78c3dd441c]
#    to [a759ea9945aa0e70757e50c45b254c6f8fdbc0b0]
# 
# patch "conf/bitbake.conf"
#  from [eb29b94151c567ed6d7a2cc7842686a5cffdbc90]
#    to [412c9f3d491bbaf1bef0156269fcdefa994cd583]
# 
# patch "conf/distro/openmn.conf"
#  from [9a78b7afdd948cba7c16ce5fe611ef6aa7eb2a53]
#    to [5af305f4438a614916cc2c0e9419fbc3afe5018a]
# 
# patch "conf/distro/unslung.conf"
#  from [ff83a015f410221e74442b2f60b99e002336fb76]
#    to [166df5335ff15d9f92e718c211aa45bfdccb8b11]
# 
# patch "conf/documentation.conf"
#  from [8a33fc2b37cd677264e72eb8480b4d51fcdf7a48]
#    to [1756d198ee92f76a95b1dda5ce51ce445b9a652c]
# 
# patch "conf/machine/a780.conf"
#  from [0232de87227cc8f08671b8ff46a768acd5ff7094]
#    to [4aa796115d8b7c263d4b957545a0d95a8c7dbc8c]
# 
# patch "conf/machine/akita.conf"
#  from [7ff5ee276ccc11d5ee3bf9466c512d263d9ac1b8]
#    to [cb07da10ff48df80f6f38074c74c8d2200a4c34b]
# 
# patch "conf/machine/blueangel.conf"
#  from [b40a0036dde4ee127c5bb43d54b0af254dbfca56]
#    to [5ef89f2f214602bbdfd9a57c907f7e8300570688]
# 
# patch "conf/machine/colinux.conf"
#  from [e83d2d2cc5876d14bd01f936eef9dc00d1d74645]
#    to [f42c63f91651f3b33b903744d78c41cd4307b9a3]
# 
# patch "conf/machine/compulab-pxa270.conf"
#  from [56fe4d2e6d3e4f5453a7ebdb08a0455dcd454c51]
#    to [20b926ce4dfb08cec2e0d563e4a8567bbb697101]
# 
# patch "conf/machine/db1200.conf"
#  from [8fd1b68618e8ca6ee65b05fb23c9121a9a7c633c]
#    to [684b48f0c8c57ff453615210af58052be68af184]
# 
# patch "conf/machine/devkitidp-pxa255.conf"
#  from [13ede609e804361ea09b3e3f272ae56bf3c7bb52]
#    to [0693954b87d48f8b2562111ce7a60785b0872457]
# 
# patch "conf/machine/dht-walnut.conf"
#  from [56423da02d3bcd65e4967b42e1da5f8493fd3e23]
#    to [584d93d94931330a70f1ac5e87503d3902eeb336]
# 
# patch "conf/machine/efika.conf"
#  from [4c8064c7fc9753321c337c5c460dd65b35c1b9d8]
#    to [889fccfbec04524cf5a29b9ae90435b76af46bf4]
# 
# patch "conf/machine/ep93xx.conf"
#  from [783e0b5738df24be79efb47c15cdf44244a0cff9]
#    to [c10a67049abec596165cf583c02fdf58e7f7f594]
# 
# patch "conf/machine/epia.conf"
#  from [5b6bd5afa186e48457f343d364de977d25d6160f]
#    to [24c8b38cd534d2f0037e1eb98ed91e98e0373f17]
# 
# patch "conf/machine/guinness.conf"
#  from [c621ed898bc09cf24b6df3fb1a11da4e28380647]
#    to [d8b9652ed1a17220091db6727a6456f0ced4a61a]
# 
# patch "conf/machine/h1910.conf"
#  from [84bf1dd7ddc007b8fb8ac261744455311049205d]
#    to [892217441dd4ec3f87ad549bf874411e2bed3057]
# 
# patch "conf/machine/h1940.conf"
#  from [f33096a84fe003947a8369c21344f39520bc8151]
#    to [031a25bd53a7d0d2b11d8fb97d4539a9e0842760]
# 
# patch "conf/machine/h2200.conf"
#  from [2e01da697b908e5f9651e3c7a817e741136a43b2]
#    to [4c24a00df9806dbb650a094d8e2c562cf387321c]
# 
# patch "conf/machine/h3600.conf"
#  from [3c946d340c542f0edc43ff1a0e9466f106a6eb16]
#    to [536cc35fdc8921ab5fa9b20d46888b009f0c7e03]
# 
# patch "conf/machine/h3900.conf"
#  from [f513d0517779fecd4267d0e831f5d0184a7ce46d]
#    to [17393b23416d2028477ff178971611770585ee22]
# 
# patch "conf/machine/h4000.conf"
#  from [1f535c7abba72a95fd973c82f27e4905abf9530c]
#    to [a40f5e8fb60d944f1c6ce55cda825a4b5cf90c6f]
# 
# patch "conf/machine/h5xxx.conf"
#  from [1b68d113d06f9d280a618986797e9a3d2cd5ce16]
#    to [64d70e68e4e78fd2253b17781c7b667b8ddf9bcd]
# 
# patch "conf/machine/h6300.conf"
#  from [6262abe38a75d7ae1d246026723b62985adc3a1d]
#    to [8603020a854003dc49e3389bbb6b5768a49c3bc2]
# 
# patch "conf/machine/htcuniversal.conf"
#  from [36c8ee00df8858230ce708da6d52aafd9d36ea8b]
#    to [63301b2d50e2762842af7a3d13f1c752189fb1ac]
# 
# patch "conf/machine/hx2000.conf"
#  from [6e6d8b900df3d1d6dcc6357f2687f16bce02c03b]
#    to [1e8743e0d85ad160c4f94b9980aa60351ff078ea]
# 
# patch "conf/machine/hx4700.conf"
#  from [a18928ca2645957d838b832626c8e4e5b1f822a8]
#    to [6309c6a191480dc9cc83c0fc58a2004b966f74df]
# 
# patch "conf/machine/include/ixp4xx.conf"
#  from [3a92c1dce772f7689c2e5b04fa596fe336719b81]
#    to [d52c7d9b5b6e4c07e4e187528945b99c13cb6d42]
# 
# patch "conf/machine/include/tune-iwmmxt.conf"
#  from [915b8be9a72b164103c1301232e9ff09af0005b0]
#    to [f84662c34e9e89d8d6c662ca1ca187771856446b]
# 
# patch "conf/machine/include/zaurus-clamshell.conf"
#  from [f73532615c93e80eaed263729d26bd685c49d18c]
#    to [078aba2b35bef7468016ac75b74c2a4b9d670562]
# 
# patch "conf/machine/ipaq-pxa270.conf"
#  from [b473fed941ba777012fb7e72c86cba1cf7c1af5c]
#    to [51963c0864ef06319c2d6edd8a5cc2a0c9db1df9]
# 
# patch "conf/machine/ixp4xx.conf"
#  from [76b8f4d3ef2190ec2fee377f30f99cf27ad85245]
#    to [9851d79649ca8863b1c067d62d29089f50072424]
# 
# patch "conf/machine/lite5200.conf"
#  from [6045b4c150715c48f2daf884c43b2f4fa496dceb]
#    to [b12042ca7189ad68b1c5a4fd8e95eb90bdf2e5da]
# 
# patch "conf/machine/logicpd-pxa270.conf"
#  from [c160601d0978919456ea1e94402500e407627166]
#    to [5678bc229f0c5e4a77ec45db316411275d59853b]
# 
# patch "conf/machine/magician.conf"
#  from [964d1bd5db3b18dfb6b21a6609f598766e3f6ed7]
#    to [5ba402eccae30456668a4f0a88aa15515e096e2d]
# 
# patch "conf/machine/mainstone.conf"
#  from [e49d72e68c61b1cb47d3d73e97f518a1f3ca4f02]
#    to [a0a6f4fbb97a898712937fa0c6c4f5a621856fe4]
# 
# patch "conf/machine/mtx-1.conf"
#  from [ac8dab36f4b567fa87b8c507b910aa3d2a41e093]
#    to [27faab16fc76dacd2043bb730299be7de15ac373]
# 
# patch "conf/machine/mtx-2.conf"
#  from [884b6d0cf0c50b61b36808d4666ad788724b72f0]
#    to [7dbae910b384792d20782684921ce86c6710f93d]
# 
# patch "conf/machine/mtx-3.conf"
#  from [fdb175ac7764898aa9cbdbac8259d104a24fe859]
#    to [e9f207b441e014cf6f02cf92aa672a044063093b]
# 
# patch "conf/machine/mx31ads.conf"
#  from [318f3008d1969f1a50d7af0de9118d53ea8d67be]
#    to [7d28c2aa9385c91dddb64068b213588ba4823023]
# 
# patch "conf/machine/navman-icn330.conf"
#  from [5ba45c91660500ead42c0ba4428008e432eeb48b]
#    to [c2df7ad8a34413a0239758138e155b2debc9dabd]
# 
# patch "conf/machine/netbook-pro.conf"
#  from [5838bbb62e0b22902b1e98e006dacaf7ac414d76]
#    to [ad6b0ceb1b487d738a31f28a3a1bd394251fa6e9]
# 
# patch "conf/machine/nokia770.conf"
#  from [ba57002822009bcf42e5214e9451151161d51ba0]
#    to [bdaa8f3221a7e275e75ebeeae347f2d2fea3c0ff]
# 
# patch "conf/machine/omap1510inn.conf"
#  from [b990d9193982212b9815b9436625559859153564]
#    to [4bfc6c6092e1fae844fc5c24a48a4393cb0b9772]
# 
# patch "conf/machine/omap1610h2.conf"
#  from [b990d9193982212b9815b9436625559859153564]
#    to [4bfc6c6092e1fae844fc5c24a48a4393cb0b9772]
# 
# patch "conf/machine/omap1710h3.conf"
#  from [b990d9193982212b9815b9436625559859153564]
#    to [4bfc6c6092e1fae844fc5c24a48a4393cb0b9772]
# 
# patch "conf/machine/omap2420h4.conf"
#  from [6aafffbda8663b5e4c009cb926e533a2c7f0df1c]
#    to [1720a868f16caf361b9de4c14bf655cc63c9fd47]
# 
# patch "conf/machine/omap5912osk.conf"
#  from [be5ff17b9dbc53ae9a474e4cc4d5e800f38cb5b7]
#    to [a09275c77819da6c49514356e45631f92c6933df]
# 
# patch "conf/machine/palmld.conf"
#  from [e9a71f744af912b240efb8f238112275e492f10f]
#    to [76a53711b49361d0f78905c2c2faa6d447ed246d]
# 
# patch "conf/machine/poodle.conf"
#  from [e78d8e315ca2605548b18768ca836c210df048f9]
#    to [ae931cc5d1c572a2a1b316c630e8707c5f5620b7]
# 
# patch "conf/machine/qemuarm.conf"
#  from [f52b81d6683cbbc2e15c093b3f14e2fcddede5e7]
#    to [1ae301524bfb611fcfe896fd49c5619531b9eb22]
# 
# patch "conf/machine/rb500.conf"
#  from [e5fb5d71007d0d82fa035b86221a9c057a09c5f5]
#    to [d66e0d0c1d6a90d74b409346835caeeb97629172]
# 
# patch "conf/machine/smdk2440.conf"
#  from [1412a78ab8e84c1216d6a4515ef8c8e2bdd93554]
#    to [7b3d2028d4fc92743e4b9753858b92b9661dc8ad]
# 
# patch "conf/machine/spitz.conf"
#  from [4b85bc745b0842faa914ea2a2eaf76f82b33af0e]
#    to [15ef27bf0d171f8e74c1a054528000d3af11e593]
# 
# patch "conf/machine/tosa.conf"
#  from [966da8541b7b0142ec47b5243079b7685749ebef]
#    to [06c4ee3d28f4accbb2906bcc26a12dc8a7fe90ef]
# 
# patch "conf/machine/triton.conf"
#  from [a9e24c1e5b5fe310fd20087b861698ba2420f9f5]
#    to [5e5eccdaa7892f5baa10a503384c277bef0e3b44]
# 
# patch "conf/machine/wrap.conf"
#  from [d81d5f5685b969f0a7563eaf9f4b65a137409bae]
#    to [99b8a2cb165428033263d30ed5ea80296065bac0]
# 
# patch "conf/machine/x86.conf"
#  from [e308761c06777be842f324bcb0e079a7cfda0ee0]
#    to [69130eb603c3024f78ef638a6056e35fe88b03dc]
# 
# patch "packages/meta/meta-sdk.bb"
#  from [b4e4879bd47174575e8fe745fe486f8c2869a603]
#    to [b1dddf271f646e5c56ed8ab8ad7cc484554fd828]
# 
# patch "packages/meta/meta-toolchain.bb"
#  from [376d920d59e96e523541a715c64f8c0b769e8eb7]
#    to [68e49ddd86cb5024a19499f8702c8f65667e5f47]
# 
============================================================
--- classes/multimachine.bbclass	39bec0079b9e0bad6abd2637e242bb97bb66cce2
+++ classes/multimachine.bbclass	c75808c11d01fe1057e53269f8da5b6ce04dc1aa
@@ -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
 
============================================================
--- classes/package_ipk.bbclass	25329a5477253bdcdb72f43a093cba57c0bf6f14
+++ classes/package_ipk.bbclass	5d149a3ccb468f3ee0310fc0c2fb61e5485bd3e1
@@ -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
============================================================
--- classes/packaged-staging.bbclass	6a63817669b82c9ebe654871409eb1ebf9b74cab
+++ classes/packaged-staging.bbclass	eecd4b2075ad18ef09bf96702dc11c61515865f1
@@ -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
============================================================
--- classes/rootfs_ipk.bbclass	5eced81bb739614c780abd2178041f78c3dd441c
+++ classes/rootfs_ipk.bbclass	a759ea9945aa0e70757e50c45b254c6f8fdbc0b0
@@ -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
============================================================
--- conf/bitbake.conf	eb29b94151c567ed6d7a2cc7842686a5cffdbc90
+++ conf/bitbake.conf	412c9f3d491bbaf1bef0156269fcdefa994cd583
@@ -57,7 +57,7 @@ MACHINE_ARCH = "${@[bb.data.getVar('HOST
 
 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.
============================================================
--- conf/distro/openmn.conf	9a78b7afdd948cba7c16ce5fe611ef6aa7eb2a53
+++ conf/distro/openmn.conf	5af305f4438a614916cc2c0e9419fbc3afe5018a
@@ -12,7 +12,7 @@ INHERIT += "debian"
 
 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"
 
============================================================
--- conf/distro/unslung.conf	ff83a015f410221e74442b2f60b99e002336fb76
+++ conf/distro/unslung.conf	166df5335ff15d9f92e718c211aa45bfdccb8b11
@@ -26,7 +26,7 @@ PACKAGE_ARCH = "${TARGET_ARCH}"
 # 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
============================================================
--- conf/documentation.conf	8a33fc2b37cd677264e72eb8480b4d51fcdf7a48
+++ conf/documentation.conf	1756d198ee92f76a95b1dda5ce51ce445b9a652c
@@ -38,8 +38,8 @@ PACKAGE_ARCH  = "${MACHINE_ARCH}" to the
 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"
============================================================
--- conf/machine/a780.conf	0232de87227cc8f08671b8ff46a768acd5ff7094
+++ conf/machine/a780.conf	4aa796115d8b7c263d4b957545a0d95a8c7dbc8c
@@ -5,7 +5,7 @@ TARGET_ARCH = "arm"
 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"
 
============================================================
--- conf/machine/akita.conf	7ff5ee276ccc11d5ee3bf9466c512d263d9ac1b8
+++ conf/machine/akita.conf	cb07da10ff48df80f6f38074c74c8d2200a4c34b
@@ -5,7 +5,7 @@ include conf/machine/include/zaurus-2.6.
 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"
============================================================
--- conf/machine/blueangel.conf	b40a0036dde4ee127c5bb43d54b0af254dbfca56
+++ conf/machine/blueangel.conf	5ef89f2f214602bbdfd9a57c907f7e8300570688
@@ -7,7 +7,7 @@ TARGET_ARCH = "arm"
 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"
============================================================
--- conf/machine/colinux.conf	e83d2d2cc5876d14bd01f936eef9dc00d1d74645
+++ conf/machine/colinux.conf	f42c63f91651f3b33b903744d78c41cd4307b9a3
@@ -1,8 +1,8 @@ TARGET_ARCH = "i686"
 #@TYPE: Machine
 #@NAME: Cooperative Linux
 #@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"
============================================================
--- conf/machine/compulab-pxa270.conf	56fe4d2e6d3e4f5453a7ebdb08a0455dcd454c51
+++ conf/machine/compulab-pxa270.conf	20b926ce4dfb08cec2e0d563e4a8567bbb697101
@@ -7,7 +7,7 @@ P%s
>>> DIFF TRUNCATED @ 16K

More information about the Openembedded-commits mailing list