diff --git a/Makefile b/Makefile index 7ebba95..d3725ac 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ build-fw: mkdir -p $(RELEASE_DIR) for device in $(DEVICES); do \ cp \ - build/heads/build/$${device}/PureBoot*.rom \ + build/heads/build/$${device}/pureboot*.rom \ $(RELEASE_DIR)/$${device}.rom ; \ done diff --git a/config/buildroot/board/x86_64/linux.config b/config/buildroot/board/x86_64/linux.config index 7c7633d..311ff68 100644 --- a/config/buildroot/board/x86_64/linux.config +++ b/config/buildroot/board/x86_64/linux.config @@ -1,5 +1,6 @@ +CONFIG_LOCALVERSION="AirgapOS" # CONFIG_LOCALVERSION_AUTO is not set -CONFIG_BUILD_SALT="4.19.0-5-amd64" +CONFIG_BUILD_SALT="5.7.19-amd64" CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_USELIB=y @@ -31,6 +32,11 @@ CONFIG_USER_NS=y CONFIG_CHECKPOINT_RESTORE=y CONFIG_SCHED_AUTOGROUP=y CONFIG_BLK_DEV_INITRD=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_RD_XZ is not set +# CONFIG_RD_LZO is not set +# CONFIG_RD_LZ4 is not set CONFIG_EXPERT=y CONFIG_KALLSYMS_ALL=y CONFIG_BPF_SYSCALL=y @@ -38,7 +44,6 @@ CONFIG_USERFAULTFD=y # CONFIG_COMPAT_BRK is not set CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SLAB_FREELIST_HARDENED=y -CONFIG_PROFILING=y CONFIG_SMP=y CONFIG_X86_X2APIC=y # CONFIG_X86_EXTENDED_PLATFORM is not set @@ -117,7 +122,6 @@ CONFIG_EFI_BOOTLOADER_CONTROL=m CONFIG_EFI_CAPSULE_LOADER=m CONFIG_APPLE_PROPERTIES=y # CONFIG_VIRTUALIZATION is not set -CONFIG_OPROFILE=m CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y CONFIG_COMPAT_32BIT_TIME=y @@ -1540,6 +1544,7 @@ CONFIG_CRC64=m CONFIG_CRC7=m CONFIG_LIBCRC32C=y CONFIG_CRC8=m +CONFIG_XZ_DEC=y # CONFIG_XZ_DEC_POWERPC is not set # CONFIG_XZ_DEC_IA64 is not set # CONFIG_XZ_DEC_ARM is not set diff --git a/config/buildroot/configs/airgap_x86_64_defconfig b/config/buildroot/configs/airgap_x86_64_defconfig index 6c17fca..c90bc0c 100644 --- a/config/buildroot/configs/airgap_x86_64_defconfig +++ b/config/buildroot/configs/airgap_x86_64_defconfig @@ -3353,8 +3353,8 @@ BR2_PACKAGE_XVISOR_ARCH_SUPPORTS=y # BR2_TARGET_ROOTFS_BTRFS is not set # BR2_TARGET_ROOTFS_CLOOP is not set BR2_TARGET_ROOTFS_CPIO=y -BR2_TARGET_ROOTFS_CPIO_NONE=y -# BR2_TARGET_ROOTFS_CPIO_GZIP is not set +# BR2_TARGET_ROOTFS_CPIO_NONE is not set +BR2_TARGET_ROOTFS_CPIO_GZIP=y # BR2_TARGET_ROOTFS_CPIO_BZIP2 is not set # BR2_TARGET_ROOTFS_CPIO_LZ4 is not set # BR2_TARGET_ROOTFS_CPIO_LZMA is not set diff --git a/config/config.env b/config/config.env index 6f6fa40..ae1c7db 100644 --- a/config/config.env +++ b/config/config.env @@ -1,2 +1,2 @@ BUILDROOT_REF=2766f346195dec29b53bc09f6038193998ea3693 -HEADS_REF=e30e3bf3e540b541aa68155233ad1106c8b8631e +HEADS_REF=6e62c83e164231c629d77a45d37569b3bff43d3f diff --git a/config/heads/patches/usb-boot.patch b/config/heads/patches/usb-boot.patch deleted file mode 100644 index 968665b..0000000 --- a/config/heads/patches/usb-boot.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/initrd/bin/gui-init b/initrd/bin/gui-init -index 38953ca..1740da6 100755 ---- a/initrd/bin/gui-init -+++ b/initrd/bin/gui-init -@@ -13,6 +13,11 @@ mount_boot() - - # Mount local disk if it is not already mounted - while ! grep -q /boot /proc/mounts ; do -+ -+ if [ "$CONFIG_BOOT_USB" = "y" ]; then -+ enable_usb -+ fi -+ - # try to mount if CONFIG_BOOT_DEV exists - if [ -e "$CONFIG_BOOT_DEV" ]; then - mount -o ro $CONFIG_BOOT_DEV /boot -diff --git a/initrd/bin/mount-usb b/initrd/bin/mount-usb -index 501171a..2196bbd 100755 ---- a/initrd/bin/mount-usb -+++ b/initrd/bin/mount-usb -@@ -4,19 +4,6 @@ - - enable_usb - --if ! lsmod | grep -q usb_storage; then -- count=$(ls /dev/sd* 2>/dev/null | wc -l) -- timeout=0 -- echo "Scanning for USB storage devices..." -- insmod /lib/modules/usb-storage.ko >/dev/null 2>&1 \ -- || die "usb_storage: module load failed" -- while [[ $count == $(ls /dev/sd* 2>/dev/null | wc -l) ]]; do -- [[ $timeout -ge 4 ]] && break -- sleep 1 -- timeout=$(($timeout+1)) -- done --fi -- - if [ ! -d /media ]; then - mkdir /media - fi -diff --git a/initrd/bin/usb-scan b/initrd/bin/usb-scan -index d9f26b0..330d672 100755 ---- a/initrd/bin/usb-scan -+++ b/initrd/bin/usb-scan -@@ -5,12 +5,6 @@ set -e -o pipefail - . /etc/gui_functions - . /tmp/config - --# Unmount any previous boot device --if grep -q /boot /proc/mounts ; then -- umount /boot \ -- || die "Unable to unmount /boot" --fi -- - # Mount the USB boot device - mount_usb || die "Unable to mount /media" - -diff --git a/initrd/etc/functions b/initrd/etc/functions -index dc0fbed..00afcdb 100755 ---- a/initrd/etc/functions -+++ b/initrd/etc/functions -@@ -122,6 +122,18 @@ enable_usb() - || die "xhci_pci: module load failed" - sleep 2 - fi -+ if ! lsmod | grep -q usb_storage; then -+ count=$(ls /dev/sd* 2>/dev/null | wc -l) -+ timeout=0 -+ echo "Scanning for USB storage devices..." -+ insmod /lib/modules/usb-storage.ko >/dev/null 2>&1 \ -+ || die "usb_storage: module load failed" -+ while [[ $count == $(ls /dev/sd* 2>/dev/null | wc -l) ]]; do -+ [[ $timeout -ge 4 ]] && break -+ sleep 1 -+ timeout=$(($timeout+1)) -+ done -+ fi - } - - confirm_gpg_card()