diff options
Diffstat (limited to 'meta/classes/libc-package.bbclass')
-rw-r--r-- | meta/classes/libc-package.bbclass | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index 60000a9547..cf0d8901e3 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass | |||
@@ -67,7 +67,12 @@ do_prep_locale_tree() { | |||
67 | for i in $treedir/${datadir}/i18n/charmaps/*gz; do | 67 | for i in $treedir/${datadir}/i18n/charmaps/*gz; do |
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 | # The extract pattern "./l*.so*" is carefully selected so that it will |
71 | # match ld*.so and lib*.so*, but not any files in the gconv directory | ||
72 | # (if it exists). This makes sure we only unpack the files we need. | ||
73 | # This is important in case usrmerge is set in DISTRO_FEATURES, which | ||
74 | # means ${base_libdir} == ${libdir}. | ||
75 | tar -cf - -C ${LOCALETREESRC}${base_libdir} -p . | tar -xf - -C $treedir/${base_libdir} --wildcards './l*.so*' | ||
71 | if [ -f ${STAGING_LIBDIR_NATIVE}/libgcc_s.* ]; then | 76 | if [ -f ${STAGING_LIBDIR_NATIVE}/libgcc_s.* ]; then |
72 | tar -cf - -C ${STAGING_LIBDIR_NATIVE} -p libgcc_s.* | tar -xf - -C $treedir/${base_libdir} | 77 | tar -cf - -C ${STAGING_LIBDIR_NATIVE} -p libgcc_s.* | tar -xf - -C $treedir/${base_libdir} |
73 | fi | 78 | fi |