From: Koen Kooi <koen@openembedded.org>
Date: Sat, 20 Jun 2009 17:31:33 +0000 (+0200)
Subject: image bbclass: fix logic buglet in lingua code
X-Git-Tag: Release-2010-05/1~3087^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abbbb26e6ad384278a620f3b4c2e85c235c6ccc5;p=openembedded.git

image bbclass: fix logic buglet in lingua code
---

diff --git a/classes/image.bbclass b/classes/image.bbclass
index 0d798fa7db..864230bc91 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -243,8 +243,8 @@ if [ -e ${IMAGE_ROOTFS}/usr/bin/opkg-cl ] ; then
 	${OPKG} update
 	${OPKG} list_installed | awk '{print $1}' |sort | uniq > /tmp/installed-packages
 
-	for i in $(cat /tmp/installed-packages) ; do
-		for translation in ${IMAGE_LINGUAS}; do
+	for i in $(cat /tmp/installed-packages | grep -v locale) ; do
+		for translation in ${IMAGE_LINGUAS} $(echo ${IMAGE_LINGUAS} | awk -F_ '{print $1}'); do
 			echo ${i}-locale-${translation}
 		done
 	done | sort | uniq > /tmp/wanted-locale-packages
@@ -252,9 +252,8 @@ if [ -e ${IMAGE_ROOTFS}/usr/bin/opkg-cl ] ; then
 	${OPKG} list | awk '{print $1}' |grep locale |sort | uniq > /tmp/available-locale-packages
 
 	cat /tmp/wanted-locale-packages /tmp/available-locale-packages | sort | uniq -d > /tmp/pending-locale-packages
-	cat /tmp/installed-packages /tmp/pending-locale-packages | grep locale | sort | uniq -u > /tmp/translation-list
 
-	cat /tmp/translation-list | xargs ${OPKG} -nodeps install
+	cat /tmp/pending-locale-packages | xargs ${OPKG} -nodeps install
 	rm -f ${IMAGE_ROOTFS}${libdir}/opkg/lists/*
 
     for i in ${IMAGE_ROOTFS}${libdir}/opkg/info/*.preinst; do