BR: zfs-devel

diff --git a/choose-preferred-initrd.patch b/choose-preferred-initrd.patch
index 3dcc197a56829adb99a75bebedf47d1faa21a927..341571a93b684d11ef97270d11842976a52c9cbd 100644 (file)
--- a/choose-preferred-initrd.patch
+++ b/choose-preferred-initrd.patch
@@ -11,41 +11,43 @@ diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub-mkconfig.in grub-2.00
  
  if test "x${grub_cfg}" != "x"; then
    rm -f "${grub_cfg}.new"
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_linux.in grub-2.00.git20131218/util/grub.d/10_linux.in
---- grub-2.00.git20131218.orig/util/grub.d/10_linux.in 2013-12-18 14:44:31.000000000 +0100
-+++ grub-2.00.git20131218/util/grub.d/10_linux.in      2013-12-18 14:44:49.000000000 +0100
-@@ -198,10 +198,12 @@
+--- grub-2.12/util/grub.d/10_linux.in.orig     2023-12-20 18:29:16.010179150 +0100
++++ grub-2.12/util/grub.d/10_linux.in  2023-12-20 18:38:21.914140889 +0100
+@@ -223,12 +223,12 @@
    done
  
    initrd_real=
--  for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
--         "initrd-${version}" "initramfs-${version}.img" \
+-  for i in "initrd.img-${version}" "initrd-${version}.img" \
+-         "initrd-${alt_version}.img.old" "initrd-${version}.gz" \
+-         "initrd-${alt_version}.gz.old" "initrd-${version}" \
+-         "initramfs-${version}.img" "initramfs-${alt_version}.img.old" \
 -         "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
 -         "initrd-${alt_version}" "initramfs-${alt_version}.img" \
 +  if [ x"${GRUB_PREFER_DRACUT}" != "xtrue" ]; then
-+        initrd_search_list="initrd.img-${version} initrd-${version}.img initrd-${version}.gz initrd-${version} initramfs-${version}.img initrd.img-${alt_version} initrd-${alt_version}.img initrd-${alt_version} initramfs-${alt_version}.img"
++        initrd_search_list="initrd.img-${version} initrd-${version}.img initrd-${alt_version}.img.old initrd-${version}.gz initrd-${alt_version}.gz.old initrd-${version} initramfs-${version}.img initramfs-${alt_version}.img.old initrd.img-${alt_version} initrd-${alt_version}.img initrd-${alt_version} initramfs-${alt_version}.img"
 +  else
-+        initrd_search_list="initramfs-${version}.img initrd.img-${version} initrd-${version}.img initrd-${version}.gz initrd-${version}  initramfs-${alt_version}.img initrd.img-${alt_version} initrd-${alt_version}.img initrd-${alt_version}"
++        initrd_search_list="initramfs-${version}.img initrd.img-${version} initrd-${version}.img initrd-${alt_version}.img.old initrd-${version}.gz initrd-${alt_version}.gz.old initrd-${version} initramfs-${alt_version}.img initramfs-${alt_version}.img.old initrd.img-${alt_version} initrd-${alt_version}.img initrd-${alt_version}"
 +  fi
 +  for i in $initrd_search_list \
           "initramfs-genkernel-${version}" \
           "initramfs-genkernel-${alt_version}" \
           "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/20_linux_xen.in grub-2.00.git20131218/util/grub.d/20_linux_xen.in
---- grub-2.00.git20131218.orig/util/grub.d/20_linux_xen.in     2013-12-18 14:44:31.000000000 +0100
-+++ grub-2.00.git20131218/util/grub.d/20_linux_xen.in  2013-12-18 14:44:49.000000000 +0100
-@@ -207,10 +207,12 @@
+--- grub-2.12/util/grub.d/20_linux_xen.in.orig 2023-12-20 18:43:31.667835423 +0100
++++ grub-2.12/util/grub.d/20_linux_xen.in      2023-12-20 18:45:35.230741185 +0100
+@@ -295,12 +295,12 @@
        linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
  
        initrd_real=
--      for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
--         "initrd-${version}" "initramfs-${version}.img" \
+-      for i in "initrd.img-${version}" "initrd-${version}.img" \
+-         "initrd-${alt_version}.img.old" "initrd-${version}.gz" \
+-         "initrd-${alt_version}.gz.old" "initrd-${version}" \
+-         "initramfs-${version}.img" "initramfs-${alt_version}.img.old" \
 -         "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
 -         "initrd-${alt_version}" "initramfs-${alt_version}.img" \
 +      if [ x"${GRUB_PREFER_DRACUT}" != "xtrue" ]; then
-+          initrd_search_list="initrd.img-${version} initrd-${version}.img initrd-${version}.gz initrd-${version} initramfs-${version}.img initrd.img-${alt_version} initrd-${alt_version}.img initrd-${alt_version} initramfs-${alt_version}.img"
++          initrd_search_list="initrd.img-${version} initrd-${version}.img initrd-${alt_version}.img.old initrd-${version}.gz initrd-${alt_version}.gz.old initrd-${version} initramfs-${version}.img initramfs-${alt_version}.img.old initrd.img-${alt_version} initrd-${alt_version}.img initrd-${alt_version} initramfs-${alt_version}.img"
 +      else
-+          initrd_search_list="initramfs-${version}.img initrd.img-${version} initrd-${version}.img initrd-${version}.gz initrd-${version}  initramfs-${alt_version}.img initrd.img-${alt_version} initrd-${alt_version}.img initrd-${alt_version}"
++          initrd_search_list="initramfs-${version}.img initrd.img-${version} initrd-${version}.img initrd-${alt_version}.img.old initrd-${version}.gz initrd-${alt_version}.gz.old initrd-${version} initramfs-${alt_version}.img initramfs-${alt_version}.img.old initrd.img-${alt_version} initrd-${alt_version}.img initrd-${alt_version}"
 +      fi
 +      for i in $initrd_search_list \
           "initramfs-genkernel-${version}" \

diff --git a/grub-mkconfig-diagnostics.patch b/grub-mkconfig-diagnostics.patch
index a10124ab4be7c299c64efc233f4fadb2f9907c11..36edb0bc34137bda245a7f9e5ecba458d84214af 100644 (file)
--- a/grub-mkconfig-diagnostics.patch
+++ b/grub-mkconfig-diagnostics.patch
@@ -107,9 +107,9 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_kfreebsd.in gr
 --- grub-2.02~beta2.orig/util/grub.d/10_kfreebsd.in    2013-12-17 18:25:57.000000000 +0100
 +++ grub-2.02~beta2/util/grub.d/10_kfreebsd.in 2014-01-04 11:34:50.135240649 +0100
 @@ -158,7 +158,7 @@
+ is_top_level=true
  
- while [ "x$list" != "x" ] ; do
-   kfreebsd=`version_find_latest $list`
+ for kfreebsd in ${reverse_sorted_list}; do
 -  gettext_printf "Found kernel of FreeBSD: %s\n" "$kfreebsd" >&2
 +  gettext_printf "Found kernel of FreeBSD: %s\n" "$kfreebsd" >&3
    basename=`basename $kfreebsd`
@@ -127,9 +127,9 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_kfreebsd.in gr
 --- grub-2.04/util/grub.d/10_linux.in.orig     2018-11-24 18:13:02.000000000 +0100
 +++ grub-2.04/util/grub.d/10_linux.in  2019-07-05 13:53:33.737370014 +0200
 @@ -194,7 +194,7 @@
+ 
  is_top_level=true
- while [ "x$list" != "x" ] ; do
-   linux=`version_find_latest $list`
+ for linux in ${reverse_sorted_list}; do
 -  gettext_printf "Found linux image: %s\n" "$linux" >&2
 +  gettext_printf "Found linux image: %s\n" "$linux" >&3
    basename=`basename $linux`
@@ -171,9 +171,9 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_windows.in gru
 --- grub-2.04/util/grub.d/20_linux_xen.in.orig 2019-04-23 10:54:47.000000000 +0200
 +++ grub-2.04/util/grub.d/20_linux_xen.in      2019-07-05 13:55:11.220267798 +0200
 @@ -243,7 +243,7 @@
+     done
  
-     while [ "x$list" != "x" ] ; do
-       linux=`version_find_latest $list`
+     for linux in ${reverse_sorted_linux_list}; do
 -      gettext_printf "Found linux image: %s\n" "$linux" >&2
 +      gettext_printf "Found linux image: %s\n" "$linux" >&3
        basename=`basename $linux`

diff --git a/grub2-fonts_path.patch b/grub2-fonts_path.patch
index d9fd2ad784a6123f31cade2275b60951bf08097c..e5f5300937c3a448a34e295a1e67410c7d09a962 100644 (file)
--- a/grub2-fonts_path.patch
+++ b/grub2-fonts_path.patch
@@ -1,12 +1,11 @@
-diff -dur -x '*~' grub-2.00.orig/configure.ac grub-2.00/configure.ac
---- grub-2.00.orig/configure.ac        2012-10-28 09:47:24.000000000 +0100
-+++ grub-2.00/configure.ac     2012-10-28 09:48:06.438240771 +0100
-@@ -940,7 +940,7 @@
- 
- if test x"$starfield_excuse" = x; then
-    for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
--     for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do
-+     for dir in . /usr/share/fonts/TTF /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do
-         if test -f "$dir/DejaVuSans.$ext"; then
-           DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
-           break 2
+--- grub-2.12/configure.ac.orig        2023-12-20 18:27:11.057068695 +0100
++++ grub-2.12/configure.ac     2023-12-20 18:28:25.454952491 +0100
+@@ -1847,7 +1847,7 @@
+   # search in well-known directories
+   if test x"$starfield_excuse" = x; then
+      for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
+-       for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype /usr/pkg/share/fonts/X11/TTF /usr/local/share/fonts/dejavu /usr/X11R6/lib/X11/fonts/TTF; do
++       for dir in . /usr/share/fonts/TTF /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype /usr/pkg/share/fonts/X11/TTF /usr/local/share/fonts/dejavu /usr/X11R6/lib/X11/fonts/TTF; do
+           if test -f "$dir/DejaVuSans.$ext"; then
+             DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
+             break 2

diff --git a/grub2.spec b/grub2.spec
index 9a301f95ac9a046e2a5eb5b92ddfba5ecae23e21..f8a200366661b517b149684b1505abb7a73db725 100644 (file)
--- a/grub2.spec
+++ b/grub2.spec
@@ -210,6 +210,7 @@ BuildRequires:      tar >= 1:1.22
 BuildRequires: texinfo
 BuildRequires: xz
 BuildRequires: xz-devel
+BuildRequires: zfs-devel
 Requires:      %{name}-platform = %{version}-%{release}
 Requires:      pld-release
 Requires:      which