Fix build error

Allow shredos i686 builds to boot on 64bit EFI only system that don't have legacy boot options.

board/shredos/fsoverlay/etc/shredos/version.txt

@@ -1 +1 @@
-2025.11_28_i686_26ece7a-commit-dev
+2025.11_28_x86-64_26ece7a-commit-dev

board/shredos/fsoverlay/usr/bin/archive_log.sh.new

@@ -1,236 +0,0 @@
-#!/bin/bash
-#
-# This script will archive the nwipe log file/s, $dmesg_file files and PDF certificates
-# to the first exFAT/FAT32 formatted partition found that is identified as having a
-# matching /boot/version.txt file (ShredOS USB) as the booted ShredOS or in the case of
-# Ventoy the version within the kernel filename that matches the booted ShredOS.
-#
-# It also checks whether /etc/nwipe/nwipe.conf and /etc/nwipe/customers.csv exist
-# on the USB flash drive and assuming mode 0, read (-r argument) has been selected will
-# read those two files from the USB drive into ShredOS's RAM disc, this is normally done
-# prior to nwipe launch. Alternatively if mode 1, write (-w argument) is selected both
-# /etc/nwipe/nwipe.conf and /etc/nwipe/customers.csv are copied from ShredOS's RAM
-# disc back to the USB flash drive, which is normally done on Nwipe exit.
-#
-# Written by PartialVolume, archive_log.sh is a component of ShredOS - the disk eraser.
-
-# This is the default date format used by ShredOS and nwipe for logs
-date_format="+%Y/%m/%d %H:%M:%S"
-
-dmesg_file="dmesg_$(dmidecode  -s system-serial-number).txt"
-exit_code=0
-mode=""
-
-# What mode is required (read or write)
-while getopts 'rw' opt; do
-  case "$opt" in
-    r)
-      mode="read"
-      ;;
-
-    w)
-      mode="write"
-      ;;
-
-    ?)
-      echo -e "Invalid command option.\nUsage: $(basename $0) [-r] [-w]"
-      exit 1
-      ;;
-  esac
-done
-
-# This is the temporary directory that the exFAT/FAT32 drive is to be mounted on
-archive_drive_directory="/archive_drive"
-
-# The nwipe logs that have been sent are moved into this directory in RAM disk.
-sent_directory="/sent"
-
-# From all the drives on the system, try to locate the ShredOS boot disc
-drive_partition=$(find_shredos_boot_disc.sh)
-
-if [ "$drive_partition" == "" ]; then
-	printf "[`date "$date_format"`] archive_log.sh: No exFAT/FAT32 drive found, unable to archive nwipe log files to USB\n" 2>&1 | tee -a transfer.log
-	exit 1
-else
-	printf "[`date "$date_format"`] Archiving nwipe logs to $drive_partition\n" 2>&1 | tee -a transfer.log
-fi
-
-# Create the temporary directory we will mount the FAT32 partition onto.
-if [ ! -d "$archive_drive_directory" ]; then
-    mkdir "$archive_drive_directory"
-    if [ $? != 0 ]; then
-                printf "[`date "$date_format"`] archive_log.sh: FAILED to create the temporary mount directory $archive_drive_directory\n" 2>&1 | tee -a transfer.log
-                exit_code=2
-    fi
-fi
-
-# mount the FAT32 partition onto the temporary directory
-mount $drive_partition $archive_drive_directory
-status=$?
-if [ $status != 0 ] && [ $status != 32 ]; then
-    # exit only if error, except code 32 which means already mounted
-    printf "[`date "$date_format"`] archive_log.sh: FAILED to mount the FAT32 partition $drive_partition to $archive_drive_directory\n" 2>&1 | tee -a transfer.log
-    exit_code=3
-else
-    printf "[`date "$date_format"`] archive_log.sh: exFAT/FAT32 partition $drive_partition is now mounted to $archive_drive_directory\n" 2>&1 | tee -a transfer.log
-
-    # Copy the $dmesg_file and PDF files over to the exFAT/FAT32 partition
-    dmesg > $dmesg_file
-    cp /$dmesg_file "$archive_drive_directory/"
-    if [ $? != 0 ]; then
-	printf "[`date "$date_format"`] archive_log.sh: FAILED to copy the $dmesg_file file to the root of $drive_partition:/\n" 2>&1 | tee -a transfer.log
-    else
-	printf "[`date "$date_format"`] archive_log.sh: Copied $dmesg_file to $drive_partition:/\n" 2>&1 | tee -a transfer.log
-    fi
-
-    # Copy the PDF certificates over to the exFAT/FAT32 partition
-    cp /nwipe_report_*pdf "$archive_drive_directory/"
-    if [ $? != 0 ]; then
-	printf "[`date "$date_format"`] archive_log.sh: Unable to copy the nwipe_report...pdf file to the root of $drive_partition:/\n" 2>&1 | tee -a transfer.log
-    else
-	printf "[`date "$date_format"`] archive_log.sh: Copied nwipe_report...pdf to $drive_partition:/\n" 2>&1 | tee -a transfer.log
-    fi
-
-    # Copy the nwipe log files over to the exFAT/FAT32 partition
-    cp /nwipe_log* "$archive_drive_directory/"
-    if [ $? != 0 ]; then
-        printf "[`date "$date_format"`] archive_log.sh: Unable to copy the nwipe log files to the root of $drive_partition:/\n" 2>&1 | tee -a transfer.log
-    else
-        printf "[`date "$date_format"`] archive_log.sh: Copied the nwipe logs to $drive_partition:/\n" 2>&1 | tee -a transfer.log
-
-        # Create the temporary sent directory we will move log files that have already been copied
-        if [ ! -d "$sent_directory" ]; then
-            mkdir "$sent_directory"
-            if [ $? != 0 ]; then
-                        printf "[`date "$date_format"`] archive_log.sh: FAILED to create the temporary directory $sent_directory on the RAM disc\n" 2>&1 | tee -a transfer.log
-                        exit_code=5
-            fi
-        fi
-
-        if [ exit_code != 5 ]; then
-                # Move the nwipe logs into the RAM disc sent directory
-                mv /nwipe_log* "$sent_directory/"
-                if [ $? != 0 ]; then
-                            printf "[`date "$date_format"`] archive_log.sh: Unable to move the nwipe logs into the $sent_directory on the RAM disc\n" 2>&1 | tee -a transfer.log
-                            exit_code=6
-                else
-                            printf "[`date "$date_format"`] archive_log.sh: Moved the nwipe logs into the $sent_directory\n" 2>&1 | tee -a transfer.log
-                fi
-                # Move the nwipe PDF certificates into the RAM disc sent directory
-                mv /nwipe_report*pdf "$sent_directory/"
-                if [ $? != 0 ]; then
-                            printf "[`date "$date_format"`] archive_log.sh: Unable to move the PDF certificates into the $sent_directory on the RAM disc\n" 2>&1 | tee -a transfer.log
-                else
-                            printf "[`date "$date_format"`] archive_log.sh: Moved the PDF certificates into the $sent_directory\n" 2>&1 | tee -a transfer.log
-                fi
-        fi
-    fi
-    # If mode 0 (read USB flash drive), read the /etc/nwipe/nwipe.conf and /etc/nwipe/customers.csv files from
-    # the USB flash drive into the ShredOS RAM disc
-    #
-    #
-    # Check that the /etc/nwipe directory exists on the ShredOS ram drive, if not create it.
-    test -d "/etc/nwipe"
-    if [ $? != 0 ]
-    then
-        mkdir "/etc/nwipe"
-        if [ $? != 0 ]; then
-            printf "[`date "$date_format"`] archive_log.sh: FAILED to create directory /etc/nwipe on ShredOS ram drive\n" 2>&1 | tee -a transfer.log
-        else
-            printf "[`date "$date_format"`] archive_log.sh: Created directory /etc/nwipe on ShredOS ram drive\n" 2>&1 | tee -a transfer.log
-        fi
-    fi
-    if [[ "$mode" == "read" ]]; then
-        # Copy /etc/nwipe/nwipe.conf from USB to ShredOS's ram disc
-        test -f "$archive_drive_directory/etc/nwipe/nwipe.conf"
-        if [ $? == 0 ]
-        then
-            # Copy nwipe.conf from USB flash to ShredOS ram disc
-            cp "$archive_drive_directory/etc/nwipe/nwipe.conf" /etc/nwipe/nwipe.conf
-            if [ $? != 0 ]; then
-                printf "[`date "$date_format"`] archive_log.sh: FAILED to copy $drive_partition:/etc/nwipe/nwipe.conf to ShredOS's ram disc\n" 2>&1 | tee -a transfer.log
-            else
-                printf "[`date "$date_format"`] archive_log.sh: Copied $drive_partition:/etc/nwipe/nwipe.conf to ShredOS's ram disc\n" 2>&1 | tee -a transfer.log
-            fi
-        fi
-
-        # Copy /etc/nwipe/customers.csv from USB to ShredOS's ram disc
-        test -f "$archive_drive_directory/etc/nwipe/nwipe_customers.csv"
-        if [ $? == 0 ]
-        then
-            # Copy nwipe.conf from USB flash to ShredOS ram disc
-            cp "$archive_drive_directory/etc/nwipe/nwipe_customers.csv" /etc/nwipe/nwipe_customers.csv
-            if [ $? != 0 ]; then
-                printf "[`date "$date_format"`] archive_log.sh: FAILED to copy $drive_partition:/etc/nwipe/nwipe_customers.csv to /etc/nwipe/nwipe_customers.csv\n" 2>&1 | tee -a transfer.log
-            else
-                printf "[`date "$date_format"`] archive_log.sh: Copied $drive_partition:/etc/nwipe/nwipe_customers.csv to /etc/nwipe/nwipe_customers.csv\n" 2>&1 | tee -a transfer.log
-            fi
-        fi
-    fi
-    # If mode 1 (write USB flash drive), write the /etc/nwipe/nwipe.conf and /etc/nwipe/customers.csv files to
-    # the USB flash drive from the ShredOS RAM disc.
-    #
-    #
-    # Check the /etc/ and /etc/nwipe directories exist on the USB drive, if not create them
-    test -d "$archive_drive_directory/etc"
-    if [ $? != 0 ]
-    then
-        mkdir "$archive_drive_directory/etc"
-        if [ $? != 0 ]; then
-            printf "[`date "$date_format"`] archive_log.sh: FAILED to create directory /etc on $drive_partition:/\n" 2>&1 | tee -a transfer.log
-        else
-            printf "[`date "$date_format"`] archive_log.sh: Created directory /etc on $drive_partition:/\n" 2>&1 | tee -a transfer.log
-        fi
-    fi
-
-    test -d "$archive_drive_directory/etc/nwipe"
-    if [ $? != 0 ]
-    then
-        mkdir "$archive_drive_directory/etc/nwipe"
-        if [ $? != 0 ]; then
-            printf "[`date "$date_format"`] archive_log.sh: FAILED to create directory /etc/nwipe on $drive_partition:/\n" 2>&1 | tee -a transfer.log
-        else
-            printf "[`date "$date_format"`] archive_log.sh: Created directory /etc/nwipe on $drive_partition:/\n" 2>&1 | tee -a transfer.log
-        fi
-    fi
-    if [[ "$mode" == "write" ]]; then
-        # Copy /etc/nwipe/nwipe.conf from ShredOS's ram disc to USB
-        test -f "/etc/nwipe/nwipe.conf"
-        if [ $? == 0 ]
-        then
-            cp /etc/nwipe/nwipe.conf "$archive_drive_directory/etc/nwipe/nwipe.conf"
-            if [ $? != 0 ]; then
-                printf "[`date "$date_format"`] archive_log.sh: FAILED to copy /etc/nwipe/nwipe.conf to $drive_partition:/etc/nwipe/nwipe.conf\n" 2>&1 | tee -a transfer.log
-            else
-                printf "[`date "$date_format"`] archive_log.sh: Copied /etc/nwipe/nwipe.conf to $drive_partition:/etc/nwipe/nwipe.conf\n" 2>&1 | tee -a transfer.log
-            fi
-        fi
-
-        # Copy /etc/nwipe/customers.csv from ShredOS's ram disc to USB
-        test -f "/etc/nwipe/nwipe_customers.csv"
-        if [ $? == 0 ]
-        then
-            cp /etc/nwipe/nwipe_customers.csv "$archive_drive_directory/etc/nwipe/nwipe_customers.csv"
-            if [ $? != 0 ]; then
-                printf "[`date "$date_format"`] archive_log.sh: FAILED to copy /etc/nwipe/nwipe_customers.csv file to the root of $drive_partition:/etc/nwipe/nwipe_customers.csv\n" 2>&1 | tee -a transfer.log
-            else
-                printf "[`date "$date_format"`] archive_log.sh: Copied /etc/nwipe/nwipe_customers.csv to $drive_partition:/etc/nwipe/nwipe_customers.csv\n" 2>&1 | tee -a transfer.log
-            fi
-        fi
-    fi
-fi
-
-# unmount the FAT32 drive
-sleep 1
-umount "$archive_drive_directory"
-if [ $? != 0 ]; then
-                printf "[`date "$date_format"`] archive_log.sh: FAILED to unmount the FAT partition\n" 2>&1 | tee -a transfer.log
-                exit_code=7
-else
-    printf "[`date "$date_format"`] archive_log.sh: Unmounted $archive_drive_directory ($drive_partition)\n" 2>&1 | tee -a transfer.log
-fi
-
-if [ $exit_code != 0 ]; then
-    printf "[`date "$date_format"`] archive_log.sh: FAILED to copy nwipe log files to $drive_partition, exit code $exit_code\n" 2>&1 | tee -a transfer.log
-fi
-exit $exit_code

board/shredos/genimage.cfg

@@ -12,7 +12,7 @@ image boot.vfat {
                 file autorun.inf            { image = 'autorun.inf' }
         }
 
-size = 371302656
+size = 372809984
 }
 
 image shredos.img {

board/shredos/genimage_i586.cfg

@@ -6,6 +6,7 @@ image boot.vfat {
                 file boot/version.txt       { image = 'version.txt' }
                 file boot/shredos.id        { image = '/dev/null' }
                 file EFI/BOOT/bootia32.efi  { image = 'bootia32.efi' }
+                file EFI/BOOT/bootx64.efi   { image = 'bootx64.efi'}
                 file EFI/BOOT/grub.cfg      { image = 'grub.cfg' }
                 file shredos.ico            { image = 'shredos.ico' }
                 file README.txt             { image = 'README.txt' }

board/shredos/make_img_file.sh

@@ -15,6 +15,7 @@ version=$(cat board/shredos/fsoverlay/etc/shredos/version.txt)
 cp "board/shredos/grub.cfg"                            "${BINARIES_DIR}/grub.cfg"         || exit 1
 cp "output/target/lib/grub/i386-pc/boot.img"           "${BINARIES_DIR}/boot.img"         || exit 1
 cp "${BINARIES_DIR}/efi-part/EFI/BOOT/${MKIMAGE_EFI}"  "${BINARIES_DIR}/${MKIMAGE_EFI}"   || exit 1
+cp "${BINARIES_DIR}/efi-part/EFI/BOOT/bootx64.efi"     "${BINARIES_DIR}/bootx64.efi"      || exit 1
 
 cp "board/shredos/autorun.inf"             "${BINARIES_DIR}/autorun.inf"                  || exit 1
 cp "board/shredos/README.txt"              "${BINARIES_DIR}/README.txt"                   || exit 1

build_all_shredos.sh

@@ -6,7 +6,7 @@ set -euo pipefail
 #
 # Arguments:
 #  x64   - Build only x86-64 configurations
-#  x32   - Build only i586 (32-bit) configurations
+#  x32   - Build only i686 (32-bit) configurations
 #  all   - Build all configurations (64-bit first, then 32-bit)
 #
 # Environment Variables:
@@ -29,19 +29,15 @@ VERSION_FILE="board/shredos/fsoverlay/etc/shredos/version.txt"
 # 64-bit configurations to build:
 X64_CONFIGS=(
 	"shredos_defconfig"
-	"shredos_img_defconfig"
-	"shredos_iso_defconfig"
 	"shredos_iso_legacy_defconfig"
 	"shredos_iso_extra_defconfig" # experimental
 )
 
 # 32-bit configurations to build:
 X32_CONFIGS=(
-	"shredos_i586_defconfig"
-	"shredos_img_i586_defconfig"
-	"shredos_iso_i586_defconfig"
-	"shredos_iso_legacy_i586_defconfig"
-	"shredos_iso_extra_i586_defconfig" # experimental
+	"shredos_i686_lite_defconfig"
+	"shredos_iso_legacy_i686_defconfig"
+	"shredos_iso_extra_i686_defconfig" # experimental
 )
 
 # Packages always needing rebuild between runs, even for the same architecture.
@@ -76,7 +72,7 @@ print_usage() {
 	echo ""
 	echo "Arguments:"
 	echo "  x64   - Build only x86-64 configurations"
-	echo "  x32   - Build only i586 (32-bit) configurations"
+	echo "  x32   - Build only i686 (32-bit) configurations"
 	echo "  all   - Build all configurations (64-bit first, then 32-bit)"
 	echo ""
 	echo "Environment Variables:"
@@ -141,7 +137,7 @@ prompt_version() {
 
 	if [ -z "$NEW_VERSION" ]; then
 		echo
-		echo "x86-64 and i586 will be replaced/switched around during builds (depending on architecture)"
+		echo "x86-64 and i686 will be replaced/switched around during builds (depending on architecture)"
 		read -rp "Enter new version or press ENTER to keep existing [${current_version}]: " NEW_VERSION
 		[ -z "$NEW_VERSION" ] && NEW_VERSION="$current_version"
 	fi
@@ -542,7 +538,7 @@ if [ ${#X64_CONFIGS[@]} -gt 0 ]; then
 	echo "Starting 64-bit builds..."
 	echo "==============================================="
 	echo
-	replace_version "i586" "x86-64"
+	replace_version "i686" "x86-64"
 
 	CFG_INDEX=0
 	for config in "${X64_CONFIGS[@]}"; do
@@ -562,7 +558,7 @@ if [ ${#X32_CONFIGS[@]} -gt 0 ]; then
 	echo "Starting 32-bit builds..."
 	echo "==============================================="
 	echo
-	replace_version "x86-64" "i586"
+	replace_version "x86-64" "i686"
 
 	CFG_INDEX=0
 	for config in "${X32_CONFIGS[@]}"; do

configs/shredos_defconfig

@@ -136,7 +136,6 @@ BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_NTPDATE=y
 BR2_PACKAGE_NTP_NTPTIME=y
 BR2_PACKAGE_OPENSSH=y
-# BR2_PACKAGE_OPENSSH_SERVER is not set
 BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_SNMPCLITOOLS=y
 BR2_PACKAGE_TFTPD=y

configs/shredos_i686_lite_defconfig

@@ -3,7 +3,7 @@ BR2_PACKAGE_GLIBC_UTILS=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y
 BR2_TARGET_GENERIC_HOSTNAME="shredos"
-BR2_TARGET_GENERIC_ISSUE="Welcome to ShredOS https://github.com/PartialVolume/shredos.i686"
+BR2_TARGET_GENERIC_ISSUE="Welcome to ShredOS https://github.com/PartialVolume/shredos.x86_64"
 BR2_INIT_SYSV=y
 BR2_ROOTFS_MERGED_USR=y
 BR2_SYSTEM_BIN_SH_BASH=y
@@ -59,7 +59,7 @@ BR2_PACKAGE_UTIL_LINUX_MOUNT=y
 BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT=y
 BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT=y
 BR2_PACKAGE_UTIL_LINUX_SETTERM=y
-BR2_TARGET_ROOTFS_CPIO_XZ=y
+BR2_TARGET_ROOTFS_CPIO_LZMA=y
 BR2_TARGET_ROOTFS_INITRAMFS=y
 BR2_TARGET_ROOTFS_ISO9660=y
 BR2_TARGET_ROOTFS_ISO9660_BOTH=y

configs/shredos_iso_extra_defconfig

@@ -19,7 +19,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/shredos/make_extra_partition.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/shredos/make_iso_file.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/shredos/kernel-6.6.22-defconfig.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/shredos/kernel-defconfig"
 BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
 BR2_PACKAGE_LINUX_TOOLS_PERF=y
 # BR2_PACKAGE_BUSYBOX_SELINUX is not set
@@ -33,6 +33,7 @@ BR2_PACKAGE_UNZIP=y
 BR2_PACKAGE_XZ=y
 BR2_PACKAGE_ZIP=y
 BR2_PACKAGE_HEXEDIT=y
+BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_BINUTILS=y
 BR2_PACKAGE_GETTEXT=y
 BR2_PACKAGE_GREP=y
@@ -114,10 +115,15 @@ BR2_PACKAGE_LIBCURL=y
 BR2_PACKAGE_LIBUPNP=y
 BR2_PACKAGE_KERNEL_CMDLINE_EXTRACTOR=y
 BR2_PACKAGE_LIBCAP=y
+BR2_PACKAGE_LIBCAP_NG=y
 BR2_PACKAGE_LIBSECCOMP=y
 BR2_PACKAGE_NWIPE=y
+BR2_PACKAGE_NWIPE_VERSION_GIT_REVISION=y
+BR2_PACKAGE_NWIPE_GIT_REVISION="26ece7a0525370f6ba39cddc5e73000b3cd867d6"
 BR2_PACKAGE_LIBFRIBIDI=y
 BR2_PACKAGE_NCURSES_WCHAR=y
+BR2_PACKAGE_NCURSES_TARGET_PROGS=y
+BR2_PACKAGE_POPT=y
 BR2_PACKAGE_UTF8PROC=y
 BR2_PACKAGE_HEIRLOOM_MAILX=y
 BR2_PACKAGE_COLLECTD=y
@@ -131,7 +137,6 @@ BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_NTPDATE=y
 BR2_PACKAGE_NTP_NTPTIME=y
 BR2_PACKAGE_OPENSSH=y
-# BR2_PACKAGE_OPENSSH_SERVER is not set
 BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_SNMPCLITOOLS=y
 BR2_PACKAGE_TFTPD=y
@@ -142,6 +147,8 @@ BR2_PACKAGE_SELINUX_PYTHON=y
 BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW=y
 BR2_PACKAGE_PARALLEL=y
 BR2_PACKAGE_TMUX=y
+BR2_PACKAGE_KMOD=y
+BR2_PACKAGE_KMOD_TOOLS=y
 BR2_PACKAGE_OPENSEACHEST=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RUNC=y
@@ -155,6 +162,7 @@ BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT=y
 BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT=y
 BR2_PACKAGE_UTIL_LINUX_RFKILL=y
 BR2_PACKAGE_UTIL_LINUX_RUNUSER=y
+BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y
 BR2_PACKAGE_UTIL_LINUX_SETTERM=y
 BR2_PACKAGE_UTIL_LINUX_SU=y
 BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
@@ -162,7 +170,7 @@ BR2_TARGET_ROOTFS_CPIO_LZMA=y
 BR2_TARGET_ROOTFS_INITRAMFS=y
 BR2_TARGET_ROOTFS_ISO9660=y
 BR2_TARGET_ROOTFS_ISO9660_BOTH=y
-BR2_TARGET_ROOTFS_ISO9660_VOLUME_NAME="SHREDOS"
+BR2_TARGET_ROOTFS_ISO9660_VOLUME_NAME="ShredOS"
 BR2_TARGET_ROOTFS_ISO9660_ISOLINUX_BOOT_MENU="board/shredos/iso/isolinux.cfg"
 BR2_TARGET_ROOTFS_ISO9660_GRUB2_BOOT_MENU="board/shredos/iso/grub.cfg"
 BR2_TARGET_ROOTFS_ISO9660_GRUB2_EFI_BOOT_MENU="board/shredos/iso/efigrub.cfg"
@@ -171,8 +179,11 @@ BR2_TARGET_ROOTFS_ISO9660_HYBRID=y
 BR2_TARGET_ROOTFS_ISO9660_HYBRID_APPEND_PARTITION="extra.vfat"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_GRUB2=y
+BR2_TARGET_GRUB2_I386_PC=y
 BR2_TARGET_GRUB2_X86_64_EFI=y
-BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal progress efi_gop efi_uga all_video video_cirrus video_bochs net efinet tftp gzio test eval read true gfxterm gfxterm_menu gfxmenu gfxterm_background png usb usb_keyboard search configfile iso9660"
+BR2_TARGET_GRUB2_BUILTIN_MODULES_PC="boot linux ext2 fat squash4 part_msdos part_gpt normal progress biosdisk video video_fb all_video video_cirrus video_bochs net tftp gzio test eval read true gfxterm gfxterm_menu gfxmenu gfxterm_background png usb usb_keyboard search configfile iso9660"
+BR2_TARGET_GRUB2_BUILTIN_CONFIG_PC="board/shredos/embed/grub.cfg"
+BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal progress efi_gop efi_uga video video_fb all_video video_cirrus video_bochs net efinet tftp gzio test eval read true gfxterm gfxterm_menu gfxmenu gfxterm_background png usb usb_keyboard search configfile iso9660"
 BR2_TARGET_GRUB2_BUILTIN_CONFIG_EFI="board/shredos/embed/grub.cfg"
 BR2_TARGET_GRUB2_INSTALL_TOOLS=y
 BR2_TARGET_SYSLINUX=y

configs/shredos_iso_extra_i686_defconfig

@@ -1,7 +1,7 @@
+BR2_x86_i686=y
 BR2_PACKAGE_GLIBC_UTILS=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y
-BR2_CPAN_MIRROR="http://cpan.metacpan.org"
 BR2_TARGET_GENERIC_HOSTNAME="shredos"
 BR2_TARGET_GENERIC_ISSUE="Welcome to ShredOS https://github.com/PartialVolume/shredos.x86_64"
 BR2_INIT_SYSV=y
@@ -10,150 +10,66 @@ BR2_SYSTEM_BIN_SH_BASH=y
 BR2_SYSTEM_DEFAULT_PATH="/bin:/sbin:/usr/bin:/usr/sbin"
 # BR2_ENABLE_LOCALE_PURGE is not set
 BR2_GENERATE_LOCALE="en_US.UTF-8"
-BR2_SYSTEM_ENABLE_NLS=y
 BR2_TARGET_TZ_INFO=y
 BR2_ROOTFS_OVERLAY="board/shredos/fsoverlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/shredos/make_extra_partition.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/shredos/make_iso_file.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/shredos/kernel-6.6.22-defconfig.config"
-BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
-BR2_PACKAGE_LINUX_TOOLS_PERF=y
-# BR2_PACKAGE_BUSYBOX_SELINUX is not set
-BR2_PACKAGE_FFMPEG=y
-BR2_PACKAGE_FFMPEG_GPL=y
-BR2_PACKAGE_FFMPEG_NONFREE=y
-BR2_PACKAGE_FFMPEG_SWSCALE=y
-BR2_PACKAGE_BZIP2=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/shredos/kernel-i686-defconfig"
 BR2_PACKAGE_GZIP=y
-BR2_PACKAGE_UNZIP=y
 BR2_PACKAGE_XZ=y
-BR2_PACKAGE_ZIP=y
 BR2_PACKAGE_HEXEDIT=y
-BR2_PACKAGE_BINUTILS=y
-BR2_PACKAGE_GETTEXT=y
-BR2_PACKAGE_GREP=y
-BR2_PACKAGE_LIBTOOL=y
-BR2_PACKAGE_SED=y
 BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
 BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
 BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_EXFATPROGS=y
-BR2_PACKAGE_ASCII_INVADERS=y
-BR2_PACKAGE_FBDUMP=y
-BR2_PACKAGE_FBGRAB=y
-BR2_PACKAGE_FBSET=y
-BR2_PACKAGE_FBTERM=y
-BR2_PACKAGE_FBV=y
-BR2_PACKAGE_MESA3D=y
-BR2_PACKAGE_MESA3D_LLVM=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_CROCUS=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y
-BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL=y
-BR2_PACKAGE_MESA3D_OPENGL_ES=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_AMDGPU=y
 BR2_PACKAGE_LINUX_FIRMWARE_I915=y
 BR2_PACKAGE_LINUX_FIRMWARE_RADEON=y
-BR2_PACKAGE_LINUX_FIRMWARE_QCOM_VENUS=y
-BR2_PACKAGE_LINUX_FIRMWARE_QCOM_ADRENO=y
-BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8=y
-BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174=y
-BR2_PACKAGE_LINUX_FIRMWARE_BROADCOM_TIGON3=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T5=y
 BR2_PACKAGE_LINUX_FIRMWARE_INTEL_E100=y
 BR2_PACKAGE_LINUX_FIRMWARE_INTEL_ICE=y
-BR2_PACKAGE_LINUX_FIRMWARE_MICROCHIP_VSC85XX_PHY=y
 BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_4X=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
-BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_2XXX=y
 BR2_PACKAGE_EDID_DECODE=y
 BR2_PACKAGE_HDPARM=y
 BR2_PACKAGE_KBD=y
 BR2_PACKAGE_LM_SENSORS=y
-BR2_PACKAGE_LSHW=y
-BR2_PACKAGE_LSSCSI=y
-BR2_PACKAGE_MINICOM=y
 BR2_PACKAGE_NVME=y
 BR2_PACKAGE_READ_EDID=y
 BR2_PACKAGE_SG3_UTILS=y
 BR2_PACKAGE_SG3_UTILS_PROGS=y
 BR2_PACKAGE_SMARTMONTOOLS=y
-BR2_PACKAGE_SYSSTAT=y
 BR2_PACKAGE_TRIGGERHAPPY=y
-BR2_PACKAGE_PERL=y
-BR2_PACKAGE_PYTHON_PYASN1_MODULES=y
-BR2_PACKAGE_PYTHON_PYBIND=y
-BR2_PACKAGE_PYTHON_PYNDIFF=y
-BR2_PACKAGE_PYTHON_SCAPY=y
 BR2_PACKAGE_LZ4=y
-BR2_PACKAGE_LIBGCRYPT=y
-BR2_PACKAGE_STB=y
-BR2_PACKAGE_JSON_GLIB=y
-BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_LIBUPNP=y
 BR2_PACKAGE_KERNEL_CMDLINE_EXTRACTOR=y
-BR2_PACKAGE_LIBCAP=y
-BR2_PACKAGE_LIBSECCOMP=y
 BR2_PACKAGE_NWIPE=y
-BR2_PACKAGE_LIBFRIBIDI=y
+BR2_PACKAGE_NWIPE_VERSION_GIT_REVISION=y
+BR2_PACKAGE_NWIPE_GIT_REVISION="26ece7a0525370f6ba39cddc5e73000b3cd867d6"
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_UTF8PROC=y
-BR2_PACKAGE_HEIRLOOM_MAILX=y
-BR2_PACKAGE_COLLECTD=y
-BR2_PACKAGE_COLLECTD_NTPD=y
 BR2_PACKAGE_XUTIL_UTIL_MACROS=y
 BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_LFTP=y
 BR2_PACKAGE_LFTP_PROTO_SFTP=y
-BR2_PACKAGE_NMAP=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_NTPDATE=y
 BR2_PACKAGE_NTP_NTPTIME=y
 BR2_PACKAGE_OPENSSH=y
-# BR2_PACKAGE_OPENSSH_SERVER is not set
-BR2_PACKAGE_RPCBIND=y
-BR2_PACKAGE_SNMPCLITOOLS=y
 BR2_PACKAGE_TFTPD=y
-BR2_PACKAGE_TRACEROUTE=y
-BR2_PACKAGE_WIREGUARD_TOOLS=y
-BR2_PACKAGE_RESTORECOND=y
-BR2_PACKAGE_SELINUX_PYTHON=y
-BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW=y
-BR2_PACKAGE_PARALLEL=y
 BR2_PACKAGE_TMUX=y
 BR2_PACKAGE_OPENSEACHEST=y
-BR2_PACKAGE_PROCPS_NG=y
-BR2_PACKAGE_RUNC=y
 BR2_PACKAGE_UTIL_LINUX_BINARIES=y
 BR2_PACKAGE_UTIL_LINUX_AGETTY=y
 BR2_PACKAGE_UTIL_LINUX_FSCK=y
-BR2_PACKAGE_UTIL_LINUX_LAST=y
-BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_MOUNT=y
 BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT=y
 BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT=y
-BR2_PACKAGE_UTIL_LINUX_RFKILL=y
-BR2_PACKAGE_UTIL_LINUX_RUNUSER=y
 BR2_PACKAGE_UTIL_LINUX_SETTERM=y
-BR2_PACKAGE_UTIL_LINUX_SU=y
-BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
 BR2_TARGET_ROOTFS_CPIO_LZMA=y
 BR2_TARGET_ROOTFS_INITRAMFS=y
 BR2_TARGET_ROOTFS_ISO9660=y
@@ -167,12 +83,13 @@ BR2_TARGET_ROOTFS_ISO9660_HYBRID=y
 BR2_TARGET_ROOTFS_ISO9660_HYBRID_APPEND_PARTITION="extra.vfat"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_GRUB2=y
+BR2_TARGET_GRUB2_I386_PC=y
 BR2_TARGET_GRUB2_I386_EFI=y
-BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal progress efi_gop efi_uga all_video video_cirrus video_bochs net efinet tftp gzio test eval read true gfxterm gfxterm_menu gfxmenu gfxterm_background png usb usb_keyboard search configfile iso9660"
+BR2_TARGET_GRUB2_BUILTIN_MODULES_PC="boot linux ext2 fat squash4 part_msdos part_gpt normal progress biosdisk video video_fb all_video video_cirrus video_bochs net tftp gzio test eval read true gfxterm gfxterm_menu gfxmenu gfxterm_background png usb usb_keyboard search configfile iso9660"
+BR2_TARGET_GRUB2_BUILTIN_CONFIG_PC="board/shredos/embed/grub.cfg"
+BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal progress efi_gop efi_uga video video_fb all_video video_cirrus video_bochs net efinet tftp gzio test eval read true gfxterm gfxterm_menu gfxmenu gfxterm_background png usb usb_keyboard search configfile iso9660"
 BR2_TARGET_GRUB2_BUILTIN_CONFIG_EFI="board/shredos/embed/grub.cfg"
 BR2_TARGET_GRUB2_INSTALL_TOOLS=y
 BR2_TARGET_SYSLINUX=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_PYTHON3_BZIP2=y
-BR2_PACKAGE_HOST_PYTHON3_SSL=y

configs/shredos_iso_legacy_defconfig

@@ -1,179 +0,0 @@
-BR2_x86_64=y
-BR2_x86_nocona=y
-BR2_PACKAGE_GLIBC_UTILS=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y
-BR2_CPAN_MIRROR="http://cpan.metacpan.org"
-BR2_TARGET_GENERIC_HOSTNAME="shredos"
-BR2_TARGET_GENERIC_ISSUE="Welcome to ShredOS https://github.com/PartialVolume/shredos.x86_64"
-BR2_INIT_SYSV=y
-BR2_ROOTFS_MERGED_USR=y
-BR2_SYSTEM_BIN_SH_BASH=y
-BR2_SYSTEM_DEFAULT_PATH="/bin:/sbin:/usr/bin:/usr/sbin"
-# BR2_ENABLE_LOCALE_PURGE is not set
-BR2_GENERATE_LOCALE="en_US.UTF-8"
-BR2_SYSTEM_ENABLE_NLS=y
-BR2_TARGET_TZ_INFO=y
-BR2_ROOTFS_OVERLAY="board/shredos/fsoverlay"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/shredos/make_iso_file.sh"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/shredos/kernel-6.6.22-defconfig.config"
-BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
-BR2_PACKAGE_LINUX_TOOLS_PERF=y
-# BR2_PACKAGE_BUSYBOX_SELINUX is not set
-BR2_PACKAGE_FFMPEG=y
-BR2_PACKAGE_FFMPEG_GPL=y
-BR2_PACKAGE_FFMPEG_NONFREE=y
-BR2_PACKAGE_FFMPEG_SWSCALE=y
-BR2_PACKAGE_BZIP2=y
-BR2_PACKAGE_GZIP=y
-BR2_PACKAGE_UNZIP=y
-BR2_PACKAGE_XZ=y
-BR2_PACKAGE_ZIP=y
-BR2_PACKAGE_HEXEDIT=y
-BR2_PACKAGE_BINUTILS=y
-BR2_PACKAGE_GETTEXT=y
-BR2_PACKAGE_GREP=y
-BR2_PACKAGE_LIBTOOL=y
-BR2_PACKAGE_SED=y
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
-BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
-BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
-BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_EXFATPROGS=y
-BR2_PACKAGE_NTFS_3G=y
-BR2_PACKAGE_ASCII_INVADERS=y
-BR2_PACKAGE_FBDUMP=y
-BR2_PACKAGE_FBGRAB=y
-BR2_PACKAGE_FBSET=y
-BR2_PACKAGE_FBTERM=y
-BR2_PACKAGE_FBV=y
-BR2_PACKAGE_MESA3D=y
-BR2_PACKAGE_MESA3D_LLVM=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_CROCUS=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y
-BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL=y
-BR2_PACKAGE_MESA3D_OPENGL_ES=y
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_AMDGPU=y
-BR2_PACKAGE_LINUX_FIRMWARE_I915=y
-BR2_PACKAGE_LINUX_FIRMWARE_RADEON=y
-BR2_PACKAGE_LINUX_FIRMWARE_QCOM_VENUS=y
-BR2_PACKAGE_LINUX_FIRMWARE_QCOM_ADRENO=y
-BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8=y
-BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174=y
-BR2_PACKAGE_LINUX_FIRMWARE_BROADCOM_TIGON3=y
-BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
-BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
-BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T5=y
-BR2_PACKAGE_LINUX_FIRMWARE_INTEL_E100=y
-BR2_PACKAGE_LINUX_FIRMWARE_INTEL_ICE=y
-BR2_PACKAGE_LINUX_FIRMWARE_MICROCHIP_VSC85XX_PHY=y
-BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_4X=y
-BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
-BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
-BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_2XXX=y
-BR2_PACKAGE_EDID_DECODE=y
-BR2_PACKAGE_HDPARM=y
-BR2_PACKAGE_KBD=y
-BR2_PACKAGE_LM_SENSORS=y
-BR2_PACKAGE_LSHW=y
-BR2_PACKAGE_LSSCSI=y
-BR2_PACKAGE_MINICOM=y
-BR2_PACKAGE_NVME=y
-BR2_PACKAGE_READ_EDID=y
-BR2_PACKAGE_SG3_UTILS=y
-BR2_PACKAGE_SG3_UTILS_PROGS=y
-BR2_PACKAGE_SMARTMONTOOLS=y
-BR2_PACKAGE_SYSSTAT=y
-BR2_PACKAGE_TRIGGERHAPPY=y
-BR2_PACKAGE_PERL=y
-BR2_PACKAGE_PYTHON_PYASN1_MODULES=y
-BR2_PACKAGE_PYTHON_PYBIND=y
-BR2_PACKAGE_PYTHON_PYNDIFF=y
-BR2_PACKAGE_PYTHON_SCAPY=y
-BR2_PACKAGE_LZ4=y
-BR2_PACKAGE_LIBGCRYPT=y
-BR2_PACKAGE_LIBJPEG=y
-BR2_PACKAGE_STB=y
-BR2_PACKAGE_JSON_GLIB=y
-BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_LIBUPNP=y
-BR2_PACKAGE_KERNEL_CMDLINE_EXTRACTOR=y
-BR2_PACKAGE_LIBCAP=y
-BR2_PACKAGE_LIBSECCOMP=y
-BR2_PACKAGE_NWIPE=y
-BR2_PACKAGE_LIBFRIBIDI=y
-BR2_PACKAGE_NCURSES_WCHAR=y
-BR2_PACKAGE_UTF8PROC=y
-BR2_PACKAGE_HEIRLOOM_MAILX=y
-BR2_PACKAGE_COLLECTD=y
-BR2_PACKAGE_COLLECTD_NTPD=y
-BR2_PACKAGE_XUTIL_UTIL_MACROS=y
-BR2_PACKAGE_IPTABLES=y
-BR2_PACKAGE_LFTP=y
-BR2_PACKAGE_LFTP_PROTO_SFTP=y
-BR2_PACKAGE_NMAP=y
-BR2_PACKAGE_NTP=y
-BR2_PACKAGE_NTP_NTPDATE=y
-BR2_PACKAGE_NTP_NTPTIME=y
-BR2_PACKAGE_OPENSSH=y
-# BR2_PACKAGE_OPENSSH_SERVER is not set
-BR2_PACKAGE_RPCBIND=y
-BR2_PACKAGE_SNMPCLITOOLS=y
-BR2_PACKAGE_TFTPD=y
-BR2_PACKAGE_TRACEROUTE=y
-BR2_PACKAGE_WIREGUARD_TOOLS=y
-BR2_PACKAGE_RESTORECOND=y
-BR2_PACKAGE_SELINUX_PYTHON=y
-BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW=y
-BR2_PACKAGE_PARALLEL=y
-BR2_PACKAGE_TMUX=y
-BR2_PACKAGE_OPENSEACHEST=y
-BR2_PACKAGE_PROCPS_NG=y
-BR2_PACKAGE_RUNC=y
-BR2_PACKAGE_UTIL_LINUX_BINARIES=y
-BR2_PACKAGE_UTIL_LINUX_AGETTY=y
-BR2_PACKAGE_UTIL_LINUX_FSCK=y
-BR2_PACKAGE_UTIL_LINUX_LAST=y
-BR2_PACKAGE_UTIL_LINUX_LOGIN=y
-BR2_PACKAGE_UTIL_LINUX_MOUNT=y
-BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT=y
-BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT=y
-BR2_PACKAGE_UTIL_LINUX_RFKILL=y
-BR2_PACKAGE_UTIL_LINUX_RUNUSER=y
-BR2_PACKAGE_UTIL_LINUX_SETTERM=y
-BR2_PACKAGE_UTIL_LINUX_SU=y
-BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
-BR2_TARGET_ROOTFS_CPIO_LZMA=y
-BR2_TARGET_ROOTFS_INITRAMFS=y
-BR2_TARGET_ROOTFS_ISO9660=y
-BR2_TARGET_ROOTFS_ISO9660_BOTH=y
-BR2_TARGET_ROOTFS_ISO9660_VOLUME_NAME="SHREDOS"
-BR2_TARGET_ROOTFS_ISO9660_ISOLINUX_BOOT_MENU="board/shredos/iso/isolinux.cfg"
-BR2_TARGET_ROOTFS_ISO9660_GRUB2_BOOT_MENU="board/shredos/iso/grub.cfg"
-BR2_TARGET_ROOTFS_ISO9660_GRUB2_EFI_BOOT_MENU="board/shredos/iso/efigrub.cfg"
-BR2_TARGET_ROOTFS_ISO9660_GRUB2_EFI_IDENT_FILE="/boot/shredos.id"
-# BR2_TARGET_ROOTFS_TAR is not set
-BR2_TARGET_GRUB2=y
-BR2_TARGET_GRUB2_X86_64_EFI=y
-BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal progress efi_gop efi_uga all_video video_cirrus video_bochs net efinet tftp gzio test eval read true gfxterm gfxterm_menu gfxmenu gfxterm_background png usb usb_keyboard search configfile iso9660"
-BR2_TARGET_GRUB2_BUILTIN_CONFIG_EFI="board/shredos/embed/grub.cfg"
-BR2_TARGET_GRUB2_INSTALL_TOOLS=y
-BR2_TARGET_SYSLINUX=y
-BR2_PACKAGE_HOST_E2FSPROGS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_PYTHON3_BZIP2=y
-BR2_PACKAGE_HOST_PYTHON3_SSL=y

configs/shredos_iso_legacy_i686_defconfig

@@ -1,176 +0,0 @@
-BR2_PACKAGE_GLIBC_UTILS=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y
-BR2_CPAN_MIRROR="http://cpan.metacpan.org"
-BR2_TARGET_GENERIC_HOSTNAME="shredos"
-BR2_TARGET_GENERIC_ISSUE="Welcome to ShredOS https://github.com/PartialVolume/shredos.x86_64"
-BR2_INIT_SYSV=y
-BR2_ROOTFS_MERGED_USR=y
-BR2_SYSTEM_BIN_SH_BASH=y
-BR2_SYSTEM_DEFAULT_PATH="/bin:/sbin:/usr/bin:/usr/sbin"
-# BR2_ENABLE_LOCALE_PURGE is not set
-BR2_GENERATE_LOCALE="en_US.UTF-8"
-BR2_SYSTEM_ENABLE_NLS=y
-BR2_TARGET_TZ_INFO=y
-BR2_ROOTFS_OVERLAY="board/shredos/fsoverlay"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/shredos/make_iso_file.sh"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/shredos/kernel-6.6.22-defconfig.config"
-BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
-BR2_PACKAGE_LINUX_TOOLS_PERF=y
-# BR2_PACKAGE_BUSYBOX_SELINUX is not set
-BR2_PACKAGE_FFMPEG=y
-BR2_PACKAGE_FFMPEG_GPL=y
-BR2_PACKAGE_FFMPEG_NONFREE=y
-BR2_PACKAGE_FFMPEG_SWSCALE=y
-BR2_PACKAGE_BZIP2=y
-BR2_PACKAGE_GZIP=y
-BR2_PACKAGE_UNZIP=y
-BR2_PACKAGE_XZ=y
-BR2_PACKAGE_ZIP=y
-BR2_PACKAGE_HEXEDIT=y
-BR2_PACKAGE_BINUTILS=y
-BR2_PACKAGE_GETTEXT=y
-BR2_PACKAGE_GREP=y
-BR2_PACKAGE_LIBTOOL=y
-BR2_PACKAGE_SED=y
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
-BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
-BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
-BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_EXFATPROGS=y
-BR2_PACKAGE_NTFS_3G=y
-BR2_PACKAGE_ASCII_INVADERS=y
-BR2_PACKAGE_FBDUMP=y
-BR2_PACKAGE_FBGRAB=y
-BR2_PACKAGE_FBSET=y
-BR2_PACKAGE_FBTERM=y
-BR2_PACKAGE_FBV=y
-BR2_PACKAGE_MESA3D=y
-BR2_PACKAGE_MESA3D_LLVM=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_CROCUS=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y
-BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL=y
-BR2_PACKAGE_MESA3D_OPENGL_ES=y
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_AMDGPU=y
-BR2_PACKAGE_LINUX_FIRMWARE_I915=y
-BR2_PACKAGE_LINUX_FIRMWARE_RADEON=y
-BR2_PACKAGE_LINUX_FIRMWARE_QCOM_VENUS=y
-BR2_PACKAGE_LINUX_FIRMWARE_QCOM_ADRENO=y
-BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8=y
-BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174=y
-BR2_PACKAGE_LINUX_FIRMWARE_BROADCOM_TIGON3=y
-BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
-BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
-BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T5=y
-BR2_PACKAGE_LINUX_FIRMWARE_INTEL_E100=y
-BR2_PACKAGE_LINUX_FIRMWARE_INTEL_ICE=y
-BR2_PACKAGE_LINUX_FIRMWARE_MICROCHIP_VSC85XX_PHY=y
-BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_4X=y
-BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
-BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
-BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_2XXX=y
-BR2_PACKAGE_EDID_DECODE=y
-BR2_PACKAGE_HDPARM=y
-BR2_PACKAGE_KBD=y
-BR2_PACKAGE_LM_SENSORS=y
-BR2_PACKAGE_LSHW=y
-BR2_PACKAGE_LSSCSI=y
-BR2_PACKAGE_MINICOM=y
-BR2_PACKAGE_NVME=y
-BR2_PACKAGE_READ_EDID=y
-BR2_PACKAGE_SG3_UTILS=y
-BR2_PACKAGE_SG3_UTILS_PROGS=y
-BR2_PACKAGE_SMARTMONTOOLS=y
-BR2_PACKAGE_SYSSTAT=y
-BR2_PACKAGE_TRIGGERHAPPY=y
-BR2_PACKAGE_PERL=y
-BR2_PACKAGE_PYTHON_PYASN1_MODULES=y
-BR2_PACKAGE_PYTHON_PYBIND=y
-BR2_PACKAGE_PYTHON_PYNDIFF=y
-BR2_PACKAGE_PYTHON_SCAPY=y
-BR2_PACKAGE_LZ4=y
-BR2_PACKAGE_LIBGCRYPT=y
-BR2_PACKAGE_STB=y
-BR2_PACKAGE_JSON_GLIB=y
-BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_LIBUPNP=y
-BR2_PACKAGE_KERNEL_CMDLINE_EXTRACTOR=y
-BR2_PACKAGE_LIBCAP=y
-BR2_PACKAGE_LIBSECCOMP=y
-BR2_PACKAGE_NWIPE=y
-BR2_PACKAGE_LIBFRIBIDI=y
-BR2_PACKAGE_NCURSES_WCHAR=y
-BR2_PACKAGE_UTF8PROC=y
-BR2_PACKAGE_HEIRLOOM_MAILX=y
-BR2_PACKAGE_COLLECTD=y
-BR2_PACKAGE_COLLECTD_NTPD=y
-BR2_PACKAGE_XUTIL_UTIL_MACROS=y
-BR2_PACKAGE_IPTABLES=y
-BR2_PACKAGE_LFTP=y
-BR2_PACKAGE_LFTP_PROTO_SFTP=y
-BR2_PACKAGE_NMAP=y
-BR2_PACKAGE_NTP=y
-BR2_PACKAGE_NTP_NTPDATE=y
-BR2_PACKAGE_NTP_NTPTIME=y
-BR2_PACKAGE_OPENSSH=y
-# BR2_PACKAGE_OPENSSH_SERVER is not set
-BR2_PACKAGE_RPCBIND=y
-BR2_PACKAGE_SNMPCLITOOLS=y
-BR2_PACKAGE_TFTPD=y
-BR2_PACKAGE_TRACEROUTE=y
-BR2_PACKAGE_WIREGUARD_TOOLS=y
-BR2_PACKAGE_RESTORECOND=y
-BR2_PACKAGE_SELINUX_PYTHON=y
-BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW=y
-BR2_PACKAGE_PARALLEL=y
-BR2_PACKAGE_TMUX=y
-BR2_PACKAGE_OPENSEACHEST=y
-BR2_PACKAGE_PROCPS_NG=y
-BR2_PACKAGE_RUNC=y
-BR2_PACKAGE_UTIL_LINUX_BINARIES=y
-BR2_PACKAGE_UTIL_LINUX_AGETTY=y
-BR2_PACKAGE_UTIL_LINUX_FSCK=y
-BR2_PACKAGE_UTIL_LINUX_LAST=y
-BR2_PACKAGE_UTIL_LINUX_LOGIN=y
-BR2_PACKAGE_UTIL_LINUX_MOUNT=y
-BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT=y
-BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT=y
-BR2_PACKAGE_UTIL_LINUX_RFKILL=y
-BR2_PACKAGE_UTIL_LINUX_RUNUSER=y
-BR2_PACKAGE_UTIL_LINUX_SETTERM=y
-BR2_PACKAGE_UTIL_LINUX_SU=y
-BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
-BR2_TARGET_ROOTFS_CPIO_LZMA=y
-BR2_TARGET_ROOTFS_INITRAMFS=y
-BR2_TARGET_ROOTFS_ISO9660=y
-BR2_TARGET_ROOTFS_ISO9660_BOTH=y
-BR2_TARGET_ROOTFS_ISO9660_VOLUME_NAME="SHREDOS"
-BR2_TARGET_ROOTFS_ISO9660_ISOLINUX_BOOT_MENU="board/shredos/iso/isolinux.cfg"
-BR2_TARGET_ROOTFS_ISO9660_GRUB2_BOOT_MENU="board/shredos/iso/grub.cfg"
-BR2_TARGET_ROOTFS_ISO9660_GRUB2_EFI_BOOT_MENU="board/shredos/iso/efigrub.cfg"
-BR2_TARGET_ROOTFS_ISO9660_GRUB2_EFI_IDENT_FILE="/boot/shredos.id"
-# BR2_TARGET_ROOTFS_TAR is not set
-BR2_TARGET_GRUB2=y
-BR2_TARGET_GRUB2_I386_EFI=y
-BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal progress efi_gop efi_uga all_video video_cirrus video_bochs net efinet tftp gzio test eval read true gfxterm gfxterm_menu gfxmenu gfxterm_background png usb usb_keyboard search configfile iso9660"
-BR2_TARGET_GRUB2_BUILTIN_CONFIG_EFI="board/shredos/embed/grub.cfg"
-BR2_TARGET_GRUB2_INSTALL_TOOLS=y
-BR2_TARGET_SYSLINUX=y
-BR2_PACKAGE_HOST_E2FSPROGS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_PYTHON3_BZIP2=y
-BR2_PACKAGE_HOST_PYTHON3_SSL=y

fs/iso9660/iso9660.mk

@@ -141,12 +141,25 @@ ROOTFS_ISO9660_GRUB2_CONFIG_PATH = $(ROOTFS_ISO9660_TMP_TARGET_DIR)/boot/grub/gr
 ROOTFS_ISO9660_GRUB2_EFI_CONFIG_PATH = $(ROOTFS_ISO9660_TMP_TARGET_DIR)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/grub.cfg
 
 define ROOTFS_ISO9660_INSTALL_GRUB2_EFI
+	# If 32bit build also copy the bootx64.efi from board/shredos/ so 32bit shredos will boot on a 64 EFI system
+	if [ "$(BR2_i386)" = "y" ]; then \
+		$(INSTALL) -D -m 0644 $(TOPDIR)/board/shredos/bootx64.efi $(BINARIES_DIR)/efi-part/EFI/BOOT/bootx64.efi; \
+	fi
 	# Create file to better find ISO9660 filesystem
 	$(INSTALL) -D -m 0644 /dev/null \
 		$(ROOTFS_ISO9660_TMP_TARGET_DIR)/$(ROOTFS_ISO9660_GRUB2_EFI_IDENT_FILE)
 	# Copy EFI bootloader also to ISO9660 filesystem
 	$(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/$(ROOTFS_ISO9660_EFI_NAME) \
 		$(ROOTFS_ISO9660_TMP_TARGET_DIR)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/$(ROOTFS_ISO9660_EFI_NAME)
+	# If 32 bit build we also want the 64 bit EFI installed
+	if [ "$(BR2_i386)" = "y" ]; then \
+		$(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/$(ROOTFS_ISO9660_EFI_NOTNAME) \
+		$(ROOTFS_ISO9660_TMP_TARGET_DIR)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/$(ROOTFS_ISO9660_EFI_NOTNAME)
+	fi
+	# If 64bit build copy the bootx64.efi to board/shredos/ as this will be used when building 32bit build
+	if [ "$(BR2_x86_64)" = "y" ]; then \
+		$(INSTALL) -D -m 0644 $(BINARIES_DIR)/efi-part/EFI/BOOT/bootx64.efi $(TOPDIR)/board/shredos/bootx64.efi; \
+	fi
 	# Create EFI FAT partition
 	$(RM) -rf $(ROOTFS_ISO9660_EFI_PARTITION_PATH)
 	mkdir -p $(dir $(ROOTFS_ISO9660_EFI_PARTITION_PATH))
@@ -156,9 +169,6 @@ define ROOTFS_ISO9660_INSTALL_GRUB2_EFI
 	$(ROOTFS_ISO9660_FIX_TIME) $(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/*
 	$(HOST_DIR)/bin/mcopy -p -m -i $(ROOTFS_ISO9660_EFI_PARTITION_PATH) -s \
 		$(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/* ::/
-	# Delete the EFI bootloader that is NOT for the platform we're building for
-	$(HOST_DIR)/bin/mdel -i $(ROOTFS_ISO9660_EFI_PARTITION_PATH) \
-		::$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/$(ROOTFS_ISO9660_EFI_NOTNAME) || true
 	# Overwrite generic EFI configuration with our EFI configuration
 	$(HOST_DIR)/bin/mcopy -n -o -p -m -i $(ROOTFS_ISO9660_EFI_PARTITION_PATH) \
 		$(ROOTFS_ISO9660_GRUB2_EFI_CONFIG_PATH) ::$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/grub.cfg
@@ -248,12 +258,25 @@ define ROOTFS_ISO9660_INSTALL_ISOLINUX_CONFIG
 endef
 
 define ROOTFS_ISO9660_INSTALL_GRUB2_EFI
+	# If 32bit build also copy the bootx64.efi from board/shredos/ so 32bit shredos will boot on a 64 EFI system
+	if [ "$(BR2_i386)" = "y" ]; then \
+		$(INSTALL) -D -m 0644 $(TOPDIR)/board/shredos/bootx64.efi $(BINARIES_DIR)/efi-part/EFI/BOOT/bootx64.efi; \
+	fi
 	# Create file to better find ISO9660 filesystem
 	$(INSTALL) -D -m 0644 /dev/null \
 		$(ROOTFS_ISO9660_TMP_TARGET_DIR)/$(ROOTFS_ISO9660_GRUB2_EFI_IDENT_FILE)
 	# Copy EFI bootloader also to ISO9660 filesystem
 	$(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/$(ROOTFS_ISO9660_EFI_NAME) \
 		$(ROOTFS_ISO9660_TMP_TARGET_DIR)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/$(ROOTFS_ISO9660_EFI_NAME)
+	# If 32 bit build we also want the 64 bit EFI installed
+	if [ "$(BR2_i386)" = "y" ]; then \
+		$(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/$(ROOTFS_ISO9660_EFI_NOTNAME) \
+		$(ROOTFS_ISO9660_TMP_TARGET_DIR)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/$(ROOTFS_ISO9660_EFI_NOTNAME)
+	fi
+	# If 64bit build copy the bootx64.efi to board/shredos/ as this will be used when building 32bit build
+	if [ "$(BR2_x86_64)" = "y" ]; then \
+		$(INSTALL) -D -m 0644 $(BINARIES_DIR)/efi-part/EFI/BOOT/bootx64.efi $(TOPDIR)/board/shredos/bootx64.efi; \
+	fi
 	# Create EFI FAT partition
 	$(RM) -rf $(ROOTFS_ISO9660_EFI_PARTITION_PATH)
 	mkdir -p $(dir $(ROOTFS_ISO9660_EFI_PARTITION_PATH))
@@ -263,9 +286,6 @@ define ROOTFS_ISO9660_INSTALL_GRUB2_EFI
 	$(ROOTFS_ISO9660_FIX_TIME) $(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/*
 	$(HOST_DIR)/bin/mcopy -p -m -i $(ROOTFS_ISO9660_EFI_PARTITION_PATH) -s \
 		$(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/* ::/
-	# Delete the EFI bootloader that is NOT for the platform we're building for
-	$(HOST_DIR)/bin/mdel -i $(ROOTFS_ISO9660_EFI_PARTITION_PATH) \
-		::$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/$(ROOTFS_ISO9660_EFI_NOTNAME) || true
 	# Overwrite generic EFI configuration with our EFI configuration
 	$(HOST_DIR)/bin/mcopy -n -o -p -m -i $(ROOTFS_ISO9660_EFI_PARTITION_PATH) \
 		$(ROOTFS_ISO9660_GRUB2_EFI_CONFIG_PATH) ::$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/grub.cfg