grub2: generate grub2-efi-image at build time

To eliminate human factor for crafting and signin this image. Extras: - remove several unneeded patches Change-Id: I78419b911afd2c8ec2a915e7007917e6870b0a36 Signed-off-by: Alexey Makhalov <[email protected]> Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/19822 Tested-by: gerrit-photon <[email protected]> Reviewed-by: Shreenidhi Shedi <[email protected]>
vmware · Mar 20, 2023 · 3435dc3 · 3435dc3
1 parent 9fc0cf7
commit 3435dc3
Show file tree

Hide file tree

Showing 11 changed files with 348 additions and 838 deletions.
diff --git a/SPECS/grub2/fedora.patches b/SPECS/grub2/fedora.patches
diff --git a/SPECS/grub2/fedora/0024-Don-t-say-GNU-Linux-in-generated-menus.patch b/SPECS/grub2/fedora/0024-Don-t-say-GNU-Linux-in-generated-menus.patch
diff --git a/SPECS/grub2/fedora/0026-Don-t-require-a-password-to-boot-entries-generated-b.patch b/SPECS/grub2/fedora/0026-Don-t-require-a-password-to-boot-entries-generated-b.patch
@@ -9,6 +9,8 @@ When we set a password, we just want that to mean you can't /edit/ an entry.
 Resolves: rhbz#1030176
 
 Signed-off-by: Peter Jones <[email protected]>
+[AM: fix conflict]
+Signed-off-by: Alexey Makhalov <[email protected]>
 ---
  util/grub.d/10_linux.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -25,4 +27,4 @@ index 4a499c53a6..cf8d118698 100644
 +CLASS="--class gnu-linux --class gnu --class os --unrestricted"
 
  if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
-   OS="$(sed 's, release .*$,,g' /etc/system-release)"
+   OS=GNU/Linux
diff --git a/SPECS/grub2/fedora/0029-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch b/SPECS/grub2/fedora/0029-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
diff --git a/SPECS/grub2/fedora/0030-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch b/SPECS/grub2/fedora/0030-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
diff --git a/SPECS/grub2/fedora/0034-tcp-add-window-scaling-support.patch b/SPECS/grub2/fedora/0034-tcp-add-window-scaling-support.patch
diff --git a/SPECS/grub2/fedora/0096-Add-a-version-command.patch b/SPECS/grub2/fedora/0096-Add-a-version-command.patch