summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2019-02-18 08:08:06 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-19 16:14:57 +0000
commitdc9abea5f0ce8261812412b8ff43c8680ccddde8 (patch)
tree10e9f4bc98faadce98c221ff6dea642f02e1c73b
parenteba1e8f56402cf57b5017a110b18f8a905f82604 (diff)
downloadpoky-dc9abea5f0ce8261812412b8ff43c8680ccddde8.tar.gz
libc-package.bbclass: Correct a few paths for when usrmerge is used
(From OE-Core rev: a880377cd67b65101bf95e8dbad6221f498e38ef) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/libc-package.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 0b4c666a74..60000a9547 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -68,8 +68,8 @@ do_prep_locale_tree() {
68 gunzip $i 68 gunzip $i
69 done 69 done
70 tar -cf - -C ${LOCALETREESRC}${base_libdir} -p . | tar -xf - -C $treedir/${base_libdir} 70 tar -cf - -C ${LOCALETREESRC}${base_libdir} -p . | tar -xf - -C $treedir/${base_libdir}
71 if [ -f ${STAGING_DIR_NATIVE}${prefix_native}/lib/libgcc_s.* ]; then 71 if [ -f ${STAGING_LIBDIR_NATIVE}/libgcc_s.* ]; then
72 tar -cf - -C ${STAGING_DIR_NATIVE}/${prefix_native}/${base_libdir} -p libgcc_s.* | tar -xf - -C $treedir/${base_libdir} 72 tar -cf - -C ${STAGING_LIBDIR_NATIVE} -p libgcc_s.* | tar -xf - -C $treedir/${base_libdir}
73 fi 73 fi
74 install -m 0755 ${LOCALETREESRC}${bindir}/localedef $treedir/${base_bindir} 74 install -m 0755 ${LOCALETREESRC}${bindir}/localedef $treedir/${base_bindir}
75} 75}
@@ -278,7 +278,7 @@ python package_do_split_gconvs () {
278 qemu_options = d.getVar('QEMU_OPTIONS') 278 qemu_options = d.getVar('QEMU_OPTIONS')
279 279
280 cmd = "PSEUDO_RELOADED=YES PATH=\"%s\" I18NPATH=\"%s\" %s -L %s \ 280 cmd = "PSEUDO_RELOADED=YES PATH=\"%s\" I18NPATH=\"%s\" %s -L %s \
281 -E LD_LIBRARY_PATH=%s %s %s/bin/localedef %s" % \ 281 -E LD_LIBRARY_PATH=%s %s %s${base_bindir}/localedef %s" % \
282 (path, i18npath, qemu, treedir, ldlibdir, qemu_options, treedir, localedef_opts) 282 (path, i18npath, qemu, treedir, ldlibdir, qemu_options, treedir, localedef_opts)
283 283
284 commands["%s/%s" % (outputpath, name)] = cmd 284 commands["%s/%s" % (outputpath, name)] = cmd