[oe-commits] Richard Purdie : classes: tar 1.27 fixes
git at git.openembedded.org
git at git.openembedded.org
Fri Oct 11 22:05:33 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: 3d5a6d0a480a0fa98260a3b3ffc71b8d9e3e58af
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3d5a6d0a480a0fa98260a3b3ffc71b8d9e3e58af
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Fri Oct 11 23:01:54 2013 +0100
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 at linuxfoundation.org>
---
meta/classes/libc-package.bbclass | 8 ++++----
meta/classes/package.bbclass | 2 +-
meta/classes/populate_sdk_deb.bbclass | 2 +-
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 fd06c4a..40c3138 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/${localedir}
- 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}
}
@@ -113,7 +113,7 @@ do_collect_bins_from_locale_tree() {
parent=$(dirname ${localedir})
mkdir -p ${PKGD}/$parent
- tar -cf - -C $treedir/$parent -ps $(basename ${localedir}) | tar -xf - -C ${PKGD}$parent
+ tar -cf - -C $treedir/$parent -p $(basename ${localedir}) | tar -xf - -C ${PKGD}$parent
}
inherit qemu
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index c98c6ec..5b1e902 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -458,7 +458,7 @@ python perform_packagecopy () {
# Start by package population by taking a copy of the installed
# files to operate on
# Preserve sparse files and hard links
- cmd = 'tar -cf - -C %s -ps . | tar -xf - -C %s' % (dest, dvar)
+ cmd = 'tar -cf - -C %s -p . | tar -xf - -C %s' % (dest, dvar)
(retval, output) = oe.utils.getstatusoutput(cmd)
if retval:
bb.fatal("file copy failed with exit code %s (cmd was %s)%s" % (retval, cmd, ":\n%s" % output if output else ""))
diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass
index ec116ab..ebb842b 100644
--- a/meta/classes/populate_sdk_deb.bbclass
+++ b/meta/classes/populate_sdk_deb.bbclass
@@ -13,7 +13,7 @@ populate_sdk_post_deb () {
local target_rootfs=$1
mkdir -p ${target_rootfs}/etc
- 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 b522c7d..ae1c546 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -13,7 +13,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
}
More information about the Openembedded-commits
mailing list