starlingx/integ
Code Issues Proposed changes

CentOS 8: Upgrade grub2 to version 2.02

Browse Source 
(1)Release Version Upgrade
(2)Matching code changes with el7 to el8_0.1
(3)Delete useless patches
(4)Add patch "0013-grub2-fix-build-grub2-pc-modules-pkgs.patch"
(5)Add patch "0014-grub2-Create-empty-grub2-pkgs.patch"
1.Delete 0002-grub2-fix-cflags.patch:
As it has already deleted useless cflags info in el8 source code

2.Delete 0003-grub2-remove-debug-pkgs.patch:
this patch is about debug info and build env.
as gcc8.2 support debug info is dawnfs0,
it doesn't match gdb debug, gdb support dawnfs(2,3,4 or 5), we may
need not run the debug info, otherwise, if remain the patch,
it prompt error as below when rpmbuild
"Dwarf Error: wrong version in compilation unit header (is 0,
should be 2, 3, 4 or 5)"

3.Delete 0004-grub2-remove-32b-requirements.patch:
As it has already deleted the useless buildrequires in upgrade SRPM.

4.Add 0013-grub2-fix-build-grub2-pc-modules-pkgs.patch, fix to build
grub2-pc-modules-2.02-66.el8.noarch.rpm, which is depended by other package,
without the fix patch, it will missed building and prompt error for no such
pkgs when install grub2-efi pkgs procedure. so we should create it act as
el7 version work.
Depends-On: https://review.opendev.org/#/c/726511/
Change-Id: I18d35834a981036fa0ab753c9b098d82e50f1366
Story: 2006729
Task: 37681
Signed-off-by: Long Li <lilong-neu@neusoft.com>
This commit is contained in:
Long Li 2019-11-21 20:49:40 +08:00
parent 5f6e275021
commit c9981d6ccc
19 changed files with 139 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grub/grub2/centos/build_srpm.data
View File

@ -1,3 +1,3 @@
COPY_LIST=""
TIS_PATCH_VER=12
TIS_PATCH_VER=1
BUILD_IS_SLOW=8

20
grub/grub2/centos/meta_patches/0001-grub2-Update-package-versioning-for-TIS-format.patch
View File

@ -8,18 +8,18 @@ Subject: [PATCH] Update-package-versioning-for-TIS-format
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
index 12d34ad..88c6c09 100644
index b471027..ccd0244 100644
--- a/SPECS/grub2.spec
+++ b/SPECS/grub2.spec
@@ -17,7 +17,7 @@
Name: grub2
Epoch: 1
Version: 2.02
-Release: 0.76%{?dist}%{?buildid}
+Release: 0.76.el7.centos%{?_tis_dist}.%{tis_patch_ver}
Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base
License: GPLv3+
@@ -7,7 +7,7 @@
Name: grub2
Epoch: 1
Version: 2.02
-Release: 66%{?dist}.1
+Release: 66.el8_0.1%{?_tis_dist}.%{tis_patch_ver}
Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base
License: GPLv3+
--
2.7.4

22
grub/grub2/centos/meta_patches/0002-grub2-fix-cflags.patch
View File

@ -1,22 +0,0 @@
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
index 6e12329..10f74df 100644
--- a/SOURCES/grub.macros
+++ b/SOURCES/grub.macros
@@ -15,16 +15,7 @@
%global cc_equals %{nil}
%endif
-%global efi_cflags %(echo %{optflags} | \\\
- sed \\\
- -e 's/-O./-g3/g' \\\
- -e 's/-fstack-protector[[:alpha:]-]\\+//g' \\\
- -e 's/-Wp,-D_FORTIFY_SOURCE=[[:digit:]]\\+//g' \\\
- -e 's/--param=ssp-buffer-size=4//g' \\\
- -e 's/-mregparm=3/-mregparm=4/g' \\\
- -e 's/-fexceptions//g' \\\
- -e 's/-fasynchronous-unwind-tables//g' \\\
- -e 's/^/ -fno-strict-aliasing /' ) %{nil}
+%global efi_cflags ''
%global legacy_cflags %(echo %{efi_cflags} | \\\
sed \\\
-e 's/-m64//g' \\\

51
grub/grub2/centos/meta_patches/0003-grub2-remove-debug-pkgs.patch
View File

@ -1,51 +0,0 @@
From 2d237c31ea6d2fdfeaf61aef89b4755def0495a2 Mon Sep 17 00:00:00 2001
From: slin14 <shuicheng.lin@intel.com>
Date: Fri, 17 Aug 2018 23:28:59 +0800
Subject: [PATCH] remove-debug-pkgs
Signed-off-by: slin14 <shuicheng.lin@intel.com>
---
SPECS/grub2.spec | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
index 88c6c09..11f6b0e 100644
--- a/SPECS/grub2.spec
+++ b/SPECS/grub2.spec
@@ -187,7 +187,6 @@ rm -f grub-%{tarversion}/util/grub-setpassword.in.orig
%install
set -e
rm -fr $RPM_BUILD_ROOT
-
%do_common_install
%if 0%{with_efi_arch}
%do_efi_install %{grubefiarch} %{grubefiname} %{grubeficdname}
@@ -215,25 +214,6 @@ cat << EOF > ${RPM_BUILD_ROOT}%{_sysconfdir}/prelink.conf.d/grub2.conf
-b /usr/sbin/grub2-sparc64-setup
EOF
-# Don't run debuginfo on all the grub modules and whatnot; it just
-# rejects them, complains, and slows down extraction.
-%global finddebugroot "%{_builddir}/%{?buildsubdir}/debug"
-
-%global dip RPM_BUILD_ROOT=%{finddebugroot} %{__debug_install_post}
-%define __debug_install_post ( \
- mkdir -p %{finddebugroot}/usr \
- mv ${RPM_BUILD_ROOT}/usr/bin %{finddebugroot}/usr/bin \
- mv ${RPM_BUILD_ROOT}/usr/sbin %{finddebugroot}/usr/sbin \
- %{dip} \
- install -m 0755 -d %{buildroot}/usr/lib/ %{buildroot}/usr/src/ \
- cp -al %{finddebugroot}/usr/lib/debug/ \\\
- %{buildroot}/usr/lib/debug/ \
- cp -al %{finddebugroot}/usr/src/debug/ \\\
- %{buildroot}/usr/src/debug/ ) \
- mv %{finddebugroot}/usr/bin %{buildroot}/usr/bin \
- mv %{finddebugroot}/usr/sbin %{buildroot}/usr/sbin \
- %{nil}
-
%clean
rm -rf $RPM_BUILD_ROOT
--
2.7.4

16
grub/grub2/centos/meta_patches/0004-grub2-remove-32b-requirements.patch
View File

@ -1,16 +0,0 @@
diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
index 11f6b0e..613f2e1 100644
--- a/SPECS/grub2.spec
+++ b/SPECS/grub2.spec
@@ -49,11 +49,6 @@ BuildRequires: /usr/lib64/crt1.o glibc-static glibc-devel
BuildRequires: /usr/lib64/crt1.o glibc-static(x86-64) glibc-devel(x86-64)
# glibc32 is what will be in the buildroots, but glibc-static(x86-32) is what
# will be in an epel-7 (i.e. centos) mock root. I think.
-%if 0%{?centos}%{?mock}
-BuildRequires: /usr/lib/crt1.o glibc-static(x86-32) glibc-devel(x86-32)
-%else
-BuildRequires: /usr/lib/crt1.o glibc32
-%endif
%else
# ppc64 builds need the ppc crt1.o
BuildRequires: /usr/lib/crt1.o glibc-static glibc-devel

27
grub/grub2/centos/meta_patches/0005-grub2-remove-32b-build.patch
View File

@ -4,14 +4,14 @@ Date: Mon, 22 Jan 2018 16:05:57 -0500
Subject: macros
---
SOURCES/grub.macros | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
SOURCES/grub.macros | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
index 10f74df..075727c 100644
index d59f889..ed426f3 100644
--- a/SOURCES/grub.macros
+++ b/SOURCES/grub.macros
@@ -82,15 +82,6 @@
@@ -122,12 +122,6 @@
%global legacy_package_arch pc
%global platform pc
@ -20,18 +20,15 @@ index 10f74df..075727c 100644
-%global alt_grub_target_name i386-efi
-%global alt_platform efi
-%global alt_package_arch efi-ia32
-%global alt_efi_cflags %(echo %{efi_cflags} | \\\
- sed \\\
- -e 's/-m64//g' \\\
- ) %{nil}
%endif
%ifarch %{ix86}
%global target_cpu_name %{_arch}
@@ -401,6 +392,7 @@ cd grub-%{1}-%{tarversion} \
install -m 700 -d $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/ \
install -m 700 -d $RPM_BUILD_ROOT/boot/grub2/ \
-
%global alt_efi_host_cflags %{expand:%%(echo %{efi_host_cflags})}
%global alt_efi_target_cflags \\\
%{expand:%%(echo %{target_cflags} | \\\
@@ -439,6 +433,7 @@ cd .. \
%define do_efi_install() \
cd grub-%{1}-%{tarversion} \
make DESTDIR=$RPM_BUILD_ROOT install \
+find $RPM_BUILD_ROOT -name "grub2-bios-setup*" | xargs rm -f \
+find $RPM_BUILD_ROOT -name "grub2-bios-setup*" | xargs rm -f \
if [ -f $RPM_BUILD_ROOT%{_infodir}/grub.info ]; then \
rm -f $RPM_BUILD_ROOT%{_infodir}/grub.info \
fi \

6
grub/grub2/centos/meta_patches/0006-grub2-ship-lst-files.patch
View File

@ -8,11 +8,11 @@ Subject: [PATCH] ship .lst files
1 file changed, 2 insertions(+)
diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
index 613f2e1..7e11008 100644
index ccd0244..1a55c34 100644
--- a/SPECS/grub2.spec
+++ b/SPECS/grub2.spec
@@ -299,6 +299,8 @@ fi
%ifarch x86_64
@@ -334,6 +334,8 @@ fi
%files common -f grub.lang
%dir %{_libdir}/grub/
+%dir %{_libdir}/grub/%{grubefiarch}/

10
grub/grub2/centos/meta_patches/0007-1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch
View File

@ -8,13 +8,13 @@ Subject: [PATCH] debrand the grub_cfg menu
1 file changed, 1 insertion(+)
diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches
index bac4594..d7475f0 100644
index 558efbe..c265b9d 100644
--- a/SOURCES/grub.patches
+++ b/SOURCES/grub.patches
@@ -286,3 +286,4 @@ Patch0285: 0285-editenv-handle-relative-symlinks.patch
Patch0286: 0286-efinet-also-use-the-firmware-acceleration-for-http.patch
Patch0287: 0287-Make-root_url-reflect-the-protocol-hostname-of-our-b.patch
Patch0289: 0288-efi-uga-Fix-PCIe-LER-when-GRUB2-accesses-non-enabled.patch
@@ -256,3 +256,4 @@ Patch0255: 0255-Make-grub2-mkconfig-to-honour-GRUB_CMDLINE_LINUX-in-.patch
Patch0256: 0256-grub-boot-success.timer-Add-a-few-Conditions-for-run.patch
Patch0257: 0257-docs-Stop-using-polkit-pkexec-for-grub-boot-success..patch
Patch0258: 0258-Fix-the-looking-up-grub.cfg-XXX-while-tftp-booting.patch
+Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch
--
2.7.4

40
grub/grub2/centos/meta_patches/0008-grub2-Build-unsigned-package.patch
View File

@ -8,10 +8,10 @@ Subject: add unsigned package
1 file changed, 15 insertions(+)
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
index 075727c..5581deb 100644
index ed426f3..0cbfa4e 100644
--- a/SOURCES/grub.macros
+++ b/SOURCES/grub.macros
@@ -235,6 +235,13 @@ Requires: %{name}-common = %{evr} \
@@ -278,6 +278,13 @@ Provides: %{name}-efi-cdboot = %{evr} \
%{expand:%%description %{1}-cdboot} \
%{desc} \
This subpackage provides optional components of grub used with removeable media on %{1} systems.\
@ -25,32 +25,32 @@ index 075727c..5581deb 100644
%{nil}
%global do_common_setup() \
@@ -309,6 +316,8 @@ done \
-p /EFI/%{efidir} -d grub-core ${GRUB_MODULES} \
@@ -345,6 +352,8 @@ done \
-p /EFI/%{efi_vendor} -d grub-core ${GRUB_MODULES} \
%{4}./grub-mkimage -O %{1} -o %{3}.orig \\\
-p /EFI/BOOT -d grub-core ${GRUB_MODULES} \
+cp %{2}.orig %{2}.unsigned \
+cp %{3}.orig %{3}.unsigned \
%{expand:%%{pesign -s -i %{2}.orig -o %{2} -a %{5} -c %{6} -n %{7}}} \
%{expand:%%{pesign -s -i %{3}.orig -o %{3} -a %{5} -c %{6} -n %{7}}} \
%{expand:%%{pesign -s -i %%{2}.orig -o %%{2} -a %%{5} -c %%{6} -n %%{7}}} \
%{expand:%%{pesign -s -i %%{3}.orig -o %%{3} -a %%{5} -c %%{6} -n %%{7}}} \
%{nil}
@@ -403,6 +412,8 @@ find $RPM_BUILD_ROOT -iname "*.module" -exec chmod a-x {} '\;' \
touch $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/grub.cfg \
ln -sf ../boot/efi/EFI/%{efidir}/grub.cfg \\\
@@ -444,6 +453,8 @@ find $RPM_BUILD_ROOT -iname "*.module" -exec chmod a-x {} '\;' \
touch $RPM_BUILD_ROOT%{efi_esp_dir}/grub.cfg \
ln -sf ..%{efi_esp_dir}/grub.cfg \\\
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}-efi.cfg \
+install -m 700 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2}.unsigned \
+install -m 700 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3}.unsigned \
install -m 700 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2} \
install -m 700 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3} \
+install -m 700 %{2} $RPM_BUILD_ROOT%{efi_esp_dir}/%{2}.unsigned \
+install -m 700 %{3} $RPM_BUILD_ROOT%{efi_esp_dir}/%{3}.unsigned \
install -m 700 %{2} $RPM_BUILD_ROOT%{efi_esp_dir}/%{2} \
install -m 700 %{3} $RPM_BUILD_ROOT%{efi_esp_dir}/%{3} \
install -D -m 700 unicode.pf2 \\\
@@ -490,4 +501,8 @@ cd .. \
%defattr(-,root,root,-) \
%attr(0700,root,root)/boot/efi/EFI/%{efidir}/%{3} \
%attr(0700,root,root)/boot/efi/EFI/%{efidir}/fonts \
+ \
@@ -546,4 +557,8 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \
%defattr(0700,root,root,-) \
%attr(0700,root,root)%{efi_esp_dir}/%{3} \
%attr(0700,root,root)%{efi_esp_dir}/fonts \
+ \
+%{expand:%%files %{1}-unsigned} \
+/boot/efi/EFI/%{efidir}/%{grubefiname}.unsigned \
+/boot/efi/EFI/%{efidir}/%{grubeficdname}.unsigned \
+%{efi_esp_dir}/%{grubefiname}.unsigned \
+%{efi_esp_dir}/%{grubeficdname}.unsigned \
%{nil}
--
2.7.4

20
grub/grub2/centos/meta_patches/0009-grub2-Build-pxeboot-package.patch
View File

@ -8,10 +8,10 @@ Subject: add pxeboot package
1 file changed, 12 insertions(+)
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
index 5581deb..9ef91d6 100644
index 0cbfa4e..60bb1b3 100644
--- a/SOURCES/grub.macros
+++ b/SOURCES/grub.macros
@@ -242,6 +242,13 @@ Summary: Unsigned versions of GRUB EFI binaries \
@@ -285,6 +285,13 @@ Summary: Unsigned versions of GRUB EFI binaries \
%description %{1}-unsigned \
This package contains unsigned version of GRUB EFI binaries. \
\
@ -25,18 +25,18 @@ index 5581deb..9ef91d6 100644
%{nil}
%global do_common_setup() \
@@ -414,6 +421,7 @@ ln -sf ../boot/efi/EFI/%{efidir}/grub.cfg \\\
@@ -455,6 +462,7 @@ ln -sf ..%{efi_esp_dir}/grub.cfg \\\
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}-efi.cfg \
install -m 700 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2}.unsigned \
install -m 700 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3}.unsigned \
install -m 700 %{2} $RPM_BUILD_ROOT%{efi_esp_dir}/%{2}.unsigned \
install -m 700 %{3} $RPM_BUILD_ROOT%{efi_esp_dir}/%{3}.unsigned \
+install -D -m 755 %{2} $RPM_BUILD_ROOT/pxeboot/EFI/%{2} \
install -m 700 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2} \
install -m 700 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3} \
install -m 700 %{2} $RPM_BUILD_ROOT%{efi_esp_dir}/%{2} \
install -m 700 %{3} $RPM_BUILD_ROOT%{efi_esp_dir}/%{3} \
install -D -m 700 unicode.pf2 \\\
@@ -505,4 +513,8 @@ cd .. \
@@ -561,4 +569,8 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \
%{expand:%%files %{1}-unsigned} \
/boot/efi/EFI/%{efidir}/%{grubefiname}.unsigned \
/boot/efi/EFI/%{efidir}/%{grubeficdname}.unsigned \
%{efi_esp_dir}/%{grubefiname}.unsigned \
%{efi_esp_dir}/%{grubeficdname}.unsigned \
+ \
+%{expand:%%files %{1}-pxeboot} \
+/pxeboot/EFI/%{grubefiname} \

32
grub/grub2/centos/meta_patches/0010-grub2-add-tboot.patch
View File

@ -1,7 +1,7 @@
From 25964e485c769efcccf853babcc8263eb1c89baf Mon Sep 17 00:00:00 2001
From: jmckenna <jason.mckenna@windriver.com>
Date: Wed, 28 Mar 2018 12:53:34 -0400
Subject: WRS: 0010-grub2-add-tboot.patch
Subject: 0007-grub2-add-tboot.patch
---
SOURCES/grub.macros | 5 +++++
@ -9,35 +9,35 @@ Subject: WRS: 0010-grub2-add-tboot.patch
2 files changed, 6 insertions(+)
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
index 9ef91d6..ffdd23c 100644
index 60bb1b3..5c43b37 100644
--- a/SOURCES/grub.macros
+++ b/SOURCES/grub.macros
@@ -82,6 +82,10 @@
@@ -110,6 +110,10 @@
%global legacy_target_cpu_name i386
%global legacy_package_arch pc
%global platform pc
+%global wrs_modules " multiboot multiboot2"
+%global extra_modules " multiboot multiboot2"
+%else
+%global wrs_modules ""
+%global extra_modules ""
+
%endif
%ifarch %{ix86}
%global target_cpu_name %{_arch}
@@ -347,6 +351,7 @@ GRUB_MODULES=" all_video boot btrfs cat chain configfile echo \\\
search_label serial sleep syslinuxcfg test tftp \\\
%ifarch x86_64
@@ -387,6 +391,7 @@ GRUB_MODULES=" all_video boot blscfg btrfs \\\
search_label serial sleep syslinuxcfg test tftp \\\
video xfs" \
GRUB_MODULES+=%{efi_modules} \
+GRUB_MODULES+=%{wrs_modules} \
GRUB_MODULES+=%{platform_modules} \
+GRUB_MODULES+=%{extra_modules} \
%{expand:%%{mkimage %{1} %{2} %{3} %{4} %{5} %{6} %{7}}} \
%{nil}
diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches
index d7475f0..e24bd8c 100644
index c265b9d..d872b74 100644
--- a/SOURCES/grub.patches
+++ b/SOURCES/grub.patches
@@ -287,3 +287,4 @@ Patch0286: 0286-efinet-also-use-the-firmware-acceleration-for-http.patch
Patch0287: 0287-Make-root_url-reflect-the-protocol-hostname-of-our-b.patch
Patch0289: 0288-efi-uga-Fix-PCIe-LER-when-GRUB2-accesses-non-enabled.patch
@@ -257,3 +257,4 @@ Patch0256: 0256-grub-boot-success.timer-Add-a-few-Conditions-for-run.patch
Patch0257: 0257-docs-Stop-using-polkit-pkexec-for-grub-boot-success..patch
Patch0258: 0258-Fix-the-looking-up-grub.cfg-XXX-while-tftp-booting.patch
Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch
+Patch1001: 1001-add-tboot.patch
--

26
grub/grub2/centos/meta_patches/0011-grub2-fix-str-for-6B-macs.patch
View File

@ -1,40 +1,40 @@
From 5e0c8a6125403db7e90990d20c1cdda5cb9deb78 Mon Sep 17 00:00:00 2001
From: jmckenna <jason.mckenna@windriver.com>
Date: Wed, 28 Mar 2018 14:08:57 -0400
Subject: [PATCH 11/12] Patch GRUB so that it doesn't add a trailing colon
Subject: Patch GRUB so that it doesn't add a trailing colon
after MAC
A CentOS GRUB patch added support for macs > 6B in size. This
breaks PXEbooting the installer, because a routine within grub
relies on the max MAC string length.
---
SOURCES/grub.macros | 2 +-
SOURCES/grub.patches | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
SOURCES/grub.patches | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
index ffdd23c..8fcb272 100644
index 5c43b37..d410247 100644
--- a/SOURCES/grub.macros
+++ b/SOURCES/grub.macros
@@ -82,7 +82,7 @@
@@ -110,7 +110,7 @@
%global legacy_target_cpu_name i386
%global legacy_package_arch pc
%global platform pc
-%global wrs_modules " multiboot multiboot2"
+%global wrs_modules " multiboot multiboot2 regexp"
-%global extra_modules " multiboot multiboot2"
+%global extra_modules " multiboot multiboot2 regexp"
%else
%global wrs_modules ""
%global extra_modules ""
diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches
index e24bd8c..73ccdee 100644
index d872b74..03e89fc 100644
--- a/SOURCES/grub.patches
+++ b/SOURCES/grub.patches
@@ -288,3 +288,5 @@ Patch0287: 0287-Make-root_url-reflect-the-protocol-hostname-of-our-b.patch
Patch0289: 0288-efi-uga-Fix-PCIe-LER-when-GRUB2-accesses-non-enabled.patch
@@ -258,3 +258,4 @@ Patch0257: 0257-docs-Stop-using-polkit-pkexec-for-grub-boot-success..patch
Patch0258: 0258-Fix-the-looking-up-grub.cfg-XXX-while-tftp-booting.patch
Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch
Patch1001: 1001-add-tboot.patch
+Patch1002: 1002-Don-t-write-trailing-colon-when-populating-MAC-strin.patch
+
--
2.7.4

10
grub/grub2/centos/meta_patches/0012-grub2-Don-t-strip-img-files-from-non-EFI-build.patch
View File

@ -8,18 +8,18 @@ Subject: Don't strip files from non-EFI build of grub
1 file changed, 2 deletions(-)
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
index 8fcb272..cd2da06 100644
index d410247..6e0e18e 100644
--- a/SOURCES/grub.macros
+++ b/SOURCES/grub.macros
@@ -488,8 +488,6 @@ cd .. \
@@ -535,8 +535,6 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \
%defattr(-,root,root) \
%dir %{_libdir}/grub/%{2}/ \
%{_libdir}/grub/%{2}/* \
-%exclude %{_libdir}/grub/%{2}/*.module \
-%exclude %{_libdir}/grub/%{2}/{boot,boot_hybrid,cdboot,diskboot,lzma_decompress,pxeboot}.{image,img} \
-%exclude %{_libdir}/grub/%{2}/{boot,boot_hybrid,cdboot,diskboot,lzma_decompress,pxeboot}.image \
%exclude %{_libdir}/grub/%{2}/*.o \
%{nil}
%else \
%%exclude %%{_libdir}/grub/%%{grublegacyarch}/* \
--
2.7.4

32
grub/grub2/centos/meta_patches/0013-grub2-fix-build-grub2-pc-modules-pkgs.patch Normal file
View File

@ -0,0 +1,32 @@
From b7e6032f36678ce38a48a8eeb7d19c3cbac0cb36 Mon Sep 17 00:00:00 2001
From: Long Li <lilong-neu@neusoft.com>
Date: Wed, 18 Dec 2019 14:07:48 +0800
Subject: 0013-grub2-fix-build-grub2-pc-modules-pkgs
This pkg is needed when install Stx system ISO, and it is built in el7 version
no problem, however, it is not built in el8 version, if it not exits, it will
prompt error for no such grub needed by other grub2 pkg install procedure.
Signed-off-by: Long Li <lilong-neu@neusoft.com>
---
SOURCES/grub.macros | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
index 6e0e18e..0abe21d 100644
--- a/SOURCES/grub.macros
+++ b/SOURCES/grub.macros
@@ -189,8 +189,8 @@
%ifarch x86_64
%global with_efi_common 1
-%global with_legacy_modules 0
-%global with_legacy_common 0
+%global with_legacy_modules 1
+%global with_legacy_common 1
%else
%global with_efi_common 0
%global with_legacy_common 1
--
2.7.4

4
grub/grub2/centos/meta_patches/PATCH_ORDER
View File

@ -1,7 +1,4 @@
0001-grub2-Update-package-versioning-for-TIS-format.patch
0002-grub2-fix-cflags.patch
0003-grub2-remove-debug-pkgs.patch
0004-grub2-remove-32b-requirements.patch
0005-grub2-remove-32b-build.patch
0006-grub2-ship-lst-files.patch
0007-1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch
@ -10,3 +7,4 @@
0010-grub2-add-tboot.patch
0011-grub2-fix-str-for-6B-macs.patch
0012-grub2-Don-t-strip-img-files-from-non-EFI-build.patch
0013-grub2-fix-build-grub2-pc-modules-pkgs.patch

7
grub/grub2/centos/patches/1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch
View File

@ -6,15 +6,16 @@ Subject: [PATCH] 10_linux: mktitle: de-brand the grub.cfg menu
Replace "CentOS" with a generic name.
Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
Signed-off-by: Long Li <lilong-neu@neusoft.com>
---
util/grub.d/10_linux.in | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index b3c460c..131c1f2 100644
index da2992a..5482ebf 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -71,22 +71,20 @@ mktitle ()
@@ -101,22 +101,20 @@ mktitle ()
local title_type
local version
local OS_NAME
@ -43,5 +44,5 @@ index b3c460c..131c1f2 100644
esac
echo -n ${title}
--
1.8.3.1
2.7.4

22
grub/grub2/centos/patches/1001-add-tboot.patch
View File

@ -4,30 +4,16 @@ Date: Tue, 21 Nov 2017 15:36:42 -0500
Subject: [PATCH 1/1] add tboot
---
util/grub-mkconfig.in | 2 +-
util/grub.d/10_linux.in | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
1 file changed, 5 insertions(+)
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 86801aa..b149cec 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -125,7 +125,7 @@ set $grub_probe dummy
if test -f "$1"; then
:
else
- gettext_print "%s: Not found.\n" "$1" 1>&2
+ gettext_printf "%s: Not found.\n" "$1" 1>&2
exit 1
fi
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 3b29c23..61406e4 100644
index 5482ebf..6e6b414 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -23,6 +23,11 @@ datarootdir="@datarootdir@"
. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
. "$pkgdatadir/grub-mkconfig_lib"
+tboot=`cat /proc/cmdline | xargs -n1 | grep '^tboot=true$'` || true
+if [ -n "$tboot" ]; then
@ -38,5 +24,5 @@ index 3b29c23..61406e4 100644
export TEXTDOMAINDIR="@localedir@"
--
1.8.3.1
2.7.4

4
grub/grub2/centos/patches/1002-Don-t-write-trailing-colon-when-populating-MAC-strin.patch
View File

@ -8,10 +8,10 @@ Subject: [PATCH] Don't write trailing colon when populating MAC string
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
index a6566bd..f3f964e 100644
index 19ff2d4..4e36bca 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -797,11 +797,18 @@ grub_net_hwaddr_to_str (const grub_net_link_level_address_t *addr, char *str)
@@ -783,11 +783,18 @@ grub_net_hwaddr_to_str (const grub_net_link_level_address_t *addr, char *str)
return;
}
maxstr = addr->len * grub_strlen ("XX:");

2
grub/grub2/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/grub2-2.02-0.76.el7.centos.src.rpm
mirror:Source/grub2-2.02-66.el8_0.1.src.rpm