Browse Source

Merge "Relocate grub2 to stx-integ/grub/grub2"

changes/73/600173/1
Zuul 9 months ago
parent
commit
c688c8410e

+ 0
- 1
centos_pkg_dirs View File

@@ -1,2 +1 @@
1 1
 seabios
2
-grub2

+ 0
- 3
grub2/centos/build_srpm.data View File

@@ -1,3 +0,0 @@
1
-COPY_LIST=""
2
-TIS_PATCH_VER=12
3
-BUILD_IS_SLOW=8

+ 0
- 13
grub2/centos/meta_patches/0001-grub2-Update-package-versioning-for-TIS-format.patch View File

@@ -1,13 +0,0 @@
1
-diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
2
-index a56d930..a4e87f5 100644
3
---- a/SPECS/grub2.spec
4
-+++ b/SPECS/grub2.spec
5
-@@ -8,7 +8,7 @@
6
- Name:           grub2
7
- Epoch:          1
8
- Version:        2.02
9
--Release:        0.64%{?dist}%{?buildid}
10
-+Release:        0.64.el7.centos%{?_tis_dist}.%{tis_patch_ver}
11
- Summary:        Bootloader with support for Linux, Multiboot and more
12
- Group:          System Environment/Base
13
- License:        GPLv3+

+ 0
- 22
grub2/centos/meta_patches/0002-grub2-fix-cflags.patch View File

@@ -1,22 +0,0 @@
1
-diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
2
-index 168b89b..c9e5177 100644
3
---- a/SOURCES/grub.macros
4
-+++ b/SOURCES/grub.macros
5
-@@ -12,16 +12,7 @@
6
- %global cc_equals %{nil}
7
- %endif
8
- 
9
--%global efi_cflags %(echo %{optflags} | 			\\\
10
--	sed							\\\
11
--		-e 's/-O./-g3/g'				\\\
12
--		-e 's/-fstack-protector[[:alpha:]-]\\+//g'	\\\
13
--		-e 's/-Wp,-D_FORTIFY_SOURCE=[[:digit:]]\\+//g'	\\\
14
--		-e 's/--param=ssp-buffer-size=4//g'		\\\
15
--		-e 's/-mregparm=3/-mregparm=4/g'		\\\
16
--		-e 's/-fexceptions//g'				\\\
17
--		-e 's/-fasynchronous-unwind-tables//g'		\\\
18
--		-e 's/^/ -fno-strict-aliasing /' ) %{nil}
19
-+%global efi_cflags ''
20
- %global legacy_cflags %(echo %{efi_cflags} |			\\\
21
- 	sed							\\\
22
- 		-e 's/-m64//g'					\\\

+ 0
- 46
grub2/centos/meta_patches/0003-grub2-remove-debug-pkgs.patch View File

@@ -1,46 +0,0 @@
1
-diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
2
-index 4059aea..a56d930 100644
3
---- a/SPECS/grub2.spec
4
-+++ b/SPECS/grub2.spec
5
-@@ -176,7 +176,6 @@ This subpackage provides tools for support of all platforms.
6
- %install
7
- set -e
8
- rm -fr $RPM_BUILD_ROOT
9
--
10
- %do_common_install
11
- # Fix for hardcoded efidir
12
- sed -i.orig -e 's@/efi/EFI/redhat/@/efi/EFI/%{efidir}/@' \
13
-@@ -184,7 +183,6 @@ sed -i.orig -e 's@/efi/EFI/redhat/@/efi/EFI/%{efidir}/@' \
14
- touch --reference=grub-%{tarversion}/util/grub-setpassword.in.orig \
15
-     grub-%{tarversion}/util/grub-setpassword.in
16
- rm -f grub-%{tarversion}/util/grub-setpassword.in.orig
17
--
18
- %if 0%{with_efi_arch}
19
- %do_efi_install %{grubefiarch} %{grubefiname} %{grubeficdname}
20
- %endif
21
-@@ -210,25 +208,6 @@ cat << EOF > ${RPM_BUILD_ROOT}%{_sysconfdir}/prelink.conf.d/grub2.conf
22
- -b /usr/sbin/grub2-sparc64-setup
23
- EOF
24
- 
25
--# Don't run debuginfo on all the grub modules and whatnot; it just
26
--# rejects them, complains, and slows down extraction.
27
--%global finddebugroot "%{_builddir}/%{?buildsubdir}/debug"
28
--
29
--%global dip RPM_BUILD_ROOT=%{finddebugroot} %{__debug_install_post}
30
--%define __debug_install_post (						\
31
--	mkdir -p %{finddebugroot}/usr					\
32
--	mv ${RPM_BUILD_ROOT}/usr/bin %{finddebugroot}/usr/bin		\
33
--	mv ${RPM_BUILD_ROOT}/usr/sbin %{finddebugroot}/usr/sbin		\
34
--	%{dip}								\
35
--	install -m 0755 -d %{buildroot}/usr/lib/ %{buildroot}/usr/src/	\
36
--	cp -al %{finddebugroot}/usr/lib/debug/				\\\
37
--		%{buildroot}/usr/lib/debug/				\
38
--	cp -al %{finddebugroot}/usr/src/debug/				\\\
39
--		%{buildroot}/usr/src/debug/ )				\
40
--	mv %{finddebugroot}/usr/bin %{buildroot}/usr/bin		\
41
--	mv %{finddebugroot}/usr/sbin %{buildroot}/usr/sbin		\
42
--	%{nil}
43
--
44
- %clean    
45
- rm -rf $RPM_BUILD_ROOT
46
- 

+ 0
- 16
grub2/centos/meta_patches/0004-grub2-remove-32b-requirements.patch View File

@@ -1,16 +0,0 @@
1
-diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
2
-index a4e87f5..95fa027 100644
3
---- a/SPECS/grub2.spec
4
-+++ b/SPECS/grub2.spec
5
-@@ -39,11 +39,6 @@ BuildRequires:  /usr/lib64/crt1.o glibc-static glibc-devel
6
- BuildRequires:  /usr/lib64/crt1.o glibc-static(x86-64) glibc-devel(x86-64)
7
- # glibc32 is what will be in the buildroots, but glibc-static(x86-32) is what
8
- # will be in an epel-7 (i.e. centos) mock root.  I think.
9
--%if 0%{?centos}%{?mock}
10
--BuildRequires:  /usr/lib/crt1.o glibc-static(x86-32) glibc-devel(x86-32)
11
--%else
12
--BuildRequires:  /usr/lib/crt1.o glibc32
13
--%endif
14
- %else
15
- # ppc64 builds need the ppc crt1.o
16
- BuildRequires:  /usr/lib/crt1.o glibc-static glibc-devel

+ 0
- 39
grub2/centos/meta_patches/0005-grub2-remove-32b-build.patch View File

@@ -1,40 +0,0 @@
1
-From 3a2d3bf327d82d3d916fa1a14b3dbbe84023a29c Mon Sep 17 00:00:00 2001
2
-From: root <root@yow-cgts4-lx.wrs.com>
3
-Date: Mon, 22 Jan 2018 16:05:57 -0500
4
-Subject: [PATCH] macros
5
-
6
----
7
- SOURCES/grub.macros | 14 +++-----------
8
- 1 file changed, 3 insertions(+), 11 deletions(-)
9
-
10
-diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
11
-index c9e5177..f03bc1a 100755
12
---- a/SOURCES/grub.macros
13
-+++ b/SOURCES/grub.macros
14
-@@ -78,15 +78,6 @@
15
- %global legacy_package_arch pc
16
- %global platform pc
17
- 
18
--%global alt_efi_arch ia32
19
--%global alt_target_cpu_name i386
20
--%global alt_grub_target_name i386-efi
21
--%global alt_platform efi
22
--%global alt_package_arch efi-ia32
23
--%global alt_efi_cflags %(echo %{efi_cflags} |			\\\
24
--	sed							\\\
25
--		-e 's/-m64//g'				\\\
26
--	) %{nil}
27
- %endif
28
- 
29
- %ifarch aarch64
30
-@@ -378,6 +369,7 @@ cd grub-%{1}-%{tarversion}					\
31
- install -m 755 -d $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/	\
32
- install -m 755 -d $RPM_BUILD_ROOT/boot/grub2/			\
33
- make DESTDIR=$RPM_BUILD_ROOT install				\
34
-+find $RPM_BUILD_ROOT -name "grub2-bios-setup*" | xargs rm -f \
35
- if [ -f $RPM_BUILD_ROOT%{_infodir}/grub.info ]; then		\
36
- 	rm -f $RPM_BUILD_ROOT%{_infodir}/grub.info		\
37
- fi								\
38
-1.8.3.1
39
-

+ 0
- 24
grub2/centos/meta_patches/0006-grub2-ship-lst-files.patch View File

@@ -1,25 +0,0 @@
1
-From c5f65a1bf71e37f73bb102472b2f067f50da1079 Mon Sep 17 00:00:00 2001
2
-From: root <root@yow-cgts4-lx.wrs.com>
3
-Date: Tue, 23 Jan 2018 09:24:16 -0500
4
-Subject: [PATCH] ship .lst files
5
-
6
----
7
- SPECS/grub2.spec | 2 ++
8
- 1 file changed, 2 insertions(+)
9
-
10
-diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
11
-index dcb0e64..85ee94d 100755
12
---- a/SPECS/grub2.spec
13
-+++ b/SPECS/grub2.spec
14
-@@ -275,6 +275,8 @@ fi
15
- 
16
- %files common -f grub.lang
17
- %dir %{_libdir}/grub/
18
-+%dir %{_libdir}/grub/%{grubefiarch}/
19
-+%{_libdir}/grub/%{grubefiarch}/*.lst
20
- %dir %{_datarootdir}/grub/
21
- %dir %{_datarootdir}/grub/themes/
22
- %exclude %{_datarootdir}/grub/themes/*
23
-1.8.3.1
24
-

+ 0
- 20
grub2/centos/meta_patches/0007-1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch View File

@@ -1,21 +0,0 @@
1
-From 38914a0de0b29f5f0efbf3e93a60fa8596f160e7 Mon Sep 17 00:00:00 2001
2
-From: root <root@yow-cgts4-lx.wrs.com>
3
-Date: Tue, 23 Jan 2018 13:29:11 -0500
4
-Subject: [PATCH 1/4] debrand the grub_cfg menu
5
-
6
----
7
- SOURCES/grub.patches | 1 +
8
- 1 file changed, 1 insertion(+)
9
-
10
-diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches
11
-index 2ef8ce5..b69fb31 100644
12
---- a/SOURCES/grub.patches
13
-+++ b/SOURCES/grub.patches
14
-@@ -257,3 +257,4 @@ Patch0256: 0256-efinet-Setting-DNS-server-from-UEFI-protocol.patch
15
- Patch0257: 0257-set-rootpath.patch
16
- Patch0258: 0258-Fix-one-more-coverity-complaint.patch
17
- Patch0260: 0260-Fix-up-linux-params-usage.patch
18
-+Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch
19
-1.8.3.1
20
-

+ 0
- 56
grub2/centos/meta_patches/0008-grub2-Build-unsigned-package.patch View File

@@ -1,57 +0,0 @@
1
-From 0e70c8a35c4434fa23717228cfa819bd64ed082f Mon Sep 17 00:00:00 2001
2
-From: root <root@yow-cgts4-lx.wrs.com>
3
-Date: Tue, 23 Jan 2018 14:46:01 -0500
4
-Subject: [PATCH 2/4] add unsigned package
5
-
6
----
7
- SOURCES/grub.macros | 15 +++++++++++++++
8
- 1 file changed, 15 insertions(+)
9
-
10
-diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
11
-index f03bc1a..486604c 100755
12
---- a/SOURCES/grub.macros
13
-+++ b/SOURCES/grub.macros
14
-@@ -212,6 +212,13 @@ Requires:	%{name}-common = %{evr}					\
15
- %{expand:%%description %{1}-cdboot}					\
16
- %{desc}									\
17
- This subpackage provides optional components of grub used with removeable media on %{1} systems.\
18
-+                                                                        \
19
-+%package %{1}-unsigned                                                  \
20
-+Summary:    Unsigned versions of GRUB EFI binaries                      \
21
-+                                                                        \
22
-+%description %{1}-unsigned                                              \
23
-+This package contains unsigned version of GRUB EFI binaries.            \
24
-+                                                                        \
25
- %{nil}
26
- 
27
- %global do_common_setup()					\
28
-@@ -286,6 +293,8 @@ done								\
29
- 	-p /EFI/%{efidir} -d grub-core ${GRUB_MODULES}		\
30
- %{4}./grub-mkimage -O %{1} -o %{3}.orig				\\\
31
- 	-p /EFI/BOOT -d grub-core ${GRUB_MODULES}		\
32
-+cp %{2}.orig %{2}.unsigned                                      \
33
-+cp %{3}.orig %{3}.unsigned                                      \
34
- %{expand:%%{pesign -s -i %{2}.orig -o %{2} -a %{5} -c %{6} -n %{7}}}	\
35
- %{expand:%%{pesign -s -i %{3}.orig -o %{3} -a %{5} -c %{6} -n %{7}}}	\
36
- %{nil}
37
-@@ -380,6 +389,8 @@ find $RPM_BUILD_ROOT -iname "*.module" -exec chmod a-x {} '\;'	\
38
- touch $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/grub.cfg		\
39
- ln -sf ../boot/efi/EFI/%{efidir}/grub.cfg			\\\
40
- 	$RPM_BUILD_ROOT%{_sysconfdir}/%{name}-efi.cfg		\
41
-+install -m 755 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2}.unsigned \
42
-+install -m 755 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3}.unsigned \
43
- install -m 755 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2}	\
44
- install -m 755 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3} \
45
- install -D -m 644 unicode.pf2					\\\
46
-@@ -470,4 +481,8 @@ cd ..								\
47
- %defattr(-,root,root,-)						\
48
- %attr(0755,root,root)/boot/efi/EFI/%{efidir}/%{3}		\
49
- %attr(0755,root,root)/boot/efi/EFI/%{efidir}/fonts		\
50
-+								\
51
-+%{expand:%%files %{1}-unsigned}                                 \
52
-+/boot/efi/EFI/%{efidir}/%{grubefiname}.unsigned                 \
53
-+/boot/efi/EFI/%{efidir}/%{grubeficdname}.unsigned               \
54
- %{nil}
55
-1.8.3.1
56
-

+ 0
- 46
grub2/centos/meta_patches/0009-grub2-Build-pxeboot-package.patch View File

@@ -1,47 +0,0 @@
1
-From 22076d1eea7ccb10541073c7318043d7634b7852 Mon Sep 17 00:00:00 2001
2
-From: root <root@yow-cgts4-lx.wrs.com>
3
-Date: Tue, 23 Jan 2018 14:57:29 -0500
4
-Subject: [PATCH 3/4] add pxeboot package
5
-
6
----
7
- SOURCES/grub.macros | 12 ++++++++++++
8
- 1 file changed, 12 insertions(+)
9
-
10
-diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
11
-index 486604c..40cb5d5 100755
12
---- a/SOURCES/grub.macros
13
-+++ b/SOURCES/grub.macros
14
-@@ -219,6 +219,13 @@ Summary:    Unsigned versions of GRUB EFI binaries                      \
15
- %description %{1}-unsigned                                              \
16
- This package contains unsigned version of GRUB EFI binaries.            \
17
-                                                                         \
18
-+%package %{1}-pxeboot                                                   \
19
-+Summary:    PXE bootable GRUB EFI binaries                              \
20
-+                                                                        \
21
-+%description %{1}-pxeboot                                               \
22
-+This package contains the version of EFI GRUB that is served by the pxeboot \
23
-+server                                                                  \
24
-+                                                                        \
25
- %{nil}
26
- 
27
- %global do_common_setup()					\
28
-@@ -391,6 +398,7 @@ ln -sf ../boot/efi/EFI/%{efidir}/grub.cfg			\\\
29
- 	$RPM_BUILD_ROOT%{_sysconfdir}/%{name}-efi.cfg		\
30
- install -m 755 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2}.unsigned \
31
- install -m 755 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3}.unsigned \
32
-+install -D -m 755 %{2} $RPM_BUILD_ROOT/pxeboot/EFI/%{2}         \
33
- install -m 755 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2}	\
34
- install -m 755 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3} \
35
- install -D -m 644 unicode.pf2					\\\
36
-@@ -485,4 +493,8 @@ cd ..								\
37
- %{expand:%%files %{1}-unsigned}                                 \
38
- /boot/efi/EFI/%{efidir}/%{grubefiname}.unsigned                 \
39
- /boot/efi/EFI/%{efidir}/%{grubeficdname}.unsigned               \
40
-+								\
41
-+%{expand:%%files %{1}-pxeboot}                                  \
42
-+/pxeboot/EFI/%{grubefiname}                                     \
43
-+								\
44
- %{nil}
45
-1.8.3.1
46
-

+ 0
- 44
grub2/centos/meta_patches/0010-grub2-add-tboot.patch View File

@@ -1,45 +0,0 @@
1
-From 9f0825676d399b40dd28ea405f09d26c9459f1e8 Mon Sep 17 00:00:00 2001
2
-From: jmckenna <jason.mckenna@windriver.com>
3
-Date: Wed, 28 Mar 2018 12:53:34 -0400
4
-Subject: [PATCH 1/2] WRS: 0010-grub2-add-tboot.patch
5
-
6
----
7
- SOURCES/grub.macros  | 5 +++++
8
- SOURCES/grub.patches | 1 +
9
- 2 files changed, 6 insertions(+)
10
-
11
-diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
12
-index 40cb5d5..247bb71 100755
13
---- a/SOURCES/grub.macros
14
-+++ b/SOURCES/grub.macros
15
-@@ -78,6 +78,10 @@
16
- %global legacy_package_arch pc
17
- %global platform pc
18
- 
19
-+%global wrs_modules " multiboot multiboot2"
20
-+%else
21
-+%global wrs_modules ""
22
-+
23
- %endif
24
- 
25
- %ifarch aarch64
26
-@@ -324,6 +328,7 @@ GRUB_MODULES="	all_video boot btrfs cat chain configfile echo	\\\
27
- 		search_label serial sleep syslinuxcfg test tftp \\\
28
- 		video xfs"					\
29
- GRUB_MODULES+=%{efi_modules}					\
30
-+GRUB_MODULES+=%{wrs_modules}                                    \
31
- %{expand:%%{mkimage %{1} %{2} %{3} %{4} %{5} %{6} %{7}}}	\
32
- %{nil}
33
- 
34
-diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches
35
-index b69fb31..5e63d71 100644
36
---- a/SOURCES/grub.patches
37
-+++ b/SOURCES/grub.patches
38
-@@ -258,3 +258,4 @@ Patch0257: 0257-set-rootpath.patch
39
- Patch0258: 0258-Fix-one-more-coverity-complaint.patch
40
- Patch0260: 0260-Fix-up-linux-params-usage.patch
41
- Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch
42
-+Patch1001: 1001-add-tboot.patch
43
-1.8.3.1
44
-

+ 0
- 39
grub2/centos/meta_patches/0011-grub2-fix-str-for-6B-macs.patch View File

@@ -1,40 +0,0 @@
1
-From f38f3a21e50130d5807088bae79c163233271a97 Mon Sep 17 00:00:00 2001
2
-From: jmckenna <jason.mckenna@windriver.com>
3
-Date: Wed, 28 Mar 2018 14:08:57 -0400
4
-Subject: [PATCH 2/2] Patch GRUB so that it doesn't add a trailing colon after
5
- MAC
6
-
7
-A CentOS GRUB patch added support for macs > 6B in size.  This
8
-breaks PXEbooting the installer, because a routine within grub
9
-relies on the max MAC string length.
10
----
11
- SOURCES/grub.macros  | 2 +-
12
- SOURCES/grub.patches | 4 +++-
13
- 2 files changed, 4 insertions(+), 2 deletions(-)
14
-
15
-diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
16
-index 247bb71..908315d 100755
17
---- a/SOURCES/grub.macros
18
-+++ b/SOURCES/grub.macros
19
-@@ -78,7 +78,7 @@
20
- %global legacy_package_arch pc
21
- %global platform pc
22
-
23
--%global wrs_modules " multiboot multiboot2"
24
-+%global wrs_modules " multiboot multiboot2 regexp"
25
- %else
26
- %global wrs_modules ""
27
-
28
-diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches
29
-index 5e63d71..688d81b 100644
30
---- a/SOURCES/grub.patches
31
-+++ b/SOURCES/grub.patches
32
-@@ -259,3 +259,5 @@ Patch0258: 0258-Fix-one-more-coverity-complaint.patch
33
- Patch0260: 0260-Fix-up-linux-params-usage.patch
34
- Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch
35
- Patch1001: 1001-add-tboot.patch
36
-+Patch1002: 1002-Don-t-write-trailing-colon-when-populating-MAC-strin.patch
37
-+
38
-1.8.3.1
39
-

+ 0
- 24
grub2/centos/meta_patches/0012-grub2-Don-t-strip-img-files-from-non-EFI-build.patch View File

@@ -1,25 +0,0 @@
1
-From a62820e84598cf6007a751db01567a8a2ac8d369 Mon Sep 17 00:00:00 2001
2
-From: root <root@yow-cgts1-lx.wrs.com>
3
-Date: Fri, 6 Apr 2018 11:36:01 -0400
4
-Subject: [PATCH] Don't strip files from non-EFI build of grub
5
-
6
----
7
- SOURCES/grub.macros | 2 --
8
- 1 file changed, 2 deletions(-)
9
-
10
-diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
11
-index 4e3bdc0..f403c91 100755
12
---- a/SOURCES/grub.macros
13
-+++ b/SOURCES/grub.macros
14
-@@ -468,8 +468,6 @@ cd ..								\
15
- %defattr(-,root,root)						\
16
- %dir %{_libdir}/grub/%{2}/					\
17
- %{_libdir}/grub/%{2}/*						\
18
--%exclude %{_libdir}/grub/%{2}/*.module				\
19
--%exclude %{_libdir}/grub/%{2}/{boot,boot_hybrid,cdboot,diskboot,lzma_decompress,pxeboot}.{image,img}						\
20
- %exclude %{_libdir}/grub/%{2}/*.o				\
21
- %{nil}
22
- 
23
-1.8.3.1
24
-

+ 0
- 12
grub2/centos/meta_patches/PATCH_ORDER View File

@@ -1,12 +0,0 @@
1
-0001-grub2-Update-package-versioning-for-TIS-format.patch
2
-0002-grub2-fix-cflags.patch
3
-0003-grub2-remove-debug-pkgs.patch
4
-0004-grub2-remove-32b-requirements.patch
5
-0005-grub2-remove-32b-build.patch
6
-0006-grub2-ship-lst-files.patch
7
-0007-1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch
8
-0008-grub2-Build-unsigned-package.patch
9
-0009-grub2-Build-pxeboot-package.patch
10
-0010-grub2-add-tboot.patch
11
-0011-grub2-fix-str-for-6B-macs.patch
12
-0012-grub2-Don-t-strip-img-files-from-non-EFI-build.patch

+ 0
- 46
grub2/centos/patches/1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch View File

@@ -1,47 +0,0 @@
1
-From 6934956143557c548cc35dcc272aae1ee3d706c8 Mon Sep 17 00:00:00 2001
2
-From: RHEL Ninjas <example@example.com>
3
-Date: Wed, 5 Oct 2016 15:14:28 -0400
4
-Subject: [PATCH] 10_linux: mktitle: de-brand the grub.cfg menu
5
-
6
-Replace "CentOS" with a generic name.
7
-
8
-Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
9
----
10
- util/grub.d/10_linux.in | 12 +++++-------
11
- 1 file changed, 5 insertions(+), 7 deletions(-)
12
-
13
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
14
-index b3c460c..131c1f2 100644
15
---- a/util/grub.d/10_linux.in
16
-+++ b/util/grub.d/10_linux.in
17
-@@ -71,22 +71,20 @@ mktitle ()
18
-   local title_type
19
-   local version
20
-   local OS_NAME
21
--  local OS_VERS
22
- 
23
-   title_type=$1 && shift
24
-   version=$1 && shift
25
- 
26
--  OS_NAME="$(eval $(grep ^NAME= /etc/os-release) ; echo ${NAME})"
27
--  OS_VERS="$(eval $(grep ^VERSION= /etc/os-release) ; echo ${VERSION})"
28
-+  OS_NAME="Linux"
29
- 
30
-   case $title_type in
31
-     recovery)
32
--      title=$(printf '%s (%s) %s (recovery mode)' \
33
--                     "${OS_NAME}" "${version}" "${OS_VERS}")
34
-+      title=$(printf '%s (%s) (recovery mode)' \
35
-+                     "${OS_NAME}" "${version}")
36
-       ;;
37
-     *)
38
--      title=$(printf '%s (%s) %s' \
39
--                     "${OS_NAME}" "${version}" "${OS_VERS}")
40
-+      title=$(printf '%s (%s)' \
41
-+                     "${OS_NAME}" "${version}")
42
-       ;;
43
-   esac
44
-   echo -n ${title}
45
-1.8.3.1
46
-

+ 0
- 41
grub2/centos/patches/1001-add-tboot.patch View File

@@ -1,42 +0,0 @@
1
-From 4a1a40ca64be1a2350ec90ceb9089dc0a3950231 Mon Sep 17 00:00:00 2001
2
-From: Bin Qian <bin.qian@windriver.com>
3
-Date: Tue, 21 Nov 2017 15:36:42 -0500
4
-Subject: [PATCH 1/1] add tboot
5
-
6
----
7
- util/grub-mkconfig.in   | 2 +-
8
- util/grub.d/10_linux.in | 5 +++++
9
- 2 files changed, 6 insertions(+), 1 deletion(-)
10
-
11
-diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
12
-index 86801aa..b149cec 100644
13
---- a/util/grub-mkconfig.in
14
-+++ b/util/grub-mkconfig.in
15
-@@ -125,7 +125,7 @@ set $grub_probe dummy
16
- if test -f "$1"; then
17
-     :
18
- else
19
--    gettext_print "%s: Not found.\n" "$1" 1>&2
20
-+    gettext_printf "%s: Not found.\n" "$1" 1>&2
21
-     exit 1
22
- fi
23
- 
24
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
25
-index 3b29c23..61406e4 100644
26
---- a/util/grub.d/10_linux.in
27
-+++ b/util/grub.d/10_linux.in
28
-@@ -23,6 +23,11 @@ datarootdir="@datarootdir@"
29
- 
30
- . "@datadir@/@PACKAGE@/grub-mkconfig_lib"
31
- 
32
-+tboot=`cat /proc/cmdline | xargs -n1 | grep '^tboot=true$'` || true
33
-+if [ -n "$tboot"  ]; then
34
-+  exit 0
35
-+fi
36
-+
37
- export TEXTDOMAIN=@PACKAGE@
38
- export TEXTDOMAINDIR="@localedir@"
39
- 
40
-1.8.3.1
41
-

+ 0
- 36
grub2/centos/patches/1002-Don-t-write-trailing-colon-when-populating-MAC-strin.patch View File

@@ -1,37 +0,0 @@
1
-From f521055ce4f334a942d23ccab6ad6b0366c0a204 Mon Sep 17 00:00:00 2001
2
-From: root <root@yow-cgts1-lx.wrs.com>
3
-Date: Wed, 28 Mar 2018 11:23:17 -0400
4
-Subject: [PATCH] Don't write trailing colon when populating MAC string
5
-
6
----
7
- grub-core/net/net.c | 10 +++++++++-
8
- 1 file changed, 9 insertions(+), 1 deletion(-)
9
-
10
-diff --git a/grub-core/net/net.c b/grub-core/net/net.c
11
-index 6b4b10b..a637da5 100644
12
---- a/grub-core/net/net.c
13
-+++ b/grub-core/net/net.c
14
-@@ -792,11 +792,19 @@ grub_net_hwaddr_to_str (const grub_net_link_level_address_t *addr, char *str)
15
- 		    addr->type, addr->len);
16
-        return;
17
-     }
18
--  for (ptr = str, i = 0; i < addr->len; i++)
19
-+
20
-+  if (addr->len == 0)
21
-+    {
22
-+      return;
23
-+    }
24
-+
25
-+  for (ptr = str, i = 0; i < (addr->len - 1); i++)
26
-     {
27
-       ptr += grub_snprintf (ptr, GRUB_NET_MAX_STR_HWADDR_LEN - (ptr - str),
28
- 		     "%02x:", addr->mac[i] & 0xff);
29
-     }
30
-+  ptr += grub_snprintf (ptr, GRUB_NET_MAX_STR_HWADDR_LEN - (ptr - str),
31
-+	         "%02x", addr->mac[i] & 0xff);
32
- }
33
- 
34
- int
35
-1.8.3.1
36
-

+ 0
- 1
grub2/centos/srpm_path View File

@@ -1 +0,0 @@
1
-mirror:Source/grub2-2.02-0.64.el7.centos.src.rpm

Loading…
Cancel
Save