diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/package_deb.bbclass | 6 | ||||
-rw-r--r-- | meta/classes/package_ipk.bbclass | 6 | ||||
-rw-r--r-- | meta/classes/package_rpm.bbclass | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index fb502cbc99..8e363f8d63 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass | |||
@@ -116,7 +116,7 @@ package_install_internal_deb () { | |||
116 | local archs="${INSTALL_ARCHS_DEB}" | 116 | local archs="${INSTALL_ARCHS_DEB}" |
117 | local package_to_install="${INSTALL_PACKAGES_NORMAL_DEB}" | 117 | local package_to_install="${INSTALL_PACKAGES_NORMAL_DEB}" |
118 | local package_attemptonly="${INSTALL_PACKAGES_ATTEMPTONLY_DEB}" | 118 | local package_attemptonly="${INSTALL_PACKAGES_ATTEMPTONLY_DEB}" |
119 | local package_lingusa="${INSTALL_PACKAGES_LINGUAS_DEB}" | 119 | local package_linguas="${INSTALL_PACKAGES_LINGUAS_DEB}" |
120 | local task="${INSTALL_TASK_DEB}" | 120 | local task="${INSTALL_TASK_DEB}" |
121 | 121 | ||
122 | rm -f ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev | 122 | rm -f ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev |
@@ -155,12 +155,12 @@ package_install_internal_deb () { | |||
155 | 155 | ||
156 | # Uclibc builds don't provide this stuff.. | 156 | # Uclibc builds don't provide this stuff.. |
157 | if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then | 157 | if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then |
158 | if [ ! -z "${package_lingusa}" ]; then | 158 | if [ ! -z "${package_linguas}" ]; then |
159 | apt-get install glibc-localedata-i18n --force-yes --allow-unauthenticated | 159 | apt-get install glibc-localedata-i18n --force-yes --allow-unauthenticated |
160 | if [ $? -ne 0 ]; then | 160 | if [ $? -ne 0 ]; then |
161 | exit 1 | 161 | exit 1 |
162 | fi | 162 | fi |
163 | for i in ${package_lingusa}; do | 163 | for i in ${package_linguas}; do |
164 | apt-get install $i --force-yes --allow-unauthenticated | 164 | apt-get install $i --force-yes --allow-unauthenticated |
165 | if [ $? -ne 0 ]; then | 165 | if [ $? -ne 0 ]; then |
166 | exit 1 | 166 | exit 1 |
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index b7afa835ed..16574e98b4 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass | |||
@@ -99,7 +99,7 @@ package_install_internal_ipk() { | |||
99 | local conffile="${INSTALL_CONF_IPK}" | 99 | local conffile="${INSTALL_CONF_IPK}" |
100 | local package_to_install="${INSTALL_PACKAGES_NORMAL_IPK}" | 100 | local package_to_install="${INSTALL_PACKAGES_NORMAL_IPK}" |
101 | local package_attemptonly="${INSTALL_PACKAGES_ATTEMPTONLY_IPK}" | 101 | local package_attemptonly="${INSTALL_PACKAGES_ATTEMPTONLY_IPK}" |
102 | local package_lingusa="${INSTALL_PACKAGES_LINGUAS_IPK}" | 102 | local package_linguas="${INSTALL_PACKAGES_LINGUAS_IPK}" |
103 | local package_multilib="${INSTALL_PACKAGES_MULTILIB_IPK}" | 103 | local package_multilib="${INSTALL_PACKAGES_MULTILIB_IPK}" |
104 | local task="${INSTALL_TASK_IPK}" | 104 | local task="${INSTALL_TASK_IPK}" |
105 | 105 | ||
@@ -111,8 +111,8 @@ package_install_internal_ipk() { | |||
111 | 111 | ||
112 | # Uclibc builds don't provide this stuff... | 112 | # Uclibc builds don't provide this stuff... |
113 | if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then | 113 | if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then |
114 | if [ ! -z "${package_lingusa}" ]; then | 114 | if [ ! -z "${package_linguas}" ]; then |
115 | for i in ${package_lingusa}; do | 115 | for i in ${package_linguas}; do |
116 | opkg-cl ${ipkg_args} install $i | 116 | opkg-cl ${ipkg_args} install $i |
117 | done | 117 | done |
118 | fi | 118 | fi |
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 037710012a..2cc0584b59 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -194,7 +194,7 @@ package_install_internal_rpm () { | |||
194 | local confbase="${INSTALL_CONFBASE_RPM}" | 194 | local confbase="${INSTALL_CONFBASE_RPM}" |
195 | local package_to_install="${INSTALL_PACKAGES_NORMAL_RPM}" | 195 | local package_to_install="${INSTALL_PACKAGES_NORMAL_RPM}" |
196 | local package_attemptonly="${INSTALL_PACKAGES_ATTEMPTONLY_RPM}" | 196 | local package_attemptonly="${INSTALL_PACKAGES_ATTEMPTONLY_RPM}" |
197 | local package_lingusa="${INSTALL_PACKAGES_LINGUAS_RPM}" | 197 | local package_linguas="${INSTALL_PACKAGES_LINGUAS_RPM}" |
198 | local providename="${INSTALL_PROVIDENAME_RPM}" | 198 | local providename="${INSTALL_PROVIDENAME_RPM}" |
199 | local task="${INSTALL_TASK_RPM}" | 199 | local task="${INSTALL_TASK_RPM}" |
200 | 200 | ||
@@ -223,8 +223,8 @@ package_install_internal_rpm () { | |||
223 | 223 | ||
224 | # Uclibc builds don't provide this stuff... | 224 | # Uclibc builds don't provide this stuff... |
225 | if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then | 225 | if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then |
226 | if [ ! -z "${package_lingusa}" ]; then | 226 | if [ ! -z "${package_linguas}" ]; then |
227 | for pkg in ${package_lingusa}; do | 227 | for pkg in ${package_linguas}; do |
228 | echo "Processing $pkg..." | 228 | echo "Processing $pkg..." |
229 | 229 | ||
230 | archvar=base_package_archs | 230 | archvar=base_package_archs |