diff options
| author | Juan RP <xtraeme@voidlinux.eu> | 2015-06-12 10:28:40 +0200 |
|---|---|---|
| committer | Juan RP <xtraeme@voidlinux.eu> | 2015-06-12 10:28:40 +0200 |
| commit | 539ed0703ac336fd2e6121ee769fecc1455c7c41 (patch) | |
| tree | c7d0e98f2bf391e30c39f16df5fb8cd205f713ae /mkrootfs.sh.in | |
| parent | 1b010f1a4caf479f2499cb93e68dce0401037675 (diff) | |
| download | hrmpf-539ed0703ac336fd2e6121ee769fecc1455c7c41.tar.gz hrmpf-539ed0703ac336fd2e6121ee769fecc1455c7c41.tar.xz hrmpf-539ed0703ac336fd2e6121ee769fecc1455c7c41.zip | |
mkrootfs: get rid of pixz; fix rpi target arch.
Diffstat (limited to 'mkrootfs.sh.in')
| -rw-r--r-- | mkrootfs.sh.in | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/mkrootfs.sh.in b/mkrootfs.sh.in index a4f08fc..1be40cf 100644 --- a/mkrootfs.sh.in +++ b/mkrootfs.sh.in @@ -126,7 +126,7 @@ case "$PLATFORM" in x86_64-musl) _TARGET_ARCH="$PLATFORM"; _ARCH="x86_64";; x86_64) _TARGET_ARCH="$PLATFORM"; _ARCH="x86_64";; rpi-musl) _TARGET_ARCH="armv6l-musl"; _ARCH="armv6l";; - rpi) _TARGET_ARCH="armv6l-musl"; _ARCH="armv6l";; + rpi) _TARGET_ARCH="armv6l"; _ARCH="armv6l";; *-musl) _TARGET_ARCH="armv7l-musl"; _ARCH="armv7l";; *) _TARGET_ARCH="armv7l"; _ARCH="armv7l";; esac @@ -169,11 +169,6 @@ done if ! $QEMU_BIN -version >/dev/null 2>&1; then die "$QEMU_BIN binary is missing in your system, exiting." fi -if type pixz >/dev/null 2>&1; then - XZ=pixz -else - XZ="xz -T0" -fi # # Check if package base-system is available. # @@ -246,7 +241,7 @@ if [ -n "${_ARCH}" ]; then fi tarball=void-${PLATFORM}-rootfs-$(date '+%Y%m%d').tar.xz -run_cmd "tar -cp --posix -C $rootfs . | $XZ -9 > $tarball " +run_cmd "tar -cp --posix -C $rootfs . | xz -T0 -9 > $tarball " rm -rf $rootfs |