Relocate grub2 to stx-integ/grub/grub2

Move content from stx-gplv3 into stx-integ

Packages will be relocated to

stx-integ:
    base/
        anaconda
        crontabs
        dnsmasq
        rsync

    database/
        python-psycopg2

    filesystem/
        parted

    grub/
        grub2

    security/
        python-keyring

Change-Id: Ib2807e3762a9ad17ef246398ab8e8cb7a7cf335c
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>

centos_pkg_dirs

@@ -145,3 +145,4 @@ base/dnsmasq
 base/rsync
 filesystem/parted
 security/python-keyring
+grub/grub2

grub/grub2/centos/build_srpm.data

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

grub/grub2/centos/meta_patches/0001-grub2-Update-package-versioning-for-TIS-format.patch

@@ -0,0 +1,28 @@
+From 7cb38901901be87761aee423b1c2f96b9907d785 Mon Sep 17 00:00:00 2001
+From: Scott Little <scott.little@windriver.com>
+Date: Tue, 3 Jan 2017 13:45:49 -0500
+Subject: [PATCH 1/2] WRS:
+ 0001-grub2-Update-package-versioning-for-TIS-format.patch
+
+Conflicts:
+	SPECS/grub2.spec
+---
+ SPECS/grub2.spec | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
+index 9259c13..5baf5c4 100644
+--- a/SPECS/grub2.spec
++++ b/SPECS/grub2.spec
+@@ -45,7 +45,7 @@
+ Name:           grub2
+ Epoch:          1
+ Version:        2.02
+-Release:        0.44%{?dist}
++Release:        0.44.el7.centos%{?_tis_dist}.%{tis_patch_ver}
+ Summary:        Bootloader with support for Linux, Multiboot and more
+ 
+ Group:          System Environment/Base
+-- 
+1.8.3.1
+

grub/grub2/centos/meta_patches/0002-1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch

@@ -0,0 +1,21 @@
+From 662913fede85b09f54e5272451e4dc3f295a4e05 Mon Sep 17 00:00:00 2001
+From: Scott Little <scott.little@windriver.com>
+Date: Tue, 3 Jan 2017 15:55:20 -0500
+Subject: [PATCH] WRS: spec-10_linux-mktitle-de-brand-the-grub.cfg-menu.patch
+
+---
+ SOURCES/grub.patches | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches
+index 8c7d946..fcd0a51 100644
+--- a/SOURCES/grub.patches
++++ b/SOURCES/grub.patches
+@@ -210,3 +210,4 @@ Patch0210: 0210-Fix-duplicate-shell-entries-1226325.patch
+ Patch0211: 0211-Coverity-rightly-noticed-that-grub_ipv6_get_masksize.patch
+ Patch0212: 0212-Export-grub-get-kernel-settings-variables.patch
+ Patch0213: 0213-Normalize-slashes-in-tftp-paths.patch
++Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch
+-- 
+1.8.3.1
+

grub/grub2/centos/meta_patches/0003-grub2-Build-unsigned-package.patch

@@ -0,0 +1,72 @@
+diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
+index 9c32a93..676572e 100644
+--- a/SPECS/grub2.spec
++++ b/SPECS/grub2.spec
+@@ -140,6 +140,16 @@ bootloader with modular architecture.  It support rich varietyof kernel formats,
+ file systems, computer architectures and hardware devices.  This subpackage
+ provides tools for support of all platforms.
+ 
++%ifarch %{efiarchs}
++%ifnarch aarch64
++%package efi-unsigned
++Summary:    Unsigned versions of GRUB EFI binaries
++
++%description efi-unsigned
++This package contains unsigned version of GRUB EFI binaries.
++%endif # aarch64
++%endif # %{efiarchs}
++
+ %prep
+ %setup -T -c -n grub-%{tarversion}
+ %ifarch %{efiarchs}
+@@ -210,6 +220,10 @@ GRUB_MODULES="${GRUB_MODULES} linuxefi"
+ 		-d grub-core ${GRUB_MODULES}
+ ./grub-mkimage -O %{grubefiarch} -o %{grubeficdname}.orig -p /EFI/BOOT \
+ 		-d grub-core ${GRUB_MODULES}
++
++cp %{grubefiname}.orig %{grubefiname}.unsigned
++cp %{grubeficdname}.orig %{grubeficdname}.unsigned
++
+ %ifarch aarch64
+ mv %{grubefiname}.orig %{grubefiname}
+ mv %{grubeficdname}.orig %{grubeficdname}
+@@ -292,6 +306,12 @@ do
+         TGT=$(echo $MODULE |sed "s,$RPM_BUILD_ROOT,.debugroot,")
+ #        install -m 755 -D $BASE$EXT $TGT
+ done
++%ifarch %{efiarchs}
++%ifnarch aarch64
++install -m 755 %{grubefiname}.unsigned $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{grubefiname}.unsigned
++install -m 755 %{grubeficdname}.unsigned $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{grubeficdname}.unsigned
++%endif
++%endif
+ install -m 755 %{grubefiname} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{grubefiname}
+ install -m 755 %{grubeficdname} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{grubeficdname}
+ install -D -m 644 unicode.pf2 $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/fonts/unicode.pf2
+@@ -444,7 +464,9 @@ fi
+ %files efi
+ %defattr(-,root,root,-)
+ %config(noreplace) %{_sysconfdir}/%{name}-efi.cfg
+-%attr(0755,root,root)/boot/efi/EFI/%{efidir}
++%attr(0755,root,root) %dir /boot/efi/EFI/%{efidir}
++%attr(0755,root,root)/boot/efi/EFI/%{efidir}/%{grubefiname}
++%attr(0755,root,root)/boot/efi/EFI/%{efidir}/%{grubeficdname}
+ %attr(0755,root,root)/boot/efi/EFI/%{efidir}/fonts
+ %ghost %config(noreplace) /boot/efi/EFI/%{efidir}/grub.cfg
+ %doc grub-%{tarversion}/COPYING
+@@ -520,6 +542,14 @@ fi
+ %dir %{_datarootdir}/grub/themes
+ %exclude %{_datarootdir}/grub/themes/starfield
+ 
++%ifarch %{efiarchs}
++%ifnarch aarch64
++%files efi-unsigned
++/boot/efi/EFI/%{efidir}/%{grubefiname}.unsigned
++/boot/efi/EFI/%{efidir}/%{grubeficdname}.unsigned
++%endif
++%endif
++
+ %changelog
+ * Sun Nov 20 2016 Johnny Hughes <johnny@centos.org> - 2.02-0.44
+ - Roll in CentOS Secureboot keys
+

grub/grub2/centos/meta_patches/0004-grub2-Build-pxeboot-package.patch

@@ -0,0 +1,42 @@
+diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
+index 53778b3..4829e91 100644
+--- a/SPECS/grub2.spec
++++ b/SPECS/grub2.spec
+@@ -149,6 +149,14 @@ Summary:    Unsigned versions of GRUB EFI binaries
+ 
+ %description efi-unsigned
+ This package contains unsigned version of GRUB EFI binaries.
++
++%package efi-pxeboot
++Summary:    PXE bootable GRUB EFI binaries
++
++%description efi-pxeboot
++This package contains the version of EFI GRUB that is served by the pxeboot
++server
++
+ %endif # aarch64
+ %endif # %{efiarchs}
+ 
+@@ -312,6 +320,7 @@ done
+ %ifnarch aarch64
+ install -m 755 %{grubefiname}.unsigned $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{grubefiname}.unsigned
+ install -m 755 %{grubeficdname}.unsigned $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{grubeficdname}.unsigned
++install -D -m 755 %{grubefiname} $RPM_BUILD_ROOT/pxeboot/EFI/%{grubefiname}
+ %endif
+ %endif
+ install -m 755 %{grubefiname} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{grubefiname}
+@@ -546,9 +555,14 @@ fi
+ 
+ %ifarch %{efiarchs}
+ %ifnarch aarch64
++
+ %files efi-unsigned
+ /boot/efi/EFI/%{efidir}/%{grubefiname}.unsigned
+ /boot/efi/EFI/%{efidir}/%{grubeficdname}.unsigned
++
++%files efi-pxeboot
++/pxeboot/EFI/%{grubefiname}
++
+ %endif
+ %endif
+ 

grub/grub2/centos/meta_patches/0005-add-tboot.patch

@@ -0,0 +1,44 @@
+From 69f56affb4e910470072b79824f3c6ecccefa4c2 Mon Sep 17 00:00:00 2001
+From: Bin Qian <bin.qian@windriver.com>
+Date: Wed, 6 Dec 2017 10:45:42 -0500
+Subject: [PATCH 1/1] WRS: Add tboot support
+
+---
+ SPECS/grub2.spec | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
+index 4d92bf9..5719df6 100644
+--- a/SPECS/grub2.spec
++++ b/SPECS/grub2.spec
+@@ -65,6 +65,7 @@ Source6:	gitignore
+ %include %{SOURCE3}
+ 
+ Patch9999: 0001-centos-grub2-password-fix.patch
++Patch10001: 10001-add-tboot.patch
+ 
+ BuildRequires:  flex bison binutils python
+ BuildRequires:  ncurses-devel xz-devel bzip2-devel
+@@ -119,7 +120,7 @@ provides support for EFI systems.
+ Summary:	Modules used to build custom grub.efi images
+ Group:		System Environment/Base
+ Requires:	%{name}-tools = %{epoch}:%{version}-%{release}
+-Obsoletes:	grub2-efi <= 1:2.00-20%{?dist}
++# Obsoletes:	grub2-efi <= 1:2.00-20%{?dist}
+ 
+ %description efi-modules
+ The GRand Unified Bootloader (GRUB) is a highly configurable and customizable
+@@ -219,6 +220,10 @@ GRUB_MODULES="	all_video boot btrfs cat chain configfile echo efifwsetup \
+ 		part_apple part_msdos part_gpt password_pbkdf2 png \
+ 		reboot search search_fs_uuid search_fs_file search_label \
+ 		sleep syslinuxcfg test tftp regexp video xfs"
++
++# WRS: Adding new modules for tboot support
++GRUB_MODULES="${GRUB_MODULES} multiboot multiboot2"
++
+ %ifarch aarch64
+ GRUB_MODULES="${GRUB_MODULES} linux"
+ %else
+-- 
+1.8.3.1
+

grub/grub2/centos/meta_patches/PATCH_ORDER

@@ -0,0 +1,5 @@
+0001-grub2-Update-package-versioning-for-TIS-format.patch
+0002-1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch
+0003-grub2-Build-unsigned-package.patch
+0004-grub2-Build-pxeboot-package.patch
+0005-add-tboot.patch

grub/grub2/centos/patches/10001-add-tboot.patch

@@ -0,0 +1,42 @@
+From 4a1a40ca64be1a2350ec90ceb9089dc0a3950231 Mon Sep 17 00:00:00 2001
+From: Bin Qian <bin.qian@windriver.com>
+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
+

grub/grub2/centos/patches/1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch

@@ -0,0 +1,47 @@
+From 6934956143557c548cc35dcc272aae1ee3d706c8 Mon Sep 17 00:00:00 2001
+From: RHEL Ninjas <example@example.com>
+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 <michel.thebeau@windriver.com>
+---
+ 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
+

grub/grub2/centos/srpm_path

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