From f3729d2d23ac5ea18658712d2c79c8ad6dba5c90 Mon Sep 17 00:00:00 2001 From: Zhe Hu Date: Thu, 27 Dec 2018 14:43:17 +0800 Subject: [PATCH] rebase grubby patch to CentOS 7.6 version Test: Pass build and simplex deploy test Depends-On: https://review.openstack.org/627466 Story: 2004522 Task: 28419 Change-Id: Ieaf38802edbd21471ff2ccf4bd64c687d7929b72 Signed-off-by: Zhe Hu --- ...ubby-Update-package-versioning-for-TIS-format.patch | 4 ++-- .../0002-grubby-Generic-name-for-Titanium.patch | 4 ++-- .../meta_patches/0003-grubby-add-multiboot2.patch | 10 +++++----- grub/grubby/centos/srpm_path | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/grub/grubby/centos/meta_patches/0001-grubby-Update-package-versioning-for-TIS-format.patch b/grub/grubby/centos/meta_patches/0001-grubby-Update-package-versioning-for-TIS-format.patch index 2e0ef7bd4..9dfb713fd 100644 --- a/grub/grubby/centos/meta_patches/0001-grubby-Update-package-versioning-for-TIS-format.patch +++ b/grub/grubby/centos/meta_patches/0001-grubby-Update-package-versioning-for-TIS-format.patch @@ -17,8 +17,8 @@ index dd8fa7f..22bff31 100644 @@ -1,6 +1,6 @@ Name: grubby Version: 8.28 --Release: 23%{?dist} -+Release: 23.el7%{?_tis_dist}.%{tis_patch_ver} +-Release: 25%{?dist} ++Release: 25.el7%{?_tis_dist}.%{tis_patch_ver} Summary: Command line tool for updating bootloader configs Group: System Environment/Base License: GPLv2+ diff --git a/grub/grubby/centos/meta_patches/0002-grubby-Generic-name-for-Titanium.patch b/grub/grubby/centos/meta_patches/0002-grubby-Generic-name-for-Titanium.patch index ba1707708..57f910281 100644 --- a/grub/grubby/centos/meta_patches/0002-grubby-Generic-name-for-Titanium.patch +++ b/grub/grubby/centos/meta_patches/0002-grubby-Generic-name-for-Titanium.patch @@ -11,9 +11,9 @@ diff --git a/SPECS/grubby.spec b/SPECS/grubby.spec index 22bff31..882339a 100644 --- a/SPECS/grubby.spec +++ b/SPECS/grubby.spec -@@ -83,6 +83,9 @@ Patch0073: 0073-Fix-info-for-s390x-s390-1285601.patch - Patch0074: 0074-Add-s390-s390x-set-default-index-test-1285601.patch +@@ -84,6 +84,9 @@ Patch0074: 0074-Add-s390-s390x-set-default-index-test-1285601.patch Patch0075: 0075-Fix-setDefaultImage-for-s390-s390x-1285601.patch + Patch0076: 0076-grubby-Make-sure-configure-BOOTLOADER-variables-are-.patch +# WRS Titanium patches +Patch1000: 1000-Generic-name-for-Titanium.patch diff --git a/grub/grubby/centos/meta_patches/0003-grubby-add-multiboot2.patch b/grub/grubby/centos/meta_patches/0003-grubby-add-multiboot2.patch index 0c021e3e3..fe02e09c9 100644 --- a/grub/grubby/centos/meta_patches/0003-grubby-add-multiboot2.patch +++ b/grub/grubby/centos/meta_patches/0003-grubby-add-multiboot2.patch @@ -11,7 +11,7 @@ diff --git a/SPECS/grubby.spec b/SPECS/grubby.spec index 071463a..a3bb371 100644 --- a/SPECS/grubby.spec +++ b/SPECS/grubby.spec -@@ -85,6 +85,7 @@ Patch0075: 0075-Fix-setDefaultImage-for-s390-s390x-1285601.patch +@@ -86,6 +86,7 @@ Patch0076: 0076-grubby-Make-sure-configure-BOOTLOADER-variables-are-.patch # WRS Titanium patches Patch1000: 1000-Generic-name-for-Titanium.patch @@ -19,7 +19,7 @@ index 071463a..a3bb371 100644 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig glib2-devel popt-devel -@@ -101,6 +102,10 @@ Requires: s390utils-base +@@ -102,6 +103,10 @@ Requires: s390utils-base Requires: uboot-tools %endif Requires: system-release @@ -30,7 +30,7 @@ index 071463a..a3bb371 100644 %description grubby is a command line tool for updating and displaying information about -@@ -140,6 +145,11 @@ mkdir -p $RPM_BUILD_ROOT/boot +@@ -142,6 +147,11 @@ mkdir -p $RPM_BUILD_ROOT/boot echo " " >> $RPM_BUILD_ROOT/boot/boot.scr %endif @@ -42,7 +42,7 @@ index 071463a..a3bb371 100644 %clean rm -rf $RPM_BUILD_ROOT -@@ -152,6 +162,11 @@ rm -rf $RPM_BUILD_ROOT +@@ -154,6 +164,11 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/sbin/installkernel %{_prefix}/sbin/new-kernel-pkg %{_prefix}/sbin/grubby @@ -53,7 +53,7 @@ index 071463a..a3bb371 100644 + %{_mandir}/man8/*.8* /usr/libexec/grubby/prune_debug - %ghost %config(noreplace) %{_sysconfdir}/sysconfig/kernel + %ghost %attr(0644,-,-) %config(noreplace) %{_sysconfdir}/sysconfig/kernel -- 1.8.3.1 diff --git a/grub/grubby/centos/srpm_path b/grub/grubby/centos/srpm_path index 09f4c437b..e07ec94cb 100644 --- a/grub/grubby/centos/srpm_path +++ b/grub/grubby/centos/srpm_path @@ -1 +1 @@ -mirror:Source/grubby-8.28-23.el7.src.rpm +mirror:Source/grubby-8.28-25.el7.src.rpm