added multi variants of initrd names- multikernel support

This commit is contained in:
Victor Tebar
2023-07-08 07:15:00 +00:00
parent afb8533515
commit 297804c66e
4 changed files with 49 additions and 9 deletions

View File

@@ -1,5 +1,5 @@
a1ec4bfb2ae5116db789397aa796683a detect-venom-fallback-initrd.patch
da388905710bb4cbfbc7bd7346ff9174 grub-2.06-upstream_fixes-1.patch
cf0fd928b1e5479c8108ee52cb114363 grub-2.06.tar.xz
5555ecc4025d7b5cf01709ed7bfe6e5f grub.cfg
b4a4d287513091e7e66eca5853101a93 grub.default
78d2b0d53485e16754d17b54837eb3f0 venom-tweaks.patch

View File

@@ -1,4 +1,4 @@
grub-2.06-5
grub-2.06-6
drwxr-xr-x root/root etc/
drwxr-xr-x root/root etc/bash_completion.d/
-rw-r--r-- root/root etc/bash_completion.d/grub
@@ -628,3 +628,33 @@ drwxr-xr-x root/root usr/share/info/
-rw-r--r-- root/root usr/share/info/grub.info-1.gz
-rw-r--r-- root/root usr/share/info/grub.info-2.gz
-rw-r--r-- root/root usr/share/info/grub.info.gz
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/grub-editenv.1.gz
-rw-r--r-- root/root usr/share/man/man1/grub-file.1.gz
-rw-r--r-- root/root usr/share/man/man1/grub-fstest.1.gz
-rw-r--r-- root/root usr/share/man/man1/grub-glue-efi.1.gz
-rw-r--r-- root/root usr/share/man/man1/grub-kbdcomp.1.gz
-rw-r--r-- root/root usr/share/man/man1/grub-menulst2cfg.1.gz
-rw-r--r-- root/root usr/share/man/man1/grub-mkfont.1.gz
-rw-r--r-- root/root usr/share/man/man1/grub-mkimage.1.gz
-rw-r--r-- root/root usr/share/man/man1/grub-mklayout.1.gz
-rw-r--r-- root/root usr/share/man/man1/grub-mknetdir.1.gz
-rw-r--r-- root/root usr/share/man/man1/grub-mkpasswd-pbkdf2.1.gz
-rw-r--r-- root/root usr/share/man/man1/grub-mkrelpath.1.gz
-rw-r--r-- root/root usr/share/man/man1/grub-mkrescue.1.gz
-rw-r--r-- root/root usr/share/man/man1/grub-mkstandalone.1.gz
-rw-r--r-- root/root usr/share/man/man1/grub-mount.1.gz
-rw-r--r-- root/root usr/share/man/man1/grub-render-label.1.gz
-rw-r--r-- root/root usr/share/man/man1/grub-script-check.1.gz
-rw-r--r-- root/root usr/share/man/man1/grub-syslinux2cfg.1.gz
drwxr-xr-x root/root usr/share/man/man8/
-rw-r--r-- root/root usr/share/man/man8/grub-bios-setup.8.gz
-rw-r--r-- root/root usr/share/man/man8/grub-install.8.gz
-rw-r--r-- root/root usr/share/man/man8/grub-macbless.8.gz
-rw-r--r-- root/root usr/share/man/man8/grub-mkconfig.8.gz
-rw-r--r-- root/root usr/share/man/man8/grub-ofpathname.8.gz
-rw-r--r-- root/root usr/share/man/man8/grub-probe.8.gz
-rw-r--r-- root/root usr/share/man/man8/grub-reboot.8.gz
-rw-r--r-- root/root usr/share/man/man8/grub-set-default.8.gz
-rw-r--r-- root/root usr/share/man/man8/grub-sparc64-setup.8.gz

View File

@@ -3,11 +3,11 @@
name=grub
version=2.06
release=5
release=6
backup="etc/default/grub"
source="https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz
venom-tweaks.patch
grub.default
detect-venom-fallback-initrd.patch
grub-2.06-upstream_fixes-1.patch
grub.cfg"
@@ -18,8 +18,8 @@ build() {
export CFLAGS="-march=x86-64 -pipe -Os"
cd $name-$version
patch -Np1 -i $SRC/detect-venom-fallback-initrd.patch
# venom fallball and multikernel support
patch -Np1 -i $SRC/venom-tweaks.patch
# Fix an issue causing grub-install to fail when the /boot partition
# (or the root partition if /boot is not a separate partition)

View File

@@ -1,6 +1,5 @@
diff -Naur grub-2.02-orig/util/grub.d/10_linux.in grub-2.02/util/grub.d/10_linux.in
--- grub-2.02-orig/util/grub.d/10_linux.in 2017-04-24 17:15:50.000000000 +0800
+++ grub-2.02/util/grub.d/10_linux.in 2019-04-16 16:25:52.639999817 +0800
--- grub-2.06-orig/util/grub.d/10_linux.in 2017-04-24 17:15:50.000000000 +0800
+++ grub-2.06/util/grub.d/10_linux.in 2019-04-16 16:25:52.639999817 +0800
@@ -83,6 +83,8 @@
case $type in
recovery)
@@ -29,3 +28,14 @@ diff -Naur grub-2.02-orig/util/grub.d/10_linux.in grub-2.02/util/grub.d/10_linux
if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
linux_entry "${OS}" "${version}" recovery \
"single ${GRUB_CMDLINE_LINUX}"
--- grub-2.06-orig/util/grub.d/10_linux.in 2020-12-23 00:24:17.000000000 +0100
+++ grub-2.06/util/grub.d/10_linux.in 2023-05-20 15:12:04.959775550 +0200
@@ -213,6 +213,7 @@
initrd_real=
for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
"initrd-${version}" "initramfs-${version}.img" \
+ "initrd-venom-*.img" \
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
"initramfs-genkernel-${version}" \