diff options
author | Christopher Larson <chris_larson@mentor.com> | 2013-03-20 15:21:31 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-22 16:54:38 +0000 |
commit | b10f2a74e42a73a284bcfb46db57202fc1ee9e49 (patch) | |
tree | 09abede3a19e9442ba388a5601a4419028277861 /meta/classes/package_deb.bbclass | |
parent | 331c1f1fe55939d61679e1c8c163b93b2879e29d (diff) | |
download | poky-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/package_deb.bbclass')
-rw-r--r-- | meta/classes/package_deb.bbclass | 17 |
1 files changed, 7 insertions, 10 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 |