From fb23b8ba92ffc893fe257375ce79e56d3dbe7504 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Mon, 11 Mar 2019 11:49:04 +0000
Subject: [PATCH] Replace pxz with xz -T0

---
 Dockerfile             | 2 +-
 README.md              | 2 +-
 depends                | 2 +-
 export-noobs/prerun.sh | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 306eea5..23cfd1c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get -y update && \
     apt-get -y install \
         git vim parted \
-        quilt coreutils qemu-user-static debootstrap zerofree pxz zip dosfstools \
+        quilt coreutils qemu-user-static debootstrap zerofree zip dosfstools \
         bsdtar libcap2-bin rsync grep udev xz-utils curl xxd file kmod\
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/README.md b/README.md
index df5d123..a528934 100755
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ to use the Docker build described below.
 To install the required dependencies for pi-gen you should run:
 
 ```bash
-apt-get install coreutils quilt parted qemu-user-static debootstrap zerofree pxz zip \
+apt-get install coreutils quilt parted qemu-user-static debootstrap zerofree zip \
 dosfstools bsdtar libcap2-bin grep rsync xz-utils file git curl
 ```
 
diff --git a/depends b/depends
index 349118e..6238eb1 100644
--- a/depends
+++ b/depends
@@ -4,7 +4,7 @@ realpath:coreutils
 qemu-arm-static:qemu-user-static
 debootstrap
 zerofree
-pxz zip
+zip
 mkdosfs:dosfstools
 capsh:libcap2-bin
 bsdtar
diff --git a/export-noobs/prerun.sh b/export-noobs/prerun.sh
index 6351b2c..b4b56b2 100755
--- a/export-noobs/prerun.sh
+++ b/export-noobs/prerun.sh
@@ -33,8 +33,8 @@ mount "$BOOT_DEV" "${STAGE_WORK_DIR}/rootfs/boot"
 
 ln -sv "/lib/systemd/system/apply_noobs_os_config.service" "$ROOTFS_DIR/etc/systemd/system/multi-user.target.wants/apply_noobs_os_config.service"
 
-bsdtar --numeric-owner --format gnutar --use-compress-program pxz -C "${STAGE_WORK_DIR}/rootfs/boot" -cpf "${NOOBS_DIR}/boot.tar.xz" .
+bsdtar --numeric-owner --format gnutar -C "${STAGE_WORK_DIR}/rootfs/boot" -cpf - . | xz -T0 > "${NOOBS_DIR}/boot.tar.xz"
 umount "${STAGE_WORK_DIR}/rootfs/boot"
-bsdtar --numeric-owner --format gnutar --use-compress-program pxz -C "${STAGE_WORK_DIR}/rootfs" --one-file-system -cpf "${NOOBS_DIR}/root.tar.xz" .
+bsdtar --numeric-owner --format gnutar -C "${STAGE_WORK_DIR}/rootfs" --one-file-system -cpf - . | xz -T0 > "${NOOBS_DIR}/root.tar.xz"
 
 unmount_image "${IMG_FILE}"