slugos: Changed SLUGOS_FLASH_IMAGE to be multi-valued, to allow for multiple target upgrade image formats. Changed the image name, so that it overwrites the previously built image (and doesn't fill the autobuilder disks).

5 files changed, 12 insertions, 9 deletions

diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index e28fb85d88..e86ffa028c 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -13,7 +13,7 @@ SLUGOS_IMAGENAME = "debianslug"
 SLUGOS_IMAGESEX  = "little-endian"
 
 # debianslug builds a complete image (not just the parts)
-SLUGOS_FLASH_IMAGE = "yes"
+SLUGOS_FLASH_IMAGE = "nslu2"
 
 # NOTE: to build new packages set DEBIANSLUG_EXTRA_BBFILES to the full path name to
 # the .bb files for the packages to build - see debianslug-packages.conf in this
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index e015314d92..07b144c7c1 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -113,8 +113,9 @@ SLUGOS_IMAGENAME ?= "${DISTRO_NAME}"
 # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf)
 CMDLINE_DEBUG = "noirqdebug"
 
-# Building a full image.  If you set SLUGOS_FLASH_IMAGE to "yes" a complete
-# 8MByte flash image will be built after the rootfs JFFS2 image.
+# Building a full image.  If you set SLUGOS_FLASH_IMAGE to "nslu2" a complete
+# 8MByte flash image will be built after the rootfs JFFS2 image.  Other options
+# may later be defined for other vendor-flashable image types.
 #
 # If you do this you will need to find a source for the LinkSys software to be
 # placed in the full image - 'RedBoot' (the boot loader), 'Trailer' (just a bunch
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index d5ceeee105..c24001f3f4 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -13,7 +13,7 @@ SLUGOS_IMAGENAME = "openslug"
 SLUGOS_IMAGESEX  = "big-endian"
 
 # openslug builds a complete image (not just the parts)
-SLUGOS_FLASH_IMAGE = "yes"
+SLUGOS_FLASH_IMAGE = "nslu2"
 
 # NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to
 # the .bb files for the packages to build - see ucslugc-packages.conf in this
diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index 7073105e24..90a5cefcbe 100644
--- a/packages/images/slugos-image.bb
+++ b/packages/images/slugos-image.bb
@@ -6,11 +6,12 @@
 DESCRIPTION = "Generic SlugOS image"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r36"
+PR = "r37"
 
 # 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,13 +114,13 @@ 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'][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 \
diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb
index d585414f1f..82ca8313fd 100644
--- a/packages/images/unslung-image.bb
+++ b/packages/images/unslung-image.bb
@@ -1,7 +1,8 @@
 LICENSE = MIT
-PR = "r23"
+PR = "r24"
 
 IMAGE_BASENAME = "unslung"
+IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}"
 
 IMAGE_LINGUAS = ""
 USE_DEVFS = "1"