merge of '440352b74d1975abf361c30e00a2519bd5c8051e'

     and '493bfe4db4e2664b2f5a442c4973208d987e2752'

5 files changed, 45 insertions, 32 deletions

diff --git a/packages/images/ludeos-image.bb b/packages/images/ludeos-image.bb
index 669ff49634..0d8443c3e2 100644
--- a/packages/images/ludeos-image.bb
+++ b/packages/images/ludeos-image.bb
@@ -1 +1,2 @@
-DEPENDS = slugos-image
\ No newline at end of file
+DEPENDS = "slugos-image"
+COMPATIBLE_MACHINE = "nslu2"
diff --git a/packages/images/nylon-image-base.bb b/packages/images/nylon-image-base.bb
index 4034590822..5eee653453 100644
--- a/packages/images/nylon-image-base.bb
+++ b/packages/images/nylon-image-base.bb
@@ -1,5 +1,5 @@
 inherit image_ipk 
-inherit nylon_image
+inherit nylon-image
 LICENSE = MIT
 
 export IMAGE_BASENAME = "nylon-base"
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 1deab932c7..3fa3607e83 100644
--- a/packages/images/unslung-image.bb
+++ b/packages/images/unslung-image.bb
@@ -1,7 +1,9 @@
 LICENSE = MIT
-PR = "r22"
+PR = "r25"
+COMPATIBLE_MACHINE = "nslu2"
 
 IMAGE_BASENAME = "unslung"
+IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}"
 
 IMAGE_LINGUAS = ""
 USE_DEVFS = "1"
@@ -10,15 +12,17 @@ DEPENDS  = "virtual/kernel \
 	${UNSLUNG_EXTRA_DEPENDS}"
 
 RDEPENDS  = "kernel update-modules unslung-rootfs \
-	libc6-unslung slingbox ipkg libipkg \
-	cpio \
-	findutils \
+	libc6-unslung slingbox ipkg \
+	libipkg \
+#	cpio \
+#	findutils \
 	${UNSLUNG_EXTRA_RDEPENDS}"
 
 IPKG_INSTALL = "kernel update-modules unslung-rootfs \
-	libc6-unslung slingbox ipkg libipkg \
-	cpio \
-	findutils \
+	libc6-unslung slingbox ipkg \
+	libipkg \
+#	cpio \
+#	findutils \
 	kernel-module-netconsole \
 	${UNSLUNG_EXTRA_INSTALL}"
 
@@ -72,25 +76,26 @@ unslung_clean_image () {
 	${STRIP} ${IMAGE_ROOTFS}/lib/libgcc_s.so.1
 	chmod ugo+x ${IMAGE_ROOTFS}/lib/libgcc_s.so.1
 
+# MJW - experimental right now, but no longer need cpio and find
 	# We need cpio and find, but we don't need any of the other stuff in
 	# the packages (users can install the full package with ipkg after
 	# unsling).  Remove the extra files and executables, and clean up
 	# the entries from the ipkg database manually.
 
 	#-- these are for cpio:
-	rm -f ${IMAGE_ROOTFS}/usr/bin/mt
-	rm -rf ${IMAGE_ROOTFS}/usr/libexec
-	rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/cpio.*
-	rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/alternatives/rmt
-	sed -i -e '/^Package: cpio/,/^$/d' ${IMAGE_ROOTFS}${libdir}/ipkg/status
+#	rm -f ${IMAGE_ROOTFS}/usr/bin/mt
+#	rm -rf ${IMAGE_ROOTFS}/usr/libexec
+#	rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/cpio.*
+#	rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/alternatives/rmt
+#	sed -i -e '/^Package: cpio/,/^$/d' ${IMAGE_ROOTFS}${libdir}/ipkg/status
 
 	#-- and these for find:
-	rm -f ${IMAGE_ROOTFS}/usr/bin/locate
-	rm -f ${IMAGE_ROOTFS}/usr/bin/updatedb
-	rm -f ${IMAGE_ROOTFS}/usr/bin/xargs
-	rm -f ${IMAGE_ROOTFS}/usr/bin/xargs.findutils
-	rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/findutils.*
-	sed -i -e '/^Package: findutils/,/^$/d' ${IMAGE_ROOTFS}${libdir}/ipkg/status
+#	rm -f ${IMAGE_ROOTFS}/usr/bin/locate
+#	rm -f ${IMAGE_ROOTFS}/usr/bin/updatedb
+#	rm -f ${IMAGE_ROOTFS}/usr/bin/xargs
+#	rm -f ${IMAGE_ROOTFS}/usr/bin/xargs.findutils
+#	rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/findutils.*
+#	sed -i -e '/^Package: findutils/,/^$/d' ${IMAGE_ROOTFS}${libdir}/ipkg/status
 
 	# FIXME: change made 24 Jul 2006 by the OE folks changes the "strip"
 	# behavior to create an extra file named .debug/<filename> containing
@@ -107,11 +112,11 @@ unslung_clean_image () {
 	rm -rf ${IMAGE_ROOTFS}/usr/bin/.debug
 	rm -rf ${IMAGE_ROOTFS}/usr/sbin/.debug
 	rm -rf ${IMAGE_ROOTFS}/usr/lib/.debug
-}
 
-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")
+# MJW - Experimental - just to make space; remove before releasing!
+#	#### Hack to make space for testing!  REMOVE THIS!
+#	rm -rf ${IMAGE_ROOTFS}/etc/samba/codepages/unicode_map.850
+#	rm -rf ${IMAGE_ROOTFS}/bin/ftp
+#	#### End of Hack!
+
 }