Accepting request 917186 from home:michael-chang:branches:Base:System

- Follow usr merge for looking up kernel config (bsc#1189782) (bsc#1190061)
  * 0001-templates-Follow-the-path-of-usr-merged-kernel-confi.patch

OBS-URL: https://build.opensuse.org/request/show/917186
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=393

0001-templates-Follow-the-path-of-usr-merged-kernel-confi.patch

@@ -0,0 +1,47 @@
+From 60d1d3b959e72c2cbd014be311c350a9b11b1289 Mon Sep 17 00:00:00 2001
+From: Michael Chang <mchang@suse.com>
+Date: Tue, 7 Sep 2021 10:06:50 +0800
+Subject: [PATCH] templates: Follow the path of usr merged kernel config
+
+The background for usr merge can be found at:
+
+https://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/
+
+This patch adapts related mkconfig scripts to follow the usr merge for
+looking up kernel configs.
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+---
+ util/grub.d/10_linux.in     | 2 +-
+ util/grub.d/20_linux_xen.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 7f3e79b09..00e351802 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -307,7 +307,7 @@ while [ "x$list" != "x" ] ; do
+   fi
+ 
+   config=
+-  for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
++  for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" "/usr/lib/modules/${version}/config" ; do
+     if test -e "${i}" ; then
+       config="${i}"
+       break
+diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
+index 8813435b7..318b6d320 100644
+--- a/util/grub.d/20_linux_xen.in
++++ b/util/grub.d/20_linux_xen.in
+@@ -304,7 +304,7 @@ for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do
+ 	version=$(echo $basename | sed -e "s,^[^0-9]*-,,g")
+ 	dirname=$(dirname $i)
+ 	config=
+-	for j in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
++	for j in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" "/usr/lib/modules/${version}/config" ; do
+ 	    if test -e "${j}" ; then
+ 		config="${j}"
+ 		break
+-- 
+2.33.0
+

grub2.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep  7 02:32:30 UTC 2021 - Michael Chang <mchang@suse.com>
+
+- Follow usr merge for looking up kernel config (bsc#1189782) (bsc#1190061)
+  * 0001-templates-Follow-the-path-of-usr-merged-kernel-confi.patch
+
 -------------------------------------------------------------------
 Wed Sep  1 05:49:47 UTC 2021 - Michael Chang <mchang@suse.com>
 

grub2.spec

@@ -306,6 +306,7 @@ Patch788:       0001-ieee1275-Avoiding-many-unecessary-open-close.patch
 Patch789:       0001-Workaround-volatile-efi-boot-variable.patch
 Patch790:       0001-30_uefi-firmware-fix-printf-format-with-null-byte.patch
 Patch791:       0001-i386-pc-build-btrfs-zstd-support-into-separate-modul.patch
+Patch792:       0001-templates-Follow-the-path-of-usr-merged-kernel-confi.patch
 
 Requires:       gettext-runtime
 %if 0%{?suse_version} >= 1140