Browse Source

Replace pxz with xz -T0

pull/270/head
Serge Schneider 2 years ago
parent
commit
fb23b8ba92
4 changed files with 5 additions and 5 deletions
  1. +1
    -1
      Dockerfile
  2. +1
    -1
      README.md
  3. +1
    -1
      depends
  4. +2
    -2
      export-noobs/prerun.sh

+ 1
- 1
Dockerfile View File

@ -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/*

+ 1
- 1
README.md View File

@ -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
```

+ 1
- 1
depends View File

@ -4,7 +4,7 @@ realpath:coreutils
qemu-arm-static:qemu-user-static
debootstrap
zerofree
pxz zip
zip
mkdosfs:dosfstools
capsh:libcap2-bin
bsdtar

+ 2
- 2
export-noobs/prerun.sh View File

@ -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}"

Loading…
Cancel
Save