summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2018-04-20 09:36:32 +0200
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-04-20 10:48:27 +0200
commit6e2f5d0254de75dfe59d27b3c4b45007c109e0bb (patch)
tree51f530c7ccebdbf43d1cf3195dd3d82ea8c21770
parentf7c8cd89c9da27dfdf60407e38ed4450fe8af713 (diff)
downloadbuildroot-6e2f5d0254de75dfe59d27b3c4b45007c109e0bb.tar.gz
buildroot-6e2f5d0254de75dfe59d27b3c4b45007c109e0bb.zip
download/git: fix transform regexp for older tar versions
Older versions of tar (e.g. 1.27.1) incorrectly interpret the escaping of the regexp separator, and generate broken tarballs. For example, given the following transform expression: --transform="s/^\.\//squashfs-e38956b92f738518c29734399629e7cdb33072d3\//" the resulting paths in the generated tarball would be: squashfs-e38956b92f738518c29734399629e7cdb33072d3\/ i.e. a directory which last character is indeed a '\'. We fix that by using a separator which is very unlikely to occur in a filename. Fixes: http://autobuild.buildroot.org/results/742/7427f34e5c9f6d043b0fe6ad2c66cc0f31d2b24f/ and probably a slew of others as well... Take this opportunity to fix indentation on the following line (leading spaces, not TABs). Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Ricardo Martincoski <ricardo.martincoski@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rwxr-xr-xsupport/download/git4
1 files changed, 2 insertions, 2 deletions
diff --git a/support/download/git b/support/download/git
index c48ad36b1a..bf05c595a5 100755
--- a/support/download/git
+++ b/support/download/git
@@ -121,8 +121,8 @@ LC_ALL=C sort <"${output}.list" >"${output}.list.sorted"
# Create GNU-format tarballs, since that's the format of the tarballs on
# sources.buildroot.org and used in the *.hash files
-tar cf - --transform="s/^\.\//${basename}\//" \
- --numeric-owner --owner=0 --group=0 --mtime="${date}" --format=gnu \
+tar cf - --transform="s#^\./#${basename}/#" \
+ --numeric-owner --owner=0 --group=0 --mtime="${date}" --format=gnu \
-T "${output}.list.sorted" >"${output}.tar"
gzip -6 -n <"${output}.tar" >"${output}"
OpenPOWER on IntegriCloud