From c695181b7bb165516116ba7c7d94805c799ae977 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Mar 06 2015 00:08:43 +0000 Subject: fix debrand for grub2 --- diff --git a/SOURCES/centos.cer b/SOURCES/centos.cer new file mode 100644 index 0000000..00a5580 Binary files /dev/null and b/SOURCES/centos.cer differ diff --git a/SOURCES/secureboot.cer b/SOURCES/secureboot.cer deleted file mode 100644 index 4ff8b79..0000000 Binary files a/SOURCES/secureboot.cer and /dev/null differ diff --git a/SOURCES/securebootca.cer b/SOURCES/securebootca.cer deleted file mode 100644 index b235400..0000000 Binary files a/SOURCES/securebootca.cer and /dev/null differ diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec index f8b3aab..6865221 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,7 @@ 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 Source4: http://unifoundry.com/unifont-5.1.20080820.pcf.gz Source5: theme.tar.bz2 Source6: gitignore @@ -359,8 +361,8 @@ GRUB_MODULES="${GRUB_MODULES} linuxefi multiboot2 multiboot" 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 @@ -634,6 +636,10 @@ fi %exclude %{_datarootdir}/grub/themes/starfield %changelog +* Thu Mar 05 2015 Johnny Hughes - 2.02-0.16.el7.centos +- Move the edidir to be CentOS, so people can co-install fedora, rhel and centos +- Roll in CentOS Secureboot keys + * Thu Oct 09 2014 Peter Jones - 2.02-0.16 - ... and build it on the right target. Related: rhbz#1148652