Narcissus/shredos.x86_64
2
0
Fork 0
mirror of https://github.com/PartialVolume/shredos.x86_64.git synced 2026-02-20 05:32:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(configs): clean up configurations

Browse Source 
Signed-off-by: desertwitch <24509509+desertwitch@users.noreply.github.com>
This commit is contained in:
desertwitch
2025-11-21 07:05:51 +01:00
parent b7e304a292
commit 2291b2fdbc
9 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
README.md
View File

@@ -820,27 +820,25 @@ $ 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 AIO hybrid ISO (64-bit)
- `make shredos_i586_defconfig` - build USB image and AIO hybrid ISO (32-bit)
- `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 legacy hybrid ISO only (64-bit)
- `make shredos_iso_i586_defconfig` - build legacy hybrid ISO only (32-bit)
- `make shredos_iso_aio_defconfig` - build AIO hybrid ISO only (64-bit)
- `make shredos_iso_aio_i586_defconfig` - build AIO hybrid ISO 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)
Do note that loading a configuration should typically be the last step before `make`.
> **The all-in-one hybrid ISOs unite most functionality of all other formats:**
> **The hybrid ISOs unite most functionality of all other formats:**
>
>- are BIOS and UEFI bootable
>- can both be written to CD/DVD-ROM and USB flash drives
>- have a writeable partition (when written to a USB flash drive)
>- **but** do not allow customization of GRUB (for `autonuke`, ...)
>
>The **legacy** hybrid ISOs do not have that writeable partition (but are
>slightly smaller in size), which means that you cannot add any files or have
>any PDFs written to them (even when using them burned to an USB flash drive).
>The **legacy** ISOs work in BIOS and UEFI, but only burned to CD/DVD-ROM.
#### Building multiple configurations:

6
board/shredos/fsoverlay/usr/bin/find_shredos_boot_disc.sh
View File

@@ -49,9 +49,9 @@ do
isEFI=$(fdisk -l | grep -i "$drive" | grep -i "EFI")
# EFI partitions should not quality for "first drive" to avoid false
# positives; we only use it if confirmed as ours. The hybrid all-in-one ISO
# image's EFI partition can be written to, and we need to ensure that other
# EFI partitions remain untouched, so we don't take EFIs as "first drive".
# positives; we only use it if confirmed as ours. The hybrid ISO image has
# an EFI partition that can be written to, and we need to ensure that other
# devices' EFI partitions remain untouched, disallowing EFI "first drive"s.
#
# Note that our USB image's FAT partition is not marked specifically as EFI
# (0xEF) but regular FAT (0xC/0x0C), so it still qualifies as "first drive".

12
board/shredos/populate_efi_partition.sh
View File

@@ -1,12 +1,12 @@
#!/bin/bash -e
#
# BR2_ROOTFS_POST_BUILD_SCRIPT for shredos_iso_aio configurations
# BR2_ROOTFS_POST_BUILD_SCRIPT for hybrid ISO configurations
#
# Our hybrid all-in-one ISO has an accessible EFI partition, which we
# can (ab)use to store our information also, so we move the usual data
# onto it before creating the images. This should not cause any issues
# for CD/DVD-ROM burned ISO images, as the EFI partition will be in RAM,
# but allow any USB burned ISO images to have that writeable data location.
# Our hybrid ISO has an accessible EFI partition, which we can (ab)use to store
# our information also, so we move the usual data onto it before creating the
# images. This should not cause any issues for CD/DVD-ROM burned ISO images, as
# the EFI partition will be in RAM, but allow any USB burned ISO images to have
# that writeable data location to put configuration files, logs and PDFs onto.
#
# Keep in mind that the EFI partition size (in configuration) must be below
# the maximum of 65535 blocks of 512 bytes (= ~32 MB) or the ISO may not

4
build_all_shredos.sh
View File

@@ -31,7 +31,7 @@ X64_CONFIGS=(
"shredos_defconfig"
"shredos_img_defconfig"
"shredos_iso_defconfig"
"shredos_iso_aio_defconfig"
"shredos_iso_legacy_defconfig"
)
# 32-bit configurations to build:
@@ -39,7 +39,7 @@ X32_CONFIGS=(
"shredos_i586_defconfig"
"shredos_img_i586_defconfig"
"shredos_iso_i586_defconfig"
"shredos_iso_aio_i586_defconfig"
"shredos_iso_legacy_i586_defconfig"
)
# Packages always needing rebuild between runs, even for the same architecture.

2
configs/shredos_iso_defconfig
View File

@@ -15,6 +15,7 @@ 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/populate_efi_partition.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/shredos/make_iso_file.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
@@ -171,6 +172,7 @@ 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_GRUB2_EFI_PARTITION_SIZE="28M"
BR2_TARGET_ROOTFS_ISO9660_HYBRID=y
# BR2_TARGET_ROOTFS_TAR is not set
BR2_TARGET_GRUB2=y

2
configs/shredos_iso_i586_defconfig
View File

@@ -13,6 +13,7 @@ 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/populate_efi_partition.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/shredos/make_iso_file.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
@@ -168,6 +169,7 @@ 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_GRUB2_EFI_PARTITION_SIZE="28M"
BR2_TARGET_ROOTFS_ISO9660_HYBRID=y
# BR2_TARGET_ROOTFS_TAR is not set
BR2_TARGET_GRUB2=y

3
configs/shredos_iso_aio_defconfig → configs/shredos_iso_legacy_defconfig
View File

@@ -15,7 +15,6 @@ 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/populate_efi_partition.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/shredos/make_iso_file.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
@@ -172,8 +171,6 @@ 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_GRUB2_EFI_PARTITION_SIZE="28M"
BR2_TARGET_ROOTFS_ISO9660_HYBRID=y
# BR2_TARGET_ROOTFS_TAR is not set
BR2_TARGET_GRUB2=y
BR2_TARGET_GRUB2_X86_64_EFI=y

3
configs/shredos_iso_aio_i586_defconfig → configs/shredos_iso_legacy_i586_defconfig
View File

@@ -13,7 +13,6 @@ 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/populate_efi_partition.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/shredos/make_iso_file.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
@@ -169,8 +168,6 @@ 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_GRUB2_EFI_PARTITION_SIZE="28M"
BR2_TARGET_ROOTFS_ISO9660_HYBRID=y
# BR2_TARGET_ROOTFS_TAR is not set
BR2_TARGET_GRUB2=y
BR2_TARGET_GRUB2_I386_EFI=y

4
fs/iso9660/iso9660.mk
View File

@@ -407,7 +407,7 @@ ROOTFS_ISO9660_OPTS_BIOS = \
endif
ifeq ($(BR2_TARGET_ROOTFS_ISO9660_BOTH)$(BR2_TARGET_ROOTFS_ISO9660_HYBRID),yy)
# BOTH (uses GRUB2 in EFI)
# BOTH + HYBRID (uses GRUB2 in EFI)
# Hybrid Image Support (Modern Variant, Debian-style)
ROOTFS_ISO9660_OPTS_EFI = \
-e $(ROOTFS_ISO9660_EFI_PARTITION) \
@@ -415,7 +415,7 @@ ROOTFS_ISO9660_OPTS_EFI = \
-isohybrid-gpt-basdat \
-isohybrid-apm-hfsplus
else
# BOTH/GRUB2 (use GRUB2 in EFI)
# BOTH or GRUB2 (use GRUB2 in EFI)
ROOTFS_ISO9660_OPTS_EFI = \
-e $(ROOTFS_ISO9660_EFI_PARTITION) \
-no-emul-boot