summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2015-12-22 15:17:25 +0100
committerJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2015-12-22 15:17:25 +0100
commit3d478460a3d9a94160e89ee82b85eb15ec5102a1 (patch)
tree1e19fe2851321fd28e8f1567cc2b1f39441da657
parent203fb23c10e4f0a4c9c87d0964ea3a275f57c266 (diff)
downloadrabbitmq-server-git-3d478460a3d9a94160e89ee82b85eb15ec5102a1.tar.gz
packaging: Always use xzcat(1) to decompress xz archiverabbitmq_v3_6_0
Do not rely on tar's behaviour. It was already done everywhere except in those three places.
-rw-r--r--packaging/debs/Debian/Makefile2
-rw-r--r--packaging/generic-unix/Makefile2
-rw-r--r--packaging/windows/Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile
index 83a45542fc..df01eee588 100644
--- a/packaging/debs/Debian/Makefile
+++ b/packaging/debs/Debian/Makefile
@@ -32,7 +32,7 @@ all: package
package: clean
cp -a $(SOURCE_DIST_FILE) $(DEBIAN_ORIG_TARBALL)
- tar -Jxf $(DEBIAN_ORIG_TARBALL)
+ xzcat $(DEBIAN_ORIG_TARBALL) | tar -xf -
cp -a debian $(UNPACKED_DIR)
rsync -a \
--exclude '.sw?' --exclude '.*.sw?' \
diff --git a/packaging/generic-unix/Makefile b/packaging/generic-unix/Makefile
index bdaed9c540..66aeff9071 100644
--- a/packaging/generic-unix/Makefile
+++ b/packaging/generic-unix/Makefile
@@ -25,7 +25,7 @@ all: dist
@:
dist:
- tar -Jxf $(SOURCE_DIST_FILE)
+ xzcat $(SOURCE_DIST_FILE) | tar -xf -
# web-manpages are not used by generic-unix but by `make release` in the.
# Umbrella. Those manpages are copied to www.rabbitmq.com
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index beda5752be..52b6531c3c 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -25,7 +25,7 @@ all: dist
@:
dist:
- tar -Jxf $(SOURCE_DIST_FILE)
+ xzcat $(SOURCE_DIST_FILE) | tar -xf -
$(MAKE) -C $(SOURCE_DIR) install-windows \
DESTDIR=$(abspath $(TARGET_DIR)) \
WINDOWS_PREFIX=