package_deb: don't install glibc-localedata-i18n separately
PATCH 1/2 package_deb: don't install glibc-localedata-i18n separately
From: Christopher Larson <[email protected]>
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 <[email protected]>
--- meta/classes/package_deb.bbclass | 4 ---- 1 file changed, 4 deletions(-)
meta/classes/package_deb.bbclass +0 -4
@@ -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
Signature · 1 line
1.8.2
PATCH 2/2 package_{ipk, deb, rpm}: drop the TARGET_OS conditional
From: Christopher Larson <[email protected]>
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 <[email protected]>
--- 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(-)
meta/classes/package_deb.bbclass +7 -10
@@ -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
meta/classes/package_ipk.bbclass +3 -8
@@ -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}
meta/classes/package_rpm.bbclass +0 -5
@@ -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
Signature · 1 line
1.8.2