diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-02-07 21:24:50 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-07 21:24:50 +0000 |
| commit | f87411938dc0ada555c14c609d632f817842db9a (patch) | |
| tree | 12cfea08d32bdaa2d8b1bf0211085fcfde9c1297 /packages | |
| parent | a99fdd2fcec87acadb638c45852b7aec467ed92e (diff) | |
slugos-image: use SLUGOS_FLASH_IMAGE consistently in meta
- the code used to only do the flash image for nslu2, now it does it
whenever SLUGOS_FLASH_IMAGE is set.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/meta/slugos-image.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/meta/slugos-image.bb b/packages/meta/slugos-image.bb index c3c1b1c104..9434e5076f 100644 --- a/packages/meta/slugos-image.bb +++ b/packages/meta/slugos-image.bb @@ -7,7 +7,7 @@ DESCRIPTION = "Generic SlugOS image" MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r25" +PR = "r26" # SLUGOS_IMAGENAME defines the name of the image to be build, if it # is not set this package will be skipped! @@ -111,8 +111,8 @@ 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 = "nslu2_pack_image;" -PACK_IMAGE_DEPENDS_nslu2 = "${@['', '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) == 'yes']}" +PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'yes']}" NSLU2_SLUGIMAGE_ARGS ?= "" |