83 lines
2.3 KiB
Diff
83 lines
2.3 KiB
Diff
diff --git a/conf/initramfs.conf b/conf/initramfs.conf
|
|
index aa561bd..bf80786 100644
|
|
--- a/conf/initramfs.conf
|
|
+++ b/conf/initramfs.conf
|
|
@@ -38,10 +38,10 @@ BUSYBOX=auto
|
|
KEYMAP=n
|
|
|
|
#
|
|
-# COMPRESS: [ gzip | bzip2 | lz4 | lzma | lzop | xz | zstd ]
|
|
+# COMPRESS: [ gzip | bzip2 | lz4 | lzma | lzop | xz ]
|
|
#
|
|
|
|
-COMPRESS=zstd
|
|
+COMPRESS=gzip
|
|
|
|
#
|
|
# COMPRESSLEVEL: ...
|
|
@@ -52,7 +52,6 @@ COMPRESS=zstd
|
|
# Valid values are:
|
|
# 1 - 9 for gzip|bzip2|lzma|lzop
|
|
# 0 - 9 for lz4|xz
|
|
-# 0 - 19 for zstd
|
|
#
|
|
# COMPRESSLEVEL=3
|
|
|
|
diff --git a/mkinitramfs b/mkinitramfs
|
|
index df1b940..166bffb 100755
|
|
--- a/mkinitramfs
|
|
+++ b/mkinitramfs
|
|
@@ -188,7 +188,6 @@ lzma) kconfig_sym=CONFIG_RD_LZMA ;;
|
|
xz) kconfig_sym=CONFIG_RD_XZ ;;
|
|
lzop) kconfig_sym=CONFIG_RD_LZO ;;
|
|
lz4) kconfig_sym=CONFIG_RD_LZ4 ;;
|
|
-zstd) kconfig_sym=CONFIG_RD_ZSTD ;;
|
|
esac
|
|
while ! grep -q "^$kconfig_sym=y" "/boot/config-${version}"; do
|
|
if [ "${compress}" = gzip ]; then
|
|
@@ -205,7 +204,6 @@ if [ -z "${compresslevel:-}" ]; then
|
|
fi
|
|
case "${compress}" in
|
|
lz4) compresslevel="-${compresslevel:-9}" ;;
|
|
-zstd) compresslevel="-${compresslevel:-9}" ;;
|
|
#gzip|xz|bzip2|lzma|lzop included
|
|
*)
|
|
# We're not using a compression level by default
|
|
@@ -227,10 +225,6 @@ gzip) # If we're doing a reproducible build, use gzip -n
|
|
fi
|
|
;;
|
|
lz4) compress="lz4 ${compresslevel} -l" ;;
|
|
-zstd) compress="zstd -q ${compresslevel}"
|
|
- # If we're not doing a reproducible build, enable multithreading
|
|
- test -z "${SOURCE_DATE_EPOCH}" && compress="$compress -T0"
|
|
- ;;
|
|
xz) compress="xz ${compresslevel} --check=crc32"
|
|
# If we're not doing a reproducible build, enable multithreading
|
|
test -z "${SOURCE_DATE_EPOCH}" && compress="$compress --threads=0"
|
|
@@ -426,12 +420,6 @@ find "${DESTDIR}/${MODULESDIR}" -name '*.ko.*' | while read -r ko; do
|
|
fi
|
|
xz -d "${ko}"
|
|
;;
|
|
- *.zst)
|
|
- if ! command -v zstd >/dev/null 2>&1; then
|
|
- break
|
|
- fi
|
|
- zstd -q -d --rm "${ko}"
|
|
- ;;
|
|
esac
|
|
done
|
|
|
|
diff --git a/unmkinitramfs b/unmkinitramfs
|
|
index d1226c3..3f8c75d 100755
|
|
--- a/unmkinitramfs
|
|
+++ b/unmkinitramfs
|
|
@@ -31,8 +31,6 @@ xcpio()
|
|
|
|
if gzip -t "$archive" >/dev/null 2>&1 ; then
|
|
gzip -c -d "$archive"
|
|
- elif zstd -q -c -t "$archive" >/dev/null 2>&1 ; then
|
|
- zstd -q -c -d "$archive"
|
|
elif xzcat -t "$archive" >/dev/null 2>&1 ; then
|
|
xzcat "$archive"
|
|
elif lz4cat -t < "$archive" >/dev/null 2>&1 ; then
|