From 7169d2534c19748b11a70610927097b9b359329a Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 8 Feb 2007 18:07:17 +0000 Subject: slugos: Replaced SLUGOS_IMAGENAME with SLUGOS_DISTRO, and localised the usage of SLUGOS_DISTRO to slugos-*.* files only. Removed SLUGOS_FLASH_IMAGE completely (made it always enabled) and cleaned up slugos-image.bb --- conf/distro/debianslug.conf | 5 +---- conf/distro/include/slugos.inc | 40 +++++----------------------------------- conf/distro/openslug.conf | 5 +---- conf/distro/ucslugc.conf | 2 +- 4 files changed, 8 insertions(+), 44 deletions(-) (limited to 'conf/distro') diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf index b2eaa39b74..c70d8623cf 100644 --- a/conf/distro/debianslug.conf +++ b/conf/distro/debianslug.conf @@ -9,10 +9,7 @@ DISTRO_NAME = "DebianSlug" # DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # DISTRO_FEED = "unstable" DISTRO_TYPE = "beta" -SLUGOS_IMAGENAME = "debianslug" - -# debianslug builds a complete image (not just the parts) -SLUGOS_FLASH_IMAGE = "1" +SLUGOS_DISTRO = "debianslug" #---------------------------------------------------------------------------------- # FIRMWARE CONFIGURATION diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 05bd57139c..7a1ae6b8e1 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -18,13 +18,6 @@ # g or u - glibc or uclibc libc implementation # set TARGET_OS to match # -# The following names are deprecated: -# -# openslug - the historical name of a canonical slugos-bag distro -# also the name of a standard slugos-bag distro with a package feed -# ucslugc - the historical (and obsolete) name of slugos-btu -# also the name of a standard slugos-btu distro with a package feed -# #---------------------------------------------------------------------------------- # STANDARD SLUGOS DEFINITIONS @@ -42,6 +35,10 @@ DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # DISTRO_FEED ?= "${SLUGOS_VERSION}-${DISTRO_TYPE}" DISTRO_FEED ?= "unstable" +SLUGOS_DISTRO ?= "slugos" + +IMAGE_BASENAME = "${SLUGOS_DISTRO}" + # The following must also be set, they define the basic format of the build # #ARM_INSTRUCTION_SET "arm" or "thumb" @@ -77,18 +74,6 @@ FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers \ -fno-unroll-loops -fno-inline-functions \ -fweb -funit-at-a-time" -# packages/meta/slugos-image.bb generates a binary image of the root file system -# with a name controlled by the following setting - it defaults to the top level -# ${DISTRO_NAME} and this should always be correct, but it may be too specific (e.g. -# if you change the DISTRO from one of the standard ones in a way which does not -# change the generated image). -SLUGOS_IMAGENAME ?= "${DISTRO_NAME}" - -# pull in the frozen list of bbfiles - this sets BBFILES and this will override any -# setting in local.conf Since this depends on ${DISTRO} it doesn't actually do -# anything by default unless conf/distro/${DISTRO}-packages.conf exists. -# require conf/distro/include/freeze.conf - #---------------------------------------------------------------------------------- # FEEDS # The FEED_URIS lines define where on the internet SlugOS looks for packages @@ -122,20 +107,6 @@ 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 "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 -# of bytes to flag the image as valid) and 'SysConf' (actually just a block of -# unset data - you could modify this to pre-configure the SysConf partition of the -# image). If you own an NSLU2 then this data is already in the flash of the NSLU2 -# and you can download it (including new versions) from the LinkSys web site - see -# packages/meta/slugos-image.bb for information about where to put the downloaded -# data. -SLUGOS_FLASH_IMAGE ?= "no" - # EXTRA PACKAGES # -------------- # SlugOS builds an image with no extra packages - to add packages to the @@ -165,8 +136,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -# compiler/binary/library versions (unslung uses different ones so these -# cannot be in ${MACHINE}.conf) +# compiler/binary/library versions PREFERRED_VERSION_binutils ?= "2.16" PREFERRED_VERSION_binutils-cross ?= "2.16" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 176b2e0955..40cf6354f3 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -9,10 +9,7 @@ DISTRO_NAME = "OpenSlug" # DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # DISTRO_FEED = "unstable" DISTRO_TYPE = "beta" -SLUGOS_IMAGENAME = "openslug" - -# openslug builds a complete image (not just the parts) -SLUGOS_FLASH_IMAGE = "1" +SLUGOS_DISTRO = "openslug" #---------------------------------------------------------------------------------- # FIRMWARE CONFIGURATION diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index 69e08aff96..8774a0729f 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -7,7 +7,7 @@ DISTRO_NAME = "UcSlugC" # DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # DISTRO_FEED = "unstable" DISTRO_TYPE = "beta" -SLUGOS_IMAGENAME = "ucslugc" +SLUGOS_DISTRO = "ucslugc" PREFERRED_VERSION_gcc-cross-initial = "3.4.4" PREFERRED_VERSION_gcc-cross = "3.4.4" -- cgit v1.2.3