[oe-commits] Khem Raj : ucslugc.conf: Revitalize, can not build slugos-image with uclibc

[git version control]

Module: openembedded.git
Branch: master
Commit: aec2d12c9f97ca65f75a07635284ff1f4bce41a6
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=aec2d12c9f97ca65f75a07635284ff1f4bce41a6

Author: Khem Raj <raj.khem at gmail.com>
Date:   Tue Jan 18 13:53:05 2011 -0800

ucslugc.conf: Revitalize, can not build slugos-image with uclibc

Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 conf/distro/include/slugos.inc |    2 +-
 conf/distro/ucslugc.conf       |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 9609dd5..0ed22d2 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -34,7 +34,7 @@ DISTRO_FEATURES = "largefile ipv4 ipv6 nfs smbfs wifi ppp alsa bluetooth ext2 vf
 # We may also wish to enable raid support at some point (space permitting)
 #DISTRO_FEATURES += " raid"
 
-IMAGE_BASENAME = "${@['slugos${SITEINFO_ENDIANNESS}', 'ucslugc'][bb.data.getVar('TARGET_OS', d, 1) == 'linux-uclibc']}"
+IMAGE_BASENAME = "${@['slugos${SITEINFO_ENDIANNESS}', 'ucslugc'][bb.data.getVar('TARGET_OS', d, 1) == 'linux-uclibceabi']}"
 
 # The following need not be set, the defaults should be adequate
 #USE_NLS = "no" or "yes"
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index 7d69a55..9ee0586 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -6,7 +6,11 @@ DISTRO_NAME = "UcSlugC"
 IMAGE_BASENAME = "ucslugc"
 TARGET_ARCH = "armeb"
 ARM_INSTRUCTION_SET = "thumb"
-THUMB_INTERWORK = "yes"
+IPKG_VARIANT ?= "opkg-nogpg-nocurl-slugos"
+PREFERRED_PROVIDER_opkg ?= "opkg-nogpg-nocurl-slugos"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-nogpg-nocurl-slugos"
+IMAGE_INITSCRIPTS ?= "initscripts-slugos"
+
 LIBC = "uclibc"
 
 require conf/distro/include/slugos.inc