Quellcode durchsuchen

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

Juan RP vor 10 Jahren
Ursprung
Commit
539ed0703a
1 geänderte Dateien mit 2 neuen und 7 gelöschten Zeilen
  1. 2 7
      mkrootfs.sh.in

+ 2 - 7
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