From 2cfb35eabc899a46d119a9ae415effef01abe002 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 15:46:30 +0000 Subject: debrand grub2-2.02-0.29.el7 --- diff --git a/.gitignore b/.gitignore index 0342d81..618dc68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ SOURCES/grub-2.02~beta2.tar.xz SOURCES/theme.tar.bz2 SOURCES/unifont-5.1.20080820.pcf.gz +SOURCES/centos.cer diff --git a/.grub2.metadata b/.grub2.metadata index 261f908..a5c2c6a 100644 --- a/.grub2.metadata +++ b/.grub2.metadata @@ -1,3 +1,4 @@ 1bf580f1e8bce4909a7ac7ca485cee02b00ed383 SOURCES/grub-2.02~beta2.tar.xz cf0b7763c528902da7e8b05cfa248f20c8825ce5 SOURCES/theme.tar.bz2 87f8600ba24e521b5d20bdf6c4b71af8ae861e3a SOURCES/unifont-5.1.20080820.pcf.gz +6e9105eb51e55a46761838f289a917611cad8091 SOURCES/centos.cer diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec index aafba13..349a48d 100644 --- a/SPECS/grub2.spec +++ b/SPECS/grub2.spec @@ -33,6 +33,9 @@ %if 0%{?fedora} %global efidir fedora %endif +%if 0%{?centos} +%global efidir centos +%endif %endif @@ -51,8 +54,8 @@ URL: http://www.gnu.org/software/grub/ Obsoletes: grub < 1:0.98 Source0: ftp://alpha.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz #Source0: ftp://ftp.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz -Source1: securebootca.cer -Source2: secureboot.cer +Source1: centos.cer +#(source removed) Source4: http://unifoundry.com/unifont-5.1.20080820.pcf.gz Source5: theme.tar.bz2 Source6: gitignore @@ -394,8 +397,8 @@ GRUB_MODULES="${GRUB_MODULES} linuxefi" mv %{grubefiname}.orig %{grubefiname} mv %{grubeficdname}.orig %{grubeficdname} %else -%pesign -s -i %{grubefiname}.orig -o %{grubefiname} -a %{SOURCE1} -c %{SOURCE2} -n redhatsecureboot301 -%pesign -s -i %{grubeficdname}.orig -o %{grubeficdname} -a %{SOURCE1} -c %{SOURCE2} -n redhatsecureboot301 +%pesign -s -i %{grubefiname}.orig -o %{grubefiname} -a %{SOURCE1} -c %{SOURCE1} -n redhatsecureboot301 +%pesign -s -i %{grubeficdname}.orig -o %{grubeficdname} -a %{SOURCE1} -c %{SOURCE1} -n redhatsecureboot301 %endif cd .. %endif @@ -692,6 +695,10 @@ fi %exclude %{_datarootdir}/grub/themes/starfield %changelog +* Thu Nov 19 2015 CentOS Sources - 2.02-0.29.el7.centos +- Roll in CentOS Secureboot keys +- Move the edidir to be CentOS, so people can co-install fedora, rhel and centos + * Fri Oct 09 2015 Peter Jones - 2.02-0.29 - Fix DHCP6 timeouts due to failed network stack once more. Resolves: rhbz#1267139