[oe-commits] org.oe.dev 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).

[rwhitby commit]

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).

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 4e4a2d2a3c172e0018ad8039dd9f8ac05a09e270
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4e4a2d2a3c172e0018ad8039dd9f8ac05a09e270
Files:
1
conf/distro/debianslug.conf
conf/distro/include/slugos.inc
conf/distro/openslug.conf
packages/images/slugos-image.bb
packages/images/unslung-image.bb
Diffs:

#
# mt diff -r1c897cacddf9442d3f28de3ef93d2663d75bdfa3 -r4e4a2d2a3c172e0018ad8039dd9f8ac05a09e270
#
# 
# 
# patch "conf/distro/debianslug.conf"
#  from [79c196b1ab214ed0e3110d0513c86630ea539e78]
#    to [45ab723f6eded2434f122813c486753c0748b821]
# 
# patch "conf/distro/include/slugos.inc"
#  from [2029aa5bd39028d60359c108178cfdfced2cb2f7]
#    to [6b6326954b48f5ec43843fa6969e8ec7d70f01c3]
# 
# patch "conf/distro/openslug.conf"
#  from [8297ae381a3d4e89401427230403bf4c969295c6]
#    to [4701ab50502bcc1d852cd84d4e8677ca35acc788]
# 
# patch "packages/images/slugos-image.bb"
#  from [f2e086d175ea7d2ebbe9a7644c92ffe54b3cd04a]
#    to [917ec13131c977e3ffba8a9730b63c1bab3f75be]
# 
# patch "packages/images/unslung-image.bb"
#  from [36458a65b81ef2793d353a1657cd270c418082b0]
#    to [eb24805749a1f6346128fd7ff3c6d6d6bff649e5]
# 
============================================================
--- conf/distro/debianslug.conf	79c196b1ab214ed0e3110d0513c86630ea539e78
+++ conf/distro/debianslug.conf	45ab723f6eded2434f122813c486753c0748b821
@@ -13,7 +13,7 @@ SLUGOS_IMAGESEX  = "little-endian"
 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
============================================================
--- conf/distro/include/slugos.inc	2029aa5bd39028d60359c108178cfdfced2cb2f7
+++ conf/distro/include/slugos.inc	6b6326954b48f5ec43843fa6969e8ec7d70f01c3
@@ -113,8 +113,9 @@ CMDLINE_DEBUG = "noirqdebug"
 # 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
============================================================
--- conf/distro/openslug.conf	8297ae381a3d4e89401427230403bf4c969295c6
+++ conf/distro/openslug.conf	4701ab50502bcc1d852cd84d4e8677ca35acc788
@@ -13,7 +13,7 @@ SLUGOS_IMAGESEX  = "big-endian"
 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
============================================================
--- packages/images/slugos-image.bb	f2e086d175ea7d2ebbe9a7644c92ffe54b3cd04a
+++ packages/images/slugos-image.bb	917ec13131c977e3ffba8a9730b63c1bab3f75be
@@ -6,11 +6,12 @@ LICENSE = "MIT"
 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 \
============================================================
--- packages/images/unslung-image.bb	36458a65b81ef2793d353a1657cd270c418082b0
+++ packages/images/unslung-image.bb	eb24805749a1f6346128fd7ff3c6d6d6bff649e5
@@ -1,7 +1,8 @@ LICENSE = MIT
 LICENSE = MIT
-PR = "r23"
+PR = "r24"
 
 IMAGE_BASENAME = "unslung"
+IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}"
 
 IMAGE_LINGUAS = ""
 USE_DEVFS = "1"