diff --git a/grub/grubby/centos/build_srpm.data b/grub/grubby/centos/build_srpm.data index ca7519660..71ae656aa 100644 --- a/grub/grubby/centos/build_srpm.data +++ b/grub/grubby/centos/build_srpm.data @@ -1,2 +1,2 @@ COPY_LIST="" -TIS_PATCH_VER=3 +TIS_PATCH_VER=1 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 9dfb713fd..4a5cd2d68 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 @@ -1,8 +1,7 @@ From aecf1e4686bbd50e96bea030bdf7ee4f4882fe5c Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 17:23:24 -0400 -Subject: [PATCH 1/2] WRS: - 0001-grubby-Update-package-versioning-for-TIS-format.patch +Subject: [PATCH 1/2] 0001-grubby-Update-package-versioning-for-TIS-format.patch Conflicts: SPECS/grubby.spec @@ -11,17 +10,17 @@ Conflicts: 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/grubby.spec b/SPECS/grubby.spec -index dd8fa7f..22bff31 100644 +index a7cb388..a42642f 100644 --- a/SPECS/grubby.spec +++ b/SPECS/grubby.spec @@ -1,6 +1,6 @@ Name: grubby - Version: 8.28 --Release: 25%{?dist} -+Release: 25.el7%{?_tis_dist}.%{tis_patch_ver} - Summary: Command line tool for updating bootloader configs - Group: System Environment/Base + Version: 8.40 +-Release: 34%{?dist} ++Release: 34.el8%{?_tis_dist}.%{tis_patch_ver} + Summary: Command line tool for updating BootLoaderSpec files License: GPLv2+ + URL: https://github.com/rhinstaller/grubby -- -1.9.1 +2.7.4 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 57f910281..746ff269d 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 @@ -1,26 +1,25 @@ From 3c4f2fef7d1d321a34a9777946879f187fdad2bc Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 17:23:24 -0400 -Subject: [PATCH 2/2] WRS: 0002-grubby-Generic-name-for-Titanium.patch +Subject: [PATCH 2/2] 0002-grubby-Generic-name-for-Titanium.patch --- - SPECS/grubby.spec | 3 +++ - 1 file changed, 3 insertions(+) + SPECS/grubby.spec | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/SPECS/grubby.spec b/SPECS/grubby.spec -index 22bff31..882339a 100644 +index a42642f..28de109 100644 --- a/SPECS/grubby.spec +++ b/SPECS/grubby.spec -@@ -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 +@@ -70,6 +70,8 @@ Patch0054: 0054-Make-installkernel-to-use-kernel-install-scripts-on-.patch + Patch0055: 0055-Add-usr-libexec-rpm-sort.patch + Patch0056: 0056-Improve-man-page-for-info-option.patch -+# WRS Titanium patches +Patch1000: 1000-Generic-name-for-Titanium.patch + - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + BuildRequires: gcc BuildRequires: pkgconfig glib2-devel popt-devel - BuildRequires: libblkid-devel git + BuildRequires: libblkid-devel git-core sed make -- -1.9.1 +2.7.4 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 fe02e09c9..cc7c801f7 100644 --- a/grub/grubby/centos/meta_patches/0003-grubby-add-multiboot2.patch +++ b/grub/grubby/centos/meta_patches/0003-grubby-add-multiboot2.patch @@ -4,56 +4,57 @@ Date: Tue, 13 Feb 2018 23:02:49 -0500 Subject: [PATCH 1/1] grubby add multiboot2 --- - SPECS/grubby.spec | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) + SPECS/grubby.spec | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) diff --git a/SPECS/grubby.spec b/SPECS/grubby.spec -index 071463a..a3bb371 100644 +index 28de109..e7bee82 100644 --- a/SPECS/grubby.spec +++ b/SPECS/grubby.spec -@@ -86,6 +86,7 @@ Patch0076: 0076-grubby-Make-sure-configure-BOOTLOADER-variables-are-.patch +@@ -71,6 +71,7 @@ Patch0055: 0055-Add-usr-libexec-rpm-sort.patch + Patch0056: 0056-Improve-man-page-for-info-option.patch - # WRS Titanium patches Patch1000: 1000-Generic-name-for-Titanium.patch -+Patch1001: 1001-Add-support-for-updating-grub-cfg-with-multiboot-2.patch ++Patch1001: 1001-Add-support-for-updating-grub-cfg-with-multiboot-2.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + BuildRequires: gcc BuildRequires: pkgconfig glib2-devel popt-devel -@@ -102,6 +103,10 @@ Requires: s390utils-base - Requires: uboot-tools +@@ -88,6 +89,11 @@ Requires: s390utils-base %endif - Requires: system-release + Requires: findutils + +BuildRequires: python-setuptools +Requires: python-devel + +%define pythonroot /usr/lib64/python2.7/site-packages - ++ %description - grubby is a command line tool for updating and displaying information about -@@ -142,6 +147,11 @@ mkdir -p $RPM_BUILD_ROOT/boot - echo " " >> $RPM_BUILD_ROOT/boot/boot.scr - %endif + This package provides a grubby compatibility script that manages + BootLoaderSpec files and is meant to only be used for legacy compatibility +@@ -128,6 +134,11 @@ sed -e "s,@@LIBEXECDIR@@,%{_libexecdir}/grubby,g" %{SOURCE2} \ + sed -e "s,@@LIBEXECDIR@@,%{_libexecdir}/installkernel,g" %{SOURCE3} \ + > %{buildroot}%{_sbindir}/installkernel +install -d -m 0755 $RPM_BUILD_ROOT/%{pythonroot}/grubby +install -m 644 grub_cfg_update.py $RPM_BUILD_ROOT/%{pythonroot}/grubby/grub_cfg_update.py +install -m 644 __init__.py $RPM_BUILD_ROOT/%{pythonroot}/grubby/__init__.py +install -m 500 grub-cfg-update $RPM_BUILD_ROOT/usr/sbin/grub-cfg-update + - %clean - 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 + %package deprecated + Summary: Legacy command line tool for updating bootloader configs + Conflicts: %{name} <= 8.40-13 +@@ -164,6 +175,11 @@ current boot environment. + %attr(0755,root,root) %{_sbindir}/grubby + %attr(0755,root,root) %{_sbindir}/installkernel + %attr(0755,root,root) %{_sbindir}/new-kernel-pkg +%{pythonroot}/grubby +%{_prefix}/sbin/grub-cfg-update +%{pythonroot}/grubby/grub_cfg_update.py +%{pythonroot}/grubby/__init__.py + %{_mandir}/man8/*.8* - /usr/libexec/grubby/prune_debug - %ghost %attr(0644,-,-) %config(noreplace) %{_sysconfdir}/sysconfig/kernel + + %changelog -- -1.8.3.1 +2.7.4 diff --git a/grub/grubby/centos/patches/1000-Generic-name-for-Titanium.patch b/grub/grubby/centos/patches/1000-Generic-name-for-Titanium.patch index 57662b925..735f9d94d 100644 --- a/grub/grubby/centos/patches/1000-Generic-name-for-Titanium.patch +++ b/grub/grubby/centos/patches/1000-Generic-name-for-Titanium.patch @@ -3,15 +3,16 @@ From: jmckenna Date: Wed, 5 Apr 2017 09:35:06 -0400 Subject: [PATCH] Use generic OS title for Titanium +Signed-off-by: lilong-neu --- new-kernel-pkg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/new-kernel-pkg b/new-kernel-pkg -index 847e959..977ef2d 100755 +index 0fe6caa..9add50b 100755 --- a/new-kernel-pkg +++ b/new-kernel-pkg -@@ -166,6 +166,8 @@ set_title() { +@@ -157,6 +157,8 @@ set_title() { fi elif [ $ARCH = 's390' -o $ARCH = 's390x' ]; then title=$(echo $version | sed 's/ /_/g') @@ -21,5 +22,5 @@ index 847e959..977ef2d 100755 . /etc/os-release title="$NAME ($version) $VERSION" -- -1.9.1 +2.7.4 diff --git a/grub/grubby/centos/patches/1001-Add-support-for-updating-grub-cfg-with-multiboot-2.patch b/grub/grubby/centos/patches/1001-Add-support-for-updating-grub-cfg-with-multiboot-2.patch index c91096dbb..538879913 100644 --- a/grub/grubby/centos/patches/1001-Add-support-for-updating-grub-cfg-with-multiboot-2.patch +++ b/grub/grubby/centos/patches/1001-Add-support-for-updating-grub-cfg-with-multiboot-2.patch @@ -4,35 +4,41 @@ Date: Tue, 13 Feb 2018 22:48:54 -0500 Subject: [PATCH 1/1] Add support for updating grub.cfg with multiboot 2 --- - Makefile | 5 +++ + Makefile | 4 ++ __init__.py | 8 ++++ grub-cfg-update | 17 ++++++++ grub_cfg_update.py | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++ new-kernel-pkg | 33 ++++++++++---- - 5 files changed, 181 insertions(+), 8 deletions(-) + 5 files changed, 180 insertions(+), 8 deletions(-) create mode 100644 __init__.py create mode 100644 grub-cfg-update create mode 100644 grub_cfg_update.py diff --git a/Makefile b/Makefile -index e021f35..93fa41b 100644 +index 8eeec80..de72d3c 100644 --- a/Makefile +++ b/Makefile -@@ -56,6 +56,11 @@ install: all - install -m 755 grubby $(DESTDIR)$(PREFIX)/sbin ; \ - install -m 644 grubby.8 $(DESTDIR)/$(mandir)/man8 ; \ +@@ -49,6 +49,7 @@ test: all + install: all + mkdir -p $(DESTDIR)$(PREFIX)$(sbindir) + mkdir -p $(DESTDIR)/$(mandir)/man8 ++ mkdir -p $(DESTDIR)/usr/lib64/python3.6/site-packages/grubby + install -m 755 new-kernel-pkg $(DESTDIR)$(PREFIX)$(sbindir) + install -m 644 new-kernel-pkg.8 $(DESTDIR)/$(mandir)/man8 + install -m 755 installkernel $(DESTDIR)$(PREFIX)$(sbindir) +@@ -59,6 +60,9 @@ install: all fi -+ mkdir -p $(DESTDIR)/usr/lib64/python2.7/site-packages/grubby -+ install -m 644 grub_cfg_update.py $(DESTDIR)/usr/lib64/python2.7/site-packages/grubby/grub_cfg_update.py -+ install -m 644 __init__.py $(DESTDIR)/usr/lib64/python2.7/site-packages/grubby/__init__.py -+ install -m 500 grub-cfg-update $(DESTDIR)$(PREFIX)/sbin/grub-cfg-update -+ + install -m 755 -d $(DESTDIR)$(PREFIX)$(libexecdir)/grubby/ + install -m 755 rpm-sort $(DESTDIR)$(PREFIX)$(libexecdir)/grubby/rpm-sort ++ install -m 644 grub_cfg_update.py $(DESTDIR)/usr/lib64/python3.6/site-packages/grubby/grub_cfg_update.py ++ install -m 644 __init__.py $(DESTDIR)/usr/lib64/python3.6/site-packages/grubby/__init__.py ++ install -m 500 grub-cfg-update $(DESTDIR)$(PREFIX)$(sbindir)/grub-cfg-update grubby:: $(OBJECTS) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(grubby_LIBS) diff --git a/__init__.py b/__init__.py new file mode 100644 -index 0000000..5f30af6 +index 0000000..40094b3 --- /dev/null +++ b/__init__.py @@ -0,0 +1,8 @@ @@ -44,14 +50,13 @@ index 0000000..5f30af6 +# +# +# -\ No newline at end of file diff --git a/grub-cfg-update b/grub-cfg-update new file mode 100644 -index 0000000..5e457e9 +index 0000000..64fd286 --- /dev/null +++ b/grub-cfg-update @@ -0,0 +1,17 @@ -+#!/usr/bin/env python ++#!/usr/bin/env python3 + +""" +Copyright (c) 2018 Wind River Systems, Inc. @@ -70,11 +75,11 @@ index 0000000..5e457e9 + diff --git a/grub_cfg_update.py b/grub_cfg_update.py new file mode 100644 -index 0000000..f5cd174 +index 0000000..03c83c9 --- /dev/null +++ b/grub_cfg_update.py @@ -0,0 +1,126 @@ -+#!/usr/bin/env python ++#!/usr/bin/env python3 +# +# Copyright (c) 2018 Wind River Systems, Inc. +# SPDX-License-Identifier: Apache-2.0 @@ -201,10 +206,10 @@ index 0000000..f5cd174 + print e + sys.exit(-1) diff --git a/new-kernel-pkg b/new-kernel-pkg -index 977ef2d..1bb0a64 100755 +index 9add50b..f87a171 100755 --- a/new-kernel-pkg +++ b/new-kernel-pkg -@@ -185,6 +185,11 @@ install() { +@@ -176,6 +176,11 @@ install() { return fi @@ -216,7 +221,7 @@ index 977ef2d..1bb0a64 100755 INITRD="" if [ -f $initrdfile ]; then [ -n "$verbose" ] && echo "found $initrdfile and using it with grubby" -@@ -334,6 +339,11 @@ remove() { +@@ -332,6 +337,11 @@ remove() { return fi @@ -228,7 +233,7 @@ index 977ef2d..1bb0a64 100755 local files local f files="/etc/kernel/prerm.d/*[^~] /etc/kernel/prerm.d/$version/*[^~]" -@@ -483,14 +493,21 @@ update() { +@@ -446,14 +456,21 @@ update() { fi if [ -n "$cfgGrub2Efi" ]; then @@ -259,5 +264,5 @@ index 977ef2d..1bb0a64 100755 [ -n "$verbose" ] && echo "$grub2EfiConfig does not exist, not running grubby" fi -- -1.8.3.1 +2.7.4 diff --git a/grub/grubby/centos/srpm_path b/grub/grubby/centos/srpm_path index e07ec94cb..c22ec9108 100644 --- a/grub/grubby/centos/srpm_path +++ b/grub/grubby/centos/srpm_path @@ -1 +1 @@ -mirror:Source/grubby-8.28-25.el7.src.rpm +mirror:Source/grubby-8.40-34.el8.src.rpm