summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2013-03-20 15:21:31 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-22 16:54:38 +0000
commitb10f2a74e42a73a284bcfb46db57202fc1ee9e49 (patch)
tree09abede3a19e9442ba388a5601a4419028277861 /meta/classes
parent331c1f1fe55939d61679e1c8c163b93b2879e29d (diff)
downloadpoky-b10f2a74e42a73a284bcfb46db57202fc1ee9e49.tar.gz
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>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/package_deb.bbclass17
-rw-r--r--meta/classes/package_ipk.bbclass11
-rw-r--r--meta/classes/package_rpm.bbclass5
3 files changed, 10 insertions, 23 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 84b1c522e7..455919913b 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -101,16 +101,13 @@ package_install_internal_deb () {
101 101
102 apt-get update 102 apt-get update
103 103
104 # Uclibc builds don't provide this stuff.. 104 if [ ! -z "${package_linguas}" ]; then
105 if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then 105 for i in ${package_linguas}; do
106 if [ ! -z "${package_linguas}" ]; then 106 apt-get install $i --force-yes --allow-unauthenticated
107 for i in ${package_linguas}; do 107 if [ $? -ne 0 ]; then
108 apt-get install $i --force-yes --allow-unauthenticated 108 exit 1
109 if [ $? -ne 0 ]; then 109 fi
110 exit 1 110 done
111 fi
112 done
113 fi
114 fi 111 fi
115 112
116 # normal install 113 # normal install
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 094ba09fcf..d003ae7e81 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -90,14 +90,9 @@ package_install_internal_ipk() {
90 90
91 opkg-cl ${ipkg_args} update 91 opkg-cl ${ipkg_args} update
92 92
93 # Uclibc builds don't provide this stuff... 93 for i in ${package_linguas}; do
94 if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then 94 opkg-cl ${ipkg_args} install $i
95 if [ ! -z "${package_linguas}" ]; then 95 done
96 for i in ${package_linguas}; do
97 opkg-cl ${ipkg_args} install $i
98 done
99 fi
100 fi
101 96
102 if [ ! -z "${package_to_install}" ]; then 97 if [ ! -z "${package_to_install}" ]; then
103 opkg-cl ${ipkg_args} install ${package_to_install} 98 opkg-cl ${ipkg_args} install ${package_to_install}
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index b6d76e7a3b..12b4bfa536 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -368,11 +368,6 @@ EOF
368 done 368 done
369 fi 369 fi
370 370
371 # Uclibc builds don't provide this stuff...
372 if [ x${TARGET_OS} != "xlinux" ] && [ x${TARGET_OS} != "xlinux-gnueabi" ] ; then
373 package_linguas=""
374 fi
375
376 # Construct install scriptlet wrapper 371 # Construct install scriptlet wrapper
377 cat << EOF > ${WORKDIR}/scriptlet_wrapper 372 cat << EOF > ${WORKDIR}/scriptlet_wrapper
378#!/bin/bash 373#!/bin/bash