diff --git a/Makefile b/Makefile index 06b2913e6..570defe39 100644 --- a/Makefile +++ b/Makefile @@ -519,6 +519,8 @@ bin_modules-$(CONFIG_POWERPC_UTILS) += powerpc-utils bin_modules-$(CONFIG_IO386) += io386 bin_modules-$(CONFIG_IOPORT) += ioport bin_modules-$(CONFIG_ZSTD) += zstd +bin_modules-$(CONFIG_E2FSPROGS) += e2fsprogs +bin_modules-$(CONFIG_EXFATPROGS) += exfatprogs $(foreach m, $(bin_modules-y), \ $(call map,initrd_bin_add,$(call bins,$m)) \ diff --git a/boards/UNTESTED_kgpe-d16_server-whiptail/UNTESTED_kgpe-d16_server-whiptail.config b/boards/UNTESTED_kgpe-d16_server-whiptail/UNTESTED_kgpe-d16_server-whiptail.config index 045ccf01e..5883eac5d 100644 --- a/boards/UNTESTED_kgpe-d16_server-whiptail/UNTESTED_kgpe-d16_server-whiptail.config +++ b/boards/UNTESTED_kgpe-d16_server-whiptail/UNTESTED_kgpe-d16_server-whiptail.config @@ -31,6 +31,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y CONFIG_POPT=y diff --git a/boards/UNTESTED_kgpe-d16_server/UNTESTED_kgpe-d16_server.config b/boards/UNTESTED_kgpe-d16_server/UNTESTED_kgpe-d16_server.config index 26a261ec9..8358a69c4 100644 --- a/boards/UNTESTED_kgpe-d16_server/UNTESTED_kgpe-d16_server.config +++ b/boards/UNTESTED_kgpe-d16_server/UNTESTED_kgpe-d16_server.config @@ -29,6 +29,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y CONFIG_POPT=y diff --git a/boards/UNTESTED_kgpe-d16_workstation-usb_keyboard/UNTESTED_kgpe-d16_workstation-usb_keyboard.config b/boards/UNTESTED_kgpe-d16_workstation-usb_keyboard/UNTESTED_kgpe-d16_workstation-usb_keyboard.config index 78b56ff42..1569591a7 100644 --- a/boards/UNTESTED_kgpe-d16_workstation-usb_keyboard/UNTESTED_kgpe-d16_workstation-usb_keyboard.config +++ b/boards/UNTESTED_kgpe-d16_workstation-usb_keyboard/UNTESTED_kgpe-d16_workstation-usb_keyboard.config @@ -25,6 +25,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y CONFIG_POPT=y diff --git a/boards/UNTESTED_kgpe-d16_workstation/UNTESTED_kgpe-d16_workstation.config b/boards/UNTESTED_kgpe-d16_workstation/UNTESTED_kgpe-d16_workstation.config index 6cee65ca1..ca8e18ae2 100644 --- a/boards/UNTESTED_kgpe-d16_workstation/UNTESTED_kgpe-d16_workstation.config +++ b/boards/UNTESTED_kgpe-d16_workstation/UNTESTED_kgpe-d16_workstation.config @@ -29,6 +29,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y CONFIG_POPT=y diff --git a/boards/UNTESTED_p8z77-m_pro-tpm1-maximized/UNTESTED_p8z77-m_pro-tpm1-maximized.config b/boards/UNTESTED_p8z77-m_pro-tpm1-maximized/UNTESTED_p8z77-m_pro-tpm1-maximized.config index 55a489356..d6e55acf3 100644 --- a/boards/UNTESTED_p8z77-m_pro-tpm1-maximized/UNTESTED_p8z77-m_pro-tpm1-maximized.config +++ b/boards/UNTESTED_p8z77-m_pro-tpm1-maximized/UNTESTED_p8z77-m_pro-tpm1-maximized.config @@ -49,6 +49,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y CONFIG_POPT=y diff --git a/boards/UNTESTED_qemu-linuxboot/UNTESTED_qemu-linuxboot.config b/boards/UNTESTED_qemu-linuxboot/UNTESTED_qemu-linuxboot.config index c47edd571..b9d02069e 100644 --- a/boards/UNTESTED_qemu-linuxboot/UNTESTED_qemu-linuxboot.config +++ b/boards/UNTESTED_qemu-linuxboot/UNTESTED_qemu-linuxboot.config @@ -11,6 +11,8 @@ CONFIG_BUSYBOX=n else CONFIG_CRYPTSETUP=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y CONFIG_POPT=y diff --git a/boards/UNTESTED_t520-hotp-maximized/UNTESTED_t520-hotp-maximized.config b/boards/UNTESTED_t520-hotp-maximized/UNTESTED_t520-hotp-maximized.config index 6cfaedc3e..f931b1053 100644 --- a/boards/UNTESTED_t520-hotp-maximized/UNTESTED_t520-hotp-maximized.config +++ b/boards/UNTESTED_t520-hotp-maximized/UNTESTED_t520-hotp-maximized.config @@ -22,6 +22,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/UNTESTED_t520-maximized/UNTESTED_t520-maximized.config b/boards/UNTESTED_t520-maximized/UNTESTED_t520-maximized.config index 2a13141aa..574118ea4 100644 --- a/boards/UNTESTED_t520-maximized/UNTESTED_t520-maximized.config +++ b/boards/UNTESTED_t520-maximized/UNTESTED_t520-maximized.config @@ -22,6 +22,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/UNTESTED_t530-dgpu-hotp-maximized/UNTESTED_t530-dgpu-hotp-maximized.config b/boards/UNTESTED_t530-dgpu-hotp-maximized/UNTESTED_t530-dgpu-hotp-maximized.config index 36b81b5df..d240aa271 100644 --- a/boards/UNTESTED_t530-dgpu-hotp-maximized/UNTESTED_t530-dgpu-hotp-maximized.config +++ b/boards/UNTESTED_t530-dgpu-hotp-maximized/UNTESTED_t530-dgpu-hotp-maximized.config @@ -25,6 +25,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/UNTESTED_t530-dgpu-maximized/UNTESTED_t530-dgpu-maximized.config b/boards/UNTESTED_t530-dgpu-maximized/UNTESTED_t530-dgpu-maximized.config index 082b32882..8827fbd4f 100644 --- a/boards/UNTESTED_t530-dgpu-maximized/UNTESTED_t530-dgpu-maximized.config +++ b/boards/UNTESTED_t530-dgpu-maximized/UNTESTED_t530-dgpu-maximized.config @@ -25,6 +25,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/UNTESTED_w530-dgpu-K1000m-hotp-maximized/UNTESTED_w530-dgpu-K1000m-hotp-maximized.config b/boards/UNTESTED_w530-dgpu-K1000m-hotp-maximized/UNTESTED_w530-dgpu-K1000m-hotp-maximized.config index 645d2afe0..b88eb516d 100644 --- a/boards/UNTESTED_w530-dgpu-K1000m-hotp-maximized/UNTESTED_w530-dgpu-K1000m-hotp-maximized.config +++ b/boards/UNTESTED_w530-dgpu-K1000m-hotp-maximized/UNTESTED_w530-dgpu-K1000m-hotp-maximized.config @@ -25,6 +25,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/UNTESTED_w530-dgpu-K1000m-maximized/UNTESTED_w530-dgpu-K1000m-maximized.config b/boards/UNTESTED_w530-dgpu-K1000m-maximized/UNTESTED_w530-dgpu-K1000m-maximized.config index 27b99f928..dc4a46f0e 100644 --- a/boards/UNTESTED_w530-dgpu-K1000m-maximized/UNTESTED_w530-dgpu-K1000m-maximized.config +++ b/boards/UNTESTED_w530-dgpu-K1000m-maximized/UNTESTED_w530-dgpu-K1000m-maximized.config @@ -25,6 +25,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/UNTESTED_w530-dgpu-K2000m-hotp-maximized/UNTESTED_w530-dgpu-K2000m-hotp-maximized.config b/boards/UNTESTED_w530-dgpu-K2000m-hotp-maximized/UNTESTED_w530-dgpu-K2000m-hotp-maximized.config index 1f1fcd735..957137fac 100644 --- a/boards/UNTESTED_w530-dgpu-K2000m-hotp-maximized/UNTESTED_w530-dgpu-K2000m-hotp-maximized.config +++ b/boards/UNTESTED_w530-dgpu-K2000m-hotp-maximized/UNTESTED_w530-dgpu-K2000m-hotp-maximized.config @@ -25,6 +25,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/UNTESTED_w530-dgpu-K2000m-maximized/UNTESTED_w530-dgpu-K2000m-maximized.config b/boards/UNTESTED_w530-dgpu-K2000m-maximized/UNTESTED_w530-dgpu-K2000m-maximized.config index 4b9f3454e..cbdf340fb 100644 --- a/boards/UNTESTED_w530-dgpu-K2000m-maximized/UNTESTED_w530-dgpu-K2000m-maximized.config +++ b/boards/UNTESTED_w530-dgpu-K2000m-maximized/UNTESTED_w530-dgpu-K2000m-maximized.config @@ -25,6 +25,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/UNTESTED_w530-hotp-maximized/UNTESTED_w530-hotp-maximized.config b/boards/UNTESTED_w530-hotp-maximized/UNTESTED_w530-hotp-maximized.config index 74931568b..0597cdd4a 100644 --- a/boards/UNTESTED_w530-hotp-maximized/UNTESTED_w530-hotp-maximized.config +++ b/boards/UNTESTED_w530-hotp-maximized/UNTESTED_w530-hotp-maximized.config @@ -25,6 +25,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/UNTESTED_w530-maximized/UNTESTED_w530-maximized.config b/boards/UNTESTED_w530-maximized/UNTESTED_w530-maximized.config index 977edbb10..b5d158287 100644 --- a/boards/UNTESTED_w530-maximized/UNTESTED_w530-maximized.config +++ b/boards/UNTESTED_w530-maximized/UNTESTED_w530-maximized.config @@ -25,6 +25,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/UNTESTED_x230-hotp-maximized-fhd_edp/UNTESTED_x230-hotp-maximized-fhd_edp.config b/boards/UNTESTED_x230-hotp-maximized-fhd_edp/UNTESTED_x230-hotp-maximized-fhd_edp.config index ded332601..82eaf64db 100644 --- a/boards/UNTESTED_x230-hotp-maximized-fhd_edp/UNTESTED_x230-hotp-maximized-fhd_edp.config +++ b/boards/UNTESTED_x230-hotp-maximized-fhd_edp/UNTESTED_x230-hotp-maximized-fhd_edp.config @@ -36,6 +36,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/UNTESTED_x230-maximized-fhd_edp/UNTESTED_x230-maximized-fhd_edp.config b/boards/UNTESTED_x230-maximized-fhd_edp/UNTESTED_x230-maximized-fhd_edp.config index 2c2f096a7..baa106c25 100644 --- a/boards/UNTESTED_x230-maximized-fhd_edp/UNTESTED_x230-maximized-fhd_edp.config +++ b/boards/UNTESTED_x230-maximized-fhd_edp/UNTESTED_x230-maximized-fhd_edp.config @@ -36,6 +36,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/librem_13v2/librem_13v2.config b/boards/librem_13v2/librem_13v2.config index bd0d18b86..f5145f871 100644 --- a/boards/librem_13v2/librem_13v2.config +++ b/boards/librem_13v2/librem_13v2.config @@ -14,6 +14,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y CONFIG_POPT=y diff --git a/boards/librem_13v4/librem_13v4.config b/boards/librem_13v4/librem_13v4.config index 45775daf5..aec2433c6 100644 --- a/boards/librem_13v4/librem_13v4.config +++ b/boards/librem_13v4/librem_13v4.config @@ -14,6 +14,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y CONFIG_POPT=y diff --git a/boards/librem_14/librem_14.config b/boards/librem_14/librem_14.config index bba19ab91..6ffa03847 100644 --- a/boards/librem_14/librem_14.config +++ b/boards/librem_14/librem_14.config @@ -14,6 +14,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y CONFIG_POPT=y diff --git a/boards/librem_15v3/librem_15v3.config b/boards/librem_15v3/librem_15v3.config index b914d9bd8..47c138997 100644 --- a/boards/librem_15v3/librem_15v3.config +++ b/boards/librem_15v3/librem_15v3.config @@ -14,6 +14,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y CONFIG_POPT=y diff --git a/boards/librem_15v4/librem_15v4.config b/boards/librem_15v4/librem_15v4.config index 28fbe5cba..e1f33ddf1 100644 --- a/boards/librem_15v4/librem_15v4.config +++ b/boards/librem_15v4/librem_15v4.config @@ -14,6 +14,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y CONFIG_POPT=y diff --git a/boards/librem_l1um/librem_l1um.config b/boards/librem_l1um/librem_l1um.config index 69052e1e0..2dd9a53f8 100644 --- a/boards/librem_l1um/librem_l1um.config +++ b/boards/librem_l1um/librem_l1um.config @@ -14,6 +14,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y CONFIG_POPT=y diff --git a/boards/librem_l1um_v2/librem_l1um_v2.config b/boards/librem_l1um_v2/librem_l1um_v2.config index 103714874..46d35a77b 100644 --- a/boards/librem_l1um_v2/librem_l1um_v2.config +++ b/boards/librem_l1um_v2/librem_l1um_v2.config @@ -14,6 +14,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y CONFIG_POPT=y diff --git a/boards/librem_mini/librem_mini.config b/boards/librem_mini/librem_mini.config index e438c27d6..9dadd5307 100644 --- a/boards/librem_mini/librem_mini.config +++ b/boards/librem_mini/librem_mini.config @@ -15,6 +15,8 @@ CONFIG_IOPORT=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y CONFIG_POPT=y diff --git a/boards/librem_mini_v2/librem_mini_v2.config b/boards/librem_mini_v2/librem_mini_v2.config index 30878ad0b..288bb5b67 100644 --- a/boards/librem_mini_v2/librem_mini_v2.config +++ b/boards/librem_mini_v2/librem_mini_v2.config @@ -15,6 +15,8 @@ CONFIG_IOPORT=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y CONFIG_POPT=y diff --git a/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config b/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config index 3cc378a65..896753374 100644 --- a/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config +++ b/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config @@ -33,6 +33,8 @@ CONFIG_UTIL_LINUX=y CONFIG_CRYPTSETUP2=y CONFIG_GPG2=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_DROPBEAR=y CONFIG_MSRTOOLS=y diff --git a/boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config b/boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config index 3faee03a6..e7a2fda89 100644 --- a/boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config +++ b/boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config @@ -31,6 +31,8 @@ CONFIG_UTIL_LINUX=y CONFIG_CRYPTSETUP2=y CONFIG_GPG2=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_DROPBEAR=y CONFIG_MSRTOOLS=y diff --git a/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config b/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config index 2de637551..54c2a8a30 100644 --- a/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config +++ b/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config @@ -34,6 +34,8 @@ CONFIG_UTIL_LINUX=y CONFIG_CRYPTSETUP2=y CONFIG_GPG2=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_DROPBEAR=y CONFIG_MSRTOOLS=y diff --git a/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config b/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config index 54b8d005a..c4b9ae93c 100644 --- a/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config +++ b/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config @@ -33,6 +33,8 @@ CONFIG_UTIL_LINUX=y CONFIG_CRYPTSETUP2=y CONFIG_GPG2=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_DROPBEAR=y CONFIG_MSRTOOLS=y diff --git a/boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config b/boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config index 5d75a5e6c..5e0f50749 100644 --- a/boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config +++ b/boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config @@ -33,6 +33,8 @@ CONFIG_UTIL_LINUX=y CONFIG_CRYPTSETUP2=y CONFIG_GPG2=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_DROPBEAR=y CONFIG_MSRTOOLS=y diff --git a/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config b/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config index 26f43a5bf..e73e78a6a 100644 --- a/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config +++ b/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config @@ -29,8 +29,12 @@ CONFIG_FLASHROM=y CONFIG_PCIUTILS=y CONFIG_UTIL_LINUX=y CONFIG_CRYPTSETUP2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_GPG2=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_DROPBEAR=y CONFIG_MSRTOOLS=y diff --git a/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config b/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config index 4ee311746..43ce0961c 100644 --- a/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config +++ b/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config @@ -34,6 +34,8 @@ CONFIG_UTIL_LINUX=y CONFIG_CRYPTSETUP2=y CONFIG_GPG2=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_DROPBEAR=y CONFIG_MSRTOOLS=y diff --git a/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config b/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config index b97d184cc..6ef488381 100644 --- a/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config +++ b/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config @@ -33,6 +33,8 @@ CONFIG_UTIL_LINUX=y CONFIG_CRYPTSETUP2=y CONFIG_GPG2=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_DROPBEAR=y CONFIG_MSRTOOLS=y diff --git a/boards/t420-hotp-maximized/t420-hotp-maximized.config b/boards/t420-hotp-maximized/t420-hotp-maximized.config index 7ba274cf7..989e9af0a 100644 --- a/boards/t420-hotp-maximized/t420-hotp-maximized.config +++ b/boards/t420-hotp-maximized/t420-hotp-maximized.config @@ -26,6 +26,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/t420-maximized/t420-maximized.config b/boards/t420-maximized/t420-maximized.config index 796e22ae9..ab373606d 100644 --- a/boards/t420-maximized/t420-maximized.config +++ b/boards/t420-maximized/t420-maximized.config @@ -25,6 +25,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/t430-hotp-maximized/t430-hotp-maximized.config b/boards/t430-hotp-maximized/t430-hotp-maximized.config index 272c30241..42e726981 100644 --- a/boards/t430-hotp-maximized/t430-hotp-maximized.config +++ b/boards/t430-hotp-maximized/t430-hotp-maximized.config @@ -24,6 +24,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/t430-maximized/t430-maximized.config b/boards/t430-maximized/t430-maximized.config index c41a6eab1..cb4dbd2b1 100644 --- a/boards/t430-maximized/t430-maximized.config +++ b/boards/t430-maximized/t430-maximized.config @@ -24,6 +24,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/t440p-maximized/t440p-maximized.config b/boards/t440p-maximized/t440p-maximized.config index 2f94b8826..bb358a187 100644 --- a/boards/t440p-maximized/t440p-maximized.config +++ b/boards/t440p-maximized/t440p-maximized.config @@ -14,6 +14,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y CONFIG_POPT=y diff --git a/boards/t530-hotp-maximized/t530-hotp-maximized.config b/boards/t530-hotp-maximized/t530-hotp-maximized.config index 1c38e875e..d61cb2af9 100644 --- a/boards/t530-hotp-maximized/t530-hotp-maximized.config +++ b/boards/t530-hotp-maximized/t530-hotp-maximized.config @@ -25,6 +25,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/t530-maximized/t530-maximized.config b/boards/t530-maximized/t530-maximized.config index 8b8868814..045ca7ba3 100644 --- a/boards/t530-maximized/t530-maximized.config +++ b/boards/t530-maximized/t530-maximized.config @@ -25,6 +25,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/x220-hotp-maximized/x220-hotp-maximized.config b/boards/x220-hotp-maximized/x220-hotp-maximized.config index 2fc941a67..1801753c7 100644 --- a/boards/x220-hotp-maximized/x220-hotp-maximized.config +++ b/boards/x220-hotp-maximized/x220-hotp-maximized.config @@ -26,6 +26,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/x220-maximized/x220-maximized.config b/boards/x220-maximized/x220-maximized.config index e69331c79..ce7a3d45f 100644 --- a/boards/x220-maximized/x220-maximized.config +++ b/boards/x220-maximized/x220-maximized.config @@ -26,6 +26,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/x230-hotp-maximized/x230-hotp-maximized.config b/boards/x230-hotp-maximized/x230-hotp-maximized.config index f6a6e30cb..c93dfb7c3 100644 --- a/boards/x230-hotp-maximized/x230-hotp-maximized.config +++ b/boards/x230-hotp-maximized/x230-hotp-maximized.config @@ -24,6 +24,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config b/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config index af850d77e..28ccb4764 100644 --- a/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config +++ b/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config @@ -27,6 +27,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/boards/x230-maximized/x230-maximized.config b/boards/x230-maximized/x230-maximized.config index a122bd654..da4a6eb1f 100644 --- a/boards/x230-maximized/x230-maximized.config +++ b/boards/x230-maximized/x230-maximized.config @@ -24,6 +24,8 @@ CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y +CONFIG_E2FSPROGS=y +CONFIG_EXFATPROGS=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y diff --git a/config/busybox.config b/config/busybox.config index c5891f256..3701311c9 100644 --- a/config/busybox.config +++ b/config/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.33.2 -# Mon Jul 3 16:24:44 2023 +# Busybox version: 1.36.1 +# Fri Jul 21 14:38:54 2023 # CONFIG_HAVE_DOT_CONFIG=y @@ -93,10 +93,16 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 +CONFIG_SHA1_SMALL=3 +CONFIG_SHA1_HWACCEL=y +CONFIG_SHA256_HWACCEL=y CONFIG_SHA3_SMALL=1 -# CONFIG_FEATURE_FAST_TOP is not set -# CONFIG_FEATURE_ETC_NETWORKS is not set -# CONFIG_FEATURE_ETC_SERVICES is not set +CONFIG_FEATURE_NON_POSIX_CP=y +# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set +CONFIG_FEATURE_USE_SENDFILE=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set @@ -120,14 +126,9 @@ CONFIG_LAST_SUPPORTED_WCHAR=767 # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set -CONFIG_FEATURE_NON_POSIX_CP=y -# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set -CONFIG_FEATURE_USE_SENDFILE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_FEATURE_SKIP_ROOTFS=y -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -CONFIG_FEATURE_HWIB=y +# CONFIG_LOOP_CONFIGURE is not set +# CONFIG_NO_LOOP_CONFIGURE is not set +CONFIG_TRY_LOOP_CONFIGURE=y # # Applets @@ -162,6 +163,8 @@ CONFIG_FEATURE_BZIP2_DECOMPRESS=y CONFIG_CPIO=y CONFIG_FEATURE_CPIO_O=y CONFIG_FEATURE_CPIO_P=y +CONFIG_FEATURE_CPIO_IGNORE_DEVNO=y +CONFIG_FEATURE_CPIO_RENUMBER_INODES=y # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set CONFIG_GZIP=y @@ -197,6 +200,22 @@ CONFIG_FEATURE_LZMA_FAST=y # # Coreutils # +CONFIG_FEATURE_VERBOSE=y + +# +# Common options for date and touch +# +# CONFIG_FEATURE_TIMEZONE is not set + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y CONFIG_BASENAME=y CONFIG_CAT=y CONFIG_FEATURE_CATN=y @@ -207,11 +226,13 @@ CONFIG_CHMOD=y # CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set CONFIG_CHROOT=y # CONFIG_CKSUM is not set +CONFIG_CRC32=y # CONFIG_COMM is not set CONFIG_CP=y CONFIG_FEATURE_CP_LONG_OPTIONS=y CONFIG_FEATURE_CP_REFLINK=y CONFIG_CUT=y +CONFIG_FEATURE_CUT_REGEX=y CONFIG_DATE=y CONFIG_FEATURE_DATE_ISOFMT=y # CONFIG_FEATURE_DATE_NANO is not set @@ -223,6 +244,7 @@ CONFIG_FEATURE_DD_IBS_OBS=y CONFIG_FEATURE_DD_STATUS=y CONFIG_DF=y CONFIG_FEATURE_DF_FANCY=y +CONFIG_FEATURE_SKIP_ROOTFS=y CONFIG_DIRNAME=y # CONFIG_DOS2UNIX is not set # CONFIG_UNIX2DOS is not set @@ -316,13 +338,13 @@ CONFIG_TEST2=y CONFIG_FEATURE_TEST_64=y # CONFIG_TIMEOUT is not set CONFIG_TOUCH=y -CONFIG_FEATURE_TOUCH_NODEREF=y CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y CONFIG_TRUE=y CONFIG_TRUNCATE=y +CONFIG_TSORT=y CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNAME_OSNAME="GNU/Linux" @@ -342,21 +364,6 @@ CONFIG_FEATURE_WC_LARGE=y # CONFIG_WHOAMI is not set # CONFIG_YES is not set -# -# Common options -# -CONFIG_FEATURE_VERBOSE=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - # # Console Utilities # @@ -420,6 +427,7 @@ CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 # CONFIG_FEATURE_VI_8BIT is not set CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_COLON_EXPAND=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y # CONFIG_FEATURE_VI_REGEX_SEARCH is not set @@ -433,6 +441,7 @@ CONFIG_FEATURE_VI_ASK_TERMINAL=y CONFIG_FEATURE_VI_UNDO=y CONFIG_FEATURE_VI_UNDO_QUEUE=y CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 +CONFIG_FEATURE_VI_VERBOSE_STATUS=y CONFIG_FEATURE_ALLOW_EXEC=y # @@ -441,7 +450,11 @@ CONFIG_FEATURE_ALLOW_EXEC=y CONFIG_FIND=y CONFIG_FEATURE_FIND_PRINT0=y CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_ATIME=y +CONFIG_FEATURE_FIND_CTIME=y CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_AMIN=y +CONFIG_FEATURE_FIND_CMIN=y CONFIG_FEATURE_FIND_PERM=y CONFIG_FEATURE_FIND_TYPE=y CONFIG_FEATURE_FIND_EXECUTABLE=y @@ -449,6 +462,7 @@ CONFIG_FEATURE_FIND_XDEV=y CONFIG_FEATURE_FIND_MAXDEPTH=y CONFIG_FEATURE_FIND_NEWER=y CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_SAMEFILE=y CONFIG_FEATURE_FIND_EXEC=y CONFIG_FEATURE_FIND_EXEC_PLUS=y CONFIG_FEATURE_FIND_USER=y @@ -641,7 +655,7 @@ CONFIG_LSUSB=y # CONFIG_FEATURE_MDEV_DAEMON is not set # CONFIG_MESG is not set # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set -CONFIG_MKE2FS=y +# CONFIG_MKE2FS is not set # CONFIG_MKFS_EXT2 is not set # CONFIG_MKFS_MINIX is not set # CONFIG_FEATURE_MINIX2 is not set @@ -739,6 +753,7 @@ CONFIG_FEATURE_VOLUMEID_XFS=y # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set +CONFIG_ASCII=y # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set # CONFIG_BC is not set @@ -819,10 +834,12 @@ CONFIG_PARTPROBE=y # CONFIG_RFKILL is not set # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set +CONFIG_SEEDRNG=y CONFIG_SETFATTR=y CONFIG_SETSERIAL=y CONFIG_STRINGS=y CONFIG_TIME=y +CONFIG_TREE=y # CONFIG_TS is not set # CONFIG_TTYSIZE is not set # CONFIG_UBIATTACH is not set @@ -834,6 +851,7 @@ CONFIG_TIME=y # CONFIG_UBIRENAME is not set # CONFIG_VOLNAME is not set # CONFIG_WATCHDOG is not set +# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set # # Networking Utilities @@ -842,6 +860,9 @@ CONFIG_TIME=y # CONFIG_FEATURE_UNIX_LOCAL is not set # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +# CONFIG_FEATURE_ETC_SERVICES is not set +CONFIG_FEATURE_HWIB=y # CONFIG_FEATURE_TLS_SHA1 is not set CONFIG_ARP=y # CONFIG_ARPING is not set @@ -860,6 +881,7 @@ CONFIG_ARP=y # CONFIG_HOSTNAME is not set # CONFIG_DNSDOMAINNAME is not set # CONFIG_HTTPD is not set +CONFIG_FEATURE_HTTPD_PORT_DEFAULT=0 # CONFIG_FEATURE_HTTPD_RANGES is not set # CONFIG_FEATURE_HTTPD_SETUID is not set # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set @@ -952,6 +974,7 @@ CONFIG_SSL_CLIENT=y # CONFIG_FEATURE_TELNET_WIDTH is not set # CONFIG_TELNETD is not set # CONFIG_FEATURE_TELNETD_STANDALONE is not set +CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set CONFIG_TFTP=y CONFIG_FEATURE_TFTP_PROGRESS_BAR=y @@ -972,6 +995,7 @@ CONFIG_VCONFIG=y CONFIG_WGET=y CONFIG_FEATURE_WGET_LONG_OPTIONS=y # CONFIG_FEATURE_WGET_STATUSBAR is not set +CONFIG_FEATURE_WGET_FTP=y # CONFIG_FEATURE_WGET_AUTHENTICATION is not set CONFIG_FEATURE_WGET_TIMEOUT=y CONFIG_FEATURE_WGET_HTTPS=y @@ -988,6 +1012,7 @@ CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y CONFIG_UDHCPC_DEFAULT_SCRIPT="/sbin/config-dhcp.sh" +CONFIG_UDHCPC6_DEFAULT_SCRIPT="" # CONFIG_UDHCPC6 is not set # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set @@ -997,6 +1022,7 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT="/sbin/config-dhcp.sh" # # Common options for DHCP applets # +CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0" # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=9 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 @@ -1014,17 +1040,19 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" # # Mail Utilities # +CONFIG_FEATURE_MIME_CHARSET="" # CONFIG_MAKEMIME is not set # CONFIG_POPMAILDIR is not set # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set # CONFIG_REFORMIME is not set # CONFIG_FEATURE_REFORMIME_COMPAT is not set # CONFIG_SENDMAIL is not set -CONFIG_FEATURE_MIME_CHARSET="" # # Process Utilities # +# CONFIG_FEATURE_FAST_TOP is not set +CONFIG_FEATURE_SHOW_THREADS=y # CONFIG_FREE is not set # CONFIG_FUSER is not set # CONFIG_IOSTAT is not set @@ -1063,7 +1091,6 @@ CONFIG_FEATURE_TOPMEM=y # CONFIG_UPTIME is not set # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set # CONFIG_WATCH is not set -CONFIG_FEATURE_SHOW_THREADS=y # # Runit Utilities @@ -1120,6 +1147,7 @@ CONFIG_ASH_EXPAND_PRMT=y CONFIG_ASH_ECHO=y CONFIG_ASH_PRINTF=y CONFIG_ASH_TEST=y +CONFIG_ASH_SLEEP=y CONFIG_ASH_HELP=y CONFIG_ASH_GETOPTS=y CONFIG_ASH_CMDCMD=y @@ -1128,8 +1156,8 @@ CONFIG_ASH_CMDCMD=y # CONFIG_SHELL_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_BRACE_EXPANSION is not set -# CONFIG_HUSH_LINENO_VAR is not set # CONFIG_HUSH_BASH_SOURCE_CURDIR is not set +# CONFIG_HUSH_LINENO_VAR is not set # CONFIG_HUSH_INTERACTIVE is not set # CONFIG_HUSH_SAVEHISTORY is not set # CONFIG_HUSH_JOB is not set diff --git a/initrd/bin/mount-usb b/initrd/bin/mount-usb index 35e81f07f..f9a391ee4 100755 --- a/initrd/bin/mount-usb +++ b/initrd/bin/mount-usb @@ -1,16 +1,90 @@ #!/bin/bash # Mount a USB device . /etc/functions +. /etc/luks-functions + +# Refactored so that options can be passed from command line without having static position +# -mode: ro or rw (default ro) +# -device: device to mount (default: first USB device found) +# -mountpoint: where to mount the device (default: /media) +# -pass: passphrase for luks device (default: none) TRACE "Under /bin/mount-usb" +function usage() { + cat < <-device> <-mountpoint mountpoint> <-pass passhphrase> + $0 --help + +parameters: + -mode: ro or rw (default ro) + -device: device to mount (default: first USB device found) + -mountpoint: where to mount the device (default: /media) + -pass: passphrase for luks device (default: none) + --help: Show this help +USAGE_END +} + +MODE="ro" +DEVICE="" +MOUNTPOINT="/media" +PASS="" + + +#Only assign -mode, -device, -mountpoint and -pass parameters only if variables following them are not empty +while [ $# -gt 0 ]; do + case "$1" in + -mode) + if [ -n "$2" ]; then + MODE="$2" + shift + shift + fi + ;; + -device) + if [ -n "$2" ]; then + DEVICE="$2" + shift + shift + fi + ;; + -mountpoint) + if [ -n "$2" ]; then + MOUNTPOINT="$2" + shift + shift + fi + ;; + -pass) + if [ -n "$2" ]; then + PASS="$2" + shift + shift + fi + ;; + *) + usage + exit 1 + ;; + esac +done + + +#Show parameters content but not luks passphrase: if empty, show "empty", if provided, show "provided" +DEBUG "Parameters: mode=$MODE, device=${DEVICE:-empty}, mountpoint=$MOUNTPOINT, -pass=${PASS:+provided}" + enable_usb enable_usb_storage if [ ! -d /media ]; then + DEBUG "Creating /media directory" mkdir /media +else + DEBUG "Cleaning /media directory" + umount /media > /dev/null 2>&1 || true fi + list_usb_storage > /tmp/usb_block_devices if [ -z "$(cat /tmp/usb_block_devices)" ]; then if [ -x /bin/whiptail ]; then @@ -34,56 +108,102 @@ if [ -z "$(cat /tmp/usb_block_devices)" ]; then fi USB_MOUNT_DEVICE="" -# Check for the common case: a single USB disk with one partition -if [ `cat /tmp/usb_block_devices | wc -l` -eq 1 ]; then - USB_MOUNT_DEVICE=`cat /tmp/usb_block_devices` -fi -# otherwise, let the user pick -if [ -z ${USB_MOUNT_DEVICE} ]; then - > /tmp/usb_disk_list - for i in `cat /tmp/usb_block_devices`; do - echo $i $(blkid | grep $i | grep -o 'LABEL=".*"' | cut -f2 -d '"') >> /tmp/usb_disk_list - done +# Check if the user has specified a USB device +if [ -n "$DEVICE" ]; then + DEBUG "Checking if $DEVICE is a USB device" + if grep -q $DEVICE /tmp/usb_block_devices; then + DEBUG "Selected device is a USB device" + USB_MOUNT_DEVICE="$DEVICE" + fi +else + # Check for the common case: a single USB disk with one partition + if [ $(cat /tmp/usb_block_devices | wc -l) -eq 1 ]; then + USB_MOUNT_DEVICE=$(cat /tmp/usb_block_devices) + fi + # otherwise, let the user pick + if [ -z ${USB_MOUNT_DEVICE} ]; then + > /tmp/usb_disk_list + for i in $(cat /tmp/usb_block_devices); do + #appends label to the device name + echo $i $(blkid | grep $i | grep -o 'LABEL=".*"' | cut -f2 -d '"') >> /tmp/usb_disk_list + done - if [ -x /bin/whiptail ]; then - MENU_OPTIONS="" - n=0 - while read option - do - n=`expr $n + 1` - option=$(echo $option | tr " " "_") - MENU_OPTIONS="$MENU_OPTIONS $n ${option}" - done < /tmp/usb_disk_list - - MENU_OPTIONS="$MENU_OPTIONS a Abort" - whiptail $BG_COLOR --title "Select your USB disk" \ - --menu "Choose your USB disk [1-$n, a to abort]:" 0 80 8 \ - -- $MENU_OPTIONS \ - 2>/tmp/whiptail - - option_index=$(cat /tmp/whiptail) - else - echo "+++ Select your USB disk:" - n=0 - while read option - do - n=`expr $n + 1` - echo "$n. $option" - done < /tmp/usb_disk_list - - read \ - -p "Choose your USB disk [1-$n, a to abort]: " \ - option_index + if [ -x /bin/whiptail ]; then + MENU_OPTIONS="" + n=0 + while read option + do + n=$(expr $n + 1) + option=$(echo $option | tr " " "_") + MENU_OPTIONS="$MENU_OPTIONS $n ${option}" + done < /tmp/usb_disk_list + + MENU_OPTIONS="$MENU_OPTIONS a Abort" + whiptail $BG_COLOR --title "Select your USB disk" \ + --menu "Choose your USB disk [1-$n, a to abort]:" 0 80 8 \ + -- $MENU_OPTIONS \ + 2>/tmp/whiptail + if [ $? -ne 0 ]; then + die "Selecting USB disk/partition aborted." + fi + option_index=$(cat /tmp/whiptail) + else + echo "+++ Select your USB disk:" + n=0 + while read option + do + n=$(expr $n + 1) + echo "$n. $option" + done < /tmp/usb_disk_list + + read \ + -p "Choose your USB disk [1-$n, a to abort]: " \ + option_index + fi + + if [ "$option_index" = "a" ]; then + exit 5 + fi + USB_MOUNT_DEVICE=$(head -n $option_index /tmp/usb_disk_list | tail -1 | sed 's/\ .*$//') fi +fi + +# Check if the selected USB partition is a luks block device +# if file exists and not empty, then we have at least one luks device +list_luks_devices > /tmp/luks_devices +if [ -s /tmp/luks_devices ]; then + DEBUG "Checking if $USB_MOUNT_DEVICE is a luks device" + if grep -q "$USB_MOUNT_DEVICE" /tmp/luks_devices; then + DEBUG "Selected USB partition is a luks device" + #Selected USB partition is a luks device + if [ -e /dev/mapper/usb_mount_device ]; then + DEBUG "Closing existing luks device" + cryptsetup luksClose usb_mount_device + fi + DEBUG "Opening LUKS device $USB_MOUNT_DEVICE" + + #Pass LUKS passphrase to cryptsetup only if we received one + if [ -z "$PASS" ]; then + #We haven't received a passphrase + cryptsetup luksOpen $USB_MOUNT_DEVICE usb_mount_device \ + || die "Failed to open ${USB_MOUNT_DEVICE} LUKS device" + else + #We received a pasphrase + echo -n "$PASS"| cryptsetup luksOpen $USB_MOUNT_DEVICE usb_mount_device \ + || die "Failed to open ${USB_MOUNT_DEVICE} LUKS device" + fi - if [ "$option_index" = "a" ]; then - exit 5 + warn "Note that you cannot boot from a mounted encrypted device." + DEBUG "Setting USB_MOUNT_DEVICE=/dev/mapper/usb_mount_device" + USB_MOUNT_DEVICE="/dev/mapper/usb_mount_device" fi - USB_MOUNT_DEVICE=`head -n $option_index /tmp/usb_disk_list | tail -1 | sed 's/\ .*$//'` fi -if [ "$1" = "rw" ]; then - mount -o rw $USB_MOUNT_DEVICE /media +# Mount the USB device +if [ "$MODE" = "rw" ]; then + DEBUG "Mounting $USB_MOUNT_DEVICE as read-write" + mount -o rw $USB_MOUNT_DEVICE $MOUNTPOINT else - mount -o ro $USB_MOUNT_DEVICE /media + DEBUG "Mounting $USB_MOUNT_DEVICE as read-only" + mount -o ro $USB_MOUNT_DEVICE $MOUNTPOINT fi diff --git a/initrd/bin/oem-factory-reset b/initrd/bin/oem-factory-reset index 9c90732fc..74378fa08 100755 --- a/initrd/bin/oem-factory-reset +++ b/initrd/bin/oem-factory-reset @@ -546,7 +546,7 @@ if [ "$prompt_output" == "y" \ # mount USB over /media only if not already mounted if ! grep -q /media /proc/mounts ; then # mount USB in rw - if ! mount-usb rw 2>/tmp/error; then + if ! mount-usb -mode rw 2>/tmp/error; then ERROR=$(tail -n 1 /tmp/error | fold -s) whiptail_error_die "Unable to mount USB on /media:\n\n${ERROR}" fi diff --git a/initrd/bin/test.sh b/initrd/bin/test.sh new file mode 100755 index 000000000..5407501d2 --- /dev/null +++ b/initrd/bin/test.sh @@ -0,0 +1,7 @@ +#!/bin/bash +. /etc/luks-functions + +enable_usb +enable_usb_storage +prepare_thumb_drive /dev/sda 25 "test" +mount-usb diff --git a/initrd/etc/luks-functions b/initrd/etc/luks-functions index 3fa3cd525..fe20928d9 100644 --- a/initrd/etc/luks-functions +++ b/initrd/etc/luks-functions @@ -1,18 +1,129 @@ #!/bin/bash -# Reencrypt LUKS container and change Disk Recovery Key associated passphrase (Slot 0: main slot) +# LUKS related functions . /etc/functions . /etc/gui_functions . /tmp/config +#List all LUKS devices on the system +list_luks_devices() +{ + #generate a list of devices to choose from that contain a LUKS header + lvm vgscan||true + blkid | cut -d ':' -f 1 | while read device;do cryptsetup isLuks $device;if [ $(echo $?) == 0 ]; then echo $device;fi; done | sort +} + + +#Whiptail prompt asking user to select ratio of device to use for LUKS container between: 25, 50, 75 +select_luks_container_size_percent() +{ + TRACE "Under /etc/luks-functions:select_luks_container_size_percent()" + if [ -x /bin/whiptail ]; then + #whiptail prompt asking user to select ratio of device to use for LUKS container between: 25, 50, 75 + #whiptail returns the percentage of the device to use for LUKS container + whiptail --title "Select LUKS container size percentage of device" --menu \ + "Select LUKS container size percentage of device:" 0 80 10 \ + "25" "25%" \ + "50" "50%" \ + "75" "75%" \ + 2> /tmp/luks_container_size_percent \ + || die "Error selecting LUKS container size percentage of device" + else + echo "+++ Select LUKS container size percentage of device:" + echo "1. 25%" + echo "2. 50%" + echo "3. 75%" + read \ + -p "Choose your USB disk [1-3]: " \ + option_index + #translate option_index to percentage + case $option_index in + 1) option_index=25;; + 2) option_index=50;; + 3) option_index=75;; + esac + echo $option_index > /tmp/luks_container_size_percent + fi +} + +#Partition a device with two partitions: a first one being a LUKS container containing private ext4 partition and second public exfat partition +# Size provisioning is done by percentage of the device +# $1: device to partition +# $2: percentage of device to use for LUKS container +# $3: passphrase to use for LUKS container +prepare_thumb_drive() +{ + TRACE "Under /etc/luks-functions:prepare_thumb_drive()" + DEVICE=$1 + PERCENTAGE=$2 + PASSPHRASE=$3 + DEBUG "DEVICE to partition: $DEVICE" + DEBUG "PERCENTAGE of device that will be used for LUKS container: $PERCENTAGE" + + #Check if device is a block device + if [ ! -b $DEVICE ]; then + die "Error: $DEVICE is not a block device" + fi + + if [ -z "$PERCENTAGE" ]; then + #If no percentage was provided, ask user to select percentage of device to use for LUKS container + select_luks_container_size_percent + PERCENTAGE=$(cat /tmp/luks_container_size_percent) + fi + + + #Get disk size in bytes from fdisk + DISK_SIZE_BYTES=$(fdisk -l $DEVICE | grep Disk | awk -F " " {'print $5'}) > /dev/null 2>&1 || die "Error getting disk size from fdisk" + #Convert disk size to MB + DISK_SIZE_MB=$(calc $DISK_SIZE_BYTES/1024/1024 | awk -F "." {'print $1'}) > /dev/null 2>&1 || die "Error calculating disk size" + #Get size in bytes from percentage and apply percentage to DISK_SIZE_MB + PERCENTAGE_MB=$(calc $DISK_SIZE_MB*$PERCENTAGE/100 | awk -F "." {'print $1'}) > /dev/null 2>&1 || die "Error calculating percentage" + + #Console and whiptail $BG_COLOR_WARNING prompt (Y/n) validate one last time wiping and repartitioning of $device of total size $DISK_SIZE_MB with $PERCENTAGE_MB assigned to LUKS encrypted private partition + if [ -x /bin/whiptail ]; then + whiptail $BG_COLOR_WARNING --title "WARNING: Wiping and repartitioning $DEVICE of $DISK_SIZE_MB MB" --yesno \ + "WARNING: Wiping and repartitioning $DEVICE with $PERCENTAGE_MB MB assigned to private LUKS contained private ext4 partition, rest assigned to extfat public partition.\n\nAre you sure you want to continue?" 0 80 \ + || die "User cancelled wiping and repartitioning of $DEVICE" + else + echo -e -n "Warning: Wiping and repartitioning $DEVICE with $PERCENTAGE_MB MB assigned to private LUKS contained private ext4 partition, rest assigned to extfat public partition.\n\nAre you sure you want to continue?" + read -r -p " [Y/n] " response + #transform response to uppercase with bash parameter expansion + response=${response^^} + #continue if response different then uppercase N + if [[ $response =~ ^(N)$ ]]; then + die "User cancelled wiping and repartitioning of $DEVICE" + fi + fi + + echo -e "Preparing $DEVICE with $PERCENTAGE_MB MB for private LUKS container and rest of disk with exfat\ + \n for public partition (This may take a while)..." | fold -s + DEBUG "Creating empty DOS partition table on device through fdisk to start clean" + echo -e "o\nw\n" | fdisk $DEVICE > /dev/null 2>&1 || die "Error creating partition table" + DEBUG "partition device with two partitions: first one being the percent applied and rest for second partition through fdisk" + echo -e "n\np\n1\n\n+"$PERCENTAGE_MB"M\nn\np\n2\n\n\nw\n" | fdisk $DEVICE > /dev/null 2>&1 || die "Error partitioning device" + DEBUG "cryptsetup luksFormat first partition with LUKS container aes-xts-plain64 cipher with sha256 hash and 512 bit key" + DEBUG "Creating ${PERCENTAGE_MB}MB LUKS container on ${DEVICE}1..." + echo -n "$PASSPHRASE" \ + | cryptsetup -c aes-xts-plain64 -h sha256 -s 512 -y luksFormat ${DEVICE}1 > /dev/null 2>&1 \ + || die "Error formatting LUKS container" + DEBUG "Opening LUKS device and mapping under /dev/mapper/private..." + echo -n "$PASSPHRASE" | cryptsetup luksOpen ${DEVICE}1 private > /dev/null 2>&1 || die "Error opening LUKS container" + DEBUG "Formatting LUKS container mapped under /dev/mapper/private as an ext4 partition..." + mke2fs -t ext4 -L private /dev/mapper/private > /dev/null 2>&1 || die "Error formatting LUKS container's ext4 filesystem" + DEBUG "Closing LUKS device /dev/mapper/private..." + cryptsetup luksClose private > /dev/null 2>&1 || die "Error closing LUKS container" + DEBUG "Formatting second partition ${DEVICE}2 with exfat filesystem..." + mkfs.exfat -L public ${DEVICE}2 > /dev/null 2>&1 || die "Error formatting second partition with exfat filesystem" + echo "Done." +} + select_luks_container() { + TRACE "Under /etc/luks-functions:select_luks_container()" if [ -s /boot/kexec_key_devices.txt ]; then LUKS=$(cut -d ' ' -f1 /boot/kexec_key_devices.txt) else - #generate a list of devices to choose from that contain a LUKS header - lvm vgscan||true - blkid | cut -d ':' -f 1 | while read device;do cryptsetup isLuks $device;if [ $(echo $?) == 0 ]; then echo $device;fi; done | sort > /tmp/luks_devices.txt + list_luks_devices if [ $(cat /tmp/luks_devices.txt | wc -l) -gt 0 ]; then file_selector "/tmp/luks_devices.txt" "Select LUKS container device" if [ "$FILE" == "" ]; then @@ -33,6 +144,7 @@ select_luks_container() test_luks_current_disk_recovery_key_passphrase() { + TRACE "Under /etc/luks-functions:test_luks_current_disk_recovery_key_passphrase()" while : ; do select_luks_container || return 1 if [ -z "$luks_current_Disk_Recovery_Key_passphrase" ]; then @@ -73,6 +185,7 @@ test_luks_current_disk_recovery_key_passphrase() } luks_reencrypt(){ +TRACE "Under /etc/luks-functions:luks_reencrypt()" while : ; do select_luks_container || return 1 if [ -z "$luks_current_Disk_Recovery_Key_passphrase" ]; then @@ -113,6 +226,7 @@ done luks_change_passphrase() { + TRACE "Under /etc/luks-functions:luks_change_passphrase()" while : ; do select_luks_container || return 1 #if actual or new Disk Recovery Key is not provisioned by oem-provisioning file diff --git a/initrd/etc/mke2fs.conf b/initrd/etc/mke2fs.conf new file mode 100644 index 000000000..b7fc95df7 --- /dev/null +++ b/initrd/etc/mke2fs.conf @@ -0,0 +1,45 @@ +[defaults] + base_features = sparse_super,large_file,filetype,resize_inode,dir_index,ext_attr + default_mntopts = acl,user_xattr + enable_periodic_fsck = 0 + blocksize = 4096 + inode_size = 256 + inode_ratio = 16384 + +[fs_types] + ext3 = { + features = has_journal + } + ext4 = { + features = has_journal,extent,huge_file,flex_bg,metadata_csum,metadata_csum_seed,64bit,dir_nlink,extra_isize,orphan_file + } + small = { + blocksize = 1024 + inode_ratio = 4096 + } + floppy = { + blocksize = 1024 + inode_ratio = 8192 + } + big = { + inode_ratio = 32768 + } + huge = { + inode_ratio = 65536 + } + news = { + inode_ratio = 4096 + } + largefile = { + inode_ratio = 1048576 + blocksize = -1 + } + largefile4 = { + inode_ratio = 4194304 + blocksize = -1 + } + hurd = { + blocksize = 4096 + inode_size = 128 + warn_y2038_dates = 0 + } diff --git a/modules/busybox b/modules/busybox index 03ec0a41d..83cb7ee2a 100644 --- a/modules/busybox +++ b/modules/busybox @@ -2,11 +2,11 @@ CONFIG_BUSYBOX ?= y modules-$(CONFIG_BUSYBOX) += busybox -busybox_version := 1.33.2 +busybox_version := 1.36.1 busybox_dir := busybox-$(busybox_version) busybox_tar := busybox-$(busybox_version).tar.bz2 busybox_url := https://busybox.net/downloads/$(busybox_tar) -busybox_hash := 6843ba7977081e735fa0fdb05893e3c002c8c5ad7c9c80da206e603cc0ac47e7 +busybox_hash := b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314 busybox_configure := $(MAKE) CC="$(heads_cc)" oldconfig busybox_config := config/busybox.config diff --git a/modules/e2fsprogs b/modules/e2fsprogs new file mode 100644 index 000000000..173afa53b --- /dev/null +++ b/modules/e2fsprogs @@ -0,0 +1,32 @@ +modules-$(CONFIG_E2FSPROGS) += e2fsprogs + +e2fsprogs_version := 1.47.0 +e2fsprogs_dir := e2fsprogs-$(e2fsprogs_version) +e2fsprogs_tar := e2fsprogs-$(e2fsprogs_version).tar.xz +e2fsprogs_url := https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v$(e2fsprogs_version)/$(e2fsprogs_tar) +e2fsprogs_hash := 144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db + +# For reproducibility reasons we have to override the exec_prefix +# and datarootdir on the configure line so that the Makefiles will +# be generated with the correct paths, but then re-write them when +# we use the install target so that they will be copied to the correct +# location. +e2fsprogs_configure := \ + $(CROSS_TOOLS) \ + CFLAGS="-Os" \ + ./configure \ + --host $(MUSL_ARCH)-linux-musl \ + --prefix "/" \ + --libexecdir "/bin" \ + +# Run one build to generate the executables with the pre-defined +# exec_prefix and datarootdir, then a second make to install the binaries +# into our actual target location +e2fsprogs_target := $(MAKE_JOBS) \ + && $(MAKE) -C $(build)/$(e2fsprogs_dir) \ + DESTDIR="$(INSTALL)" \ + install + +e2fsprogs_output := misc/mke2fs + +e2fsprogs_depends := $(musl_dep) diff --git a/modules/exfatprogs b/modules/exfatprogs new file mode 100644 index 000000000..04a759b1d --- /dev/null +++ b/modules/exfatprogs @@ -0,0 +1,32 @@ +modules-$(CONFIG_EXFATPROGS) += exfatprogs + +exfatprogs_version := 1.2.1 +exfatprogs_dir := exfatprogs-$(exfatprogs_version) +exfatprogs_tar := exfatprogs-$(exfatprogs_version).tar.xz +exfatprogs_url := https://github.com/exfatprogs/exfatprogs/releases/download/$(exfatprogs_version)/$(exfatprogs_tar) +exfatprogs_hash := a6f3b1fb4bd37835c8f8cb421aac4eb75b880a51342b29850c4063973162227b + +# For reproducibility reasons we have to override the exec_prefix +# and datarootdir on the configure line so that the Makefiles will +# be generated with the correct paths, but then re-write them when +# we use the install target so that they will be copied to the correct +# location. +exfatprogs_configure := \ + $(CROSS_TOOLS) \ + CFLAGS="-Os" \ + ./configure \ + --host $(MUSL_ARCH)-linux-musl \ + --prefix "/" \ + --libexecdir "/bin" \ + +# Run one build to generate the executables with the pre-defined +# exec_prefix and datarootdir, then a second make to install the binaries +# into our actual target location +exfatprogs_target := $(MAKE_JOBS) \ + && $(MAKE) -C $(build)/$(exfatprogs_dir) \ + DESTDIR="$(INSTALL)" \ + install + +exfatprogs_output := fsck/fsck.exfat mkfs/mkfs.exfat + +exfatprogs_depends := $(musl_dep) diff --git a/patches/busybox-1.33.2.patch b/patches/busybox-1.36.1.patch similarity index 100% rename from patches/busybox-1.33.2.patch rename to patches/busybox-1.36.1.patch