Add some COMPATIBLE_MACHINE entries for various zaurus .bb files.

Also update python functions doing the same job to use COMPATIBLE_(MACHINE|HOST)

diff --git a/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb b/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb
index 0b8b6ab63a5a741a6bad80c2c1839699b5379ac0..5df470af1dd0b245a4cf10e8fbeba71350f9ca6b 100644 (file)
--- a/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb
+++ b/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb
@@ -12,6 +12,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \
 S = "${WORKDIR}/linux-2.6.11"
 
 COMPATIBLE_HOST = 'arm.*-linux'
+COMPATIBLE_MACHINE = "devkitidp-pxa255"
 
 inherit kernel
 inherit package
@@ -38,10 +39,3 @@ do_deploy() {
 do_deploy[dirs] = "${S}"
 
 addtask deploy before do_build after do_compile
-
-python () {
-       # Don't build kernel unless we're targeting an nslu2
-       mach = bb.data.getVar("MACHINE", d, 1)
-       if mach != 'devkitidp-pxa255':
-               raise bb.parse.SkipPackage("This kernel only builds for the PXA255 DevKitIDP")
-}

diff --git a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
index c0b3bf2742c07be40da864453553b2319d3d84e1..846e5f4fa256cc73b79fd9958db8e4382713b37f 100644 (file)
--- a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
+++ b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
@@ -21,9 +21,4 @@ do_configure_prepend() {
         oe_runmake oldconfig
 }
 
-python __anonymous () {
-       import re
-       host = bb.data.getVar('HOST_SYS', d, 1)
-       if not re.match('arm.*-linux', host):
-               raise bb.parse.SkipPackage("incompatible with host %s" % host)
-}
+COMPATIBLE_HOST = 'arm.*-linux'

diff --git a/packages/linux/linux-omap-2.6_2.6.9-omap1.bb b/packages/linux/linux-omap-2.6_2.6.9-omap1.bb
index 5cb4a439b133e923faed7aa17428b4d073132272..feb9581e5cfb7a2fc7328499f2f7bcb0e20c60a7 100644 (file)
--- a/packages/linux/linux-omap-2.6_2.6.9-omap1.bb
+++ b/packages/linux/linux-omap-2.6_2.6.9-omap1.bb
@@ -10,12 +10,7 @@ S = "${WORKDIR}/linux-2.6.9"
 
 inherit kernel
 
-python __anonymous () {
-       import re
-       host = bb.data.getVar('HOST_SYS', d, 1)
-       if not re.match('arm.*-linux', host):
-               raise bb.parse.SkipPackage("incompatible with host %s" % host)
-}
+COMPATIBLE_HOST = 'arm.*-linux'
 
 KERNEL_IMAGETYPE = "uImage"
 

diff --git a/packages/linux/linux-omap1_2.6.12-rc2.bb b/packages/linux/linux-omap1_2.6.12-rc2.bb
index 133fe9ac2c228147cc43e34a0d504e7724ab8325..7ea9e16091c7eba5e49e74fc4dd02ea89df1f696 100644 (file)
--- a/packages/linux/linux-omap1_2.6.12-rc2.bb
+++ b/packages/linux/linux-omap1_2.6.12-rc2.bb
@@ -18,13 +18,7 @@ KERNEL_CCSUFFIX = "-3.3.4"
 
 inherit kernel
 
-python __anonymous () {
-       import re
-       host = bb.data.getVar('HOST_SYS', d, 1)
-       if not re.match('arm.*-linux', host):
-               raise bb.parse.SkipPackage("incompatible with host %s" % host)
-}
-
+COMPATIBLE_HOST = 'arm.*-linux'
 
 do_configure_prepend() {
        install -m 0644 ${WORKDIR}/defconfig ${S}/.config

diff --git a/packages/linux/linux-wrt_2.4.20.bb b/packages/linux/linux-wrt_2.4.20.bb
index 8e49ffa2c2d493bd71aa74f788f71271f267047e..32361b7810c88e0f449507c17056220991d86226 100644 (file)
--- a/packages/linux/linux-wrt_2.4.20.bb
+++ b/packages/linux/linux-wrt_2.4.20.bb
@@ -58,9 +58,4 @@ do_deploy[dirs] = "${S}"
 
 addtask deploy before do_build after do_compile
 
-python () {
-       # Don't build kernel unless we're targeting a wrt
-       mach = bb.data.getVar("MACHINE", d, 1)
-       if mach != 'wrt54':
-               raise bb.parse.SkipPackage("Unable to build for non-WRT54 device.")
-}
+COMPATIBLE_MACHINE = "wrt54"

diff --git a/packages/linux/linux-wrt_2.4.30.bb b/packages/linux/linux-wrt_2.4.30.bb
index 0d9229c5d80a332dc85b86484f9d795932f66588..352c879d45254ee32d877c206f43bf51b50f4771 100644 (file)
--- a/packages/linux/linux-wrt_2.4.30.bb
+++ b/packages/linux/linux-wrt_2.4.30.bb
@@ -112,9 +112,4 @@ do_deploy[dirs] = "${S}"
 
 addtask deploy before do_build after do_compile
 
-python () {
-       # Don't build kernel unless we're targeting a wrt
-       mach = bb.data.getVar("MACHINE", d, 1)
-       if mach != 'wrt54':
-               raise bb.parse.SkipPackage("Unable to build for non-WRT54 device.")
-}
+COMPATIBLE_MACHINE = "wrt54"

diff --git a/packages/linux/mainstone-kernel_2.6.11.bb b/packages/linux/mainstone-kernel_2.6.11.bb
index 12422c96deb6b3f70eadee2c8e8fbc9616ab7104..0e242c2dc880e146daa8eed5298ca39985856151 100644 (file)
--- a/packages/linux/mainstone-kernel_2.6.11.bb
+++ b/packages/linux/mainstone-kernel_2.6.11.bb
@@ -36,9 +36,4 @@ do_deploy[dirs] = "${S}"
 
 addtask deploy before do_build after do_compile
 
-python () {
-       # Don't build kernel unless we're targeting a mainstone
-       mach = bb.data.getVar("MACHINE", d, 1)
-       if mach != 'mainstone':
-               raise bb.parse.SkipPackage("This kernel only builds for the Mainstone")
-}
+COMPATIBLE_MACHINE = "mainstone"

diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc
index b4c675264afd1a3e065d75c89f217d6fce13e04d..bfae5f82d4fc2065581fd965955b3bea22271235 100644 (file)
--- a/packages/linux/nslu2-kernel.inc
+++ b/packages/linux/nslu2-kernel.inc
@@ -257,9 +257,4 @@ do_deploy() {
 
 addtask deploy before do_build after do_compile
 
-python () {
-       # Don't build the kernel unless we're targeting an nslu2
-       mach = bb.data.getVar("MACHINE", d, 1)
-       if mach != 'nslu2':
-               raise bb.parse.SkipPackage("nslu2-kernel only builds for the Linksys NSLU2")
-}
+COMPATIBLE_MACHINE = "nslu2"

diff --git a/packages/linux/nslu2-linksys-kernel_2.4.22.bb b/packages/linux/nslu2-linksys-kernel_2.4.22.bb
index 40bceb373ecc7dd72167625dfe722d39cf7a0bbe..de2715d107a6b670d1f9b9b80222fd0f60bd0d31 100644 (file)
--- a/packages/linux/nslu2-linksys-kernel_2.4.22.bb
+++ b/packages/linux/nslu2-linksys-kernel_2.4.22.bb
@@ -17,13 +17,8 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-2.4.22.tar.bz2 \
            file://defconfig"
 S = "${WORKDIR}/linux-2.4.22"
 
-python () {
-       # Don't build unless we're targeting an nslu2
-       if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-               raise bb.parse.SkipPackage("NSLU2 kernel only builds for the Linksys NSLU2")
-}
-
 COMPATIBLE_HOST = 'arm.*-linux'
+COMPATIBLE_MACHINE = "nslu2"
 
 inherit kernel
 

diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
index d9addd968abbdc7047ccf9192fb88577cd45d4a9..eae524a7ae6f68f105335d3556817f1202881905 100644 (file)
--- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
+++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
@@ -75,6 +75,7 @@ EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}"
 KERNEL_CCSUFFIX = "-2.95"
 KERNEL_LDSUFFIX = "-2.11.2"
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(akita|spitz|borzoi)'
 PARALLEL_MAKE = ""
 
 #

diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
index 4c8b43121d08a10dbf36cbd0b332fd14fb9489c9..3b0024d147d15093254728ddd103a05f9722e251 100644 (file)
--- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
@@ -89,6 +89,7 @@ EXTRA_OEMAKE = " EMBEDIXRELEASE=-${DISTRO_VERSION}"
 KERNEL_CCSUFFIX = "-2.95"
 KERNEL_LDSUFFIX = "-2.11.2"
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(c7x0|corgi|husky|shepherd|poodle|poodle255)'
 PARALLEL_MAKE = ""
 
 #

diff --git a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
index f600acbaedbf94c97a148df0eb5170f96daaeee3..a79d4f3a0032d47a2c85647f005bd5e20d7a92ad 100644 (file)
--- a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -57,6 +57,7 @@ ALLOW_EMPTY = 1
 KERNEL_CCSUFFIX = "-2.95"
 KERNEL_LDSUFFIX = "-2.11.2"
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = "collie"
 EXTRA_OEMAKE = " EMBEDIXRELEASE=-${DISTRO_VERSION}"
 
 module_conf_usbdmonitor = "alias usbd0 usbdmonitor"

diff --git a/packages/linux/poodle-kernels-2.4-embedix.bb b/packages/linux/poodle-kernels-2.4-embedix.bb
index e21a47a9082ba83263b8314c5fbee1e559104adf..7a714b7a12a9675973111ee30b3663b4f00ec847 100644 (file)
--- a/packages/linux/poodle-kernels-2.4-embedix.bb
+++ b/packages/linux/poodle-kernels-2.4-embedix.bb
@@ -1 +1,2 @@
+COMPATIBLE_MACHINE = "poodle"
 DEPENDS = "poodle-kernel-2.4-embedix poodle255-kernel-2.4-embedix"

diff --git a/packages/linux/triton-kernel_2.6.11.bb b/packages/linux/triton-kernel_2.6.11.bb
index 6fc575c2b0308296277b4fce555b0e55e3785987..e42dfa2ae9ad27cd4b79e9ccbe2c84b59ce9ddda 100644 (file)
--- a/packages/linux/triton-kernel_2.6.11.bb
+++ b/packages/linux/triton-kernel_2.6.11.bb
@@ -37,9 +37,4 @@ do_deploy[dirs] = "${S}"
 
 addtask deploy before do_build after do_compile
 
-python () {
-       # Don't build kernel unless we're targeting an triton
-       mach = bb.data.getVar("MACHINE", d, 1)
-       if mach != 'triton':
-               raise bb.parse.SkipPackage("The triton kernel is only for use on triton machines")
-}
+COMPATIBLE_MACHINE = "triton"

diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
index 8aa07e89787d59f1075e0fc9182899a0eaa96aa9..c397a90efe6cb1ab53ff4c1de57090f6a8a78a39 100644 (file)
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -28,9 +28,4 @@ SRC_URI += "file://linux-kernel-R25_to_R29.patch;patch=1 \
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-kernel', '${FILE_DIRNAME}/nslu2-linksys-kernel-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
-python () {
-       # Don't build unslung kernel unless we're targeting an nslu2
-       mach = bb.data.getVar("MACHINE", d, 1)
-       if mach != 'nslu2':
-               raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
-}
+COMPATIBLE_MACHINE = "nslu2"

diff --git a/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb b/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
index beb00d5f9db85a8e3f69d09e4d798329b7694879..f7a04cf6f250b444ead82cef28821cd65d188395 100644 (file)
--- a/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
+++ b/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
@@ -13,6 +13,7 @@ S = "${WORKDIR}/AtiCore-1.0.1"
 EXTRA_OEMAKE="CC='${CC}' AS='${AS}' AR='${AR}' LD='${LD}' FPU='${TARGET_FPU}'"
 
 PARALLEL_MAKE = ""
+COMPATIBLE_MACHINE = 'c7x0'
 
 do_install() {
        install -d ${D}${bindir}

diff --git a/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb b/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb
index 50301aae9d1cd03781dcca9b49a7a3da2aa2044a..fb886a2b97467c113f38b0c9a84e518974127147 100644 (file)
--- a/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb
+++ b/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb
@@ -12,6 +12,8 @@ SRC_URI = "http://openzaurus.sf.net/mirror/camera-modules-2.4.18-rmk7-pxa3-embed
            file://sharpzdc.conf"
 S = "${WORKDIR}"
 
+COMPATIBLE_MACHINE = '(collie|poodle|tosa)'
+
 inherit module-base
 
 do_install() {

diff --git a/packages/sharp-binary-only/sharp-flash-header-c700.bb b/packages/sharp-binary-only/sharp-flash-header-c700.bb
index c02882482e2329f87d8e7291f2e03c06ee03f0da..789c7c2f0157f55303affa04b4133a928f015a53 100644 (file)
--- a/packages/sharp-binary-only/sharp-flash-header-c700.bb
+++ b/packages/sharp-binary-only/sharp-flash-header-c700.bb
@@ -1,6 +1,7 @@
 SECTION = "base"
 SRC_URI = "file://header-c700.bin"
 LICENSE = "sharp-binary-only"
+COMPATIBLE_MACHINE = '(c7x0|spitz|akita)'
 do_stage() {
        install -d ${STAGING_LIBDIR}/sharp-flash-header
        install -m 0644 ${WORKDIR}/header-c700.bin ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin

diff --git a/packages/sharp-binary-only/sharp-sdmmc-support.bb b/packages/sharp-binary-only/sharp-sdmmc-support.bb
index fa4e66e7e88522aada061d3ac2f49ab8571c3f18..6072c94e3314fbe6a4f075444afd19069e31dc12 100644 (file)
--- a/packages/sharp-binary-only/sharp-sdmmc-support.bb
+++ b/packages/sharp-binary-only/sharp-sdmmc-support.bb
@@ -7,6 +7,8 @@ RDEPENDS = "kernel (${PV})"
 PR = "r23"
 PACKAGE_ARCH = "${MACHINE}"
 
+COMPATIBLE_MACHINE = '(collie|poodle|tosa)'
+
 KERNEL2418 = "2.4.18-rmk7-pxa3-embedix"
 KERNEL2420 = "2.4.20"
 

diff --git a/packages/zaurus-updater/encdec-updater.bb b/packages/zaurus-updater/encdec-updater.bb
index 49371a6a499fc50c411d6f9dc7fd489df2950ba6..797a762ebf6f9848e1c02dfe866247597686eaea 100644 (file)
--- a/packages/zaurus-updater/encdec-updater.bb
+++ b/packages/zaurus-updater/encdec-updater.bb
@@ -4,6 +4,8 @@ DESCRIPTION = "A tool to encode and decode the Sharp Zaurus updater.sh skript"
 
 SRC_URI = "file://encdec-updater.c"
 
+COMPATIBLE_MACHINE = '(poodle|c7x0|spitz|akita|tosa)'
+
 do_compile() {
        ${CC} -o encdec-updater ${WORKDIR}/encdec-updater.c
 }

diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb
index 21c15c74656bff98d05fdbf59187f5a0f47dc441..0040ebeebb307ecd780c1a8abfb35a4750e0e8bd 100644 (file)
--- a/packages/zaurus-updater/zaurus-updater.bb
+++ b/packages/zaurus-updater/zaurus-updater.bb
@@ -5,6 +5,7 @@ PR = "r4"
 
 PACKAGES = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = '(poodle|c7x0|spitz|akita|tosa)'
 
 SRC_URI = "file://updater.sh \
            file://gnu-tar.gz"