diff options
-rw-r--r-- | conf/distro/include/slugos.inc | 4 | ||||
-rw-r--r-- | conf/distro/slugos-bau.conf | 18 | ||||
-rw-r--r-- | conf/distro/slugos-btu.conf | 20 | ||||
-rw-r--r-- | conf/distro/slugos-lau.conf | 18 | ||||
-rw-r--r-- | conf/distro/slugos-ltu.conf | 20 | ||||
-rw-r--r-- | conf/distro/ucslugc.conf | 16 |
6 files changed, 9 insertions, 87 deletions
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 diff --git a/conf/distro/slugos-bau.conf b/conf/distro/slugos-bau.conf deleted file mode 100644 index e204033c4f..0000000000 --- a/conf/distro/slugos-bau.conf +++ /dev/null @@ -1,18 +0,0 @@ -#@TYPE: Distribution -#@NAME: SLUGOS-BAU -#@DESCRIPTION: Linux Distribution for the NSLU2 - -# See slugos.conf for an explanation of this file. - -# This slugos variant is not supported - there are no nslu2-linux.org -# regular builds and there is no feed. -DISTRO_NAME ?= "slugos-bau" -# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" -# DISTRO_FEED ?= "unstable" -DISTRO_TYPE ?= "alpha" - -TARGET_ARCH = "armeb" -ARM_INSTRUCTION_SET = "arm" -TARGET_OS = "linux-uclibc" - -require conf/distro/include/slugos.inc diff --git a/conf/distro/slugos-btu.conf b/conf/distro/slugos-btu.conf deleted file mode 100644 index 24228737bb..0000000000 --- a/conf/distro/slugos-btu.conf +++ /dev/null @@ -1,20 +0,0 @@ -#@TYPE: Distribution -#@NAME: SLUGOS-BTU -#@DESCRIPTION: Linux Distribution for the NSLU2 - -# See slugos.conf for an explanation of this file. - -# This slugos variant corresponds to UcSlugC -DISTRO_NAME ?= "slugos-btu" -# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" -# DISTRO_FEED ?= "unstable" -DISTRO_TYPE ?= "beta" - -TARGET_ARCH = "armeb" -ARM_INSTRUCTION_SET = "thumb" -TARGET_OS = "linux-uclibc" - -FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-btu/cross/${DISTRO_FEED}" -FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-btu/native/${DISTRO_FEED}" - -require conf/distro/include/slugos.inc diff --git a/conf/distro/slugos-lau.conf b/conf/distro/slugos-lau.conf deleted file mode 100644 index a35fbffcb6..0000000000 --- a/conf/distro/slugos-lau.conf +++ /dev/null @@ -1,18 +0,0 @@ -#@TYPE: Distribution -#@NAME: SLUGOS-LAU -#@DESCRIPTION: Linux Distribution for the NSLU2 - -# This slugos variant is not supported - there are no nslu2-linux.org -# regular builds and there is no feed. -DISTRO_NAME ?= "slugos-lau" -# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" -# DISTRO_FEED ?= "unstable" -DISTRO_TYPE ?= "alpha" - -TARGET_ARCH = "arm" -ARM_INSTRUCTION_SET = "arm" -TARGET_OS = "linux-uclibc" - -# no feeds - -require conf/distro/include/slugos.inc diff --git a/conf/distro/slugos-ltu.conf b/conf/distro/slugos-ltu.conf deleted file mode 100644 index 6defe0dd02..0000000000 --- a/conf/distro/slugos-ltu.conf +++ /dev/null @@ -1,20 +0,0 @@ -#@TYPE: Distribution -#@NAME: SLUGOS-LTU -#@DESCRIPTION: Linux Distribution for the NSLU2 - -# See slugos.conf for an explanation of this file. - -DISTRO_NAME ?= "slugos-ltu" -# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" -# DISTRO_FEED ?= "unstable" -DISTRO_TYPE ?= "beta" - -TARGET_ARCH = "arm" -ARM_INSTRUCTION_SET = "thumb" -TARGET_OS = "linux-uclibc" - -FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-ltu/cross/${DISTRO_FEED}" -FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-ltu/native/${DISTRO_FEED}" - - -require conf/distro/include/slugos.inc diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index 8774a0729f..6ff939c8b0 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -2,23 +2,21 @@ #@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 ?= "" - -# -SLUGOS_EXTRA_RDEPENDS ?= "${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/slugos-btu.conf +require conf/distro/include/slugos.inc |