Replace pxz with xz -T0
This commit is contained in:
parent
91bc38d510
commit
fb23b8ba92
|
@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND noninteractive
|
||||||
RUN apt-get -y update && \
|
RUN apt-get -y update && \
|
||||||
apt-get -y install \
|
apt-get -y install \
|
||||||
git vim parted \
|
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\
|
bsdtar libcap2-bin rsync grep udev xz-utils curl xxd file kmod\
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ to use the Docker build described below.
|
||||||
To install the required dependencies for pi-gen you should run:
|
To install the required dependencies for pi-gen you should run:
|
||||||
|
|
||||||
```bash
|
```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
|
dosfstools bsdtar libcap2-bin grep rsync xz-utils file git curl
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
2
depends
2
depends
|
@ -4,7 +4,7 @@ realpath:coreutils
|
||||||
qemu-arm-static:qemu-user-static
|
qemu-arm-static:qemu-user-static
|
||||||
debootstrap
|
debootstrap
|
||||||
zerofree
|
zerofree
|
||||||
pxz zip
|
zip
|
||||||
mkdosfs:dosfstools
|
mkdosfs:dosfstools
|
||||||
capsh:libcap2-bin
|
capsh:libcap2-bin
|
||||||
bsdtar
|
bsdtar
|
||||||
|
|
|
@ -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"
|
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"
|
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}"
|
unmount_image "${IMG_FILE}"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user