From 11c474e8de5fb486e082c6749b0812d0e19d438b Mon Sep 17 00:00:00 2001 From: slin14 Date: Fri, 17 Aug 2018 23:38:05 +0800 Subject: [PATCH] rebase grub2 patch to CentOS7.5 Story: 2003389 Task: 24495 Change-Id: Ia5ccf65e9c3e462710694f1e860bf4281339ca85 Signed-off-by: slin14 --- ...te-package-versioning-for-TIS-format.patch | 20 +++++++++++--- .../0003-grub2-remove-debug-pkgs.patch | 27 +++++++++++-------- ...x-mktitle-de-brand-the-grub.cfg-menu.patch | 12 ++++----- ...ling-colon-when-populating-MAC-strin.patch | 21 +++++++-------- grub/grub2/centos/srpm_path | 2 +- 5 files changed, 49 insertions(+), 33 deletions(-) diff --git a/grub/grub2/centos/meta_patches/0001-grub2-Update-package-versioning-for-TIS-format.patch b/grub/grub2/centos/meta_patches/0001-grub2-Update-package-versioning-for-TIS-format.patch index 17035c775..b221ef7ff 100644 --- a/grub/grub2/centos/meta_patches/0001-grub2-Update-package-versioning-for-TIS-format.patch +++ b/grub/grub2/centos/meta_patches/0001-grub2-Update-package-versioning-for-TIS-format.patch @@ -1,13 +1,25 @@ +From 008445e8d11202f53190da4a12386df338549000 Mon Sep 17 00:00:00 2001 +From: slin14 +Date: Fri, 17 Aug 2018 22:48:46 +0800 +Subject: [PATCH] Update-package-versioning-for-TIS-format + +--- + SPECS/grub2.spec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec -index a56d930..a4e87f5 100644 +index 12d34ad..88c6c09 100644 --- a/SPECS/grub2.spec +++ b/SPECS/grub2.spec -@@ -8,7 +8,7 @@ +@@ -6,7 +6,7 @@ Name: grub2 Epoch: 1 Version: 2.02 --Release: 0.64%{?dist}%{?buildid} -+Release: 0.64.el7.centos%{?_tis_dist}.%{tis_patch_ver} +-Release: 0.65%{?dist}%{?buildid}.2 ++Release: 0.65.el7.centos.2%{?_tis_dist}.%{tis_patch_ver} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ +-- +2.7.4 + diff --git a/grub/grub2/centos/meta_patches/0003-grub2-remove-debug-pkgs.patch b/grub/grub2/centos/meta_patches/0003-grub2-remove-debug-pkgs.patch index ed2029d57..b89beac76 100644 --- a/grub/grub2/centos/meta_patches/0003-grub2-remove-debug-pkgs.patch +++ b/grub/grub2/centos/meta_patches/0003-grub2-remove-debug-pkgs.patch @@ -1,24 +1,26 @@ +From 2d237c31ea6d2fdfeaf61aef89b4755def0495a2 Mon Sep 17 00:00:00 2001 +From: slin14 +Date: Fri, 17 Aug 2018 23:28:59 +0800 +Subject: [PATCH] remove-debug-pkgs + +Signed-off-by: slin14 +--- + SPECS/grub2.spec | 20 -------------------- + 1 file changed, 20 deletions(-) + diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec -index 4059aea..a56d930 100644 +index 88c6c09..11f6b0e 100644 --- a/SPECS/grub2.spec +++ b/SPECS/grub2.spec -@@ -176,7 +176,6 @@ This subpackage provides tools for support of all platforms. +@@ -172,7 +172,6 @@ rm -f grub-%{tarversion}/util/grub-setpassword.in.orig %install set -e rm -fr $RPM_BUILD_ROOT - %do_common_install - # Fix for hardcoded efidir - sed -i.orig -e 's@/efi/EFI/redhat/@/efi/EFI/%{efidir}/@' \ -@@ -184,7 +183,6 @@ sed -i.orig -e 's@/efi/EFI/redhat/@/efi/EFI/%{efidir}/@' \ - touch --reference=grub-%{tarversion}/util/grub-setpassword.in.orig \ - grub-%{tarversion}/util/grub-setpassword.in - rm -f grub-%{tarversion}/util/grub-setpassword.in.orig -- %if 0%{with_efi_arch} %do_efi_install %{grubefiarch} %{grubefiname} %{grubeficdname} - %endif -@@ -210,25 +208,6 @@ cat << EOF > ${RPM_BUILD_ROOT}%{_sysconfdir}/prelink.conf.d/grub2.conf +@@ -199,25 +198,6 @@ cat << EOF > ${RPM_BUILD_ROOT}%{_sysconfdir}/prelink.conf.d/grub2.conf -b /usr/sbin/grub2-sparc64-setup EOF @@ -44,3 +46,6 @@ index 4059aea..a56d930 100644 %clean rm -rf $RPM_BUILD_ROOT +-- +2.7.4 + diff --git a/grub/grub2/centos/meta_patches/0007-1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch b/grub/grub2/centos/meta_patches/0007-1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch index d73d3f110..ea8a5a2c0 100644 --- a/grub/grub2/centos/meta_patches/0007-1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch +++ b/grub/grub2/centos/meta_patches/0007-1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch @@ -1,21 +1,21 @@ -From 38914a0de0b29f5f0efbf3e93a60fa8596f160e7 Mon Sep 17 00:00:00 2001 +From 9056b35661962a311aafa1937b5d8e236f44b119 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 23 Jan 2018 13:29:11 -0500 -Subject: [PATCH 1/4] debrand the grub_cfg menu +Subject: [PATCH] debrand the grub_cfg menu --- SOURCES/grub.patches | 1 + 1 file changed, 1 insertion(+) diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches -index 2ef8ce5..b69fb31 100644 +index bac4594..d7475f0 100644 --- a/SOURCES/grub.patches +++ b/SOURCES/grub.patches -@@ -257,3 +257,4 @@ Patch0256: 0256-efinet-Setting-DNS-server-from-UEFI-protocol.patch - Patch0257: 0257-set-rootpath.patch +@@ -258,3 +258,4 @@ Patch0257: 0257-set-rootpath.patch Patch0258: 0258-Fix-one-more-coverity-complaint.patch Patch0260: 0260-Fix-up-linux-params-usage.patch + Patch0261: 0261-Fix-grub_net_hwaddr_to_str.patch +Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch -- -1.8.3.1 +2.7.4 diff --git a/grub/grub2/centos/patches/1002-Don-t-write-trailing-colon-when-populating-MAC-strin.patch b/grub/grub2/centos/patches/1002-Don-t-write-trailing-colon-when-populating-MAC-strin.patch index 5558adba0..68afb58c5 100644 --- a/grub/grub2/centos/patches/1002-Don-t-write-trailing-colon-when-populating-MAC-strin.patch +++ b/grub/grub2/centos/patches/1002-Don-t-write-trailing-colon-when-populating-MAC-strin.patch @@ -1,22 +1,21 @@ -From f521055ce4f334a942d23ccab6ad6b0366c0a204 Mon Sep 17 00:00:00 2001 +From 56561f1b5850888c9266b1155d4ac6d352e791c4 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 28 Mar 2018 11:23:17 -0400 Subject: [PATCH] Don't write trailing colon when populating MAC string --- - grub-core/net/net.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) + grub-core/net/net.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/grub-core/net/net.c b/grub-core/net/net.c -index 6b4b10b..a637da5 100644 +index a6566bd..f3f964e 100644 --- a/grub-core/net/net.c +++ b/grub-core/net/net.c -@@ -792,11 +792,19 @@ grub_net_hwaddr_to_str (const grub_net_link_level_address_t *addr, char *str) - addr->type, addr->len); +@@ -794,11 +794,18 @@ grub_net_hwaddr_to_str (const grub_net_link_level_address_t *addr, char *str) return; } + maxstr = addr->len * grub_strlen ("XX:"); - for (ptr = str, i = 0; i < addr->len; i++) -+ + if (addr->len == 0) + { + return; @@ -24,14 +23,14 @@ index 6b4b10b..a637da5 100644 + + for (ptr = str, i = 0; i < (addr->len - 1); i++) { - ptr += grub_snprintf (ptr, GRUB_NET_MAX_STR_HWADDR_LEN - (ptr - str), + ptr += grub_snprintf (ptr, maxstr - (ptr - str), "%02x:", addr->mac[i] & 0xff); } -+ ptr += grub_snprintf (ptr, GRUB_NET_MAX_STR_HWADDR_LEN - (ptr - str), -+ "%02x", addr->mac[i] & 0xff); ++ ptr += grub_snprintf (ptr, maxstr - (ptr - str), ++ "%02x", addr->mac[i] & 0xff); } int -- -1.8.3.1 +2.7.4 diff --git a/grub/grub2/centos/srpm_path b/grub/grub2/centos/srpm_path index 3deeb3024..7eb22e359 100644 --- a/grub/grub2/centos/srpm_path +++ b/grub/grub2/centos/srpm_path @@ -1 +1 @@ -mirror:Source/grub2-2.02-0.64.el7.centos.src.rpm +mirror:Source/grub2-2.02-0.65.el7.centos.2.src.rpm