[oe-commits] org.oe.dev rootfs*.bbclass: uclibc doesn't provides glibc-locale* and locale-base*, so don't try to install it

[koen commit]

rootfs*.bbclass: uclibc doesn't provides glibc-locale* and locale-base*, so don't try to install it

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 160d348d6250416d3611c06249de547bcea62ff8
ViewMTN: http://monotone.openembedded.org/revision.psp?id=160d348d6250416d3611c06249de547bcea62ff8
Files:
1
classes/rootfs_deb.bbclass
classes/rootfs_ipk.bbclass
Diffs:

#
# mt diff -r5d2e32fb9864db7ab20c3a83fb59b021d1a8ed51 -r160d348d6250416d3611c06249de547bcea62ff8
#
# 
# 
# patch "classes/rootfs_deb.bbclass"
#  from [879ba74c1e013701649d53858c52b79d09441ccd]
#    to [707eb78db91916253acef44e2f1a8ff049193cff]
# 
# patch "classes/rootfs_ipk.bbclass"
#  from [731a40ee3d0b40e7e6d9bdc838728a484250233e]
#    to [237808776045be08b7c6b05f62ed82bb94daada8]
# 
============================================================
--- classes/rootfs_deb.bbclass	879ba74c1e013701649d53858c52b79d09441ccd
+++ classes/rootfs_deb.bbclass	707eb78db91916253acef44e2f1a8ff049193cff
@@ -53,20 +53,22 @@ 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 [ 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 "${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 [ ! -z "${PACKAGE_INSTALL}" ]; then
 		for i in ${PACKAGE_INSTALL}; do
 			apt-get install $i --force-yes --allow-unauthenticated
============================================================
--- classes/rootfs_ipk.bbclass	731a40ee3d0b40e7e6d9bdc838728a484250233e
+++ classes/rootfs_ipk.bbclass	237808776045be08b7c6b05f62ed82bb94daada8
@@ -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}