c9981d6ccc
(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>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
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 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 | 1 +
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
|
|
index 5c43b37..d410247 100644
|
|
--- a/SOURCES/grub.macros
|
|
+++ b/SOURCES/grub.macros
|
|
@@ -110,7 +110,7 @@
|
|
%global legacy_target_cpu_name i386
|
|
%global legacy_package_arch pc
|
|
%global platform pc
|
|
-%global extra_modules " multiboot multiboot2"
|
|
+%global extra_modules " multiboot multiboot2 regexp"
|
|
%else
|
|
%global extra_modules ""
|
|
|
|
diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches
|
|
index d872b74..03e89fc 100644
|
|
--- a/SOURCES/grub.patches
|
|
+++ b/SOURCES/grub.patches
|
|
@@ -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
|
|
|