diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-11 23:01:54 +0100 |
|---|---|---|
| committer |   Andreas Oberritter <obi@opendreambox.org> | 2013-11-04 14:18:03 +0100 |
| commit | b2a32ae94776e4d48b940277574fe595840ce738 (patch) | |
| tree | 4500069e39bbc06d51710c83e931f3198a59bc2f | |
| parent | 0c0c7644fd85c88d8436e24c0bf5d88f88d3ba4d (diff) | |
| download | openembedded-core-contrib-b2a32ae94776e4d48b940277574fe595840ce738.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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3d5a6d0a480a0fa98260a3b3ffc71b8d9e3e58af)
Conflicts:
meta/classes/libc-package.bbclass
meta/classes/package.bbclass
meta/classes/populate_sdk_deb.bbclass
| -rw-r--r-- | meta/classes/libc-package.bbclass | 8 | ||||
| -rw-r--r-- | meta/classes/package.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/populate_sdk_deb.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/staging.bbclass | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index bb4ba682dc..b9a2851972 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -96,14 +96,14 @@ do_prep_locale_tree() { treedir=${WORKDIR}/locale-tree rm -rf $treedir mkdir -p $treedir/${base_bindir} $treedir/${base_libdir} $treedir/${datadir} $treedir/${libdir}/locale - tar -cf - -C ${LOCALETREESRC}${datadir} -ps i18n | tar -xf - -C $treedir/${datadir} + tar -cf - -C ${LOCALETREESRC}${datadir} -p i18n | tar -xf - -C $treedir/${datadir} # unzip to avoid parsing errors for i in $treedir/${datadir}/i18n/charmaps/*gz; do gunzip $i done - tar -cf - -C ${LOCALETREESRC}${base_libdir} -ps . | tar -xf - -C $treedir/${base_libdir} + tar -cf - -C ${LOCALETREESRC}${base_libdir} -p . | tar -xf - -C $treedir/${base_libdir} if [ -f ${STAGING_DIR_NATIVE}${prefix_native}/lib/libgcc_s.* ]; then - tar -cf - -C ${STAGING_DIR_NATIVE}/${prefix_native}/${base_libdir} -ps libgcc_s.* | tar -xf - -C $treedir/${base_libdir} + tar -cf - -C ${STAGING_DIR_NATIVE}/${prefix_native}/${base_libdir} -p libgcc_s.* | tar -xf - -C $treedir/${base_libdir} fi install -m 0755 ${LOCALETREESRC}${bindir}/localedef $treedir/${base_bindir} } @@ -112,7 +112,7 @@ do_collect_bins_from_locale_tree() { treedir=${WORKDIR}/locale-tree mkdir -p ${PKGD}${libdir} - tar -cf - -C $treedir/${libdir} -ps locale | tar -xf - -C ${PKGD}${libdir} + tar -cf - -C $treedir/${libdir} -p locale | tar -xf - -C ${PKGD}${libdir} } inherit qemu diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index c51b32d9a6..c6c2d85d8c 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -435,7 +435,7 @@ python perform_packagecopy () { # files to operate on os.system('rm -rf %s/*' % (dvar)) # Preserve sparse files and hard links - os.system('tar -cf - -C %s -ps . | tar -xf - -C %s' % (dest, dvar)) + os.system('tar -cf - -C %s -p . | tar -xf - -C %s' % (dest, dvar)) } # We generate a master list of directories to process, we start by diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass index 920c89a0f3..216f51bfc4 100644 --- a/meta/classes/populate_sdk_deb.bbclass +++ b/meta/classes/populate_sdk_deb.bbclass @@ -10,7 +10,7 @@ populate_sdk_post_deb () { local target_rootfs=$1 - tar -cf - -C ${STAGING_ETCDIR_NATIVE} -ps apt | tar -xf - -C ${target_rootfs}/etc + tar -cf - -C ${STAGING_ETCDIR_NATIVE} -p apt | tar -xf - -C ${target_rootfs}/etc } populate_sdk_deb () { diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index a98f51deb5..86dc812b9f 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -17,7 +17,7 @@ sysroot_stage_dir() { # However we always want to stage a $src itself, even if it's empty mkdir -p "$dest" if [ -d "$src" ]; then - tar -cf - -C "$src" -ps . | tar -xf - -C "$dest" + tar -cf - -C "$src" -p . | tar -xf - -C "$dest" fi } |