summaryrefslogtreecommitdiff
path: root/conf/distro/include/slugos.inc
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro/include/slugos.inc')
-rw-r--r--conf/distro/include/slugos.inc16
1 files changed, 5 insertions, 11 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 52b9e5bef5..0a11c0e8ac 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.
@@ -53,9 +49,7 @@ DISTRO_BASE = ":slugos"
# 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"
+FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers -fno-unroll-loops -fno-inline-functions -fweb -funit-at-a-time"
#----------------------------------------------------------------------------------
# FEEDS
@@ -64,8 +58,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