[oe-commits] org.oe.dev slugos: Subsumed slugos-btu.conf into ucslugc.conf, and dropped slugos-{b, l}{a, t}u.conf

[rwhitby commit]

slugos: Subsumed slugos-btu.conf into ucslugc.conf, and dropped slugos-{b,l}{a,t}u.conf

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 9bfe666a387d3be1af5e1ff0195d3617273ff9eb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9bfe666a387d3be1af5e1ff0195d3617273ff9eb
Files:
1
conf/distro/slugos-bau.conf
conf/distro/slugos-btu.conf
conf/distro/slugos-lau.conf
conf/distro/slugos-ltu.conf
conf/distro/include/slugos.inc
conf/distro/ucslugc.conf
Diffs:

#
# mt diff -raec967755f263cafd292d50141a8f067a805334d -r9bfe666a387d3be1af5e1ff0195d3617273ff9eb
#
# 
# 
# delete "conf/distro/slugos-bau.conf"
# 
# delete "conf/distro/slugos-btu.conf"
# 
# delete "conf/distro/slugos-lau.conf"
# 
# delete "conf/distro/slugos-ltu.conf"
# 
# patch "conf/distro/include/slugos.inc"
#  from [38b1bf659e06882ee0efbccb10178993122d2bb2]
#    to [082ca5c971b043bf98c454e31c5575945fa2251f]
# 
# patch "conf/distro/ucslugc.conf"
#  from [3dedc1b93daec8d139bb92cb338c0c3adb547483]
#    to [0b87dc6ab0978c7d08149a9deb271ff5e2b85753]
# 
============================================================
--- conf/distro/include/slugos.inc	38b1bf659e06882ee0efbccb10178993122d2bb2
+++ conf/distro/include/slugos.inc	082ca5c971b043bf98c454e31c5575945fa2251f
@@ -1,13 +1,13 @@
 #@TYPE: Distribution
 #@NAME: SlugOS
 #@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
============================================================
--- conf/distro/ucslugc.conf	3dedc1b93daec8d139bb92cb338c0c3adb547483
+++ conf/distro/ucslugc.conf	0b87dc6ab0978c7d08149a9deb271ff5e2b85753
@@ -1,24 +1,22 @@
 #@TYPE: Distribution
 #@NAME: UcSlugC
 #@DESCRIPTION: UcSlugC Linux Distribution for the NSLU2
 
-# This is SLUGOS-BTU with a different name...
 DISTRO_NAME = "UcSlugC"
 # DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
 # DISTRO_FEED = "unstable"
 DISTRO_TYPE = "beta"
 SLUGOS_DISTRO = "ucslugc"
 
+TARGET_ARCH = "armeb"
+ARM_INSTRUCTION_SET = "thumb"
+TARGET_OS = "linux-uclibc"
+
 PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
 PREFERRED_VERSION_gcc-cross = "3.4.4"
 PREFERRED_VERSION_gcc = "3.4.4"
 
-# For compatibility with the old way of overriding these settings names with the
-# prefix UCSLUGC_ are used here to default the values of the corresponding NSLU2_
-# setting - either may be set in local.conf to override these values.
-UCSLUGC_EXTRA_RDEPENDS ?= ""
+FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/${DISTRO_FEED}"
+FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/${DISTRO_FEED}"
 
+require conf/distro/include/slugos.inc
-#
-SLUGOS_EXTRA_RDEPENDS ?= "${UCSLUGC_EXTRA_RDEPENDS}"
-
-require conf/distro/slugos-btu.conf