diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-11-12 09:02:18 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2006-11-12 09:02:18 +0000 |
| commit | d1b1231953cce26a8d087a087cc54d83b568c20a (patch) | |
| tree | 1b7a3b390ab72414f64161d5365700b37c293aeb /conf | |
| parent | f3088cbe5754d03762722ae4ca05de2063485864 (diff) | |
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).
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/debianslug.conf | 2 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 5 | ||||
| -rw-r--r-- | conf/distro/openslug.conf | 2 |
3 files changed, 5 insertions, 4 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 |