package_{ipk, deb, rpm}: drop the TARGET_OS conditional

The tclibc file for uclibc already empties IMAGE_LINGUAS, so there's no point
to this conditional as far as I can tell, and it can cause issues for certain
values of TARGET_OS.

(From OE-Core rev: 0fdda5840452c7715ed775d5d18d9f850396f483)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 84b1c52..4559199 100644 (file)
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -101,16 +101,13 @@ package_install_internal_deb () {
 
        apt-get update
 
-       # Uclibc builds don't provide this stuff..
-       if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then
-               if [ ! -z "${package_linguas}" ]; then
-                       for i in ${package_linguas}; do
-                               apt-get install $i --force-yes --allow-unauthenticated
-                               if [ $? -ne 0 ]; then
-                                       exit 1
-                               fi
-                       done
-               fi
+       if [ ! -z "${package_linguas}" ]; then
+               for i in ${package_linguas}; do
+                       apt-get install $i --force-yes --allow-unauthenticated
+                       if [ $? -ne 0 ]; then
+                               exit 1
+                       fi
+               done
        fi
 
        # normal install

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 094ba09..d003ae7 100644 (file)
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -90,14 +90,9 @@ package_install_internal_ipk() {
 
        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 "${package_linguas}" ]; then
-                       for i in ${package_linguas}; do
-                               opkg-cl ${ipkg_args} install $i
-                       done
-               fi
-       fi
+       for i in ${package_linguas}; do
+               opkg-cl ${ipkg_args} install $i
+       done
 
        if [ ! -z "${package_to_install}" ]; then
                opkg-cl ${ipkg_args} install ${package_to_install}

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index b6d76e7..12b4bfa 100644 (file)
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -368,11 +368,6 @@ EOF
                done
        fi
 
-       # Uclibc builds don't provide this stuff...
-       if [ x${TARGET_OS} != "xlinux" ] && [ x${TARGET_OS} != "xlinux-gnueabi" ] ; then
-               package_linguas=""
-       fi
-
        # Construct install scriptlet wrapper
        cat << EOF > ${WORKDIR}/scriptlet_wrapper
 #!/bin/bash