Merge bk://openembedded@openembedded.bkbits.net/packages-devel

into stealth.nexus.co.uk:/home/pb/oe/oe-packages

2004/11/21 23:50:56+00:00 nexus.co.uk!pb
rootfs_ipk: try to work around ipk bugs with locale package handling

BKrev: 41a129f2YsrRmr4te-Q3Eafd_QrGGA

diff --git a/classes/rootfs_ipk.oeclass b/classes/rootfs_ipk.oeclass
index 772984c..b725d39 100644 (file)
--- a/classes/rootfs_ipk.oeclass
+++ b/classes/rootfs_ipk.oeclass
@@ -20,7 +20,7 @@ ROOTFS_POSTPROCESS_COMMAND ?= ""
 # some default locales
 IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
 
-IPKG_INSTALL =+ "${@" ".join(map(lambda s: "locale-base-%s" % s, oe.data.getVar('IMAGE_LINGUAS', d, 1).split()))}"
+LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, oe.data.getVar('IMAGE_LINGUAS', d, 1).split()))}"
 
 real_do_rootfs () {
        set -x
@@ -50,6 +50,11 @@ EOF
                fi
        done
        ipkg-cl ${IPKG_ARGS} update
+       if [ ! -z "${LINGUAS_INSTALL}" ]; then
+               for i in ${LINGUAS_INSTALL}; do
+                       ipkg-cl ${IPKG_ARGS} install $i
+               done
+       fi
        if [ ! -z "${IPKG_INSTALL}" ]; then
                ipkg-cl ${IPKG_ARGS} install ${IPKG_INSTALL}
        fi