diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-11 23:01:54 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-11 14:10:46 +0000 |
commit | 90a862ce422e2b823c7fec7b8d4c78e7fb4422a3 (patch) | |
tree | 023cb2467e336a2c4e9b459cc1f877e895854661 | |
parent | 3ef7b65897587a1c56c1504335c77a24a83ba7ac (diff) | |
download | poky-90a862ce422e2b823c7fec7b8d4c78e7fb4422a3.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 master rev: 3d5a6d0a480a0fa98260a3b3ffc71b8d9e3e58af)
(From OE-Core rev: 5e3ec61bacd393d461498d9e090306cc7bd8fa63)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 3a131540f3..c038e750b8 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 |
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 551cafc51a..202b4ed1c9 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -451,7 +451,7 @@ python perform_packagecopy () { | |||
451 | # Start by package population by taking a copy of the installed | 451 | # Start by package population by taking a copy of the installed |
452 | # files to operate on | 452 | # files to operate on |
453 | # Preserve sparse files and hard links | 453 | # Preserve sparse files and hard links |
454 | cmd = 'tar -cf - -C %s -ps . | tar -xf - -C %s' % (dest, dvar) | 454 | cmd = 'tar -cf - -C %s -p . | tar -xf - -C %s' % (dest, dvar) |
455 | retval = subprocess.call(cmd, shell=True) | 455 | retval = subprocess.call(cmd, shell=True) |
456 | if retval: | 456 | if retval: |
457 | bb.fatal("file copy failed with exit code %s (cmd was %s)" % (retval, cmd)) | 457 | bb.fatal("file copy failed with exit code %s (cmd was %s)" % (retval, cmd)) |
diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass index 3e123ac561..0e549cd432 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 | ||
19 | populate_sdk_deb () { | 19 | populate_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 | ||