image.bbclass: add LINGUAS_INSTALL to PACKAGE_INSTALL.

They aren't a special case, no reason to handle them that way, as we can
leverage overrides.

Signed-off-by: Chris Larson <chris_larson@mentor.com>

diff --git a/classes/image.bbclass b/classes/image.bbclass
index 97da440..9dda990 100644 (file)
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -29,11 +29,19 @@ ${IMAGE_DEV_MANAGER} \
 ${IMAGE_INIT_MANAGER} \
 ${IMAGE_LOGIN_MANAGER} "
 
+# some default locales
+IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
+
+LINGUAS_INSTALL = ""
+LINGUAS_INSTALL_linux = "glibc-localedata-i18n"
+LINGUAS_INSTALL_linux += "${@' '.join(map(lambda s: 'locale-base-%s' % s, '${IMAGE_LINGUAS}'.split()))}"
+LINGUAS_INSTALL_linux-gnueabi = "${LINGUAS_INSTALL_linux}"
+
 RDEPENDS += "${PACKAGE_INSTALL}"
 
 # "export IMAGE_BASENAME" not supported at this time
 IMAGE_BASENAME[export] = "1"
-export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${IMAGE_BOOT}"
+export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${IMAGE_BOOT} ${LINGUAS_INSTALL}"
 
 # We need to recursively follow RDEPENDS and RRECOMMENDS for images
 do_rootfs[recrdeptask] += "do_deploy do_populate_sysroot"
@@ -103,11 +111,6 @@ IMAGE_POSTPROCESS_COMMAND ?= ""
 MACHINE_POSTPROCESS_COMMAND ?= ""
 ROOTFS_POSTPROCESS_COMMAND ?= ""
 
-# some default locales
-IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
-
-LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, bb.data.getVar('IMAGE_LINGUAS', d, 1).split()))}"
-
 do_rootfs[nostamp] = "1"
 do_rootfs[dirs] = "${TOPDIR}"
 do_build[nostamp] = "1"

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 77e573c..a4a8563 100644 (file)
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -47,15 +47,6 @@ fakeroot rootfs_ipk_do_rootfs () {
 
        opkg-cl ${IPKG_ARGS} update
 
-       # Uclibc builds don't provide this stuff...
-       if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then 
-               if [ ! -z "${LINGUAS_INSTALL}" ]; then
-                       opkg-cl ${IPKG_ARGS} install glibc-localedata-i18n
-                       for i in ${LINGUAS_INSTALL}; do
-                               opkg-cl ${IPKG_ARGS} install $i 
-                       done
-               fi
-       fi
        if [ ! -z "${PACKAGE_INSTALL}" ]; then
                opkg-cl ${IPKG_ARGS} install ${PACKAGE_INSTALL}
        fi