summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-11 23:01:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-14 16:55:21 +0100
commitd3846f06d1e3faedcbc3c28e22c427bb0088683d (patch)
treec3ed2697085cc06dce01b3ddee017645155659e6 /meta/classes
parentfaf8f8660fae26a14578738b642fdeb08bcb9d54 (diff)
downloadpoky-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')
-rw-r--r--meta/classes/libc-package.bbclass8
-rw-r--r--meta/classes/package.bbclass2
-rw-r--r--meta/classes/populate_sdk_deb.bbclass2
-rw-r--r--meta/classes/staging.bbclass2
4 files changed, 7 insertions, 7 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
119inherit qemu 119inherit qemu
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index c98c6ec4eb..5b1e902c07 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -458,7 +458,7 @@ python perform_packagecopy () {
458 # Start by package population by taking a copy of the installed 458 # Start by package population by taking a copy of the installed
459 # files to operate on 459 # files to operate on
460 # Preserve sparse files and hard links 460 # Preserve sparse files and hard links
461 cmd = 'tar -cf - -C %s -ps . | tar -xf - -C %s' % (dest, dvar) 461 cmd = 'tar -cf - -C %s -p . | tar -xf - -C %s' % (dest, dvar)
462 (retval, output) = oe.utils.getstatusoutput(cmd) 462 (retval, output) = oe.utils.getstatusoutput(cmd)
463 if retval: 463 if retval:
464 bb.fatal("file copy failed with exit code %s (cmd was %s)%s" % (retval, cmd, ":\n%s" % output if output else "")) 464 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 ec116ab187..ebb842ba86 100644
--- a/meta/classes/populate_sdk_deb.bbclass
+++ b/meta/classes/populate_sdk_deb.bbclass
@@ -13,7 +13,7 @@ populate_sdk_post_deb () {
13 local target_rootfs=$1 13 local target_rootfs=$1
14 14
15 mkdir -p ${target_rootfs}/etc 15 mkdir -p ${target_rootfs}/etc
16 tar -cf - -C ${STAGING_ETCDIR_NATIVE} -ps apt | tar -xf - -C ${target_rootfs}/etc 16 tar -cf - -C ${STAGING_ETCDIR_NATIVE} -p apt | tar -xf - -C ${target_rootfs}/etc
17} 17}
18 18
19populate_sdk_deb () { 19populate_sdk_deb () {
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index b522c7da9f..ae1c546ad6 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -13,7 +13,7 @@ sysroot_stage_dir() {
13 # However we always want to stage a $src itself, even if it's empty 13 # However we always want to stage a $src itself, even if it's empty
14 mkdir -p "$dest" 14 mkdir -p "$dest"
15 if [ -d "$src" ]; then 15 if [ -d "$src" ]; then
16 tar -cf - -C "$src" -ps . | tar -xf - -C "$dest" 16 tar -cf - -C "$src" -p . | tar -xf - -C "$dest"
17 fi 17 fi
18} 18}
19 19