summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2018-11-29 17:11:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-08 20:14:43 +0000
commite09515d282d33bb1bdfde24da283a271e5b53fd8 (patch)
tree5e2a3471a61014651e3f623ef508059f2edbe3ad /meta
parent8bfb94cc9f85bd0893c7959997a9a17c211c998f (diff)
downloadpoky-e09515d282d33bb1bdfde24da283a271e5b53fd8.tar.gz
libc-package: fix postinst error when ENABLE_BINARY_LOCALE_GENERATION = "0"
[YOCTO #13028] (From OE-Core rev: f630da64b010795482e013362c3fe184dcbd8d25) (From OE-Core rev: 29759c2c3b4d97c835740a7f233b8e8f7b4570a1) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/libc-package.bbclass10
1 files changed, 2 insertions, 8 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 9d09c7be6a..345ec2986a 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -49,13 +49,7 @@ python __anonymous () {
49 49
50OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" 50OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
51 51
52locale_base_postinst() { 52locale_base_postinst_ontarget() {
53#!/bin/sh
54
55if [ "x$D" != "x" ]; then
56 exit 1
57fi
58
59localedef --inputfile=${datadir}/i18n/locales/%s --charmap=%s %s 53localedef --inputfile=${datadir}/i18n/locales/%s --charmap=%s %s
60} 54}
61 55
@@ -215,7 +209,7 @@ python package_do_split_gconvs () {
215 def output_locale_source(name, pkgname, locale, encoding): 209 def output_locale_source(name, pkgname, locale, encoding):
216 d.setVar('RDEPENDS_%s' % pkgname, '%slocaledef %s-localedata-%s %s-charmap-%s' % \ 210 d.setVar('RDEPENDS_%s' % pkgname, '%slocaledef %s-localedata-%s %s-charmap-%s' % \
217 (mlprefix, mlprefix+bpn, legitimize_package_name(locale), mlprefix+bpn, legitimize_package_name(encoding))) 211 (mlprefix, mlprefix+bpn, legitimize_package_name(locale), mlprefix+bpn, legitimize_package_name(encoding)))
218 d.setVar('pkg_postinst_%s' % pkgname, d.getVar('locale_base_postinst') \ 212 d.setVar('pkg_postinst_ontarget_%s' % pkgname, d.getVar('locale_base_postinst_ontarget') \
219 % (locale, encoding, locale)) 213 % (locale, encoding, locale))
220 d.setVar('pkg_postrm_%s' % pkgname, d.getVar('locale_base_postrm') % \ 214 d.setVar('pkg_postrm_%s' % pkgname, d.getVar('locale_base_postrm') % \
221 (locale, encoding, locale)) 215 (locale, encoding, locale))