diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-02-12 05:57:24 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-02-12 05:57:24 +0000 |
| commit | 613606be24cae0a114b2d1aa81ddca0d44b61a10 (patch) | |
| tree | 7d6f42059bd62291026686cc842223f5a8d2400d /conf/distro/include/slugos.inc | |
| parent | 7edfef39a97bf8b6922f7fb4bfe50bd911ce76cb (diff) | |
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.
Diffstat (limited to 'conf/distro/include/slugos.inc')
| -rw-r--r-- | conf/distro/include/slugos.inc | 12 |
1 files changed, 4 insertions, 8 deletions
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 |