diff options
| author |   Mike Westerhof <mwester@dls.net> | 2011-02-26 09:53:39 -0600 |
|---|---|---|
| committer | Mike Westerhof <mwester@dls.net> | 2011-02-26 09:53:39 -0600 |
| commit | d86370d18ae58dd7802a6439b4c69e1f80f8bc14 (patch) | |
| tree | 66664a4a9747356e3100663f54134747e4c78902 /conf | |
| parent | c50a4ef00e736d2d030e75e6c30d3ab9845c05d0 (diff) | |
| download | openembedded-d86370d18ae58dd7802a6439b4c69e1f80f8bc14.tar.gz | |
SlugOS: remove TARGET_ARCH (set in machine conf instead), bump up distro to v6.0
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/slugos.inc | 2 | ||||
| -rw-r--r-- | conf/distro/slugos.conf | 8 | ||||
| -rw-r--r-- | conf/distro/ucslugc.conf | 3 |
3 files changed, 4 insertions, 9 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 32ec09d196..994b2c15cb 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -16,7 +16,7 @@ #TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "5.8" +SLUGOS_VERSION = "6.0" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 049e24ebed..4679d95c3b 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -2,14 +2,9 @@ #@NAME: SlugOS #@DESCRIPTION: SlugOS Linux Distribution for the NSLU2 -#---------------------------------------------------------------------------------- -# STANDARD SlugOS/BE DEFINITIONS -#---------------------------------------------------------------------------------- DISTRO_NAME = "SlugOS" -# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" -# DISTRO_FEED = "unstable" DISTRO_TYPE = "alpha" -TARGET_ARCH ?= "armeb" + ARM_INSTRUCTION_SET = "thumb" IPKG_VARIANT ?= "opkg" PREFERRED_PROVIDER_opkg ?= "opkg" @@ -18,6 +13,7 @@ IMAGE_INITSCRIPTS ?= "initscripts-slugos" IMAGE_DEV_MANAGER = "udev" # Disable installing ldconfig USE_LDCONFIG = "0" + require conf/distro/include/slugos.inc require conf/distro/include/sane-toolchain.inc require conf/distro/include/arm-thumb.inc diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index 8f6fbe58a9..e9109f167d 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -5,15 +5,14 @@ DISTRO_NAME = "UcSlugC" DISTRO_TYPE = "alpha" IMAGE_BASENAME = "ucslugc" -TARGET_ARCH = "armeb" ARM_INSTRUCTION_SET = "thumb" IPKG_VARIANT ?= "opkg" PREFERRED_PROVIDER_opkg ?= "opkg" PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg" IMAGE_INITSCRIPTS ?= "initscripts-slugos" +IMAGE_DEV_MANAGER = "busybox-mdev" LIBC = "uclibc" -IMAGE_DEV_MANAGER = "busybox-mdev" require conf/distro/include/slugos.inc require conf/distro/include/sane-toolchain.inc |