Merge pull request #468 from desertwitch/upstream-fixes2

Nwipe versioning fixes & add 32-bit EFI to 64-bit builds
chore(board): copy over 32-bit EFI for IMG
2026-02-20 09:35:26 +00:00 · 2026-02-18 11:57:09 +00:00 · 2026-02-18 10:58:13 +01:00 · 2026-02-18 10:45:23 +01:00 · 2026-02-18 10:35:40 +01:00 · 2026-02-18 10:33:35 +01:00
60 changed files with 8175 additions and 1999 deletions
--- a/README.md
+++ b/README.md
@@ -19,29 +19,15 @@
 #### For those that just want to get on with using ShredOS, you can download the pre-built .img or .iso images and burn them straight to USB flash drive or CD/DVD. Boot from the USB flash drive or CD/DVD and nwipe will appear ready for you to select your preferred wipe options.
 [![GitHub all releases](https://img.shields.io/github/downloads/PartialVolume/shredos.x86_64/total?label=Total%20downloads%20x86_64%20all%20releases,%2064%20and%2032bit%20code,%20.iso%20and%20.img%20&style=plastic)](https://github.com/PartialVolume/shredos.x86_64/releases)

+### ShredOS version v2025.11_28_x86-64_0.40 [(Latest release - Release notes and downloads)](https://github.com/PartialVolume/shredos.x86_64/releases/tag/v2025.11_28_x86-64_0.40)
+
 ## Download the Latest ShredOS .img and .iso files for burning to USB flash drives and CD-R/DVD-R.

 NOTE! There may be pre-release versions that are newer than the latest versions listed below, To see all versions, [pre-release & latest](https://github.com/PartialVolume/shredos.x86_64/releases) The latest versions contain a full set of .img & .iso images in 32bit & 64bit while the pre-releases generally only contain a 64bit .img. Which should you use? Well, unless you need either 32 bit images or .iso images I would tend to download the very latest pre-release. Even the pre-releases are subjected to a fair amount of testing before they become a pre-release.

-### ShredOS version v2024.11_27_x86-64_0.38 [(Latest Release - Details)](https://github.com/PartialVolume/shredos.x86_64/releases/tag/v2024.11_27_x86-64_0.38) 
-| Nwipe Version | File to download |
-| -- | -- |
-| v0.38 | [ShredOS .img x86_64bit for USB Vanilla](https://github.com/PartialVolume/shredos.x86_64/releases/download/v2024.11_27_x86-64_0.38/shredos-2024.11_27_x86-64_0.38_20250123.img) |
-| v0.38 | [ShredOS .iso x86_64bit for CD/DVD/Ventoy, Vanilla](https://github.com/PartialVolume/shredos.x86_64/releases/download/v2024.11_27_x86-64_0.38/shredos-2024.11_27_x86-64_0.38_20250125_vanilla.iso) |
-| v0.38 | [ShredOS .iso x86_64bit for CD/DVD/Ventoy nomodeset ](https://github.com/PartialVolume/shredos.x86_64/releases/download/v2024.11_27_x86-64_0.38/shredos-2024.11_27_x86-64_0.38_20250125_nomodeset.iso) |
-| v0.38 | [ShredOS .img i586_32bit for USB vanilla ](https://github.com/PartialVolume/shredos.x86_64/releases/download/v2024.11_27_x86-64_0.38/shredos-2024.11_27_i586_32bit_0.38_20250127_vanilla.img) |
-| v0.38 | [ShredOS .iso i586_32bit for CD/DVD/Ventoy vanilla ](https://github.com/PartialVolume/shredos.x86_64/releases/download/v2024.11_27_x86-64_0.38/shredos-2024.11_27_i586_32bit_0.38_20250128_vanilla.iso) |
-
-### ShredOS version v2024.02.2_26.0_x86-64_0.37 [(Previous Release - Details)](https://github.com/PartialVolume/shredos.x86_64/releases/tag/v2024.02.2_26.0_x86-64_0.37) 
-| Nwipe Version | File to download |
-| -- | -- |
-| v0.37 | [ShredOS .img x86_64bit for USB Vanilla](https://github.com/PartialVolume/shredos.x86_64/releases/download/v2024.02.2_26.0_x86-64_0.37/shredos-2024.02.2_26.0_x86-64_0.37_20240610.img) |
-| v0.37 | [ShredOS .iso x86_64bit for CD/DVD/Ventoy, Vanilla](https://github.com/PartialVolume/shredos.x86_64/releases/download/v2024.02.2_26.0_x86-64_0.37/shredos-2024.02.2_26.0_x86-64_0.37_20240611.iso) |
-| v0.37 | [ShredOS .iso x86_64bit for CD/DVD/Ventoy nomodeset ](https://github.com/PartialVolume/shredos.x86_64/releases/download/v2024.02.2_26.0_x86-64_0.37/shredos-2024.02.2_26.0_x86-64_0.37-nomodeset_20240611.iso) |
-
 ### For all releases including latest and more recent pre-releases [releases](https://github.com/PartialVolume/shredos.x86_64/releases)

-Note for versions **after** _v2024.11_27_x86-64_0.38_: The .img files for burning to USB flash drives support both BIOS/UEFI booting, as well as saving of generated PDF reports to the USB flash drive. The .iso image also supports both BIOS/UEFI booting, burning to USB flash drives and CD/DVD-ROM, but not (yet) saving of generated PDF reports to the USB flash drive (unless being written in "ISO-Mode" with some tools, such as Rufus). Use the .img file whenever needing these generated PDF reports or planning to customize ShredOS (`autonuke` setups, kernel parameters, ...). The .img file also allows direct interaction with the filesystem and modification of the GRUB boot menu, e.g. appending of kernel parameters, which the .iso file does not support due to filesystem constraints.
+Note for versions **after** _v2024.11_27_x86-64_0.38_: The .img files for burning to USB flash drives support both BIOS/UEFI booting, as well as saving of generated PDF reports to the USB flash drive. The .iso image also supports both BIOS/UEFI booting, burning to USB flash drives and CD/DVD-ROM and if you use the `partion-plus` iso, saving of generated PDF reports to the USB flash drive. Use the .img file whenever planning to customize ShredOS (`autonuke` setups, kernel parameters, ...). The .img file also allows direct interaction with the filesystem and modification of the GRUB boot menu, e.g. appending of kernel parameters, which the .iso file does not support due to filesystem constraints.

 Note for versions **until** _v2024.11_27_x86-64_0.38_: The .img files for burning to USB flash drives support both BIOS/UEFI booting. The .iso image supports legacy BIOS booting only and not UEFI, however, a BIOS/UEFI version of the .iso is available in newer ShredOS versions.
 You can also consider [VENTOY (Open Source tool to create bootable USB drive for ISO/WIM/IMG/VHD(x)/EFI files)](https://github.com/ventoy/Ventoy) as a workaround to avoid BIOS/UEFI issues.
@@ -240,7 +226,7 @@ Create the new ShredOS .img file
 Copy shredos_with_mods.img to the root of the Ventoy USB stick and boot the Ventoy USB stick. You can confirm your changes to the kernel commmand line by booting ShredOS, switching to a virtual terminal ALT F2, and type `more /proc/cmdline`

 ## Virtual Terminals
-ShredOS has three tty terminals, ALT-F1 (Where nwipe is initially launched), ALT-F2 (A virtual terminal), ALT-F3 (console log, login required which is root with no password). Typical use of a virtual terminal might be to run other disk related tools such as hdparm to remove hidden sectors or hexedit to display the contents of the disk as hexadecimal values.
+ShredOS has four tty terminals, ALT-F1 (Where nwipe is initially launched), ALT-F2 (A virtual terminal), ALT-F3 (console log, login required which is root with no password), ALT-F4 ([SMART Monitoring Terminal](#smartdmt)). Typical use of a virtual terminal might be to run other disk related tools such as hdparm to remove hidden sectors or hexedit to display the contents of the disk as hexadecimal values.

 ## How to exclude the FAT formatted ShredOS Boot drive from Nwipe, interactive and autonuke modes
 There are two methods that can be used to exclude the FAT formatted ShredOS boot drive from appearing in nwipe's interactive mode or autonuke modes.
@@ -591,7 +577,13 @@ After running the setfont command.
 ## Included Packages

 #### smartmontools
-Nwipes ability to detect serial numbers on USB devices now works on USB bridges who's chipset supports that functionality. Smartmontools provides nwipe with that capability. Smartmontools can be used in the second or third virtual terminal. ALT-F2 and ALT-F3.
+Nwipes ability to detect serial numbers on USB devices now works on USB bridges who's chipset supports that functionality. Smartmontools provides nwipe with that capability. Smartmontools can be used in the second or third virtual terminal (ALT-F2 and ALT-F3).
+
+#### smartdmt
+For convenience a SMART Monitoring Terminal is available in the fourth virtual terminal (ALT-F4).
+It allows to observe all SMART information on one screen and without interacting with the command-line.
+
+![smartdmt](/images/smartdmt.gif)

 #### hdparm
 hdparm has many uses and is a powerfull tool. Although Nwipe will be adding ATA secure erase capability, i.e using the hard disk own firmware to initiate an erase, nwipe currently wipes drives using the traditional method of writing to every block. If you want to initiate a ATA secure erase using the drives firmware then hdparm will be of use.
@@ -821,18 +813,13 @@ $ dd if=shredos-20200412.img of=/dev/sdx (20200412 will be the day you compiled,
 #### The following configurations are available to build different targets:

 - `make shredos_defconfig` - build USB image and hybrid ISO (64-bit)
- `make shredos_i586_defconfig` - build USB image and hybrid ISO (32-bit)
- `make shredos_img_defconfig` - build USB image only (64-bit)
- `make shredos_img_i586_defconfig` - build USB image only (32-bit)
- `make shredos_iso_defconfig` - build hybrid ISO only (64-bit)
- `make shredos_iso_i586_defconfig` - build hybrid ISO only (32-bit)
- `make shredos_iso_legacy_defconfig` - build legacy ISO only (64-bit)
- `make shredos_iso_legacy_i586_defconfig` - build legacy ISO only (32-bit)
+- `make shredos_lite_defconfig` - build lighter USB image and hybrid ISO (64-bit)
+- `make shredos_i686_lite_defconfig` - build lighter USB image and hybrid ISO (32-bit)

 #### The following experimental configurations are available for testing:

 - `make shredos_iso_extra_defconfig` - build hybrid ISO with appended writeable partition (64-bit)
- `make shredos_iso_extra_i586_defconfig` - build hybrid ISO with appended writeable partition (32-bit)
+- `make shredos_iso_extra_i686_lite_defconfig` - build lighter hybrid ISO with appended writeable partition (32-bit)

 Do note that loading a configuration should typically be the last step before `make`.

@@ -847,8 +834,6 @@ Do note that loading a configuration should typically be the last step before `m
 > partition at burn-time, which then also allows customization of the GRUB
 > configuration.
 >
->The **extra** ISOs (experimental) have an "extra" write partition appended.  
->The **legacy** ISOs work in BIOS and UEFI, but only as burned to CD/DVD-ROM.

 #### Building multiple configurations:

--- a/board/shredos/bootia32.efi
+++ b/board/shredos/bootia32.efi
--- a/board/shredos/bootx64.efi
+++ b/board/shredos/bootx64.efi
--- a/board/shredos/fsoverlay/etc/inittab
+++ b/board/shredos/fsoverlay/etc/inittab
@@ -16,6 +16,8 @@ rcS:12345:wait:/etc/init.d/rcS
 sole::respawn:/sbin/getty -L  console 0 vt100 # GENERIC_SERIAL
 1:3:respawn:/sbin/getty 38400 tty1 -n -l /usr/bin/nwipe_launcher
 2:3:respawn:/sbin/getty 38400 tty2 -n -l /bin/sh
+# tty3 is reserved for the regular console
+4:3:respawn:/sbin/getty 38400 tty4 -n -l /usr/bin/smartdmt_launcher

 # Stuff to do for the 3-finger salute
 #ca::ctrlaltdel:/sbin/reboot
--- a/board/shredos/fsoverlay/etc/shredos/version.txt
+++ b/board/shredos/fsoverlay/etc/shredos/version.txt
@@ -1 +1 @@
-2024.11_27.1_x86-64_0.40-dev-1
+2025.11_28_x86-64_26ece7a-commit-dev
--- a/board/shredos/fsoverlay/usr/bin/archive_log.sh.new
+++ b/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
--- a/board/shredos/fsoverlay/usr/bin/find_shredos_boot_disc.sh
+++ b/board/shredos/fsoverlay/usr/bin/find_shredos_boot_disc.sh
@@ -46,14 +46,18 @@ fi
 #
 while read drive ;
 do
-	if [[ "$first_drive" == "" ]]
-	then
-		first_drive=$drive
-	fi
-
 	if [[ "$drive" != "" ]]
 	then
 		mount $drive $drive_dir 2>&1 | tee -a transfer.log
+		if [ $? == 0 ]
+		then
+			# Note the first mountable drive, we will use this for storage of PDFs
+			# if we can't identify a ShredOS USB stick
+			if [[ "$first_drive" == "" ]]
+			then
+				first_drive=$drive
+			fi
+		fi

 		# Check the partion for the file /etc/shredos/shredos_exclude_disc,
 		# If the file is found it indicates that the user considers that
@@ -120,7 +124,7 @@ do

 		umount $drive_dir 2>&1 | tee -a transfer.log
 	fi
-done <<< $(fdisk -l | grep -i "exfat\|fat16\|fat32" | awk '{print $1}')
+done <<< $(fdisk -l | grep -i "exfat\|fat16\|fat32\|Microsoft basic data" | awk '{print $1}')

 # If no boot disc has been found that contains the version of ShredOS
 # that is running, then output the first FAT formatted drive we came across.
--- a/board/shredos/fsoverlay/usr/bin/smartdmt_launcher
+++ b/board/shredos/fsoverlay/usr/bin/smartdmt_launcher
@@ -0,0 +1,18 @@
+#!/bin/sh
+trap "echo" INT
+
+sleep 2
+if [ -x /usr/bin/smartdmt ]; then
+    while true; do
+        /usr/bin/smartdmt
+        echo "Press ENTER to restart SMART Device Monitoring Terminal..."
+        read dummy
+        clear
+    done
+else
+    while true; do
+        echo "SMART Device Monitoring Terminal is not available in this version of ShredOS."
+        read dummy
+        clear
+    done
+fi
--- a/board/shredos/fsoverlay/usr/sbin/mount.ntfs
+++ b/board/shredos/fsoverlay/usr/sbin/mount.ntfs
@@ -0,0 +1 @@
+mount.ntfs-3g
--- a/board/shredos/genimage.cfg
+++ b/board/shredos/genimage.cfg
@@ -5,14 +5,17 @@ image boot.vfat {
                file boot/grub/grub.cfg     { image = 'grub.cfg' }
                file boot/version.txt       { image = 'version.txt' }
                file boot/shredos.id        { image = '/dev/null' }
+                file boot/memtest           { image = 'memtest.bin' }
+                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 EFI/BOOT/memtest.efi   { image = 'memtest.efi' }
                file shredos.ico            { image = 'shredos.ico' }
                file README.txt             { image = 'README.txt' }
                file autorun.inf            { image = 'autorun.inf' }
        }

-        size = 380000000
+size = 119873792
 }

 image shredos.img {
--- a/board/shredos/genimage_i586.cfg
+++ b/board/shredos/genimage_i586.cfg
@@ -1,41 +0,0 @@
-image boot.vfat {
-        vfat {
-                extraargs = "-F 32 -n SHREDOS"
-                file boot/bzImage            { image = 'bzImage' }
-                file boot/grub/grub.cfg      { image = 'grub.cfg' }
-                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/grub.cfg       { image = 'grub.cfg' }
-                file shredos.ico             { image = 'shredos.ico' }
-                file README.txt              { image = 'README.txt' }
-                file autorun.inf             { image = 'autorun.inf' }
-        }
-
-        size = 310000000
-}
-
-image shredos.img {
-        hdimage {
-        }
-
-         partition boot {
-              in-partition-table = "no"
-              image = "boot.img"
-              offset = 0
-              size = 512
-              holes = {"(440; 512)"}
-        }
-
-        partition grub {
-              in-partition-table = "no"
-              image = "grub.img"
-              offset = 512
-        }
-
-        partition vfat {
-                partition-type = 0xC
-                image = "boot.vfat"
-                offset = 646656
-        }
-}
--- a/board/shredos/genimage_i686.cfg
+++ b/board/shredos/genimage_i686.cfg
@@ -0,0 +1,44 @@
+image boot.vfat {
+        vfat {
+                extraargs = "-F 32 -n SHREDOS"
+                file boot/bzImage           { image = 'bzImage' }
+                file boot/grub/grub.cfg     { image = 'grub.cfg' }
+                file boot/version.txt       { image = 'version.txt' }
+                file boot/shredos.id        { image = '/dev/null' }
+                file boot/memtest           { image = 'memtest.bin' }
+                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 EFI/BOOT/memtest.efi   { image = 'memtest.efi' }
+                file shredos.ico            { image = 'shredos.ico' }
+                file README.txt             { image = 'README.txt' }
+                file autorun.inf            { image = 'autorun.inf' }
+        }
+
+size = 115277568
+}
+
+image shredos.img {
+        hdimage {
+        }
+
+         partition boot {
+              in-partition-table = "no"
+              image = "boot.img"
+              offset = 0
+              size = 512
+              holes = {"(440; 512)"}
+        }
+
+        partition grub {
+              in-partition-table = "no"
+              image = "grub.img"
+              offset = 512
+        }
+
+        partition vfat {
+                partition-type = 0xC
+                image = "boot.vfat"
+                offset = 646656
+        }
+}
--- a/board/shredos/grub.cfg
+++ b/board/shredos/grub.cfg
@@ -5,6 +5,35 @@ menuentry "ShredOS" {
    linux /boot/bzImage console=tty3 loglevel=3
 }

-menuentry "ShredOS (nomodeset)" {
+menuentry "ShredOS (nomodeset - display issues? try this)" {
    linux /boot/bzImage console=tty3 loglevel=3 nomodeset
 }
+
+if [ "${grub_platform}" = "efi" ]; then
+   menuentry "Memtest86+ (BIOS legacy emulation for USB keyboard)" {
+    linux /EFI/BOOT/memtest.efi keyboard=legacy
+}
+   menuentry "Memtest86+ (USB keyboards)" {
+    linux /EFI/BOOT/memtest.efi keyboard=both
+}
+   menuentry "Memtest86+ (Disable SMP and memory identification)" {
+    linux /EFI/BOOT/memtest.efi nosmp nosm nobench
+}
+fi
+
+if [ "${grub_platform}" = "pc" ]; then
+   menuentry "Memtest86+ (Use BIOS legacy emulation for USB keyboards)" {
+    linux /boot/memtest keyboard=legacy
+}
+   menuentry "Memtest86+ (USB keyboards)" {
+    linux /boot/memtest keyboard=both
+}
+   menuentry "Memtest86+ (Disable SMP and memory identification)" {
+    linux /boot/memtest nosmp nosm nobench
+}
+   menuentry "Memtest86+ (Serial line RS232, ttyS0,115200)" {
+    linux /boot/memtest console=ttyS0,115200
+}
+fi
+
+
--- a/board/shredos/iso/grub.cfg
+++ b/board/shredos/iso/grub.cfg
@@ -6,7 +6,34 @@ menuentry "ShredOS" {
    initrd __INITRD_PATH__
 }

-menuentry "ShredOS (nomodeset)" {
+menuentry "ShredOS (nomodeset - display issues? try this)" {
    linux __KERNEL_PATH__ console=tty3 loglevel=3 nomodeset
    initrd __INITRD_PATH__
 }
+
+if [ "${grub_platform}" = "efi" ]; then
+   menuentry "Memtest86+ (BIOS legacy emulation for USB keyboard)" {
+    linux /EFI/BOOT/memtest.efi keyboard=legacy
+}
+   menuentry "Memtest86+ (USB keyboards)" {
+    linux /EFI/BOOT/memtest.efi keyboard=both
+}
+   menuentry "Memtest86+ (Disable SMP and memory identification)" {
+    linux /EFI/BOOT/memtest.efi nosmp nosm nobench
+}
+fi
+
+if [ "${grub_platform}" = "pc" ]; then
+   menuentry "Memtest86+ (BIOS legacy emulation for USB keyboard)" {
+    linux /boot/memtest keyboard=legacy
+}
+   menuentry "Memtest86+ (USB keyboards)" {
+    linux /boot/memtest keyboard=both
+}
+   menuentry "Memtest86+ (Disable SMP and memory identification)" {
+    linux /boot/memtest nosmp nosm nobench
+}
+  menuentry "Memtest86+ (Serial line RS232, ttyS0,115200)" {
+    linux /boot/memtest console=ttyS0,115200
+}
+fi
--- a/board/shredos/iso/isolinux.cfg
+++ b/board/shredos/iso/isolinux.cfg
@@ -10,6 +10,21 @@ label shredos
    append initrd=__INITRD_PATH__ console=tty3 loglevel=3

 label shredos-nomodeset
-    menu label ShredOS (nomodeset)
+    menu label ShredOS (nomodeset - display issues? try this)
    kernel __KERNEL_PATH__
    append initrd=__INITRD_PATH__ console=tty3 loglevel=3 nomodeset
+
+label memtest86-bios-legacy-emulation-usb-keyboards
+    menu label Memtest86+ (use BIOS legacy emulation for USB keyboards)
+    kernel /boot/memtest
+    append keyboard=legacy
+
+label memtest86-usb-keyboards
+    menu label Memtest86+ (USB Keyboards)
+    kernel /boot/memtest
+    append keyboard=both
+
+label memtest86-serial
+    menu label Memtest86+ (Serial line RS232, ttyS0,115200 )
+    kernel /boot/memtest
+    append console=ttyS0,115200
--- a/board/shredos/kernel-6.6.22-defconfig.config
+++ b/board/shredos/kernel-6.6.22-defconfig.config
--- a/board/shredos/kernel-i686-defconfig
+++ b/board/shredos/kernel-i686-defconfig
--- a/board/shredos/make_img_file.sh
+++ b/board/shredos/make_img_file.sh
@@ -1,20 +1,19 @@
 #!/bin/bash -e

 if grep -Eq "^BR2_ARCH_IS_64=y$" "${BR2_CONFIG}"; then
-    MKIMAGE_ARCH=x86_64
-    MKIMAGE_EFI=bootx64.efi
+    MKIMAGE_ARCH=x86-64
    MKIMAGE_CFG=genimage.cfg
 else
-    MKIMAGE_ARCH=i586
-    MKIMAGE_EFI=bootia32.efi
-    MKIMAGE_CFG=genimage_i586.cfg
+    MKIMAGE_ARCH=i686
+    MKIMAGE_CFG=genimage_i686.cfg
 fi

 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/bootia32.efi"    "${BINARIES_DIR}/bootia32.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
@@ -23,6 +22,31 @@ cp "board/shredos/shredos.ico"             "${BINARIES_DIR}/shredos.ico"
 # version.txt is used to help identify the (boot) USB disk
 cp "board/shredos/fsoverlay/etc/shredos/version.txt" "${BINARIES_DIR}/version.txt"        || exit 1

+# Determine size of FAT partition based on size of bzImage plus an arbitary 20MB to hold PDF's etc.
+BZIMAGE="${BINARIES_DIR}/bzImage"
+CFG="board/shredos/${MKIMAGE_CFG}"
+OFFSET=20000000
+
+# Get bzImage size in bytes
+if [[ ! -f "$BZIMAGE" ]]; then
+    echo "Error: $BZIMAGE not found"
+    exit 1
+fi
+
+SIZE=$(stat -c %s "$BZIMAGE")
+NEW_SIZE=$((SIZE + OFFSET))
+
+# Update size line in genimage.cfg
+if [[ ! -f "$CFG" ]]; then
+    echo "Error: $CFG not found"
+    exit 1
+fi
+
+sed -i -E "0,/^[[:space:]]*size[[:space:]]*=/{s/^[[:space:]]*size[[:space:]]*=.*/size = ${NEW_SIZE}/}" "$CFG"
+
+echo "Updated size to $NEW_SIZE bytes in $CFG"
+
+# Create the .img
 rm -rf "${BUILD_DIR}/genimage.tmp"                                                        || exit 1
 genimage --rootpath="${TARGET_DIR}" \
    --inputpath="${BINARIES_DIR}" \
--- a/board/shredos/make_iso_file.sh
+++ b/board/shredos/make_iso_file.sh
@@ -1,9 +1,9 @@
 #!/bin/bash -e

 if grep -Eq "^BR2_ARCH_IS_64=y$" "${BR2_CONFIG}"; then
-    MKIMAGE_ARCH=x86_64
+    MKIMAGE_ARCH=x86-64
 else
-    MKIMAGE_ARCH=i386
+    MKIMAGE_ARCH=i686
 fi

 version=$(cat board/shredos/fsoverlay/etc/shredos/version.txt)
--- a/build_all_shredos.sh
+++ b/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,25 +29,21 @@ 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
+	"shredos_lite_defconfig"
+	"shredos_iso_extra_defconfig"
 )

 # 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_extra_i686_lite_defconfig"
 )

 # Packages always needing rebuild between runs, even for the same architecture.
 # This only applies when QUICK_BUILD is enabled, otherwise rebuilds everything.
 ALWAYS_REBUILD_PKGS=(
-	"grub2"
+	"nwipe" # For specific version/banner patching
+	"grub2" # For specific bootloader generation
 )

 ################################################################################
@@ -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
@@ -278,11 +274,13 @@ build_config() {

 	# Build  | QuickBuild=1, PreClean=1  | QuickBuild=0, PreClean=1  | QuickBuild=1, PreClean=0  | QuickBuild=0, PreClean=0
 	# -------|---------------------------|---------------------------|---------------------------|---------------------------
-	# x64 #0 | config -> make            | config -> make            | config -> rebuild -> make | config -> rebuild -> make
+	# x64 #0 | clean* -> config -> make  | clean* -> config -> make  | config -> rebuild -> make | config -> rebuild -> make
 	# x64 #1 | config -> rebuild -> make | clean -> config -> make   | config -> rebuild -> make | clean -> config -> make
 	# x64 #2+| config -> rebuild -> make | clean -> config -> make   | config -> rebuild -> make | clean -> config -> make
 	# x32 #0 | clean -> config -> make   | clean -> config -> make   | clean -> config -> make   | clean -> config -> make
 	# x32 #1+| config -> rebuild -> make | clean -> config -> make   | config -> rebuild -> make | clean -> config -> make
+	# -------|---------------------------|---------------------------|---------------------------|---------------------------
+	# *: This clean is ensured in another part of the script before reaching this point.

 	if [ "$index" -ne 0 ] && [ "$QUICK_BUILD" -eq 1 ] && [ "$FORCE_CLEAN" -ne 1 ]; then
 		# If it's not the first configuration, and quick-build is enabled,
@@ -415,9 +413,12 @@ build_config_success() {
 		run_cmd mv "$log_file" "dist/${config}-SUCCESS.log"
 	fi

+	rename_and_checksum_images "$config"
+
 	run_cmd mkdir -p "dist/$config"
 	run_cmd mv output/images/shredos*.iso "dist/$config/" 2>/dev/null || true
 	run_cmd mv output/images/shredos*.img "dist/$config/" 2>/dev/null || true
+	run_cmd mv output/images/shredos*.sha1 "dist/$config/" 2>/dev/null || true

 	printf "%b" "$GREEN"
 	echo
@@ -469,6 +470,79 @@ build_config_failed() {
 	fi
 }

+# Function to handle suffix insertion before the extension
+insert_suffix() {
+    local fname="$1"
+    local suffix="$2"
+    local base="${fname%.*}"
+    local ext="${fname##*.}"
+    echo "${base}${suffix}.${ext}"
+}
+
+rename_and_checksum_images() {
+    local config="$1"
+    target_dir="output/images"
+
+    # If the defconfig contains the string `lite`, i.e a reduced size
+    # so it will boot on systems with only 512MB of RAM then insert
+    # into the .iso or .img filename the string _lite prior to the extension.
+
+    if [[ "$config" == *"lite"* ]]; then
+        shopt -s nullglob
+        for file in "$target_dir"/shredos*.{iso,img}; do
+            filename=$(basename "$file")
+            if [[ "$filename" != *"_lite"* ]]; then
+                new_name=$(insert_suffix "$filename" "_lite")
+                mv -v "$file" "$target_dir/$new_name"
+            fi
+        done
+        shopt -u nullglob
+    else
+        echo "Condition not met: 'lite' not in $config, rename not necessary."
+    fi
+
+    # If the defconfig contains the string `extra`, i.e an extra partition
+    # then insert into the .iso or .img filename the string _plus-partition
+
+    if [[ "$config" == *"extra"* ]]; then
+        shopt -s nullglob
+        for file in "$target_dir"/shredos*.{iso,img}; do
+            filename=$(basename "$file")
+            if [[ "$filename" != *"_plus-partition"* ]]; then
+                new_name=$(insert_suffix "$filename" "_plus-partition")
+                mv -v "$file" "$target_dir/$new_name"
+            fi
+        done
+        shopt -u nullglob
+    else
+        echo "Condition not met: 'extra' not in $config, rename not necessary."
+    fi
+
+    # Clean up orphaned .sha1 files (that don't match any existing image)
+    echo "Cleaning up orphaned .sha1 files..."
+    shopt -s nullglob
+    for sha_file in "$target_dir"/shredos*.sha1; do
+        # Strip .sha1 to find the base image name
+        corresponding_image="${sha_file%.sha1}"
+        if [[ ! -f "$corresponding_image" ]]; then
+            rm -v "$sha_file"
+        fi
+    done
+    shopt -u nullglob
+
+    # Calculate SHA1 for all final files
+    echo "Calculating SHA1 checksums..."
+    current_dir=$(pwd)
+    cd "$target_dir" || exit
+    shopt -s nullglob
+    for file in shredos*.{iso,img}; do
+        sha1sum "$file" > "$file.sha1"
+    done
+    shopt -u nullglob
+    cd "$current_dir" || exit
+    echo "[DONE]"
+}
+
 ################################################################################

 if [ -f "build_all_shredos.log" ]; then
@@ -542,7 +616,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 +636,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
--- a/configs/shredos_defconfig
+++ b/configs/shredos_defconfig
@@ -18,7 +18,7 @@ BR2_ROOTFS_OVERLAY="board/shredos/fsoverlay"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/shredos/make_iso_file.sh board/shredos/make_img_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
@@ -44,6 +44,8 @@ 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_SMARTDMT=y
 BR2_PACKAGE_ASCII_INVADERS=y
 BR2_PACKAGE_FBDUMP=y
 BR2_PACKAGE_FBGRAB=y
@@ -91,6 +93,7 @@ BR2_PACKAGE_KBD=y
 BR2_PACKAGE_LM_SENSORS=y
 BR2_PACKAGE_LSHW=y
 BR2_PACKAGE_LSSCSI=y
+BR2_PACKAGE_MEMTEST86=y
 BR2_PACKAGE_MINICOM=y
 BR2_PACKAGE_NVME=y
 BR2_PACKAGE_READ_EDID=y
@@ -116,6 +119,7 @@ BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_LIBCAP_NG=y
 BR2_PACKAGE_LIBSECCOMP=y
 BR2_PACKAGE_NWIPE=y
+BR2_PACKAGE_NWIPE_GIT_REVISION="v0.40"
 BR2_PACKAGE_LIBFRIBIDI=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_NCURSES_TARGET_PROGS=y
@@ -133,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
@@ -166,13 +169,20 @@ 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_ISO9660_HYBRID=y
 # 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_PC="boot linux ext2 fat squash4 part_msdos part_gpt normal progress biosdisk 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"
+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"
 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 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_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
--- a/configs/shredos_i686_lite_defconfig
+++ b/configs/shredos_i686_lite_defconfig
@@ -0,0 +1,99 @@
+BR2_x86_i686=y
+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.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_TARGET_TZ_INFO=y
+BR2_ROOTFS_OVERLAY="board/shredos/fsoverlay"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/shredos/make_iso_file.sh board/shredos/make_img_file.sh"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/shredos/kernel-i686-defconfig"
+BR2_PACKAGE_GZIP=y
+BR2_PACKAGE_XZ=y
+BR2_PACKAGE_HEXEDIT=y
+BR2_PACKAGE_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
+BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
+BR2_PACKAGE_E2FSPROGS=y
+BR2_PACKAGE_NTFS_3G=y
+BR2_PACKAGE_SMARTDMT=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_I915=y
+BR2_PACKAGE_LINUX_FIRMWARE_XE=y
+BR2_PACKAGE_LINUX_FIRMWARE_RADEON=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_QLOGIC_4X=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
+BR2_PACKAGE_EDID_DECODE=y
+BR2_PACKAGE_HDPARM=y
+BR2_PACKAGE_KBD=y
+BR2_PACKAGE_LM_SENSORS=y
+BR2_PACKAGE_MEMTEST86=y
+BR2_PACKAGE_NVME=y
+BR2_PACKAGE_READ_EDID=y
+BR2_PACKAGE_PCIUTILS=y
+BR2_PACKAGE_SG3_UTILS=y
+BR2_PACKAGE_SG3_UTILS_PROGS=y
+BR2_PACKAGE_SMARTMONTOOLS=y
+BR2_PACKAGE_TRIGGERHAPPY=y
+BR2_PACKAGE_LZ4=y
+BR2_PACKAGE_KERNEL_CMDLINE_EXTRACTOR=y
+BR2_PACKAGE_NWIPE=y
+BR2_PACKAGE_NWIPE_GIT_REVISION="v0.40"
+BR2_PACKAGE_NCURSES_WCHAR=y
+BR2_PACKAGE_UTF8PROC=y
+BR2_PACKAGE_XUTIL_UTIL_MACROS=y
+BR2_PACKAGE_IPTABLES=y
+BR2_PACKAGE_LFTP=y
+BR2_PACKAGE_LFTP_PROTO_SFTP=y
+BR2_PACKAGE_NTP=y
+BR2_PACKAGE_NTP_NTPDATE=y
+BR2_PACKAGE_NTP_NTPTIME=y
+BR2_PACKAGE_OPENSSH=y
+BR2_PACKAGE_TFTPD=y
+BR2_PACKAGE_TMUX=y
+BR2_PACKAGE_OPENSEACHEST=y
+BR2_PACKAGE_UTIL_LINUX_BINARIES=y
+BR2_PACKAGE_UTIL_LINUX_AGETTY=y
+BR2_PACKAGE_UTIL_LINUX_FSCK=y
+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_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_ISO9660_HYBRID=y
+BR2_TARGET_GRUB2=y
+BR2_TARGET_GRUB2_I386_PC=y
+BR2_TARGET_GRUB2_I386_EFI=y
+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"
+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=y
+BR2_PACKAGE_HOST_PYTHON3_BZIP2=y
+BR2_PACKAGE_HOST_PYTHON3_SSL=y
--- a/configs/shredos_img_defconfig
+++ b/configs/shredos_img_defconfig
@@ -1,176 +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_img_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_STRACE=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_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_NWIPE_VERSION_GIT_REVISION=y
-BR2_PACKAGE_NWIPE_GIT_REVISION="26ece7a0525370f6ba39cddc5e73000b3cd867d6"
-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_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_PC="boot linux ext2 fat squash4 part_msdos part_gpt normal progress biosdisk 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"
-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 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"
-BR2_TARGET_GRUB2_BUILTIN_CONFIG_EFI="board/shredos/embed/grub.cfg"
-BR2_TARGET_GRUB2_INSTALL_TOOLS=y
-BR2_PACKAGE_HOST_E2FSPROGS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_PYTHON3_BZIP2=y
-BR2_PACKAGE_HOST_PYTHON3_SSL=y
--- a/configs/shredos_img_i586_defconfig
+++ b/configs/shredos_img_i586_defconfig
@@ -1,170 +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_img_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_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_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_PC="boot linux ext2 fat squash4 part_msdos part_gpt normal progress biosdisk 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"
-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 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"
-BR2_TARGET_GRUB2_BUILTIN_CONFIG_EFI="board/shredos/embed/grub.cfg"
-BR2_TARGET_GRUB2_INSTALL_TOOLS=y
-BR2_PACKAGE_HOST_E2FSPROGS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_PYTHON3_BZIP2=y
-BR2_PACKAGE_HOST_PYTHON3_SSL=y
--- a/configs/shredos_iso_defconfig
+++ b/configs/shredos_iso_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_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_ISO9660_HYBRID=y
-# 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
--- a/configs/shredos_iso_extra_defconfig
+++ b/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
@@ -44,6 +45,8 @@ 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_SMARTDMT=y
 BR2_PACKAGE_ASCII_INVADERS=y
 BR2_PACKAGE_FBDUMP=y
 BR2_PACKAGE_FBGRAB=y
@@ -91,6 +94,7 @@ BR2_PACKAGE_KBD=y
 BR2_PACKAGE_LM_SENSORS=y
 BR2_PACKAGE_LSHW=y
 BR2_PACKAGE_LSSCSI=y
+BR2_PACKAGE_MEMTEST86=y
 BR2_PACKAGE_MINICOM=y
 BR2_PACKAGE_NVME=y
 BR2_PACKAGE_READ_EDID=y
@@ -113,10 +117,14 @@ 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_GIT_REVISION="v0.40"
 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
@@ -130,7 +138,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
@@ -141,6 +148,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
@@ -154,6 +163,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
@@ -170,8 +180,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
--- a/configs/shredos_iso_extra_i686_lite_defconfig
+++ b/configs/shredos_iso_extra_i686_lite_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,75 +10,31 @@ 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_NTFS_3G=y
+BR2_PACKAGE_SMARTDMT=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_AMDGPU=y
 BR2_PACKAGE_LINUX_FIRMWARE_I915=y
+BR2_PACKAGE_LINUX_FIRMWARE_XE=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
@@ -87,73 +43,38 @@ 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_MEMTEST86=y
 BR2_PACKAGE_NVME=y
+BR2_PACKAGE_PCIUTILS=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_GIT_REVISION="v0.40"
 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 +88,16 @@ 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=y
 BR2_PACKAGE_HOST_PYTHON3_BZIP2=y
 BR2_PACKAGE_HOST_PYTHON3_SSL=y
--- a/configs/shredos_iso_i586_defconfig
+++ b/configs/shredos_iso_i586_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_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_ISO9660_HYBRID=y
-# 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
--- a/configs/shredos_iso_legacy_defconfig
+++ b/configs/shredos_iso_legacy_defconfig
@@ -1,178 +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_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
--- a/configs/shredos_iso_legacy_i586_defconfig
+++ b/configs/shredos_iso_legacy_i586_defconfig
@@ -1,175 +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_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
--- a/configs/shredos_lite_defconfig
+++ b/configs/shredos_lite_defconfig
@@ -1,7 +1,8 @@
+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
@@ -10,74 +11,30 @@ 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 board/shredos/make_img_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-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_NTFS_3G=y
+BR2_PACKAGE_SMARTDMT=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_AMDGPU=y
 BR2_PACKAGE_LINUX_FIRMWARE_I915=y
+BR2_PACKAGE_LINUX_FIRMWARE_XE=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
@@ -86,73 +43,38 @@ 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_MEMTEST86=y
 BR2_PACKAGE_NVME=y
 BR2_PACKAGE_READ_EDID=y
+BR2_PACKAGE_PCIUTILS=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_GIT_REVISION="v0.40"
 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
@@ -166,10 +88,10 @@ BR2_TARGET_ROOTFS_ISO9660_HYBRID=y
 # 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_PC="boot linux ext2 fat squash4 part_msdos part_gpt normal progress biosdisk 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"
+BR2_TARGET_GRUB2_X86_64_EFI=y
+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"
 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 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_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
@@ -177,4 +99,3 @@ BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_PYTHON3_BZIP2=y
 BR2_PACKAGE_HOST_PYTHON3_SSL=y
-BR2_PACKAGE_STRACE=y
--- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk
@@ -44,11 +44,9 @@ ROOTFS_ISO9660_HYBRID_APPEND_PARTITION_TYPE = $(call qstrip,$(BR2_TARGET_ROOTFS_

 ifeq ($(BR2_ARCH_IS_64),y)
 ROOTFS_ISO9660_EFI_NAME = bootx64.efi
-ROOTFS_ISO9660_EFI_NOTNAME = bootia32.efi
 ROOTFS_ISO9660_GRUB2_EFI_PREFIX = $(call qstrip,$(GRUB2_PREFIX_x86_64-efi))
 else
 ROOTFS_ISO9660_EFI_NAME = bootia32.efi
-ROOTFS_ISO9660_EFI_NOTNAME = bootx64.efi
 ROOTFS_ISO9660_GRUB2_EFI_PREFIX = $(call qstrip,$(GRUB2_PREFIX_i386-efi))
 endif

@@ -95,6 +93,17 @@ else
 ROOTFS_ISO9660_TMP_TARGET_DIR = $(TARGET_DIR)
 endif

+################################################################################
+# Memtest
+################################################################################
+
+define ROOTFS_ISO9660_COPY_MEMTEST_BINARIES
+	$(INSTALL) -D -m 0644 $(BINARIES_DIR)/memtest.efi \
+		$(ROOTFS_ISO9660_TMP_TARGET_DIR)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/memtest.efi
+	$(INSTALL) -D -m 0644 $(BINARIES_DIR)/memtest.bin \
+		$(ROOTFS_ISO9660_TMP_TARGET_DIR)/boot/memtest
+endef
+
 ################################################################################
 # Reproducible build support
 ################################################################################
@@ -140,7 +149,33 @@ ROOTFS_ISO9660_EFI_PARTITION_CONTENT = $(BINARIES_DIR)/efi-part
 ROOTFS_ISO9660_GRUB2_CONFIG_PATH = $(ROOTFS_ISO9660_TMP_TARGET_DIR)/boot/grub/grub.cfg
 ROOTFS_ISO9660_GRUB2_EFI_CONFIG_PATH = $(ROOTFS_ISO9660_TMP_TARGET_DIR)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/grub.cfg

+ifeq ($(BR2_ARCH_IS_64),y)
+# Include also the 32-bit bootloader for 64-bit builds
+define ROOTFS_ISO9660_EFI_OTHER_ARCH
+	$(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootx64.efi \
+		$(TOPDIR)/board/shredos/bootx64.efi
+	$(INSTALL) -D -m 0644 $(TOPDIR)/board/shredos/bootia32.efi \
+		$(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootia32.efi
+	$(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootia32.efi \
+		$(ROOTFS_ISO9660_TMP_TARGET_DIR)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootia32.efi
+endef
+else
+# Include also the 64-bit bootloader for 32-bit builds
+define ROOTFS_ISO9660_EFI_OTHER_ARCH
+	$(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootia32.efi \
+		$(TOPDIR)/board/shredos/bootia32.efi
+	$(INSTALL) -D -m 0644 $(TOPDIR)/board/shredos/bootx64.efi \
+		$(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootx64.efi
+	$(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootx64.efi \
+		$(ROOTFS_ISO9660_TMP_TARGET_DIR)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootx64.efi
+endef
+endif
+
 define ROOTFS_ISO9660_INSTALL_GRUB2_EFI
+	# Install memtest binaries to ISO9660 filesystem
+	$(ROOTFS_ISO9660_COPY_MEMTEST_BINARIES)
+	# Include also the other achitecture bootloader
+	$(ROOTFS_ISO9660_EFI_OTHER_ARCH)
 	# Create file to better find ISO9660 filesystem
 	$(INSTALL) -D -m 0644 /dev/null \
 		$(ROOTFS_ISO9660_TMP_TARGET_DIR)/$(ROOTFS_ISO9660_GRUB2_EFI_IDENT_FILE)
@@ -156,9 +191,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
@@ -247,7 +279,33 @@ define ROOTFS_ISO9660_INSTALL_ISOLINUX_CONFIG
 		$(ROOTFS_ISO9660_ISOLINUX_CONFIG_PATH)
 endef

+ifeq ($(BR2_ARCH_IS_64),y)
+# Include also the 32-bit bootloader for 64-bit builds
+define ROOTFS_ISO9660_EFI_OTHER_ARCH
+	$(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootx64.efi \
+		$(TOPDIR)/board/shredos/bootx64.efi
+	$(INSTALL) -D -m 0644 $(TOPDIR)/board/shredos/bootia32.efi \
+		$(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootia32.efi
+	$(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootia32.efi \
+		$(ROOTFS_ISO9660_TMP_TARGET_DIR)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootia32.efi
+endef
+else
+# Include also the 64-bit bootloader for 32-bit builds
+define ROOTFS_ISO9660_EFI_OTHER_ARCH
+	$(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootia32.efi \
+		$(TOPDIR)/board/shredos/bootia32.efi
+	$(INSTALL) -D -m 0644 $(TOPDIR)/board/shredos/bootx64.efi \
+		$(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootx64.efi
+	$(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootx64.efi \
+		$(ROOTFS_ISO9660_TMP_TARGET_DIR)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootx64.efi
+endef
+endif
+
 define ROOTFS_ISO9660_INSTALL_GRUB2_EFI
+	# Install memtest binaries to ISO9660 filesystem
+	$(ROOTFS_ISO9660_COPY_MEMTEST_BINARIES)
+	# Include also the other achitecture bootloader
+	$(ROOTFS_ISO9660_EFI_OTHER_ARCH)
 	# Create file to better find ISO9660 filesystem
 	$(INSTALL) -D -m 0644 /dev/null \
 		$(ROOTFS_ISO9660_TMP_TARGET_DIR)/$(ROOTFS_ISO9660_GRUB2_EFI_IDENT_FILE)
@@ -263,9 +321,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
--- a/images/smartdmt.gif
+++ b/images/smartdmt.gif
--- a/package/Config.in
+++ b/package/Config.in
@@ -245,6 +245,7 @@ menu "Filesystem and flash utilities"
 	source "package/sp-oops-extract/Config.in"
 	source "package/squashfs/Config.in"
 	source "package/sshfs/Config.in"
+	source "package/smartdmt/Config.in"
 	source "package/sunxi-tools/Config.in"
 	source "package/udftools/Config.in"
 	source "package/ufs-utils/Config.in"
--- a/package/axfsutils/axfsutils.hash
+++ b/package/axfsutils/axfsutils.hash
@@ -1,3 +0,0 @@
-# Locally calculated
-sha256  7d8c0febaf6f104c2b179475ea1ee6d361688ad7fa4c98dfdf7395fcff2be685  axfsutils-384a1ea214c8cf8359faba00a12513ee7ae1a9f5.tar.gz
-sha256  1929a1e67d189aa3a24de76255841b33818f7f65944b6e73a1568ba575ab54d5  mkfs.axfs-legacy/COPYING
--- a/package/axfsutils/axfsutils.mk
+++ b/package/axfsutils/axfsutils.mk
@@ -1,24 +0,0 @@
-################################################################################
-#
-# axfsutils
-#
-################################################################################
-
-AXFSUTILS_VERSION = 384a1ea214c8cf8359faba00a12513ee7ae1a9f5
-AXFSUTILS_SITE = $(call github,jaredeh,axfs,$(AXFSUTILS_VERSION))
-AXFSUTILS_LICENSE = GPL-2.0
-AXFSUTILS_LICENSE_FILES = mkfs.axfs-legacy/COPYING
-HOST_AXFSUTILS_DEPENDENCIES = host-zlib
-
-# The 'new' mkfs.axfs version requires GNUstep which is not a buildroot
-# prerequisite. The 'legacy' one works just as well without that requirement.
-define HOST_AXFSUTILS_BUILD_CMDS
-	$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/mkfs.axfs-legacy
-endef
-
-define HOST_AXFSUTILS_INSTALL_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/mkfs.axfs-legacy/mkfs.axfs \
-		$(HOST_DIR)/bin/mkfs.axfs
-endef
-
-$(eval $(host-generic-package))
--- a/package/busybox/busybox.config
+++ b/package/busybox/busybox.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.37.0
-# Thu Jan  8 21:26:42 2026
+# Thu Jan 22 00:38:58 2026
 #
 CONFIG_HAVE_DOT_CONFIG=y

@@ -18,7 +18,7 @@ CONFIG_FEATURE_VERBOSE_USAGE=y
 # CONFIG_FEATURE_COMPRESS_USAGE is not set
 CONFIG_LFS=y
 CONFIG_TIME64=y
-CONFIG_PAM=y
+# CONFIG_PAM is not set
 CONFIG_FEATURE_DEVPTS=y
 CONFIG_FEATURE_UTMP=y
 CONFIG_FEATURE_WTMP=y
@@ -95,8 +95,8 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=1
 CONFIG_SHA1_SMALL=3
-CONFIG_SHA1_HWACCEL=y
-CONFIG_SHA256_HWACCEL=y
+# CONFIG_SHA1_HWACCEL is not set
+# CONFIG_SHA256_HWACCEL is not set
 CONFIG_SHA3_SMALL=1
 CONFIG_FEATURE_NON_POSIX_CP=y
 # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
@@ -650,7 +650,7 @@ CONFIG_IPCS=y
 CONFIG_LAST=y
 # CONFIG_FEATURE_LAST_FANCY is not set
 CONFIG_LOSETUP=y
-CONFIG_LSPCI=y
+# CONFIG_LSPCI is not set
 CONFIG_LSUSB=y
 CONFIG_MDEV=y
 CONFIG_FEATURE_MDEV_CONF=y
@@ -671,16 +671,16 @@ CONFIG_MKDOSFS=y
 CONFIG_MKSWAP=y
 # CONFIG_FEATURE_MKSWAP_UUID is not set
 CONFIG_MORE=y
-CONFIG_MOUNT=y
+# CONFIG_MOUNT is not set
 # CONFIG_FEATURE_MOUNT_FAKE is not set
 # CONFIG_FEATURE_MOUNT_VERBOSE is not set
 # CONFIG_FEATURE_MOUNT_HELPERS is not set
 # CONFIG_FEATURE_MOUNT_LABEL is not set
 # CONFIG_FEATURE_MOUNT_NFS is not set
-CONFIG_FEATURE_MOUNT_CIFS=y
-CONFIG_FEATURE_MOUNT_FLAGS=y
-CONFIG_FEATURE_MOUNT_FSTAB=y
-CONFIG_FEATURE_MOUNT_OTHERTAB=y
+# CONFIG_FEATURE_MOUNT_CIFS is not set
+# CONFIG_FEATURE_MOUNT_FLAGS is not set
+# CONFIG_FEATURE_MOUNT_FSTAB is not set
+# CONFIG_FEATURE_MOUNT_OTHERTAB is not set
 CONFIG_MOUNTPOINT=y
 CONFIG_NOLOGIN=y
 # CONFIG_NOLOGIN_DEPENDENCIES is not set
--- a/package/exiv2/0001-add-BUILD_WITH_STACK_PROTECTOR-option.patch
+++ b/package/exiv2/0001-add-BUILD_WITH_STACK_PROTECTOR-option.patch
@@ -1,54 +0,0 @@
-From 4bb57da5fb0bb0d7e747b9e325e9ec0876ffc1f9 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sat, 31 Jul 2021 16:36:50 +0200
-Subject: [PATCH] add BUILD_WITH_STACK_PROTECTOR option
-
-Add BUILD_WITH_STACK_PROTECTOR to avoid the following build failure with
-toolchains that don't support stack-protector:
-
-/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-uclibc/9.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: utils.cpp:(.text._ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPcEEvT_S7_St20forward_iterator_tag[_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPcEEvT_S7_St20forward_iterator_tag]+0xd0): undefined reference to `__stack_chk_fail'
-
-Indeed, support for -fstack-protector-strong can't be detected through
-check_cxx_compiler_flag as some toolchains need to link with -lssp to
-enable SSP support
-
-Fixes:
- - http://autobuild.buildroot.org/results/ae4635899124c602c70d2b342a76f95c34aa4a3d
-
-Upstream: https://github.com/Exiv2/exiv2/commit/f31c0eba098889899d29b7b0da830aee2b62a7b8
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
- CMakeLists.txt            | 1 +
- cmake/compilerFlags.cmake | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6f0da06a..0746ee14 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -47,6 +47,7 @@ mark_as_advanced(
-     EXIV2_TEAM_USE_SANITIZERS
- )
- 
-+option( BUILD_WITH_STACK_PROTECTOR    "Build with stack protector"                            ON )
- option( BUILD_WITH_CCACHE             "Use ccache to speed up compilations"                   OFF )
- option( BUILD_WITH_COVERAGE           "Add compiler flags to generate coverage stats"         OFF )
- 
-diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake
-index 35faf501..0a646e50 100644
--- a/cmake/compilerFlags.cmake
-+++ b/cmake/compilerFlags.cmake
-@@ -33,8 +33,8 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN
-             endif()
-             if(HAS_FCF_PROTECTION)
-                 add_compile_options(-fcf-protection)
-            endif()
-            if(HAS_FSTACK_PROTECTOR_STRONG)
-+              endif()
-+	    if(BUILD_WITH_STACK_PROTECTOR AND HAS_FSTACK_PROTECTOR_STRONG)
-                 add_compile_options(-fstack-protector-strong)
-             endif()
-         endif()
-- 
-2.31.1
-
--- a/package/libbson/Config.in
+++ b/package/libbson/Config.in
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_LIBBSON
-	bool "libbson"
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	help
-	  libbson is a library providing useful routines related to
-	  building, parsing, and iterating BSON documents.
-
-	  http://mongoc.org/libbson/
-
-comment "libbson needs a toolchain w/ threads"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
--- a/package/libbson/libbson.hash
+++ b/package/libbson/libbson.hash
@@ -1,4 +0,0 @@
-# Locally calculated
-sha256  6bb51b863a4641d6d7729e4b55df8f4389ed534c34eb3a1cda906a53df11072c  libbson-1.9.5.tar.gz
-sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  COPYING
-sha256  8dc5cb3146b026715e6c145621c7732f36c295d825b7b3a03076ad3f238db48e  THIRD_PARTY_NOTICES
--- a/package/libbson/libbson.mk
+++ b/package/libbson/libbson.mk
@@ -1,22 +0,0 @@
-################################################################################
-#
-# libbson
-#
-################################################################################
-
-LIBBSON_VERSION = 1.9.5
-LIBBSON_SITE = https://github.com/mongodb/libbson/releases/download/$(LIBBSON_VERSION)
-LIBBSON_LICENSE = Apache-2.0, MIT (jsonl), ISC (b64), Zlib (md5)
-LIBBSON_LICENSE_FILES = COPYING THIRD_PARTY_NOTICES
-LIBBSON_CPE_ID_VENDOR = mongodb
-LIBBSON_CONF_OPTS = \
-	--disable-tests \
-	--disable-examples \
-	--disable-man-pages \
-	--disable-html-docs
-
-LIBBSON_INSTALL_STAGING = YES
-
-# Also has CMake support, but that forces shared+static libs and static
-# lib has a different name.
-$(eval $(autotools-package))
--- a/package/libiberty/libiberty.hash
+++ b/package/libiberty/libiberty.hash
@@ -1 +0,0 @@
-../binutils/binutils.hash
--- a/package/libiberty/libiberty.mk
+++ b/package/libiberty/libiberty.mk
@@ -1,32 +0,0 @@
-################################################################################
-#
-# libiberty
-#
-################################################################################
-
-LIBIBERTY_VERSION = 2.41
-LIBIBERTY_SOURCE = binutils-$(LIBIBERTY_VERSION).tar.xz
-LIBIBERTY_SITE = $(BR2_GNU_MIRROR)/binutils
-HOST_LIBIBERTY_DL_SUBDIR = binutils
-
-# We're only building libiberty here, not the full binutils suite
-LIBIBERTY_LICENSE = LGPL-2.1+
-LIBIBERTY_LICENSE_FILES = COPYING.LIB
-
-LIBIBERTY_SUBDIR = libiberty
-
-# We explicitly disable multilib, as we do in binutils.
-# By default, libiberty installs nothing, so we must force it.
-HOST_LIBIBERTY_CONF_OPTS = \
-	--disable-multilib \
-	--enable-install-libiberty
-
-# Some packages (e.g. host-gdb) will pick this library and build shared
-# objects with it. But libiberty does not honour the --enable-shared and
-# --disable-static flags; it only ever builds a static library no matter
-# what. So we must force -fPIC in build flags.
-HOST_LIBIBERTY_CONF_ENV = \
-	CFLAGS="$(HOST_CFLAGS) -fPIC" \
-	LDFLAGS="$(HOST_LDFLAGS) -fPIC"
-
-$(eval $(host-autotools-package))
--- a/package/netsurf-buildsystem/netsurf-buildsystem.hash
+++ b/package/netsurf-buildsystem/netsurf-buildsystem.hash
@@ -1,3 +0,0 @@
-# Locally computed
-sha256  b8620c6a95ccf071046cdb8e4e0ca149cdd58d292eb9ee02b3b0d63646466b72  netsurf-buildsystem-7574b41345968b5f7e9ca5875faccb1478ce0555-git4.tar.gz
-sha256  b2ddc1d607332423f6cf415b2ac619a1c03dd565facdc39a571282a520929a65  llvm/LICENSE.TXT
--- a/package/netsurf-buildsystem/netsurf-buildsystem.mk
+++ b/package/netsurf-buildsystem/netsurf-buildsystem.mk
@@ -1,20 +0,0 @@
-################################################################################
-#
-# netsurf-buildsystem
-#
-################################################################################
-
-NETSURF_BUILDSYSTEM_VERSION = 7574b41345968b5f7e9ca5875faccb1478ce0555
-NETSURF_BUILDSYSTEM_SITE = http://git.netsurf-browser.org/buildsystem.git
-NETSURF_BUILDSYSTEM_SITE_METHOD = git
-NETSURF_BUILDSYSTEM_LICENSE = MIT, BSD-3-Clause (for llvm/* files)
-NETSURF_BUILDSYSTEM_LICENSE_FILES = llvm/LICENSE.TXT
-
-NETSURF_BUILDSYSTEM_INSTALL_DIR = $(HOST_DIR)/share/netsurf-buildsystem
-
-define HOST_NETSURF_BUILDSYSTEM_INSTALL_CMDS
-	mkdir -p $(NETSURF_BUILDSYSTEM_INSTALL_DIR)
-	cp -dpfr $(@D)/* $(NETSURF_BUILDSYSTEM_INSTALL_DIR)
-endef
-
-$(eval $(host-generic-package))
--- a/package/nwipe/Config.in
+++ b/package/nwipe/Config.in
@@ -8,10 +8,9 @@ config BR2_PACKAGE_NWIPE
 	help
 	  NWipe – secure disk wiping tool (fork of Darik's Boot and Nuke).

-if BR2_PACKAGE_NWIPE
-
 config BR2_PACKAGE_NWIPE_SITE
 	string "nwipe Git repository URL"
+	depends on BR2_PACKAGE_NWIPE
 	default "https://github.com/martijnvanbrummelen/nwipe.git"
 	help
 	  Git repository used to fetch the nwipe sources.
@@ -19,32 +18,12 @@ config BR2_PACKAGE_NWIPE_SITE
 	    - https://github.com/youruser/nwipe.git
 	    - git@github.com:youruser/nwipe.git

-choice
-	prompt "nwipe version"
-	default BR2_PACKAGE_NWIPE_VERSION_STABLE
-	help
-	  Select which nwipe version (Git ref) should be built.
-
-config BR2_PACKAGE_NWIPE_VERSION_STABLE
-	bool "Stable tag (v0.39)"
-	help
-	  Use the previously hard-coded tag (v0.39) as a stable baseline.
-
-config BR2_PACKAGE_NWIPE_VERSION_GIT_REVISION
-	bool "Git revision"
-	help
-	  Use a user-specified Git revision (full commit SHA-1 or tag).
-
-endchoice
-
 config BR2_PACKAGE_NWIPE_GIT_REVISION
-	string "Git revision (full commit SHA-1 or tag)"
-	depends on BR2_PACKAGE_NWIPE_VERSION_GIT_REVISION
+	string "Git revision (full commit SHA-1 or tag v0.25-v0.40 ..)"
+	depends on BR2_PACKAGE_NWIPE
+	default "v0.40"
 	help
 	  When 'Git revision' is selected above, this string is passed as the
 	  Git ref to check out. Examples:
 	    - 051e1aa0c9572b26301a33d40689adb544927d11 (full commit SHA-1)
-	    - v0.39 (tag)
-
-endif
-
+	    - v0.40 (tag)
--- a/package/nwipe/nwipe.mk
+++ b/package/nwipe/nwipe.mk
@@ -4,37 +4,75 @@
 #
 ################################################################################

-# Select the Git reference based on the Kconfig choice.
-ifeq ($(BR2_PACKAGE_NWIPE_VERSION_STABLE),y)
-NWIPE_VERSION = v0.39
-else ifeq ($(BR2_PACKAGE_NWIPE_VERSION_GIT_REVISION),y)
+NWIPE_BUILD_ARCH = $(call qstrip,$(BR2_ARCH))
 NWIPE_VERSION = $(call qstrip,$(BR2_PACKAGE_NWIPE_GIT_REVISION))
-else
-# Fallback – should not happen because the choice enforces exactly one option
-NWIPE_VERSION = v0.39
-endif
-
-# Default Git repository URL (never empty).
-NWIPE_SITE = https://github.com/martijnvanbrummelen/nwipe.git
-ifneq ($(call qstrip,$(BR2_PACKAGE_NWIPE_SITE)),)
-NWIPE_SITE = $(call qstrip,$(BR2_PACKAGE_NWIPE_SITE))
-endif
-
+NWIPE_DEPENDENCIES = ncurses parted dmidecode coreutils libconfig
 NWIPE_SITE_METHOD = git

-NWIPE_DEPENDENCIES = ncurses parted dmidecode coreutils libconfig
+ifneq ($(call qstrip,$(BR2_PACKAGE_NWIPE_SITE)),)
+NWIPE_SITE = $(call qstrip,$(BR2_PACKAGE_NWIPE_SITE))
+else
+NWIPE_SITE = https://github.com/martijnvanbrummelen/nwipe.git
+endif

-define NWIPE_INITSH
+################################################################################
+# Architecture safeguard
+################################################################################
+
+define NWIPE_CHECK_ARCH
+	case "$(NWIPE_BUILD_ARCH)" in \
+	i686|x86_64) ;; \
+	*) echo "Unsupported architecture: $(NWIPE_BUILD_ARCH)"; exit 1 ;; \
+	esac
+endef
+
+NWIPE_PRE_CONFIGURE_HOOKS += NWIPE_CHECK_ARCH
+
+################################################################################
+# SHREDOS version.txt and banner updater. Updates the nwipe version which
+# could be a release version, such as 0.40 or a commit reference, such as
+# e964dba-dev used by developers when working on non released code from the
+# master branch.
+################################################################################
+
+SHREDOS_VERSION_FILE = board/shredos/fsoverlay/etc/shredos/version.txt
+
+# If version contains a dot, treat it as a release tag
+ifneq ($(findstring .,$(NWIPE_VERSION)),)
+NWIPE_VERSION_BANNER = $(NWIPE_VERSION)
+else
+# Otherwise assume it is a development version by hash
+NWIPE_VERSION_BANNER = $(shell printf "%.7s-commit-dev" "$(NWIPE_VERSION)")
+endif
+
+# Normalize x86_64 to x86-64 for version
+NWIPE_VERSION_ARCH = $(if $(filter x86_64,$(NWIPE_BUILD_ARCH)),x86-64,$(NWIPE_BUILD_ARCH))
+
+define NWIPE_UPDATE_VERSION_TXT
+	echo "Updating version.txt: arch=$(NWIPE_VERSION_ARCH) banner=$(NWIPE_VERSION_BANNER)"
+	sed -i "s/\(.*_\)\(x86-64\|i686\)_.*$$/\1$(NWIPE_VERSION_ARCH)_$(NWIPE_VERSION_BANNER)/" \
+		$(SHREDOS_VERSION_FILE)
+	grep -q "$(NWIPE_VERSION_ARCH)_$(NWIPE_VERSION_BANNER)" $(SHREDOS_VERSION_FILE) || \
+		{ echo "ERROR: Failed to update version.txt - unexpected format in file?"; exit 1; }
+endef
+
+NWIPE_PRE_CONFIGURE_HOOKS += NWIPE_UPDATE_VERSION_TXT
+
+################################################################################
+# Version architecture nwipe banner updater (pre-build)
+################################################################################
+
+define NWIPE_INIT_BUILD
 	(cd $(@D) && \
-		cp ../../../package/nwipe/002-nwipe-banner-patch.sh . && \
-		./002-nwipe-banner-patch.sh && \
-		PATH="../../host/bin:${PATH}" ./autogen.sh)
+	cp ../../../package/nwipe/002-nwipe-banner-patch.sh . && \
+	./002-nwipe-banner-patch.sh && \
+	PATH="../../host/bin:${PATH}" ./autogen.sh)
 endef

 # Pre-configure hook, as a post-patch hook would not get triggered on a package
 # reconfigure, and possibly also taint the sources directory with the generated
 # autogen files (which should not be there).
-NWIPE_PRE_CONFIGURE_HOOKS += NWIPE_INITSH
+NWIPE_PRE_CONFIGURE_HOOKS += NWIPE_INIT_BUILD

 $(eval $(autotools-package))

--- a/package/prelink-cross/0001-src-rtld-dl-tls.c-Fix-TLS-offsets-computation-for-s3.patch
+++ b/package/prelink-cross/0001-src-rtld-dl-tls.c-Fix-TLS-offsets-computation-for-s3.patch
@@ -1,43 +0,0 @@
-From 4064f77d2f550762cbf220fec7c26a8ce4219ea4 Mon Sep 17 00:00:00 2001
-From: Alexander Egorenkov <egorenar@linux.ibm.com>
-Date: Sun, 8 Aug 2021 11:19:52 +0200
-Subject: [PATCH] src/rtld/dl-tls.c: Fix TLS offsets computation for s390 arch
-
-rtld_determine_tlsoffsets() didn't handle s390 arch properly by falling
-back to the default case. If TLS_TCB_AT_TP is 1, then set offset to -1.
-
-From glibc's sysdeps/s390/nptl/tls.h:
-------------------------------------
-/* The TCB can have any size and the memory following the address the
-   thread pointer points to is unspecified.  Allocate the TCB there.  */
-define TLS_TCB_AT_TP	1
-define TLS_DTV_AT_TP	0
-
-This lead to the following error:
---------------------------------
-prelink-rtld: error while loading shared libraries: /lib64/libc.so.6: cannot handle TLS data
-
-Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com>
---
- src/rtld/dl-tls.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/rtld/dl-tls.c b/src/rtld/dl-tls.c
-index 280cee45f950..29422dcfd25e 100644
--- a/src/rtld/dl-tls.c
-+++ b/src/rtld/dl-tls.c
-@@ -143,6 +143,11 @@ rtld_determine_tlsoffsets (int e_machine, struct r_scope_elem *search_list)
-       tls_tcb_size = 0;
-       break;
- 
-+    case EM_S390:
-+      tls_tcb_at_tp = 1;
-+      tls_tcb_size = -1;
-+      break;
-+
-     default:
-       /* Hope there's no TLS!  */
-       for (i = 0; i < search_list->r_nlist; i++)
-- 
-2.31.1
-
--- a/package/prelink-cross/0002-src-execstack.c-fix-prelink_path-type.patch
+++ b/package/prelink-cross/0002-src-execstack.c-fix-prelink_path-type.patch
@@ -1,44 +0,0 @@
-From 516030f287f65ca8bdab92c979ba2d328ee40506 Mon Sep 17 00:00:00 2001
-From: James Hilliard <james.hilliard1@gmail.com>
-Date: Fri, 31 May 2024 12:51:01 -0600
-Subject: [PATCH] src/execstack.c: fix prelink_path type
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes:
-execstack.c: In function ‘execstack_make_rdwr’:
-execstack.c:127:17: error: passing argument 1 of ‘asprintf’ from incompatible pointer type [-Wincompatible-pointer-types]
-  127 |       asprintf (&prelink_path, "%s/%s", dirname, PRELINK_PROG EXEEXT);
-      |                 ^~~~~~~~~~~~~
-      |                 |
-      |                 const char **
-In file included from execstack.c:10:
-/usr/include/stdio.h:403:40: note: expected ‘char ** restrict’ but argument is of type ‘const char **’
-  403 | extern int asprintf (char **__restrict __ptr,
-      |                      ~~~~~~~~~~~~~~~~~~^~~~~
-
-Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-Upstream: https://git.yoctoproject.org/prelink-cross/commit/?id=ff2561c02ade96c5d4d56ddd4e27ff064840a176
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
- src/execstack.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/execstack.c b/src/execstack.c
-index dda6bc7..5413fa2 100644
--- a/src/execstack.c
-+++ b/src/execstack.c
-@@ -52,7 +52,7 @@ const char *program_path;
- 
- /* The full pathname of the prelink tool, or NULL if it hasn't been
-    computed yet.  */
-const char *prelink_path;
-+char *prelink_path;
- 
- static error_t
- parse_opt (int key, char *arg, struct argp_state *state)
-- 
-2.45.2
-
--- a/package/prelink-cross/prelink-cross.hash
+++ b/package/prelink-cross/prelink-cross.hash
@@ -1,3 +0,0 @@
-# Locally computed
-sha256  555fd65c1b907f9b78d6d41ec04cb6e242d2ecb0667867e39cdd517b3f182dd3  prelink-cross-a853a5d715d84eec93aa68e8f2df26b7d860f5b2-git4.tar.gz
-sha256  b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf  COPYING
--- a/package/prelink-cross/prelink-cross.mk
+++ b/package/prelink-cross/prelink-cross.mk
@@ -1,16 +0,0 @@
-################################################################################
-#
-# host-prelink-cross
-#
-################################################################################
-
-PRELINK_CROSS_VERSION = a853a5d715d84eec93aa68e8f2df26b7d860f5b2
-PRELINK_CROSS_SITE = https://git.yoctoproject.org/git/prelink-cross
-PRELINK_CROSS_SITE_METHOD = git
-PRELINK_CROSS_LICENSE = GPL-2.0+
-PRELINK_CROSS_LICENSE_FILES = COPYING
-# Sources from git, no configure script present
-PRELINK_CROSS_AUTORECONF = YES
-HOST_PRELINK_CROSS_DEPENDENCIES = host-elfutils host-libiberty
-
-$(eval $(host-autotools-package))
--- a/package/python-dunamai/python-dunamai.hash
+++ b/package/python-dunamai/python-dunamai.hash
@@ -1,5 +0,0 @@
-# md5, sha256 from https://pypi.org/pypi/dunamai/json
-md5  1b3ca932416961ea6953dbbc21e6d42c  dunamai-1.22.0.tar.gz
-sha256  375a0b21309336f0d8b6bbaea3e038c36f462318c68795166e31f9873fdad676  dunamai-1.22.0.tar.gz
-# Locally computed sha256 checksums
-sha256  cd75c5564078e3aadf662a9df3d23430f4705dfeedebbd0ebbeef53998ad94a8  LICENSE
--- a/package/python-dunamai/python-dunamai.mk
+++ b/package/python-dunamai/python-dunamai.mk
@@ -1,15 +0,0 @@
-################################################################################
-#
-# python-dunamai
-#
-################################################################################
-
-PYTHON_DUNAMAI_VERSION = 1.22.0
-PYTHON_DUNAMAI_SOURCE = dunamai-$(PYTHON_DUNAMAI_VERSION).tar.gz
-PYTHON_DUNAMAI_SITE = https://files.pythonhosted.org/packages/a0/fe/aee602f08765de4dd753d2e5d6cbd480857182e345f161f7a19ad1979e4d
-PYTHON_DUNAMAI_SETUP_TYPE = poetry
-PYTHON_DUNAMAI_LICENSE = MIT
-PYTHON_DUNAMAI_LICENSE_FILES = LICENSE
-HOST_PYTHON_DUNAMAI_DEPENDENCIES = host-python-packaging
-
-$(eval $(host-python-package))
--- a/package/python-poetry-dynamic-versioning/python-poetry-dynamic-versioning.hash
+++ b/package/python-poetry-dynamic-versioning/python-poetry-dynamic-versioning.hash
@@ -1,5 +0,0 @@
-# md5, sha256 from https://pypi.org/pypi/poetry-dynamic-versioning/json
-md5  91032d27f9da010d8a9b7e76bfd09d24  poetry_dynamic_versioning-1.4.1.tar.gz
-sha256  21584d21ca405aa7d83d23d38372e3c11da664a8742995bdd517577e8676d0e1  poetry_dynamic_versioning-1.4.1.tar.gz
-# Locally computed sha256 checksums
-sha256  cd75c5564078e3aadf662a9df3d23430f4705dfeedebbd0ebbeef53998ad94a8  LICENSE
--- a/package/python-poetry-dynamic-versioning/python-poetry-dynamic-versioning.mk
+++ b/package/python-poetry-dynamic-versioning/python-poetry-dynamic-versioning.mk
@@ -1,18 +0,0 @@
-################################################################################
-#
-# python-poetry-dynamic-versioning
-#
-################################################################################
-
-PYTHON_POETRY_DYNAMIC_VERSIONING_VERSION = 1.4.1
-PYTHON_POETRY_DYNAMIC_VERSIONING_SOURCE = poetry_dynamic_versioning-$(PYTHON_POETRY_DYNAMIC_VERSIONING_VERSION).tar.gz
-PYTHON_POETRY_DYNAMIC_VERSIONING_SITE = https://files.pythonhosted.org/packages/dd/70/1138211a6e5051d28596922ed39acf20b42819db5ae1f93e465b9a903c28
-PYTHON_POETRY_DYNAMIC_VERSIONING_SETUP_TYPE = poetry
-PYTHON_POETRY_DYNAMIC_VERSIONING_LICENSE = MIT
-PYTHON_POETRY_DYNAMIC_VERSIONING_LICENSE_FILES = LICENSE
-HOST_PYTHON_POETRY_DYNAMIC_VERSIONING_DEPENDENCIES = \
-	host-python-dunamai \
-	host-python-jinja2 \
-	host-python-tomlkit
-
-$(eval $(host-python-package))
--- a/package/smartdmt/Config.in
+++ b/package/smartdmt/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_SMARTDMT
+	bool "smartdmt"
+	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
+	select BR2_PACKAGE_HOST_GO
+	help
+	  SMART Device Monitoring Terminal
+
+	  https://github.com/desertwitch/smartdmt
+
+config BR2_PACKAGE_SMARTDMT_GIT_REVISION
+	string "Git revision (full commit SHA-1 or tag v0.25-v0.40 ..)"
+	depends on BR2_PACKAGE_SMARTDMT
+	default "v0.1.5"
+	help
+	  When 'Git revision' is selected above, this string is passed as the
+	  Git ref to check out. Examples:
+	    - 051e1aa0c9572b26301a33d40689adb544927d11 (full commit SHA-1)
+	    - v0.40 (tag)
--- a/package/smartdmt/smartdmt.mk
+++ b/package/smartdmt/smartdmt.mk
@@ -0,0 +1,23 @@
+################################################################################
+#
+# smartdmt
+#
+################################################################################
+
+SMARTDMT_VERSION = $(call qstrip,$(BR2_PACKAGE_SMARTDMT_GIT_REVISION))
+
+SMARTDMT_SITE = https://github.com/desertwitch/smartdmt.git
+SMARTDMT_SITE_METHOD = git
+
+SMARTDMT_LICENSE = MIT
+SMARTDMT_LICENSE_FILES = LICENSE
+
+SMARTDMT_GOMOD = github.com/desertwitch/smartdmt
+SMARTDMT_GO_ENV = CGO_ENABLED=0
+
+SMARTDMT_LDFLAGS = \
+	-X main.Version=$(shell echo $(SMARTDMT_VERSION) | sed 's/^v//' | cut -c1-7)
+
+SMARTDMT_BUILD_TARGETS = ./cmd/smartdmt
+
+$(eval $(golang-package))
--- a/package/starfive-spltool/Config.in.host
+++ b/package/starfive-spltool/Config.in.host
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_HOST_STARFIVE_SPLTOOL
-	bool "host starfive-spltool"
-	depends on BR2_riscv
-	help
-	  Add header to the Secondary Program Loader with the 3rd party
-	  software given by Starfive-Tech for their SoCs.
-
-	  https://github.com/starfive-tech/soft_3rdpart/tree/JH7110_VisionFive2_devel/spl_tool
--- a/package/starfive-spltool/starfive-spltool.hash
+++ b/package/starfive-spltool/starfive-spltool.hash
@@ -1,2 +0,0 @@
-# Locally computed
-sha256  f5466225021fbe4e983cc85f32ce11d92ad30689b18e0d1390d16f6bfab74477  starfive-spltool-JH7110_VF2_515_v5.11.3.tar.gz
--- a/package/starfive-spltool/starfive-spltool.mk
+++ b/package/starfive-spltool/starfive-spltool.mk
@@ -1,20 +0,0 @@
-################################################################################
-#
-# starfive-spltool
-#
-################################################################################
-
-STARFIVE_SPLTOOL_VERSION = JH7110_VF2_515_v5.11.3
-STARFIVE_SPLTOOL_SITE = $(call github,starfive-tech,soft_3rdpart,$(STARFIVE_SPLTOOL_VERSION))
-STARFIVE_SPLTOOL_LICENSE = GPL-2.0+
-STARFIVE_SPLTOOL_FILES = spl_tool/LICENSE
-
-define HOST_STARFIVE_SPLTOOL_BUILD_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D)/spl_tool
-endef
-
-define HOST_STARFIVE_SPLTOOL_INSTALL_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/spl_tool/spl_tool $(HOST_DIR)/bin/spl_tool
-endef
-
-$(eval $(host-generic-package))
Author	SHA1	Message	Date
PartialVolume	f5c1da45a9	Merge pull request #468 from desertwitch/upstream-fixes2 Nwipe versioning fixes & add 32-bit EFI to 64-bit builds	2026-02-18 11:57:09 +00:00
desertwitch	b7dcf284c9	chore(board): copy over 32-bit EFI for IMG	2026-02-18 10:58:13 +01:00
desertwitch	95872d0744	fix(nwipe): use less generic variable name	2026-02-18 10:45:23 +01:00
desertwitch	9b9c569e66	fix(nwipe): use sanitized variable	2026-02-18 10:35:40 +01:00
desertwitch	63ad758ad5	fix(nwipe): sanitize global arch variable	2026-02-18 10:33:35 +01:00
desertwitch	68710cedf1	chore(board): add 32-bit EFI to IMG	2026-02-18 10:26:09 +01:00
desertwitch	e2d8217ff8	fix(nwipe): evaluate variables on use	2026-02-18 10:22:40 +01:00
PartialVolume	58399ade5a	Merge pull request #467 from desertwitch/smartdmt-readme Smartdmt documentation	2026-02-18 09:16:48 +00:00
desertwitch	fcd4a17e44	chore(smartdmt): bump default version	2026-02-18 09:30:13 +01:00
desertwitch	5b710a81a6	chore(docs): add smartdmt documentation	2026-02-18 09:30:01 +01:00
desertwitch	6f212156fb	chore(nwipe): print out case	2026-02-18 08:51:07 +01:00
desertwitch	03ba568178	chore(nwipe): print out commands	2026-02-18 08:49:33 +01:00
desertwitch	c8f737eb0a	chore(nwipe): revert arch dependencies in config A build may otherwise silently omit building nwipe, and we already check the architecture requirement as part of the pre-configure hook.	2026-02-18 08:13:33 +01:00
desertwitch	e6e4a2bab3	chore(nwipe): add arch dependencies	2026-02-18 08:12:02 +01:00
desertwitch	39d2a25c74	chore(nwipe): rename definition	2026-02-18 08:07:35 +01:00
desertwitch	e1f99a053d	chore(nwipe): refactor config	2026-02-18 07:57:39 +01:00
desertwitch	3abe570540	chore(build): always rebuild nwipe for versioning	2026-02-18 07:56:02 +01:00
desertwitch	ecea0be3bd	fix(nwipe): version replacement	2026-02-18 07:55:35 +01:00
desertwitch	3200381771	chore(board): add default 32-bit EFI	2026-02-18 07:10:01 +01:00
desertwitch	caf93d8106	chore(iso9660): add 32-bit EFI to 64-bit builds	2026-02-18 07:03:51 +01:00
PartialVolume	2ac8113e93	Merge pull request #465 from desertwitch/ssmart feat: add SMART monitoring terminal	2026-02-17 23:07:41 +00:00
PartialVolume	54e7f83122	Merge pull request #466 from desertwitch/upstream-fixes2 QoL improvements	2026-02-17 22:32:38 +00:00
desertwitch	3cd5ee3f1e	chore(iso9660): combine definitions	2026-02-17 20:28:48 +01:00
desertwitch	e7b2317d05	chore(board): rename iso arch to i686	2026-02-17 18:10:47 +01:00
desertwitch	59ec5813c6	chore(docs): update build targets	2026-02-17 18:10:45 +01:00
desertwitch	b4316be330	chore(board): rename arch to i686	2026-02-17 18:10:39 +01:00
desertwitch	8aeffd36d6	chore(iso9660): refactor for i686	2026-02-17 18:10:35 +01:00
desertwitch	e87c0f7a49	feat: add SMART monitoring terminal	2026-02-17 13:39:15 +01:00
PartialVolume	fd8eb7b898	Merge pull request #462 from PartialVolume/add-memtest86 Added memtest86+ to ShredOS boot menus	2026-02-11 10:36:14 +00:00
PartialVolume	e17537311c	Added memtest86+ to both isolinux and grub2 boot menus, included the memtest package in all defconfigs	2026-02-11 10:33:54 +00:00
PartialVolume	92d50b61fd	Merge pull request #458 from PartialVolume/update_nwipe_stable_release_selection Simplify selection of git commit hash or revision tag v0.40 in menuconfig	2026-02-05 01:47:46 +00:00
PartialVolume	fad7da67a1	Simplify selection of git commit hash or revision tag v0.40 etc. by removing the hard coded references to the stable release and have just a single selection in menuconfig where you enter a commit hash or a version tag. This means for future updates I won't need to manually update the hard coded version or comments in nwipe.mk and Config.in that mention v0.40 to keep it relevent, I simply update the version in menuconfig to v0.41. Updated all defconfigs with the new revision string BR2_PACKAGE_NWIPE_GIT_REVISION="v0.40"	2026-02-05 01:42:19 +00:00
PartialVolume	df55edb486	Update README.md Simplify maintenance of README.md by removing multiple links to latest and previous releases. Just have a single link to the latest release.	2026-02-04 21:31:24 +00:00
PartialVolume	d54617f898	Merge pull request #456 from desertwitch/patch-1 Build script minor clarification/quoting fix	2026-02-04 19:59:55 +00:00
Rysz	1989d7ab13	Fix quoting in directory change command	2026-02-04 14:16:15 +01:00
Rysz	9ae389d461	Clarification in building table comment Make it clear for future readers that preclean runs a clean before step 0 of the building.	2026-02-04 14:14:52 +01:00
PartialVolume	af01857818	Merge pull request #454 from PartialVolume/update-stable-nwipe-release-to-0.40 Update the nwipe.mk, Config.in and defconfigs from 0.39 to 0.40.	2026-02-04 00:37:59 +00:00
PartialVolume	07f2d5057f	Update the nwipe.mk and Config.in from 0.39 to 0.40. Update all defconfigs to stable release (0.40)	2026-02-04 00:36:03 +00:00
PartialVolume	6ab4b901b0	Merge pull request #453 from PartialVolume/ISO9660-volume-name Make ISO9660 volume name upper case for maximum compatibility.	2026-02-01 00:59:24 +00:00
PartialVolume	ec2bee0a92	Make ISO9660 volume name upper case for maximum compatibility with older bootloaders	2026-02-01 00:57:12 +00:00
PartialVolume	6fd11b61ce	Merge pull request #452 from PartialVolume/create-shredos_lite_defconfig Add a new x86-64 light defconfig for 64bit systems with minimum 512MB RAM	2026-02-01 00:49:01 +00:00
PartialVolume	24e1f872d1	Add a new x86-64 light defconfig for systems manufactured between 2000-2010 with a minimum of 512MB of RAM	2026-02-01 00:45:50 +00:00
PartialVolume	20bdda24af	Merge pull request #451 from PartialVolume/rename_and_checksum_images Add creation of sha1 checksum files and add additional info to image filenames	2026-01-31 23:44:54 +00:00
PartialVolume	e06ba53380	Updated the script build_all_shredos.sh so that if the defconfig is lite or extra then lite and plus-partitionare inserted into the filename immediately prior to the extension. The placing of this extra information at the end of the version information is important. In this position it doesn't interfere with the search that is conducted in the script find_shredos_boot_script.sh in relation to the search for the shredos boot disc. The sha1 checksum is calculated and placed in a file with the same name as the image but with the addition of the extension.sha1. These .sha1 files are also copied to the folder dist/ along with the corresponding .iso or .img file. The addition of this extra information in the filenames makes the files unique amongst the group of build files. This is required when the .iso and .img files are uploaded when a ShredOS release is published	2026-01-31 23:35:15 +00:00
PartialVolume	6ede7ef074	Merge pull request #450 from PartialVolume/sync-shredos_i686_lite_defconfig Sync i686 defconfigs and update build all script	2026-01-30 21:21:20 +00:00
PartialVolume	e962210590	Sync i686 defconfigs and update build all script	2026-01-30 21:16:31 +00:00
PartialVolume	4d30569cde	Merge pull request #449 from PartialVolume/fix_img_build_error Fix build error	2026-01-30 14:53:06 +00:00
PartialVolume	d893547c0e	Fix build error	2026-01-30 14:50:37 +00:00
PartialVolume	828b70df80	Merge pull request #448 from PartialVolume/boot-i686-using-64bit-EFI Allow shredos i686 builds to boot on 64bit EFI only system that don't have legacy boot options.	2026-01-29 19:54:09 +00:00
PartialVolume	7e198a902e	The i686 .iso builds failed to boot on X86-64 systems that only support booting with 64bit efi, i.e no legacy boot option. This was due to bootx64.efi not being included by iso9660.mk when the architecture is i686. Changes were made to iso9660.mk to correct this.	2026-01-29 19:49:33 +00:00
PartialVolume	2e3aff54c4	Merge pull request #447 from PartialVolume/more-updates-to-shredos-iso-extra-i686-defconfig Updates to defconfigs	2026-01-28 19:16:08 +00:00
PartialVolume	98f1690285	Updates to defconfigs	2026-01-28 19:04:17 +00:00
PartialVolume	e446a26c11	Merge pull request #445 from PartialVolume/update-shredos-iso-extra-i686-defconfig Update shredos-iso-extra-i686-defconfig	2026-01-28 01:12:33 +00:00
PartialVolume	6e31fca714	Update shredos-iso-extra-i686-defconfig so it's sync'ed with other i686 defconfigs and like other i686 defconfigs it will boot with a minimum of 512MB RAM.	2026-01-28 01:08:23 +00:00
PartialVolume	0ba9d4e6f8	Merge pull request #444 from PartialVolume/remove-iso-legacy-builds Removed legacy iso defconfigs	2026-01-27 18:34:09 +00:00
PartialVolume	52eef55419	Removed legacy iso defconfigs as the hybrid iso images book on all my test systems and as the legacy are not hybrid and therefore don't boot on USB may cause unnecessary confusion if the user is not aware of their limitation.	2026-01-27 18:25:33 +00:00
PartialVolume	19d7f41b10	Merge pull request #443 from PartialVolume/sync-shredos_iso_legacy_defconfig sync shredos_iso_legacy_defconfig	2026-01-27 02:44:01 +00:00
PartialVolume	48ba2441d8	sync shredos_iso_legacy_defconfig	2026-01-27 02:43:03 +00:00
PartialVolume	2f3712f2cb	Merge pull request #442 from PartialVolume/add-legacy-boot Added i386 legacy boot	2026-01-27 01:37:16 +00:00
PartialVolume	6ac1d0c6f3	Added i386 legacy boot required to boot one of my systems, EFI USB & CD and legacy USB & CD tested. All booting with shredos_iso_extra_defconfig. Confirmed ShredOS mounts the 50MB extra partition on the USB and uses for configs, logs and PDFs.	2026-01-27 01:34:23 +00:00
PartialVolume	e6a611c612	Sync shredos_iso_extra_defconfig	2026-01-25 19:23:15 +00:00
PartialVolume	233eae18e8	Merge pull request #441 from PartialVolume/update-build_all_shredos.sh Update build_all_shredos.sh due to change in defconfig names and number of defconfigs	2026-01-25 16:40:55 +00:00
PartialVolume	8e32730ab5	Update the build_all_shredos.sh with refernce to i686 being used as opposed to i586. Update the list of defconfig names and reduce their number from ten to six. The four removed were single builds of either .img or .iso files when the defconfigs that produce both .iso and .img in a single build were considered adequate for our needs. This reduces workload keeping all the defconfigs correctly sync'ed.	2026-01-25 16:36:34 +00:00
PartialVolume	c5851e9501	Merge pull request #440 from PartialVolume/add-openssh-server Add ssh logins as alternative to telnet	2026-01-24 00:52:38 +00:00
PartialVolume	a981af81bf	add openssh server, root login disabled as default in /etc/ssh/sshd_config. Introduced ssh login for those not wishing to use telnetd. Main use being to access headless systems due to no graphics system or faulty graphics system. I'm open to discussions for those interested in ssh logins how best to implement this in practise or is it ok as is?	2026-01-24 00:49:02 +00:00
PartialVolume	e7c1bde3c6	Remove old copy of file archive_log.sh.new	2026-01-22 20:00:31 +00:00
PartialVolume	9819b70435	Merge pull request #439 from PartialVolume/remove-unwanted-defconfigs Remove defconfigs that are surplus to requirements	2026-01-22 19:51:36 +00:00
PartialVolume	405a211b24	Remove defconfigs that are surplus to requirements and don't really provide anything that the other defconfigs already provide. Their removal also helps to reduce my workload keeping all the defconfigs in sync with one another.	2026-01-22 19:46:55 +00:00
PartialVolume	1186a5fe80	Merge pull request #438 from PartialVolume/add-ntfs-3g Add ntfs-3g to all defconfigs	2026-01-22 19:34:19 +00:00
PartialVolume	db6ad14377	Add ntfs-3g for r/w access to NTFS (Microsoft basic data) formatted drives for backing up PDF, logs and nwipe config files.	2026-01-22 19:31:09 +00:00
PartialVolume	0bd9f53fd0	Merge pull request #437 from PartialVolume/fix-USB-storage-device-not-being-identified Fix #342 and #385 by adding RW support for NTFS (Microsoft basic data)	2026-01-22 11:08:09 +00:00
PartialVolume	3ba5beaf17	Fixed the issues (#342 and #385 ) where a Ventoy USB memory stick that was formatted as GPT with NTFS (Type:Microsoft Basic Data) was unable to have config, PDFs and log files written to it as it was being mounted read only. This was corrected by installing BR2_PACKAGE_NTFS_3G, deinstalling the busybox mount command and installing mount from the util-linux package. I also fixed an issue that occurs when multiple formatted discs exist on the system and the user pulls the ShredOS USB boot device out after booting. In that circumstance, when it's time for ShredOS to backup PDFs, logs and configs it attempts to write them first to a disc that is identified as the ShredOS boot disc, if it fails it then looks for the first disc with a mountable partition and writes the PDFs, log and configs to that disc. Unfortunately if the disc failed to mount it wouldn't then go on and search for other disks, it would assume the mount completed ok. The save of PDFs etc, would then fail. This was also fixed so the mount return status is now checked and if it fails it now continues its search.	2026-01-22 11:02:09 +00:00
PartialVolume	4fe795cab5	Merge pull request #436 from PartialVolume/add-minimal-graphics-firmware-to-i686-lite Added legacy firmware to shredos_i686_lite_defconfig	2026-01-21 19:12:11 +00:00
PartialVolume	1390bf9e68	Commit relevant to shredos_i686_lite_defconfig only. Added some graphics firmware for Radeon, Intel that have a small footprint, avoiding AMDGPU for graphics hardware post circa 2010 while maintaining that shredos_i686_lite will boot in 512MB of RAM (but not 256MB). Created a separate kernel backup file for all i686 builds called kernel_i686_defconfig as switching between x86-64 and i686 and back could cause some settings to disappear in the kernel backup file if committed. Replaced the busybox version of lspci with the full pciutils version.	2026-01-21 14:07:23 +00:00
PartialVolume	8b7c69305e	Merge pull request #435 from PartialVolume/auto-update-nwipe-version-in-banner Auto update nwipe banner and version.txt with version tag or commit SHA, examples ShredOS v2025.11_28_i686_26ece7a-commit-dev ShredOS v2025.11_28_i686_v0.39	2026-01-18 22:39:25 +00:00
PartialVolume	71aa5fe168	The nwipe banner is updated automatically with the the release version such as v0.39, v0.40 ... or if the developer has chosen to compile a version of nwipe based on a commit full SHA then the banner will show the first 7 characters of the commit followed by commit-dev. i.e ShredOS v2025.11_28_i686_26ece7a-commit-dev	2026-01-18 22:27:18 +00:00
PartialVolume	d3fba815ef	Merge pull request #434 from PartialVolume/auto-update-architecture-in-nwipe-banner Automatically update banner with correct architecture during nwipe build	2026-01-17 23:28:39 +00:00
PartialVolume	7c48bb4f9d	Prior to building nwipe, determine architecture and update the nwipe banner as appropriate, either i686 or x86-64. Prior to this patch the banner was hardcoded and had to be manually edited in board/shredos/fsoverlay/etc/shredos/version.txt. When switching between architectures the banner will be automatically updated and manual editing of architecture is no longer necessary.	2026-01-17 23:25:59 +00:00
PartialVolume	77db54a4dc	Merge pull request #433 from PartialVolume/dynamically-calculate-partition-size Dynamically calculate vfat size based on bzImage size plus 20MB	2026-01-17 01:02:19 +00:00
PartialVolume	73200ac892	Modified make_img_file.sh so that the vfat partition size is dynamically calculated based on the bzImage size plus an arbitary 20MB added to accommodate the extra files including PDF reports and logs.	2026-01-17 00:59:46 +00:00
PartialVolume	3aa170ada4	Merge pull request #432 from PartialVolume/rename-i586-defconfigs Rename i586 defconfigs to i686	2026-01-16 22:47:59 +00:00
PartialVolume	ef58bfa2d8	Rename i586 defconfigs to i686	2026-01-16 22:45:21 +00:00
PartialVolume	728b792cac	Merge pull request #431 from PartialVolume/add-img-creation-to-i586-lite shredos_i686_lite_defconfig now creates both .iso and .img image files	2026-01-16 22:29:47 +00:00
PartialVolume	3cf5c1e5c9	shredos_i686_lite_defconfig now creates both .img and .iso images, renamed defconfig file from shredos_i586_lite_defconfig to shredos_i686_lite_defconfig	2026-01-16 22:23:57 +00:00
PartialVolume	160e655731	Merge pull request #430 from PartialVolume/update_i586_lite_kbd Fix f keystroke (font size) in shredos_i586_lite_defconfig	2026-01-16 01:32:04 +00:00
PartialVolume	bc790b9be0	Added BR2_PACKAGE_KBD=y which is required for the f keystroke in nwipe when running in ShredOS. KBD provides setfont which doubles the size of the font.	2026-01-16 01:26:38 +00:00
PartialVolume	7d0e54cb8c	Merge pull request #429 from PartialVolume/update-i586-lite Update shredos_i586_lite_defconfig plus tidy up	2026-01-16 00:23:11 +00:00
PartialVolume	fb2af5b5e5	nwipe aes failed to compile due to missing g++ compiler code for gcc, added smartmontools so nwipes reports were complete. Added various smaller programs that don't require much space like hexedit. Added NTP so RTC is accurate if connected to a network. Despite these additions ShredOS_i586_lite_defconfig will still boot with only 256MB CPU RAM required.	2026-01-16 00:19:19 +00:00
Fabian Druschke	6708c3f861	Legacy lite iso defconfig (#428 ) * Created minimal i586 compatible defconfig * Refined minimal i586 defconfig, and added missing shell interpreter	2026-01-16 00:06:36 +00:00
PartialVolume	92aa64707d	Updated i686 build by removing Linux firmware, mainly graphics firmware and added BR2_i386=y	2026-01-15 00:48:46 +00:00
PartialVolume	25570b8b7a	Merge pull request #426 from PartialVolume/i586 Updated shredos_i586_defconfig so it is sync'ed with shredos_defconfig	2026-01-13 23:50:33 +00:00
PartialVolume	436e4ec558	Updated shredos_i586_defconfig so it is generally sync'ed with shredos_defconfig, except for the necessary differences for i686 support. Unfortunately something has changed between kernel release 6.15 and 6.18. i586 is no longer supported, i686 should be but the kernel fails to load.	2026-01-13 23:44:56 +00:00
PartialVolume	53ff6d0b1f	Merge pull request #425 from PartialVolume/fix-iso-1 Correct the path for iso config files.	2026-01-12 14:57:29 +00:00
PartialVolume	41babc35b3	Correct the path for iso config files.	2026-01-12 14:56:09 +00:00
PartialVolume	e36af7c0c8	Restored some changes related to ISO9660 builds	2026-01-12 13:42:01 +00:00
PartialVolume	ebf6f9d355	Merge pull request #423 from PartialVolume/update-to-nwipe-master-for-testing Update nwipe to last commit in master for testing	2026-01-11 20:13:34 +00:00
PartialVolume	f6ce3e3e64	Update nwipe to last commit in master for testing before release of nwipe	2026-01-11 20:11:17 +00:00
PartialVolume	21e02a3cf8	Merge pull request #422 from PartialVolume/update-revision-banner Update revision banner as shown in nwipe to 2025.11_28_x86-64_0.40	2026-01-11 15:57:31 +00:00
PartialVolume	70b99a4530	Update revision banner as shown in nwipe to 2025.11_28_x86-64_0.40	2026-01-11 15:55:54 +00:00
PartialVolume	16933b883c	Remove obsolete package files and folders	2026-01-11 15:26:52 +00:00
PartialVolume	f13ccbc889	Merge pull request #421 from PartialVolume/add-two-missing-video-modules-to-grub Add video and video_fb modules to grub legacy and EFI	2026-01-11 14:03:56 +00:00
PartialVolume	763e5a13ec	Add video and video_fb modules to grub legacy and EFI	2026-01-11 13:55:12 +00:00
PartialVolume	2207e01415	Merge pull request #420 from PartialVolume/revert-nvme-cli-to-2.15 Revert nvme from 2.16 to 2.15 as provided by buildroot	2026-01-11 12:13:51 +00:00
PartialVolume	c5896c2e44	Revert nvme from 2.16 to 2.15 as provided by buildroot	2026-01-11 12:12:25 +00:00
PartialVolume	cbfae94bc0	Merge pull request #419 from PartialVolume/upgrade_nvme-cli Upgraded nvme-cli to v2.16	2026-01-10 15:30:43 +00:00
PartialVolume	540d0d49d7	Upgraded nvme-cli to v2.16	2026-01-10 15:19:32 +00:00
PartialVolume	acd8f5976f	Give custom kernel defconfig file a name not related to the kernel version, so I don't have to keep changing it everytime I upgrade the kernel.	2026-01-10 15:03:49 +00:00
PartialVolume	cb7442500d	Merge pull request #418 from PartialVolume/upgrade-Seagate's-OpenSeaChest Upgraded Seagate's openSeaChest tools to 25.05.3 and restored busybox to it's default location.	2026-01-09 00:29:25 +00:00