diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 278397a..41f077c 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -1,2 +1 @@ seabios -grub2 diff --git a/grub2/centos/build_srpm.data b/grub2/centos/build_srpm.data deleted file mode 100644 index 2b07deb..0000000 --- a/grub2/centos/build_srpm.data +++ /dev/null @@ -1,3 +0,0 @@ -COPY_LIST="" -TIS_PATCH_VER=12 -BUILD_IS_SLOW=8 diff --git a/grub2/centos/meta_patches/0001-grub2-Update-package-versioning-for-TIS-format.patch b/grub2/centos/meta_patches/0001-grub2-Update-package-versioning-for-TIS-format.patch deleted file mode 100644 index 17035c7..0000000 --- a/grub2/centos/meta_patches/0001-grub2-Update-package-versioning-for-TIS-format.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec -index a56d930..a4e87f5 100644 ---- a/SPECS/grub2.spec -+++ b/SPECS/grub2.spec -@@ -8,7 +8,7 @@ - Name: grub2 - Epoch: 1 - Version: 2.02 --Release: 0.64%{?dist}%{?buildid} -+Release: 0.64.el7.centos%{?_tis_dist}.%{tis_patch_ver} - Summary: Bootloader with support for Linux, Multiboot and more - Group: System Environment/Base - License: GPLv3+ diff --git a/grub2/centos/meta_patches/0002-grub2-fix-cflags.patch b/grub2/centos/meta_patches/0002-grub2-fix-cflags.patch deleted file mode 100644 index b01b1ce..0000000 --- a/grub2/centos/meta_patches/0002-grub2-fix-cflags.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros -index 168b89b..c9e5177 100644 ---- a/SOURCES/grub.macros -+++ b/SOURCES/grub.macros -@@ -12,16 +12,7 @@ - %global cc_equals %{nil} - %endif - --%global efi_cflags %(echo %{optflags} | \\\ -- sed \\\ -- -e 's/-O./-g3/g' \\\ -- -e 's/-fstack-protector[[:alpha:]-]\\+//g' \\\ -- -e 's/-Wp,-D_FORTIFY_SOURCE=[[:digit:]]\\+//g' \\\ -- -e 's/--param=ssp-buffer-size=4//g' \\\ -- -e 's/-mregparm=3/-mregparm=4/g' \\\ -- -e 's/-fexceptions//g' \\\ -- -e 's/-fasynchronous-unwind-tables//g' \\\ -- -e 's/^/ -fno-strict-aliasing /' ) %{nil} -+%global efi_cflags '' - %global legacy_cflags %(echo %{efi_cflags} | \\\ - sed \\\ - -e 's/-m64//g' \\\ diff --git a/grub2/centos/meta_patches/0003-grub2-remove-debug-pkgs.patch b/grub2/centos/meta_patches/0003-grub2-remove-debug-pkgs.patch deleted file mode 100644 index ed2029d..0000000 --- a/grub2/centos/meta_patches/0003-grub2-remove-debug-pkgs.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec -index 4059aea..a56d930 100644 ---- a/SPECS/grub2.spec -+++ b/SPECS/grub2.spec -@@ -176,7 +176,6 @@ This subpackage provides tools for support of all platforms. - %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 - -b /usr/sbin/grub2-sparc64-setup - EOF - --# Don't run debuginfo on all the grub modules and whatnot; it just --# rejects them, complains, and slows down extraction. --%global finddebugroot "%{_builddir}/%{?buildsubdir}/debug" -- --%global dip RPM_BUILD_ROOT=%{finddebugroot} %{__debug_install_post} --%define __debug_install_post ( \ -- mkdir -p %{finddebugroot}/usr \ -- mv ${RPM_BUILD_ROOT}/usr/bin %{finddebugroot}/usr/bin \ -- mv ${RPM_BUILD_ROOT}/usr/sbin %{finddebugroot}/usr/sbin \ -- %{dip} \ -- install -m 0755 -d %{buildroot}/usr/lib/ %{buildroot}/usr/src/ \ -- cp -al %{finddebugroot}/usr/lib/debug/ \\\ -- %{buildroot}/usr/lib/debug/ \ -- cp -al %{finddebugroot}/usr/src/debug/ \\\ -- %{buildroot}/usr/src/debug/ ) \ -- mv %{finddebugroot}/usr/bin %{buildroot}/usr/bin \ -- mv %{finddebugroot}/usr/sbin %{buildroot}/usr/sbin \ -- %{nil} -- - %clean - rm -rf $RPM_BUILD_ROOT - diff --git a/grub2/centos/meta_patches/0004-grub2-remove-32b-requirements.patch b/grub2/centos/meta_patches/0004-grub2-remove-32b-requirements.patch deleted file mode 100644 index 82fed5b..0000000 --- a/grub2/centos/meta_patches/0004-grub2-remove-32b-requirements.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec -index a4e87f5..95fa027 100644 ---- a/SPECS/grub2.spec -+++ b/SPECS/grub2.spec -@@ -39,11 +39,6 @@ BuildRequires: /usr/lib64/crt1.o glibc-static glibc-devel - BuildRequires: /usr/lib64/crt1.o glibc-static(x86-64) glibc-devel(x86-64) - # glibc32 is what will be in the buildroots, but glibc-static(x86-32) is what - # will be in an epel-7 (i.e. centos) mock root. I think. --%if 0%{?centos}%{?mock} --BuildRequires: /usr/lib/crt1.o glibc-static(x86-32) glibc-devel(x86-32) --%else --BuildRequires: /usr/lib/crt1.o glibc32 --%endif - %else - # ppc64 builds need the ppc crt1.o - BuildRequires: /usr/lib/crt1.o glibc-static glibc-devel diff --git a/grub2/centos/meta_patches/0005-grub2-remove-32b-build.patch b/grub2/centos/meta_patches/0005-grub2-remove-32b-build.patch deleted file mode 100644 index b909ad6..0000000 --- a/grub2/centos/meta_patches/0005-grub2-remove-32b-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3a2d3bf327d82d3d916fa1a14b3dbbe84023a29c Mon Sep 17 00:00:00 2001 -From: root -Date: Mon, 22 Jan 2018 16:05:57 -0500 -Subject: [PATCH] macros - ---- - SOURCES/grub.macros | 14 +++----------- - 1 file changed, 3 insertions(+), 11 deletions(-) - -diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros -index c9e5177..f03bc1a 100755 ---- a/SOURCES/grub.macros -+++ b/SOURCES/grub.macros -@@ -78,15 +78,6 @@ - %global legacy_package_arch pc - %global platform pc - --%global alt_efi_arch ia32 --%global alt_target_cpu_name i386 --%global alt_grub_target_name i386-efi --%global alt_platform efi --%global alt_package_arch efi-ia32 --%global alt_efi_cflags %(echo %{efi_cflags} | \\\ -- sed \\\ -- -e 's/-m64//g' \\\ -- ) %{nil} - %endif - - %ifarch aarch64 -@@ -378,6 +369,7 @@ cd grub-%{1}-%{tarversion} \ - install -m 755 -d $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/ \ - install -m 755 -d $RPM_BUILD_ROOT/boot/grub2/ \ - make DESTDIR=$RPM_BUILD_ROOT install \ -+find $RPM_BUILD_ROOT -name "grub2-bios-setup*" | xargs rm -f \ - if [ -f $RPM_BUILD_ROOT%{_infodir}/grub.info ]; then \ - rm -f $RPM_BUILD_ROOT%{_infodir}/grub.info \ - fi \ --- -1.8.3.1 - diff --git a/grub2/centos/meta_patches/0006-grub2-ship-lst-files.patch b/grub2/centos/meta_patches/0006-grub2-ship-lst-files.patch deleted file mode 100644 index 4d4d160..0000000 --- a/grub2/centos/meta_patches/0006-grub2-ship-lst-files.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c5f65a1bf71e37f73bb102472b2f067f50da1079 Mon Sep 17 00:00:00 2001 -From: root -Date: Tue, 23 Jan 2018 09:24:16 -0500 -Subject: [PATCH] ship .lst files - ---- - SPECS/grub2.spec | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec -index dcb0e64..85ee94d 100755 ---- a/SPECS/grub2.spec -+++ b/SPECS/grub2.spec -@@ -275,6 +275,8 @@ fi - - %files common -f grub.lang - %dir %{_libdir}/grub/ -+%dir %{_libdir}/grub/%{grubefiarch}/ -+%{_libdir}/grub/%{grubefiarch}/*.lst - %dir %{_datarootdir}/grub/ - %dir %{_datarootdir}/grub/themes/ - %exclude %{_datarootdir}/grub/themes/* --- -1.8.3.1 - diff --git a/grub2/centos/meta_patches/0007-1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch b/grub2/centos/meta_patches/0007-1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch deleted file mode 100644 index d73d3f1..0000000 --- a/grub2/centos/meta_patches/0007-1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 38914a0de0b29f5f0efbf3e93a60fa8596f160e7 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 - ---- - SOURCES/grub.patches | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches -index 2ef8ce5..b69fb31 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 - Patch0258: 0258-Fix-one-more-coverity-complaint.patch - Patch0260: 0260-Fix-up-linux-params-usage.patch -+Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch --- -1.8.3.1 - diff --git a/grub2/centos/meta_patches/0008-grub2-Build-unsigned-package.patch b/grub2/centos/meta_patches/0008-grub2-Build-unsigned-package.patch deleted file mode 100644 index f3ee9ca..0000000 --- a/grub2/centos/meta_patches/0008-grub2-Build-unsigned-package.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 0e70c8a35c4434fa23717228cfa819bd64ed082f Mon Sep 17 00:00:00 2001 -From: root -Date: Tue, 23 Jan 2018 14:46:01 -0500 -Subject: [PATCH 2/4] add unsigned package - ---- - SOURCES/grub.macros | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros -index f03bc1a..486604c 100755 ---- a/SOURCES/grub.macros -+++ b/SOURCES/grub.macros -@@ -212,6 +212,13 @@ Requires: %{name}-common = %{evr} \ - %{expand:%%description %{1}-cdboot} \ - %{desc} \ - This subpackage provides optional components of grub used with removeable media on %{1} systems.\ -+ \ -+%package %{1}-unsigned \ -+Summary: Unsigned versions of GRUB EFI binaries \ -+ \ -+%description %{1}-unsigned \ -+This package contains unsigned version of GRUB EFI binaries. \ -+ \ - %{nil} - - %global do_common_setup() \ -@@ -286,6 +293,8 @@ done \ - -p /EFI/%{efidir} -d grub-core ${GRUB_MODULES} \ - %{4}./grub-mkimage -O %{1} -o %{3}.orig \\\ - -p /EFI/BOOT -d grub-core ${GRUB_MODULES} \ -+cp %{2}.orig %{2}.unsigned \ -+cp %{3}.orig %{3}.unsigned \ - %{expand:%%{pesign -s -i %{2}.orig -o %{2} -a %{5} -c %{6} -n %{7}}} \ - %{expand:%%{pesign -s -i %{3}.orig -o %{3} -a %{5} -c %{6} -n %{7}}} \ - %{nil} -@@ -380,6 +389,8 @@ find $RPM_BUILD_ROOT -iname "*.module" -exec chmod a-x {} '\;' \ - touch $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/grub.cfg \ - ln -sf ../boot/efi/EFI/%{efidir}/grub.cfg \\\ - $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-efi.cfg \ -+install -m 755 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2}.unsigned \ -+install -m 755 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3}.unsigned \ - install -m 755 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2} \ - install -m 755 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3} \ - install -D -m 644 unicode.pf2 \\\ -@@ -470,4 +481,8 @@ cd .. \ - %defattr(-,root,root,-) \ - %attr(0755,root,root)/boot/efi/EFI/%{efidir}/%{3} \ - %attr(0755,root,root)/boot/efi/EFI/%{efidir}/fonts \ -+ \ -+%{expand:%%files %{1}-unsigned} \ -+/boot/efi/EFI/%{efidir}/%{grubefiname}.unsigned \ -+/boot/efi/EFI/%{efidir}/%{grubeficdname}.unsigned \ - %{nil} --- -1.8.3.1 - diff --git a/grub2/centos/meta_patches/0009-grub2-Build-pxeboot-package.patch b/grub2/centos/meta_patches/0009-grub2-Build-pxeboot-package.patch deleted file mode 100644 index dc8af1d..0000000 --- a/grub2/centos/meta_patches/0009-grub2-Build-pxeboot-package.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 22076d1eea7ccb10541073c7318043d7634b7852 Mon Sep 17 00:00:00 2001 -From: root -Date: Tue, 23 Jan 2018 14:57:29 -0500 -Subject: [PATCH 3/4] add pxeboot package - ---- - SOURCES/grub.macros | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros -index 486604c..40cb5d5 100755 ---- a/SOURCES/grub.macros -+++ b/SOURCES/grub.macros -@@ -219,6 +219,13 @@ Summary: Unsigned versions of GRUB EFI binaries \ - %description %{1}-unsigned \ - This package contains unsigned version of GRUB EFI binaries. \ - \ -+%package %{1}-pxeboot \ -+Summary: PXE bootable GRUB EFI binaries \ -+ \ -+%description %{1}-pxeboot \ -+This package contains the version of EFI GRUB that is served by the pxeboot \ -+server \ -+ \ - %{nil} - - %global do_common_setup() \ -@@ -391,6 +398,7 @@ ln -sf ../boot/efi/EFI/%{efidir}/grub.cfg \\\ - $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-efi.cfg \ - install -m 755 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2}.unsigned \ - install -m 755 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3}.unsigned \ -+install -D -m 755 %{2} $RPM_BUILD_ROOT/pxeboot/EFI/%{2} \ - install -m 755 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2} \ - install -m 755 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3} \ - install -D -m 644 unicode.pf2 \\\ -@@ -485,4 +493,8 @@ cd .. \ - %{expand:%%files %{1}-unsigned} \ - /boot/efi/EFI/%{efidir}/%{grubefiname}.unsigned \ - /boot/efi/EFI/%{efidir}/%{grubeficdname}.unsigned \ -+ \ -+%{expand:%%files %{1}-pxeboot} \ -+/pxeboot/EFI/%{grubefiname} \ -+ \ - %{nil} --- -1.8.3.1 - diff --git a/grub2/centos/meta_patches/0010-grub2-add-tboot.patch b/grub2/centos/meta_patches/0010-grub2-add-tboot.patch deleted file mode 100644 index b5a7c85..0000000 --- a/grub2/centos/meta_patches/0010-grub2-add-tboot.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 9f0825676d399b40dd28ea405f09d26c9459f1e8 Mon Sep 17 00:00:00 2001 -From: jmckenna -Date: Wed, 28 Mar 2018 12:53:34 -0400 -Subject: [PATCH 1/2] WRS: 0010-grub2-add-tboot.patch - ---- - SOURCES/grub.macros | 5 +++++ - SOURCES/grub.patches | 1 + - 2 files changed, 6 insertions(+) - -diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros -index 40cb5d5..247bb71 100755 ---- a/SOURCES/grub.macros -+++ b/SOURCES/grub.macros -@@ -78,6 +78,10 @@ - %global legacy_package_arch pc - %global platform pc - -+%global wrs_modules " multiboot multiboot2" -+%else -+%global wrs_modules "" -+ - %endif - - %ifarch aarch64 -@@ -324,6 +328,7 @@ GRUB_MODULES=" all_video boot btrfs cat chain configfile echo \\\ - search_label serial sleep syslinuxcfg test tftp \\\ - video xfs" \ - GRUB_MODULES+=%{efi_modules} \ -+GRUB_MODULES+=%{wrs_modules} \ - %{expand:%%{mkimage %{1} %{2} %{3} %{4} %{5} %{6} %{7}}} \ - %{nil} - -diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches -index b69fb31..5e63d71 100644 ---- a/SOURCES/grub.patches -+++ b/SOURCES/grub.patches -@@ -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 - Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch -+Patch1001: 1001-add-tboot.patch --- -1.8.3.1 - diff --git a/grub2/centos/meta_patches/0011-grub2-fix-str-for-6B-macs.patch b/grub2/centos/meta_patches/0011-grub2-fix-str-for-6B-macs.patch deleted file mode 100644 index 636b97f..0000000 --- a/grub2/centos/meta_patches/0011-grub2-fix-str-for-6B-macs.patch +++ /dev/null @@ -1,40 +0,0 @@ -From f38f3a21e50130d5807088bae79c163233271a97 Mon Sep 17 00:00:00 2001 -From: jmckenna -Date: Wed, 28 Mar 2018 14:08:57 -0400 -Subject: [PATCH 2/2] 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 | 4 +++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros -index 247bb71..908315d 100755 ---- a/SOURCES/grub.macros -+++ b/SOURCES/grub.macros -@@ -78,7 +78,7 @@ - %global legacy_package_arch pc - %global platform pc - --%global wrs_modules " multiboot multiboot2" -+%global wrs_modules " multiboot multiboot2 regexp" - %else - %global wrs_modules "" - -diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches -index 5e63d71..688d81b 100644 ---- a/SOURCES/grub.patches -+++ b/SOURCES/grub.patches -@@ -259,3 +259,5 @@ Patch0258: 0258-Fix-one-more-coverity-complaint.patch - Patch0260: 0260-Fix-up-linux-params-usage.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 -+ --- -1.8.3.1 - diff --git a/grub2/centos/meta_patches/0012-grub2-Don-t-strip-img-files-from-non-EFI-build.patch b/grub2/centos/meta_patches/0012-grub2-Don-t-strip-img-files-from-non-EFI-build.patch deleted file mode 100644 index 137fb13..0000000 --- a/grub2/centos/meta_patches/0012-grub2-Don-t-strip-img-files-from-non-EFI-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a62820e84598cf6007a751db01567a8a2ac8d369 Mon Sep 17 00:00:00 2001 -From: root -Date: Fri, 6 Apr 2018 11:36:01 -0400 -Subject: [PATCH] Don't strip files from non-EFI build of grub - ---- - SOURCES/grub.macros | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros -index 4e3bdc0..f403c91 100755 ---- a/SOURCES/grub.macros -+++ b/SOURCES/grub.macros -@@ -468,8 +468,6 @@ cd .. \ - %defattr(-,root,root) \ - %dir %{_libdir}/grub/%{2}/ \ - %{_libdir}/grub/%{2}/* \ --%exclude %{_libdir}/grub/%{2}/*.module \ --%exclude %{_libdir}/grub/%{2}/{boot,boot_hybrid,cdboot,diskboot,lzma_decompress,pxeboot}.{image,img} \ - %exclude %{_libdir}/grub/%{2}/*.o \ - %{nil} - --- -1.8.3.1 - diff --git a/grub2/centos/meta_patches/PATCH_ORDER b/grub2/centos/meta_patches/PATCH_ORDER deleted file mode 100644 index f11838a..0000000 --- a/grub2/centos/meta_patches/PATCH_ORDER +++ /dev/null @@ -1,12 +0,0 @@ -0001-grub2-Update-package-versioning-for-TIS-format.patch -0002-grub2-fix-cflags.patch -0003-grub2-remove-debug-pkgs.patch -0004-grub2-remove-32b-requirements.patch -0005-grub2-remove-32b-build.patch -0006-grub2-ship-lst-files.patch -0007-1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch -0008-grub2-Build-unsigned-package.patch -0009-grub2-Build-pxeboot-package.patch -0010-grub2-add-tboot.patch -0011-grub2-fix-str-for-6B-macs.patch -0012-grub2-Don-t-strip-img-files-from-non-EFI-build.patch diff --git a/grub2/centos/patches/1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch b/grub2/centos/patches/1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch deleted file mode 100644 index 10ba44d..0000000 --- a/grub2/centos/patches/1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 6934956143557c548cc35dcc272aae1ee3d706c8 Mon Sep 17 00:00:00 2001 -From: RHEL Ninjas -Date: Wed, 5 Oct 2016 15:14:28 -0400 -Subject: [PATCH] 10_linux: mktitle: de-brand the grub.cfg menu - -Replace "CentOS" with a generic name. - -Signed-off-by: Michel Thebeau ---- - util/grub.d/10_linux.in | 12 +++++------- - 1 file changed, 5 insertions(+), 7 deletions(-) - -diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index b3c460c..131c1f2 100644 ---- a/util/grub.d/10_linux.in -+++ b/util/grub.d/10_linux.in -@@ -71,22 +71,20 @@ mktitle () - local title_type - local version - local OS_NAME -- local OS_VERS - - title_type=$1 && shift - version=$1 && shift - -- OS_NAME="$(eval $(grep ^NAME= /etc/os-release) ; echo ${NAME})" -- OS_VERS="$(eval $(grep ^VERSION= /etc/os-release) ; echo ${VERSION})" -+ OS_NAME="Linux" - - case $title_type in - recovery) -- title=$(printf '%s (%s) %s (recovery mode)' \ -- "${OS_NAME}" "${version}" "${OS_VERS}") -+ title=$(printf '%s (%s) (recovery mode)' \ -+ "${OS_NAME}" "${version}") - ;; - *) -- title=$(printf '%s (%s) %s' \ -- "${OS_NAME}" "${version}" "${OS_VERS}") -+ title=$(printf '%s (%s)' \ -+ "${OS_NAME}" "${version}") - ;; - esac - echo -n ${title} --- -1.8.3.1 - diff --git a/grub2/centos/patches/1001-add-tboot.patch b/grub2/centos/patches/1001-add-tboot.patch deleted file mode 100644 index ef6e94c..0000000 --- a/grub2/centos/patches/1001-add-tboot.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4a1a40ca64be1a2350ec90ceb9089dc0a3950231 Mon Sep 17 00:00:00 2001 -From: Bin Qian -Date: Tue, 21 Nov 2017 15:36:42 -0500 -Subject: [PATCH 1/1] add tboot - ---- - util/grub-mkconfig.in | 2 +- - util/grub.d/10_linux.in | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 86801aa..b149cec 100644 ---- a/util/grub-mkconfig.in -+++ b/util/grub-mkconfig.in -@@ -125,7 +125,7 @@ set $grub_probe dummy - if test -f "$1"; then - : - else -- gettext_print "%s: Not found.\n" "$1" 1>&2 -+ gettext_printf "%s: Not found.\n" "$1" 1>&2 - exit 1 - fi - -diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 3b29c23..61406e4 100644 ---- a/util/grub.d/10_linux.in -+++ b/util/grub.d/10_linux.in -@@ -23,6 +23,11 @@ datarootdir="@datarootdir@" - - . "@datadir@/@PACKAGE@/grub-mkconfig_lib" - -+tboot=`cat /proc/cmdline | xargs -n1 | grep '^tboot=true$'` || true -+if [ -n "$tboot" ]; then -+ exit 0 -+fi -+ - export TEXTDOMAIN=@PACKAGE@ - export TEXTDOMAINDIR="@localedir@" - --- -1.8.3.1 - diff --git a/grub2/centos/patches/1002-Don-t-write-trailing-colon-when-populating-MAC-strin.patch b/grub2/centos/patches/1002-Don-t-write-trailing-colon-when-populating-MAC-strin.patch deleted file mode 100644 index 5558adb..0000000 --- a/grub2/centos/patches/1002-Don-t-write-trailing-colon-when-populating-MAC-strin.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f521055ce4f334a942d23ccab6ad6b0366c0a204 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(-) - -diff --git a/grub-core/net/net.c b/grub-core/net/net.c -index 6b4b10b..a637da5 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); - return; - } -- for (ptr = str, i = 0; i < addr->len; i++) -+ -+ if (addr->len == 0) -+ { -+ return; -+ } -+ -+ for (ptr = str, i = 0; i < (addr->len - 1); i++) - { - ptr += grub_snprintf (ptr, GRUB_NET_MAX_STR_HWADDR_LEN - (ptr - str), - "%02x:", addr->mac[i] & 0xff); - } -+ ptr += grub_snprintf (ptr, GRUB_NET_MAX_STR_HWADDR_LEN - (ptr - str), -+ "%02x", addr->mac[i] & 0xff); - } - - int --- -1.8.3.1 - diff --git a/grub2/centos/srpm_path b/grub2/centos/srpm_path deleted file mode 100644 index 3deeb30..0000000 --- a/grub2/centos/srpm_path +++ /dev/null @@ -1 +0,0 @@ -mirror:Source/grub2-2.02-0.64.el7.centos.src.rpm