diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-11 23:01:54 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-14 16:55:21 +0100 |
commit | d3846f06d1e3faedcbc3c28e22c427bb0088683d (patch) | |
tree | c3ed2697085cc06dce01b3ddee017645155659e6 /meta/classes/libc-package.bbclass | |
parent | faf8f8660fae26a14578738b642fdeb08bcb9d54 (diff) | |
download | poky-d3846f06d1e3faedcbc3c28e22c427bb0088683d.tar.gz |
classes: tar 1.27 fixes
tar version 1.27 returns:
tar: --same-order option cannot be used with -c
with the commandlines we have been using. We can remove the -s option (which
is --same-order) to remove the error.
(From OE-Core rev: 3d5a6d0a480a0fa98260a3b3ffc71b8d9e3e58af)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/libc-package.bbclass')
-rw-r--r-- | meta/classes/libc-package.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index fd06c4a434..40c3138d5b 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass | |||
@@ -96,14 +96,14 @@ do_prep_locale_tree() { | |||
96 | treedir=${WORKDIR}/locale-tree | 96 | treedir=${WORKDIR}/locale-tree |
97 | rm -rf $treedir | 97 | rm -rf $treedir |
98 | mkdir -p $treedir/${base_bindir} $treedir/${base_libdir} $treedir/${datadir} $treedir/${localedir} | 98 | mkdir -p $treedir/${base_bindir} $treedir/${base_libdir} $treedir/${datadir} $treedir/${localedir} |
99 | tar -cf - -C ${LOCALETREESRC}${datadir} -ps i18n | tar -xf - -C $treedir/${datadir} | 99 | tar -cf - -C ${LOCALETREESRC}${datadir} -p i18n | tar -xf - -C $treedir/${datadir} |
100 | # unzip to avoid parsing errors | 100 | # unzip to avoid parsing errors |
101 | for i in $treedir/${datadir}/i18n/charmaps/*gz; do | 101 | for i in $treedir/${datadir}/i18n/charmaps/*gz; do |
102 | gunzip $i | 102 | gunzip $i |
103 | done | 103 | done |
104 | tar -cf - -C ${LOCALETREESRC}${base_libdir} -ps . | tar -xf - -C $treedir/${base_libdir} | 104 | tar -cf - -C ${LOCALETREESRC}${base_libdir} -p . | tar -xf - -C $treedir/${base_libdir} |
105 | if [ -f ${STAGING_DIR_NATIVE}${prefix_native}/lib/libgcc_s.* ]; then | 105 | if [ -f ${STAGING_DIR_NATIVE}${prefix_native}/lib/libgcc_s.* ]; then |
106 | tar -cf - -C ${STAGING_DIR_NATIVE}/${prefix_native}/${base_libdir} -ps libgcc_s.* | tar -xf - -C $treedir/${base_libdir} | 106 | tar -cf - -C ${STAGING_DIR_NATIVE}/${prefix_native}/${base_libdir} -p libgcc_s.* | tar -xf - -C $treedir/${base_libdir} |
107 | fi | 107 | fi |
108 | install -m 0755 ${LOCALETREESRC}${bindir}/localedef $treedir/${base_bindir} | 108 | install -m 0755 ${LOCALETREESRC}${bindir}/localedef $treedir/${base_bindir} |
109 | } | 109 | } |
@@ -113,7 +113,7 @@ do_collect_bins_from_locale_tree() { | |||
113 | 113 | ||
114 | parent=$(dirname ${localedir}) | 114 | parent=$(dirname ${localedir}) |
115 | mkdir -p ${PKGD}/$parent | 115 | mkdir -p ${PKGD}/$parent |
116 | tar -cf - -C $treedir/$parent -ps $(basename ${localedir}) | tar -xf - -C ${PKGD}$parent | 116 | tar -cf - -C $treedir/$parent -p $(basename ${localedir}) | tar -xf - -C ${PKGD}$parent |
117 | } | 117 | } |
118 | 118 | ||
119 | inherit qemu | 119 | inherit qemu |