From 579019b1aef8fe103cf266d418bb90532c635e4b Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 28 Aug 2007 03:32:37 +0000
Subject: rootfs*.bbclass: uclibc doesn't provides glibc-locale* and
 locale-base*, so don't try to install it

---
 classes/rootfs_deb.bbclass | 28 +++++++++++++++-------------
 classes/rootfs_ipk.bbclass | 24 +++++++++++++++---------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
index 67fa661308..32b1c57f1a 100644
--- a/classes/rootfs_deb.bbclass
+++ b/classes/rootfs_deb.bbclass
@@ -53,19 +53,21 @@ fakeroot rootfs_deb_do_rootfs () {
 	_getflag () {
 		cat ${IMAGE_ROOTFS}/var/dpkg/status | sed -n -e "/^Package: $2\$/{n; s/Status: install ok .*/$1/; p}"
 	}
-
-	if [ ! -z "${LINGUAS_INSTALL}" ]; then
-		apt-get install glibc-localedata-i18n --force-yes --allow-unauthenticated
-		if [ $? -ne 0 ]; then
-			exit $?
-		fi
-		for i in ${LINGUAS_INSTALL}; do
-			apt-get install $i --force-yes --allow-unauthenticated
-			if [ $? -ne 0 ]; then
-				exit $?
-			fi
-		done
-	fi
+        
+        if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then
+	  if [ ! -z "${LINGUAS_INSTALL}" ]; then
+		  apt-get install glibc-localedata-i18n --force-yes --allow-unauthenticated
+		  if [ $? -ne 0 ]; then
+			  exit $?
+		  fi
+		  for i in ${LINGUAS_INSTALL}; do
+			  apt-get install $i --force-yes --allow-unauthenticated
+			  if [ $? -ne 0 ]; then
+				  exit $?
+			  fi
+		  done
+	  fi
+        fi
 
 	if [ ! -z "${PACKAGE_INSTALL}" ]; then
 		for i in ${PACKAGE_INSTALL}; do
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 53b0162eac..9a58777ade 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -52,15 +52,21 @@ fakeroot rootfs_ipk_do_rootfs () {
 	    fi
 	done
 	ipkg-cl ${IPKG_ARGS} update
-	if [ ! -z "${LINGUAS_INSTALL}" ]; then
-		ipkg-cl ${IPKG_ARGS} install glibc-localedata-i18n
-		for i in ${LINGUAS_INSTALL}; do
-			ipkg-cl ${IPKG_ARGS} install $i
-		done
-	fi
-	if [ ! -z "${PACKAGE_INSTALL}" ]; then
-		ipkg-cl ${IPKG_ARGS} install ${PACKAGE_INSTALL}
-	fi
+        
+        # Uclibc builds don't provide this stuff...
+        #
+        if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then 
+	  if [ ! -z "${LINGUAS_INSTALL}" ]; then
+	  	  ipkg-cl ${IPKG_ARGS} install glibc-localedata-i18n
+		  for i in ${LINGUAS_INSTALL}; do
+			  ipkg-cl ${IPKG_ARGS} install $i 
+		  done
+	  fi
+        fi
+	  if [ ! -z "${PACKAGE_INSTALL}" ]; then
+		  ipkg-cl ${IPKG_ARGS} install ${PACKAGE_INSTALL}
+	  fi
+       
 
 	export D=${IMAGE_ROOTFS}
 	export OFFLINE_ROOT=${IMAGE_ROOTFS}
-- 
cgit v1.2.3