update build-iso efi grub to latest debian (SBAT Secure Boot changes)

MX-Linux · Oct 4, 2024 · a427031 · a427031
1 parent cceaf36
commit a427031
Show file tree

Hide file tree

Showing 33 changed files with 17 additions and 15 deletions.
diff --git a/Template/COMMON/iso/EFI/BOOT/BOOTia32.efi b/Template/COMMON/iso/EFI/BOOT/BOOTia32.efi
diff --git a/Template/COMMON/iso/EFI/BOOT/BOOTx64.efi b/Template/COMMON/iso/EFI/BOOT/BOOTx64.efi
diff --git a/Template/COMMON/iso/EFI/BOOT/grubx64.efi b/Template/COMMON/iso/EFI/BOOT/grubx64.efi
diff --git a/Template/COMMON/iso/EFI/BOOT/mmx64.efi b/Template/COMMON/iso/EFI/BOOT/mmx64.efi
diff --git a/Template/COMMON/iso/boot/grub/config/defaults.cfg b/Template/COMMON/iso/boot/grub/config/defaults.cfg
@@ -15,13 +15,14 @@ TIMEOUT_NOTIFICATION_LONG_EN="The highlighted entry will start in %d seconds"
 if [ -z "$have_defaults" ]; then
 
    if [ "${grub_platform}" = "efi" ]; then
-      # unload tpm unless secure boot detected using heuristic check:
-      # 'eval true' would not run in Debian's secure boot
-      if eval true; then 
+      # unload tpm unless secure boot detected
+      if [ "x$lockdown" = "xy" ]; then
          true
+      else
          rmmod tpm
       fi
    fi
+
    if [ -s  $prefix/config/load_defaults.cfg ]; then
      source $prefix/config/load_defaults.cfg
    fi

diff --git a/Template/COMMON/iso/boot/grub/efi.img b/Template/COMMON/iso/boot/grub/efi.img
diff --git a/Template/COMMON/iso/boot/grub/i386-efi/config.h b/Template/COMMON/iso/boot/grub/i386-efi/config.h
@@ -51,9 +51,9 @@
 /* Version number of package.  */
 #define VERSION "2.06"
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GRUB 2.06-13"
+#define PACKAGE_STRING "GRUB 2.06-13+deb12u1"
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.06-13"
+#define PACKAGE_VERSION "2.06-13+deb12u1"
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "GRUB"
 /* Define to the address where bug reports for this package should be sent. */

diff --git a/Template/COMMON/iso/boot/grub/i386-efi/http.mod b/Template/COMMON/iso/boot/grub/i386-efi/http.mod
diff --git a/Template/COMMON/iso/boot/grub/i386-efi/modinfo.sh b/Template/COMMON/iso/boot/grub/i386-efi/modinfo.sh
@@ -34,7 +34,7 @@ grub_target_img_ldflags='@TARGET_IMG_BASE_LDFLAGS@'
 # Version
 grub_version="2.06"
 grub_package="grub"
-grub_package_string="GRUB 2.06-13"
-grub_package_version="2.06-13"
+grub_package_string="GRUB 2.06-13+deb12u1"
+grub_package_version="2.06-13+deb12u1"
 grub_package_name="GRUB"
 grub_package_bugreport="[email protected]"
diff --git a/Template/COMMON/iso/boot/grub/i386-efi/multiboot.mod b/Template/COMMON/iso/boot/grub/i386-efi/multiboot.mod
diff --git a/Template/COMMON/iso/boot/grub/i386-efi/multiboot2.mod b/Template/COMMON/iso/boot/grub/i386-efi/multiboot2.mod
diff --git a/Template/COMMON/iso/boot/grub/i386-efi/normal.mod b/Template/COMMON/iso/boot/grub/i386-efi/normal.mod
diff --git a/Template/COMMON/iso/boot/grub/i386-efi/ntfs.mod b/Template/COMMON/iso/boot/grub/i386-efi/ntfs.mod
diff --git a/Template/COMMON/iso/boot/grub/i386-efi/shim_lock.mod b/Template/COMMON/iso/boot/grub/i386-efi/shim_lock.mod
diff --git a/Template/COMMON/iso/boot/grub/i386-pc/config.h b/Template/COMMON/iso/boot/grub/i386-pc/config.h
@@ -51,9 +51,9 @@
 /* Version number of package.  */
 #define VERSION "2.06"
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GRUB 2.06-13"
+#define PACKAGE_STRING "GRUB 2.06-13+deb12u1"
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.06-13"
+#define PACKAGE_VERSION "2.06-13+deb12u1"
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "GRUB"
 /* Define to the address where bug reports for this package should be sent. */

diff --git a/Template/COMMON/iso/boot/grub/i386-pc/core.img b/Template/COMMON/iso/boot/grub/i386-pc/core.img
diff --git a/Template/COMMON/iso/boot/grub/i386-pc/efiemu32.o b/Template/COMMON/iso/boot/grub/i386-pc/efiemu32.o
diff --git a/Template/COMMON/iso/boot/grub/i386-pc/efiemu64.o b/Template/COMMON/iso/boot/grub/i386-pc/efiemu64.o
diff --git a/Template/COMMON/iso/boot/grub/i386-pc/eltorito.img b/Template/COMMON/iso/boot/grub/i386-pc/eltorito.img
diff --git a/Template/COMMON/iso/boot/grub/i386-pc/http.mod b/Template/COMMON/iso/boot/grub/i386-pc/http.mod
diff --git a/Template/COMMON/iso/boot/grub/i386-pc/modinfo.sh b/Template/COMMON/iso/boot/grub/i386-pc/modinfo.sh
@@ -34,7 +34,7 @@ grub_target_img_ldflags='@TARGET_IMG_BASE_LDFLAGS@'
 # Version
 grub_version="2.06"
 grub_package="grub"
-grub_package_string="GRUB 2.06-13"
-grub_package_version="2.06-13"
+grub_package_string="GRUB 2.06-13+deb12u1"
+grub_package_version="2.06-13+deb12u1"
 grub_package_name="GRUB"
 grub_package_bugreport="[email protected]"
diff --git a/Template/COMMON/iso/boot/grub/i386-pc/multiboot.mod b/Template/COMMON/iso/boot/grub/i386-pc/multiboot.mod
diff --git a/Template/COMMON/iso/boot/grub/i386-pc/multiboot2.mod b/Template/COMMON/iso/boot/grub/i386-pc/multiboot2.mod
diff --git a/Template/COMMON/iso/boot/grub/i386-pc/normal.mod b/Template/COMMON/iso/boot/grub/i386-pc/normal.mod
diff --git a/Template/COMMON/iso/boot/grub/i386-pc/ntfs.mod b/Template/COMMON/iso/boot/grub/i386-pc/ntfs.mod
diff --git a/Template/COMMON/iso/boot/grub/loopback.cfg b/Template/COMMON/iso/boot/grub/loopback.cfg
@@ -1,2 +1,3 @@
+export iso_path
 prefix=($root)/boot/grub
 source $prefix/grub.cfg
diff --git a/Template/COMMON/iso/boot/grub/x86_64-efi/config.h b/Template/COMMON/iso/boot/grub/x86_64-efi/config.h
@@ -51,9 +51,9 @@
 /* Version number of package.  */
 #define VERSION "2.06"
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GRUB 2.06-13"
+#define PACKAGE_STRING "GRUB 2.06-13+deb12u1"
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.06-13"
+#define PACKAGE_VERSION "2.06-13+deb12u1"
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "GRUB"
 /* Define to the address where bug reports for this package should be sent. */

diff --git a/Template/COMMON/iso/boot/grub/x86_64-efi/http.mod b/Template/COMMON/iso/boot/grub/x86_64-efi/http.mod
diff --git a/Template/COMMON/iso/boot/grub/x86_64-efi/modinfo.sh b/Template/COMMON/iso/boot/grub/x86_64-efi/modinfo.sh
@@ -34,7 +34,7 @@ grub_target_img_ldflags='@TARGET_IMG_BASE_LDFLAGS@'
 # Version
 grub_version="2.06"
 grub_package="grub"
-grub_package_string="GRUB 2.06-13"
-grub_package_version="2.06-13"
+grub_package_string="GRUB 2.06-13+deb12u1"
+grub_package_version="2.06-13+deb12u1"
 grub_package_name="GRUB"
 grub_package_bugreport="[email protected]"
diff --git a/Template/COMMON/iso/boot/grub/x86_64-efi/multiboot.mod b/Template/COMMON/iso/boot/grub/x86_64-efi/multiboot.mod
diff --git a/Template/COMMON/iso/boot/grub/x86_64-efi/multiboot2.mod b/Template/COMMON/iso/boot/grub/x86_64-efi/multiboot2.mod
diff --git a/Template/COMMON/iso/boot/grub/x86_64-efi/normal.mod b/Template/COMMON/iso/boot/grub/x86_64-efi/normal.mod
diff --git a/Template/COMMON/iso/boot/grub/x86_64-efi/ntfs.mod b/Template/COMMON/iso/boot/grub/x86_64-efi/ntfs.mod