* [PATCH 1/2] package_deb: don't install glibc-localedata-i18n separately
@ 2013-03-20 22:21 Christopher Larson
2013-03-20 22:21 ` [PATCH 2/2] package_{ipk, deb, rpm}: drop the TARGET_OS conditional Christopher Larson
0 siblings, 1 reply; 2+ messages in thread
From: Christopher Larson @ 2013-03-20 22:21 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
This was removed from package_rpm and package_ipk years ago, and shouldn't be
needed, installing the packages from package_linguas should be sufficient.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/classes/package_deb.bbclass | 4 ----
1 file changed, 4 deletions(-)
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 3174184..84b1c52 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -104,10 +104,6 @@ package_install_internal_deb () {
# Uclibc builds don't provide this stuff..
if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then
if [ ! -z "${package_linguas}" ]; then
- apt-get install glibc-localedata-i18n --force-yes --allow-unauthenticated
- if [ $? -ne 0 ]; then
- exit 1
- fi
for i in ${package_linguas}; do
apt-get install $i --force-yes --allow-unauthenticated
if [ $? -ne 0 ]; then
--
1.8.2
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH 2/2] package_{ipk, deb, rpm}: drop the TARGET_OS conditional
2013-03-20 22:21 [PATCH 1/2] package_deb: don't install glibc-localedata-i18n separately Christopher Larson
@ 2013-03-20 22:21 ` Christopher Larson
0 siblings, 0 replies; 2+ messages in thread
From: Christopher Larson @ 2013-03-20 22:21 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
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.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/classes/package_deb.bbclass | 17 +++++++----------
meta/classes/package_ipk.bbclass | 11 +++--------
meta/classes/package_rpm.bbclass | 5 -----
3 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 84b1c52..4559199 100644
--- 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
--- 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
--- 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
--
1.8.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-03-20 22:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-20 22:21 [PATCH 1/2] package_deb: don't install glibc-localedata-i18n separately Christopher Larson
2013-03-20 22:21 ` [PATCH 2/2] package_{ipk, deb, rpm}: drop the TARGET_OS conditional Christopher Larson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox