merge of '0479e731919623fe441e7b76d00e8c836c573157'

     and 'bcd222bb88d3e217d64a5699a87a9c1253895f1f'

3 files changed, 16 insertions, 14 deletions

diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index 7073105e24..9ef1e6ee88 100644
--- a/packages/images/slugos-image.bb
+++ b/packages/images/slugos-image.bb
@@ -6,11 +6,14 @@
 DESCRIPTION = "Generic SlugOS image"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r36"
+PR = "r37"
+
+COMPATIBLE_MACHINE = "nslu2"
 
 # SLUGOS_IMAGENAME defines the name of the image to be build, if it
 # is not set this package will be skipped!
 IMAGE_BASENAME = "${SLUGOS_IMAGENAME}"
+IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}"
 IMAGE_FSTYPES = "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --${SLUGOS_IMAGESEX} --eraseblock=0x20000 -D ${SLUGOS_DEVICE_TABLE}"
 IMAGE_LINGUAS = ""
@@ -113,26 +116,29 @@ python () {
 # LinkSys have made "EraseAll" available, however, (this does overwrite RedBoot)
 # it is a bad idea to produce flash images without a valid RedBoot - that allows
 # an innocent user upgrade attempt to instantly brick the NSLU2.
-PACK_IMAGE += "${@['', 'nslu2_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'yes']}"
-PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'yes']}"
+PACK_IMAGE += "${@['', 'nslu2_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}"
+PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware apex ixp4xx-npe'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}"
 
 NSLU2_SLUGIMAGE_ARGS ?= ""
 
 nslu2_pack_image() {
-	if test '${SLUGOS_FLASH_IMAGE}' = yes
+	if test '${SLUGOS_FLASH_IMAGE}' = nslu2
 	then
 		install -d ${DEPLOY_DIR_IMAGE}/slug
 		install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \
 				${STAGING_LIBDIR}/nslu2-binaries/Trailer \
 				${STAGING_LIBDIR}/nslu2-binaries/SysConf \
 				${DEPLOY_DIR_IMAGE}/slug/
+		install -m 0644 ${STAGING_LOADER_DIR}/apex.bin ${DEPLOY_DIR_IMAGE}/slug/
 		install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${ARCH_BYTE_SEX} \
 			${DEPLOY_DIR_IMAGE}/slug/vmlinuz
 		install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 			${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2
+		install -m 0644 ${STAGING_FIRMWARE_DIR}/NPE-B ${DEPLOY_DIR_IMAGE}/slug/
 		cd ${DEPLOY_DIR_IMAGE}/slug
-		slugimage -p -b RedBoot -s SysConf -r Ramdisk:1,Flashdisk:flashdisk.jffs2 -t \
-			Trailer -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img \
+		slugimage -p -b RedBoot -s SysConf -L apex.bin -k vmlinuz \
+			-r Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \
+			-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img \
 			${NSLU2_SLUGIMAGE_ARGS}
 		rm -rf ${DEPLOY_DIR_IMAGE}/slug
 	fi
diff --git a/packages/images/slugos-imagename.bb b/packages/images/slugos-imagename.bb
index 01cca8a0c3..61629d44af 100644
--- a/packages/images/slugos-imagename.bb
+++ b/packages/images/slugos-imagename.bb
@@ -9,6 +9,7 @@ PACKAGES = ""
 INHIBIT_DEFAULT_DEPS = "1"
 
 SLUGOS_IMAGENAME ?= "slugos"
+COMPATIBLE_MACHINE = "nslu2"
 
 do_fetch() {
 }
diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb
index d585414f1f..3fa3607e83 100644
--- a/packages/images/unslung-image.bb
+++ b/packages/images/unslung-image.bb
@@ -1,7 +1,9 @@
 LICENSE = MIT
-PR = "r23"
+PR = "r25"
+COMPATIBLE_MACHINE = "nslu2"
 
 IMAGE_BASENAME = "unslung"
+IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}"
 
 IMAGE_LINGUAS = ""
 USE_DEVFS = "1"
@@ -118,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")
-}