4 files changed, 8 insertions, 26 deletions
diff --git a/packages/upslug/upslug-native_1.0.bb b/packages/upslug/upslug-native_1.0.bb
index 0249cb56fd..729f176a75 100644
--- 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 7099b3ba44..95b340c589 100644
--- 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")
-}
diff --git a/packages/upslug/upslug2-cvs.inc b/packages/upslug/upslug2-cvs.inc
index ebd89a9b73..995f9dc5ab 100644
--- a/packages/upslug/upslug2-cvs.inc
+++ b/packages/upslug/upslug2-cvs.inc
@@ -2,9 +2,9 @@
 include upslug2.inc
 
 SRC_TAG = "upslug2_${@'_'.join(bb.data.getVar('PV',d,1).split('.'))}"
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/nslu;method=pserver;module=upslug2;tag=${SRC_TAG}"
+SRC_URI = "cvs://anonymous@nslu.cvs.sourceforge.net/cvsroot/nslu;method=pserver;module=upslug2;tag=${SRC_TAG}"
 # For testing use this (tags and other changes take a day to
 # propogate on sourceforge).  Change 'jbowler' to your login name!
-#SRC_URI = "cvs://jbowler@cvs.sourceforge.net/cvsroot/nslu;method=ext;rsh=ssh;module=upslug2;tag=${SRC_TAG}"
+#SRC_URI = "cvs://jbowler@nslu.cvs.sourceforge.net/cvsroot/nslu;method=ext;rsh=ssh;module=upslug2;tag=${SRC_TAG}"
 
 S = "${WORKDIR}/upslug2"
diff --git a/packages/upslug/upslug2.inc b/packages/upslug/upslug2.inc
index 0a91bc3fd1..9bee027034 100644
--- a/packages/upslug/upslug2.inc
+++ b/packages/upslug/upslug2.inc
@@ -1,11 +1,12 @@
 # This package builds the 'upslug2' binary upload/flash tool
 # for the NSLU2.  It is not useful for anything else.
-PR = "r0"
+PR = "r1"
 DESCRIPTION = "NSLU2 binary upload tool (version 2)"
 HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug2"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "MIT"
+COMPATIBLE_MACHINE = "nslu2"
 
 # On Linux libpcap does not work.  Using libpcap is sub-optimal - it
 # is intended for packet capture not management of a new protocol
@@ -28,10 +29,3 @@ S = "${WORKDIR}/upslug2-${PV}"
 
 PACKAGES = "${PN}"
 EXTRA_OECONF += "${LIBPCAP_OECONF}"
-
-python () {
-	# Don't build upslug2 unless we're targeting an nslu2
-	mach = bb.data.getVar("MACHINE", d, 1)
-	if mach != 'nslu2':
-		raise bb.parse.SkipPackage("upslug2 only builds for the Linksys NSLU2")
-}