mollusk/void-mklive
mollusk/void-mklive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mkrootfs: get rid of pixz; fix rpi target arch.

Browse Source
This commit is contained in:
Juan RP 2015-06-12 10:28:40 +02:00
parent 1b010f1a4c
commit 539ed0703a
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mkrootfs.sh.in
View File

@ -126,7 +126,7 @@ case "$PLATFORM" in
x86_64-musl) _TARGET_ARCH="$PLATFORM"; _ARCH="x86_64";; x86_64-musl) _TARGET_ARCH="$PLATFORM"; _ARCH="x86_64";;
x86_64) _TARGET_ARCH="$PLATFORM"; _ARCH="x86_64";; x86_64) _TARGET_ARCH="$PLATFORM"; _ARCH="x86_64";;
rpi-musl) _TARGET_ARCH="armv6l-musl"; _ARCH="armv6l";; 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";; *-musl) _TARGET_ARCH="armv7l-musl"; _ARCH="armv7l";;
*) _TARGET_ARCH="armv7l"; _ARCH="armv7l";; *) _TARGET_ARCH="armv7l"; _ARCH="armv7l";;
esac esac
@ -169,11 +169,6 @@ done
if ! $QEMU_BIN -version >/dev/null 2>&1; then if ! $QEMU_BIN -version >/dev/null 2>&1; then
die "$QEMU_BIN binary is missing in your system, exiting." die "$QEMU_BIN binary is missing in your system, exiting."
fi fi
if type pixz >/dev/null 2>&1; then
XZ=pixz
else
XZ="xz -T0"
fi
# #
# Check if package base-system is available. # Check if package base-system is available.
# #
@ -246,7 +241,7 @@ if [ -n "${_ARCH}" ]; then
fi fi
tarball=void-${PLATFORM}-rootfs-$(date '+%Y%m%d').tar.xz 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 rm -rf $rootfs