From 31d11a69ee54b6fd6bda1ae63f8260f8f2a6649a Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 8 Feb 2007 14:05:17 +0000 Subject: slugos: Removed SLUGOS_IMAGESEX from throughout OE. --- conf/distro/include/slugos.inc | 1 - 1 file changed, 1 deletion(-) (limited to 'conf/distro/include/slugos.inc') diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index c0401d93d3..13f6bad29c 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -46,7 +46,6 @@ DISTRO_FEED ?= "unstable" # #ARM_INSTRUCTION_SET "arm" or "thumb" #TARGET_OS "linux" or "linux-uclibc" -#SLUGOS_IMAGESEX "big-endian" or "little-endian" (JFFS2 format) # The following need not be set, the defaults should be adequate #USE_NLS = "no" or "yes" -- cgit v1.2.3 From 45802a74a4a83a9523f0423797a1cb1b27345ed8 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 8 Feb 2007 15:52:47 +0000 Subject: ixp4xx.conf,slugos.inc: Removed ARM_INSTRUCTION_SET and THUMB_INTERWORK, cause they are already set to defaults in tune-thumb.conf. Moved FULL_OPTIMIZATION to slugos.inc cause it's distro policy not inherent to the machine. --- conf/distro/include/slugos.inc | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'conf/distro/include/slugos.inc') diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 13f6bad29c..05bd57139c 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -65,6 +65,18 @@ INHERIT += "package_ipk debian" DISTRO_BASE = ":slugos" +# FULL_OPTIMIZATION +# Optimization settings. Os works fine and is significantly better than O2. +# The other settings are somewhat arbitrary. The optimisations chosen here +# include the ones which 'break' symbolic debugging (because the compiler does +# not include enough information to allow the debugger to know where given +# values are.) The -fno options are an attempt to cancel explicit use of space +# consuming options found in some packages (this isn't a complete list, this is +# just the ones which package writers seem to know about and abuse). +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. -- cgit v1.2.3 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/include/slugos.inc | 40 +++++----------------------------------- 1 file changed, 5 insertions(+), 35 deletions(-) (limited to 'conf/distro/include/slugos.inc') 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" -- cgit v1.2.3 From 49856b77f98ab2d00c412b38b30a9e33f6f35a0d Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 8 Feb 2007 18:22:59 +0000 Subject: slugos: Subsumed slugos-btu.conf into ucslugc.conf, and dropped slugos-{b,l}{a,t}u.conf --- conf/distro/include/slugos.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf/distro/include/slugos.inc') diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 7a1ae6b8e1..ce206a047b 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -3,11 +3,11 @@ #@DESCRIPTION: SlugOS Linux Distribution for the NSLU2 # WARNING: this file should not be used directly, use one of -# the supported slugos-???.conf instead: +# the supported slugos-derived distributions instead: # Explanation of the naming # -# slugos-dist - the base distro configuration for an NSLU2 +# slugos - the base distro configuration for an NSLU2 # slugos-[bl][at][gu] - a specific configuration encoded as follows: # # b or l - big or little endian -- cgit v1.2.3 From ae35d5932fa824472ce62b7ef829b479852c6269 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 8 Feb 2007 18:42:29 +0000 Subject: slugos: Subsumed slugos-lag.conf into slugosle.conf, slugos-bag.conf into slugosbe.conf, and dropped slugos-{b,l}ag.conf. Deprecated openslug.conf in favour of slugosbe.conf. Deprecated debianslug.conf in favour of slugosle.conf. Eventually this all might be done with multimachine. --- conf/distro/include/slugos.inc | 41 +++++++---------------------------------- 1 file changed, 7 insertions(+), 34 deletions(-) (limited to 'conf/distro/include/slugos.inc') diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index ce206a047b..52b9e5bef5 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -3,21 +3,7 @@ #@DESCRIPTION: SlugOS Linux Distribution for the NSLU2 # WARNING: this file should not be used directly, use one of -# the supported slugos-derived distributions instead: - -# Explanation of the naming -# -# slugos - the base distro configuration for an NSLU2 -# slugos-[bl][at][gu] - a specific configuration encoded as follows: -# -# b or l - big or little endian -# -# a or t - ARM or Thumb instructions in the low level libraries -# set ARM_INSTRUCTION_SET to match -# -# g or u - glibc or uclibc libc implementation -# set TARGET_OS to match -# +# the supported slugos-derived distributions instead. #---------------------------------------------------------------------------------- # STANDARD SLUGOS DEFINITIONS @@ -26,6 +12,8 @@ # #DISTRO_NAME #DISTRO_TYPE +#ARM_INSTRUCTION_SET "arm" or "thumb" +#TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions SLUGOS_VERSION = "4.3" @@ -39,11 +27,6 @@ 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" -#TARGET_OS "linux" or "linux-uclibc" - # The following need not be set, the defaults should be adequate #USE_NLS = "no" or "yes" USE_NLS ?= "no" @@ -80,21 +63,9 @@ FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers \ # when downloading new packages or updating existing packages. Additional feeds # (such as a local feed) can be defined in local.conf #---------------------------------------------------------------------------------- -# Add to the user's feeds from local.conf (there may be none). -# In general slugos-[bl][at][gu] is sufficient to identify a set of packages which -# will work on any derived distro. The slugos-???.conf files set the FEED_URIS to -# an appropriate ipkg.nslu2-linux.org default if nslu2-linux is actually building -# such a feed: -# -#FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/cross/${DISTRO_FEED}" -#FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/native/${DISTRO_FEED}" # -# When such a feed exists the corresponding 'unstable' feed will normally also -# exist - the packages in unstable are the latest but very unlikely to be the -# greatest. Use at your own risk! -# -#FEED_URIS_append += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/cross/unstable" -#FEED_URIS_append += "unstable_native##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/native/unstable" +FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/${SLUGOS_DISTRO}/cross/${DISTRO_FEED}" +FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${SLUGOS_DISTRO}/native/${DISTRO_FEED}" #---------------------------------------------------------------------------------- # FIRMWARE CONFIGURATION @@ -170,6 +141,8 @@ SRCDATE_irssi ?= "20050930" CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" INHERIT += "nslu2-mirrors" +PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63" + PREFERRED_VERSION_ipkg ?= "0.99.154" PREFERRED_VERSION_ipkg-native ?= "0.99.154" -- cgit v1.2.3 From 613606be24cae0a114b2d1aa81ddca0d44b61a10 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 12 Feb 2007 05:57:24 +0000 Subject: slugos: Major build structure change - subsumed openslug and debianslug into a single slugos distribution which works with either nslu2be or nslu2le machines. Kept the openslug and debianslug conf files around to enable people to migrate smoothly, but eventually they will disappear. --- conf/distro/include/slugos.inc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'conf/distro/include/slugos.inc') diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 52b9e5bef5..a26a069fa0 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -23,9 +23,7 @@ DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # DISTRO_FEED ?= "${SLUGOS_VERSION}-${DISTRO_TYPE}" DISTRO_FEED ?= "unstable" -SLUGOS_DISTRO ?= "slugos" - -IMAGE_BASENAME = "${SLUGOS_DISTRO}" +IMAGE_BASENAME = "${@['slugos${SITEINFO_ENDIANESS}', 'ucslugc'][bb.data.getVar('TARGET_OS', d, 1) == 'linux-uclibc']}" # The following need not be set, the defaults should be adequate #USE_NLS = "no" or "yes" @@ -41,9 +39,7 @@ TARGET_FPU = "soft" # glib-2.0 builds require USE_NLS to be overridden USE_NLS_glib-2.0 = "yes" -INHERIT += "package_ipk debian" - -DISTRO_BASE = ":slugos" +INHERIT += "package_ipk debian multimachine" # FULL_OPTIMIZATION # Optimization settings. Os works fine and is significantly better than O2. @@ -64,8 +60,8 @@ FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers \ # (such as a local feed) can be defined in local.conf #---------------------------------------------------------------------------------- # -FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/${SLUGOS_DISTRO}/cross/${DISTRO_FEED}" -FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${SLUGOS_DISTRO}/native/${DISTRO_FEED}" +FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME}/cross/${DISTRO_FEED}" +FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME}/native/${DISTRO_FEED}" #---------------------------------------------------------------------------------- # FIRMWARE CONFIGURATION -- cgit v1.2.3