Added the unslung OVERRIDE for unslung-binary-kernel distro

6 files changed, 10 insertions, 24 deletions

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 858af69eb0..2a61d61307 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -1,10 +1,8 @@
-DEFAULT_PREFERENCE_unslung = "-1"
-
 SECTION = "kernel"
 DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device"
 LICENSE = "GPL"
 MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>"
-PR = "r0"
+PR = "r1"
 
 S = "${WORKDIR}/linux-2.4.22"
 
@@ -16,12 +14,10 @@ DEPENDS += "nslu2-linksys-firmware"
 python () {
 	# Don't build unslung kernel unless we're targeting an nslu2
 	mach = bb.data.getVar("MACHINE", d, 1)
-	dist = bb.data.getVar("DISTRO", d, 1)
-	if mach != 'nslu2' or dist != 'unslung':
+	if mach != 'nslu2':
 		raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
 }
 
-
 do_deploy() {
 	cp ${STAGING_LIBDIR}/nslu2-binaries/vmlinuz vmlinuz
 	dd if=vmlinuz bs=1 count=11732 > vmlinuh
@@ -30,13 +26,13 @@ do_deploy() {
 	cat vmlinux | sed \
 		-e 's/ram0/slug/' \
 		-e 's/\x01\x31\x2c\xff/\x00\x1e\x84\x7f/' \
-		-e 's/flash_sda\x00/hdd_sda\x00\x00\x00/' \
- 		-e 's/flash_\x00/hdd_\x00\x00\x00/' \
-		-e 's/flash_sd%c\x00/hdd_sd%c\x00\x00\x00/' \
 			| gzip -9 -c > vmlinux.gz
-#	cat vmlinuh vmlinux.gz vmlinut > vmlinuz
-	dd if=/dev/zero of=padding bs=1 count=9
-	cat vmlinuh vmlinux.gz padding vmlinut > vmlinuz
+#		-e 's/flash_sda\x00/hdd_sda\x00\x00\x00/' \
+# 		-e 's/flash_\x00/hdd_\x00\x00\x00/' \
+#		-e 's/flash_sd%c\x00/hdd_sd%c\x00\x00\x00/' \
+	cat vmlinuh vmlinux.gz vmlinut > vmlinuz
+#	dd if=/dev/zero of=padding bs=1 count=9
+#	cat vmlinuh vmlinux.gz padding vmlinut > vmlinuz
         install -d ${DEPLOY_DIR}/images
         install -m 0644 vmlinuz ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}
 }
diff --git a/packages/meta/unslung-image.bb b/packages/meta/unslung-image.bb
index a6277afcf7..7fa1b1cd4c 100644
--- a/packages/meta/unslung-image.bb
+++ b/packages/meta/unslung-image.bb
@@ -47,7 +47,6 @@ unslung_clean_image () {
 python () {
 	# Don't build unslung images unless we're targeting an nslu2
 	mach = bb.data.getVar("MACHINE", d, 1)
-	dist = bb.data.getVar("DISTRO", d, 1)
-	if mach != 'nslu2' or dist != 'unslung':
+	if mach != 'nslu2':
 		raise bb.parse.SkipPackage("Unslung only builds for the Linksys 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 c90bcd6fe3..fc75df7209 100644
--- a/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
@@ -1,5 +1,3 @@
-DEFAULT_PREFERENCE_unslung = "-1"
-
 SECTION = "base"
 DEPENDS = "slugimage-native unzip-native"
 PACKAGES = ""
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 299286c2ac..8e3c1cf160 100644
--- a/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb
@@ -1,5 +1,3 @@
-DEFAULT_PREFERENCE_unslung = "-1"
-
 DESCRIPTION = "Linksys NSLU2 Stock Firmware Libraries."
 PACKAGE_ARCH = "nslu2"
 SECTION = "base"
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 af5a2dabbd..dccac753f9 100644
--- a/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb
@@ -1,5 +1,3 @@
-DEFAULT_PREFERENCE_unslung = "-1"
-
 DESCRIPTION = "Linksys NSLU2 Stock Firmware Ramdisk."
 PACKAGE_ARCH = "nslu2"
 SECTION = "base"
diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
index 5b22e3cbd3..41de542c31 100644
--- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
+++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
@@ -1,5 +1,3 @@
-DEFAULT_PREFERENCE_unslung = "-1"
-
 SECTION = "base"
 
 PR = "r0"
@@ -49,8 +47,7 @@ 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)
-	dist = bb.data.getVar("DISTRO", d, 1)
-	if mach != 'nslu2' or dist != 'unslung':
+	if mach != 'nslu2':
 		raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
 }