COMPATIBLE_MACHINE=nslu2: various packages updated

diff --git a/packages/busybox/slingbox_1.00.bb b/packages/busybox/slingbox_1.00.bb
index 8e11a09..2d2d883 100644 (file)
--- a/packages/busybox/slingbox_1.00.bb
+++ b/packages/busybox/slingbox_1.00.bb
@@ -4,7 +4,8 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r9"
+PR = "r10"
+COMPATIBLE_MACHINE = "nslu2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://defconfig \
@@ -13,12 +14,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 
 S = "${WORKDIR}/busybox-${PV}"
 
-python () {
-       # Don't build slingbox unless we're targeting an nslu2
-       if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-               raise bb.parse.SkipPackage("switchbox only builds for the Linksys NSLU2")
-}
-
 export EXTRA_CFLAGS = "${CFLAGS}"
 EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
 

diff --git a/packages/busybox/slingbox_1.1.3.bb b/packages/busybox/slingbox_1.1.3.bb
index 8cd85ce..2a86748 100644 (file)
--- a/packages/busybox/slingbox_1.1.3.bb
+++ b/packages/busybox/slingbox_1.1.3.bb
@@ -4,7 +4,8 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r2"
+PR = "r3"
+COMPATIBLE_MACHINE = "nslu2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://defconfig \
@@ -15,12 +16,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 
 S = "${WORKDIR}/busybox-${PV}"
 
-python () {
-       # Don't build slingbox unless we're targeting an nslu2
-       if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-               raise bb.parse.SkipPackage("slingbox only builds for the Linksys NSLU2")
-}
-
 export EXTRA_CFLAGS = "${CFLAGS}"
 EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
 

diff --git a/packages/busybox/slingbox_1.2.2.bb b/packages/busybox/slingbox_1.2.2.bb
index 56d75f9..523e219 100644 (file)
--- a/packages/busybox/slingbox_1.2.2.bb
+++ b/packages/busybox/slingbox_1.2.2.bb
@@ -4,7 +4,8 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r3"
+PR = "r4"
+COMPATIBLE_MACHINE = "nslu2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://defconfig \
@@ -17,12 +18,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 
 S = "${WORKDIR}/busybox-${PV}"
 
-python () {
-       # Don't build slingbox unless we're targeting an nslu2
-       if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-               raise bb.parse.SkipPackage("slingbox only builds for the Linksys NSLU2")
-}
-
 export EXTRA_CFLAGS = "${CFLAGS}"
 EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
 

diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb
index 82ca831..3fa3607 100644 (file)
--- a/packages/images/unslung-image.bb
+++ b/packages/images/unslung-image.bb
@@ -1,5 +1,6 @@
 LICENSE = MIT
-PR = "r24"
+PR = "r25"
+COMPATIBLE_MACHINE = "nslu2"
 
 IMAGE_BASENAME = "unslung"
 IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}"
@@ -119,10 +120,3 @@ unslung_clean_image () {
 #      #### End of Hack!
 
 }
-
-python () {
-       # Don't build unslung images 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")
-}

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 fd8afd1..348fccf 100644 (file)
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -1,4 +1,5 @@
 SECTION = "kernel"
+COMPATIBLE_MACHINE = "nslu2"
 
 require nslu2-linksys-kernel_2.4.22.bb
 
@@ -27,5 +28,3 @@ SRC_URI += "file://linux-kernel-R25_to_R29.patch;patch=1 \
            ${UNSLUNG_KERNEL_EXTRA_SRC_URI}"
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-kernel', '${FILE_DIRNAME}/nslu2-linksys-kernel-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-COMPATIBLE_MACHINE = "nslu2"

diff --git a/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
index b8db38d..6d13d09 100644 (file)
--- a/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
@@ -2,16 +2,12 @@ SECTION = "base"
 PACKAGES = ""
 LICENSE = "GPL"
 INHIBIT_DEFAULT_DEPS = "1"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://nslu.sf.net/downloads/${PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${PN}-${PV}"
 
-python () {
-       # Don't build unless we're targeting an nslu2
-       if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-               raise bb.parse.SkipPackage("NSLU2 firmware only builds for the Linksys NSLU2")
-}
+COMPATIBLE_MACHINE = "nslu2"
 
 do_compile () {
        install -d ${STAGING_LIBDIR}/nslu2-binaries

diff --git a/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb
index 4424e99..86b0a57 100644 (file)
--- a/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linksys NSLU2 Stock Firmware Libraries."
 PACKAGE_ARCH = "nslu2"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2"
 
@@ -16,8 +16,4 @@ do_install () {
 PACKAGES = "${PN}"
 FILES_${PN} = "/lib"
 
-python () {
-       # Don't build unless we're targeting an nslu2
-       if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-               raise bb.parse.SkipPackage("NSLU2 stock firmware libraries only builds for the Linksys NSLU2")
-}
+COMPATIBLE_MACHINE = "nslu2"

diff --git a/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb
index 007b19c..b098ba7 100644 (file)
--- a/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linksys NSLU2 Stock Firmware Ramdisk."
 PACKAGE_ARCH = "nslu2"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2"
 
@@ -13,8 +13,4 @@ do_install () {
 PACKAGES = "${PN}"
 FILES_${PN} = "/"
 
-python () {
-       # Don't build unless we're targeting an nslu2
-       if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-               raise bb.parse.SkipPackage("NSLU2 ramdisk only builds for the Linksys NSLU2")
-}
+COMPATIBLE_MACHINE = "nslu2"

diff --git a/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb
index 4aace52..44ef8aa 100644 (file)
--- a/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linksys NSLU2 Stock Firmware Samba Code Pages."
 PACKAGE_ARCH = "nslu2"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2"
 
@@ -22,8 +22,4 @@ do_install () {
 PACKAGES = "${PN}"
 FILES_${PN} = "/etc/samba/codepages"
 
-python () {
-       # Don't build unless we're targeting an nslu2
-       if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-               raise bb.parse.SkipPackage("NSLU2 stock firmware Samba code pages only builds for the Linksys NSLU2")
-}
+COMPATIBLE_MACHINE = "nslu2"

diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
index 290d2de..f6b65aa 100644 (file)
--- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
+++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
@@ -1,6 +1,7 @@
 SECTION = "base"
+COMPATIBLE_MACHINE = "nslu2"
 
-PR = "r16"
+PR = "r17"
 
 DEPENDS = "nslu2-linksys-libs nslu2-linksys-sambacodepages"
 
@@ -58,13 +59,6 @@ SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2 \
 
 S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r63"
 
-python () {
-       # Don't build unslung images 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")
-}
-
 do_compile () {
        echo "V2.3R63-uNSLUng-${DISTRO_VERSION}" > ${S}/.unslung
 

diff --git a/packages/upslug/upslug-native_1.0.bb b/packages/upslug/upslug-native_1.0.bb
index 0249cb5..729f176 100644 (file)
--- a/packages/upslug/upslug-native_1.0.bb
+++ b/packages/upslug/upslug-native_1.0.bb
@@ -1,11 +1,12 @@
 # This package builds the 'upslug' binary upload/flash tool
 # for the NSLU2.  It is not useful for anything else.
-PR = "r0"
+PR = "r1"
 DESCRIPTION = "NSLU2 binary upload tool"
 HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL-2"
+COMPATIBLE_MACHINE = "nslu2"
 
 SRC_TAG = "UPSLUG_${@'_'.join(bb.data.getVar('PV',d,1).split('.'))}"
 SRC_URI = "cvs://anonymous@nslu.cvs.sourceforge.net/cvsroot/nslu;method=pserver;module=upslug;tag=${SRC_TAG}"
@@ -25,10 +26,3 @@ do_compile() {
 do_stage() {
        oe_runmake "DESTDIR=${STAGING_BINDIR}" install
 }
-
-python () {
-       # Don't build upslug unless we're targeting an nslu2
-       mach = bb.data.getVar("MACHINE", d, 1)
-       if mach != 'nslu2':
-               raise bb.parse.SkipPackage("upslug only builds for the Linksys NSLU2")
-}

diff --git a/packages/upslug/upslug-native_cvs.bb b/packages/upslug/upslug-native_cvs.bb
index 7099b3b..95b340c 100644 (file)
--- a/packages/upslug/upslug-native_cvs.bb
+++ b/packages/upslug/upslug-native_cvs.bb
@@ -1,11 +1,12 @@
 # This package builds the 'upslug' binary upload/flash tool
 # for the NSLU2.  It is not useful for anything else.
-PR = "r0"
+PR = "r1"
 DESCRIPTION = "NSLU2 binary upload tool"
 HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL-2"
+COMPATIBLE_MACHINE = "nslu2"
 
 # Use releases in preference
 DEFAULT_PREFERENCE = "-1"
@@ -24,10 +25,3 @@ do_compile() {
 do_stage() {
        oe_runmake "DESTDIR=${STAGING_BINDIR}" install
 }
-
-python () {
-       # Don't build upslug unless we're targeting an nslu2
-       mach = bb.data.getVar("MACHINE", d, 1)
-       if mach != 'nslu2':
-               raise bb.parse.SkipPackage("upslug only builds for the Linksys NSLU2")
-}