starlingx/integ
Code Issues Proposed changes

rebase grubby patch to CentOS 7.6 version

Browse Source 
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 <zhe.hu@intel.com>
This commit is contained in:
Zhe Hu 2018-12-27 14:43:17 +08:00
parent e4bc1535c9
commit f3729d2d23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,8 +17,8 @@ index dd8fa7f..22bff31 100644
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
Name: grubby Name: grubby
Version: 8.28 Version: 8.28
-Release: 23%{?dist} -Release: 25%{?dist}
+Release: 23.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 25.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: Command line tool for updating bootloader configs Summary: Command line tool for updating bootloader configs
Group: System Environment/Base Group: System Environment/Base
License: GPLv2+ License: GPLv2+

4
grub/grubby/centos/meta_patches/0002-grubby-Generic-name-for-Titanium.patch
View File

@ -11,9 +11,9 @@ diff --git a/SPECS/grubby.spec b/SPECS/grubby.spec
index 22bff31..882339a 100644 index 22bff31..882339a 100644
--- a/SPECS/grubby.spec --- a/SPECS/grubby.spec
+++ b/SPECS/grubby.spec +++ b/SPECS/grubby.spec
@@ -83,6 +83,9 @@ Patch0073: 0073-Fix-info-for-s390x-s390-1285601.patch @@ -84,6 +84,9 @@ Patch0074: 0074-Add-s390-s390x-set-default-index-test-1285601.patch
Patch0074: 0074-Add-s390-s390x-set-default-index-test-1285601.patch
Patch0075: 0075-Fix-setDefaultImage-for-s390-s390x-1285601.patch Patch0075: 0075-Fix-setDefaultImage-for-s390-s390x-1285601.patch
Patch0076: 0076-grubby-Make-sure-configure-BOOTLOADER-variables-are-.patch
+# WRS Titanium patches +# WRS Titanium patches
+Patch1000: 1000-Generic-name-for-Titanium.patch +Patch1000: 1000-Generic-name-for-Titanium.patch

10
grub/grubby/centos/meta_patches/0003-grubby-add-multiboot2.patch
View File

@ -11,7 +11,7 @@ diff --git a/SPECS/grubby.spec b/SPECS/grubby.spec
index 071463a..a3bb371 100644 index 071463a..a3bb371 100644
--- a/SPECS/grubby.spec --- a/SPECS/grubby.spec
+++ b/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 # WRS Titanium patches
Patch1000: 1000-Generic-name-for-Titanium.patch Patch1000: 1000-Generic-name-for-Titanium.patch
@ -19,7 +19,7 @@ index 071463a..a3bb371 100644
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig glib2-devel popt-devel BuildRequires: pkgconfig glib2-devel popt-devel
@@ -101,6 +102,10 @@ Requires: s390utils-base @@ -102,6 +103,10 @@ Requires: s390utils-base
Requires: uboot-tools Requires: uboot-tools
%endif %endif
Requires: system-release Requires: system-release
@ -30,7 +30,7 @@ index 071463a..a3bb371 100644
%description %description
grubby is a command line tool for updating and displaying information about 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 echo " " >> $RPM_BUILD_ROOT/boot/boot.scr
%endif %endif
@ -42,7 +42,7 @@ index 071463a..a3bb371 100644
%clean %clean
rm -rf $RPM_BUILD_ROOT 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/installkernel
%{_prefix}/sbin/new-kernel-pkg %{_prefix}/sbin/new-kernel-pkg
%{_prefix}/sbin/grubby %{_prefix}/sbin/grubby
@ -53,7 +53,7 @@ index 071463a..a3bb371 100644
+ +
%{_mandir}/man8/*.8* %{_mandir}/man8/*.8*
/usr/libexec/grubby/prune_debug /usr/libexec/grubby/prune_debug
%ghost %config(noreplace) %{_sysconfdir}/sysconfig/kernel %ghost %attr(0644,-,-) %config(noreplace) %{_sysconfdir}/sysconfig/kernel
-- --
1.8.3.1 1.8.3.1

2
grub/grubby/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/grubby-8.28-23.el7.src.rpm mirror:Source/grubby-8.28-25.el7.src.rpm