image bbclass: fix logic buglet in lingua code

diff --git a/classes/image.bbclass b/classes/image.bbclass
index 0d798fa..864230b 100644 (file)
--- 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