Add /etc/sysconfig/grub link to /etc/default/grub
Resolves: rhbz#800152
This commit is contained in:
Peter Jones
parent
c07e9a4da9
commit
62a7c9b4ec
46
grub2.spec
46
grub2.spec
|
|
@ -18,7 +18,7 @@
|
|||
Name: grub2
|
||||
Epoch: 1
|
||||
Version: 1.99
|
||||
Release: 13%{?dist}
|
||||
Release: 17%{?dist}
|
||||
Summary: Bootloader with support for Linux, Multiboot and more
|
||||
|
||||
Group: System Environment/Base
|
||||
|
|
@ -36,6 +36,7 @@ Patch3: grub-1.99-Workaround-for-variable-set-but-not-used-issue.patch
|
|||
Patch4: grub2-handle-initramfs-on-xen.patch
|
||||
Patch5: grub2-1.99-handle-more-dmraid.patch
|
||||
Patch6: grub2-gfxpayload-efi.patch
|
||||
# https://savannah.gnu.org/bugs/index.php?35018
|
||||
Patch7: grub-1.99-fix_grub-probe_call.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
|
@ -109,6 +110,7 @@ cd grub-efi-%{version}
|
|||
./autogen.sh
|
||||
%configure \
|
||||
CFLAGS="$(echo $RPM_OPT_FLAGS | sed \
|
||||
-e 's/-O.//g' \
|
||||
-e 's/-fstack-protector//g' \
|
||||
-e 's/--param=ssp-buffer-size=4//g' \
|
||||
-e 's/-mregparm=3/-mregparm=4/g' \
|
||||
|
|
@ -124,9 +126,9 @@ make %{?_smp_mflags}
|
|||
%else
|
||||
%define grubefiarch %{_arch}-efi
|
||||
%endif
|
||||
./grub-mkimage -O %{grubefiarch} -o grub.efi -d grub-core part_gpt hfsplus fat \
|
||||
./grub-mkimage -O %{grubefiarch} -p /EFI/redhat/%{name}-efi -o grub.efi -d grub-core part_gpt hfsplus fat \
|
||||
ext2 btrfs normal chain boot configfile linux appleldr minicmd \
|
||||
loadbios reboot halt search font gfxterm
|
||||
loadbios reboot halt search font gfxterm echo video efi_gop efi_uga
|
||||
cd ..
|
||||
%endif
|
||||
|
||||
|
|
@ -170,11 +172,14 @@ rm -fr $RPM_BUILD_ROOT
|
|||
cd grub-efi-%{version}
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
mv $RPM_BUILD_ROOT/etc/bash_completion.d/grub $RPM_BUILD_ROOT/etc/bash_completion.d/grub-efi
|
||||
mv $RPM_BUILD_ROOT/usr/lib/grub $RPM_BUILD_ROOT/usr/lib/grub-efi
|
||||
sed s,grub/grub-mkconfig_lib,grub-efi/grub-mkconfig_lib, -i $RPM_BUILD_ROOT/sbin/grub2-efi-mkconfig
|
||||
|
||||
# Ghost config file
|
||||
install -d $RPM_BUILD_ROOT/boot/%{name}-efi
|
||||
touch $RPM_BUILD_ROOT/boot/%{name}-efi/grub.cfg
|
||||
ln -s ../boot/%{name}-efi/grub.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-efi.cfg
|
||||
install -m 755 -d $RPM_BUILD_ROOT/boot/efi/EFI/redhat/
|
||||
install -d $RPM_BUILD_ROOT/boot/efi/EFI/redhat/%{name}-efi
|
||||
touch $RPM_BUILD_ROOT/boot/efi/EFI/redhat/%{name}-efi/grub.cfg
|
||||
ln -s ../boot/efi/EFI/redhat/%{name}-efi/grub.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-efi.cfg
|
||||
|
||||
# Install ELF files modules and images were created from into
|
||||
# the shadow root, where debuginfo generator will grab them from
|
||||
|
|
@ -189,8 +194,7 @@ do
|
|||
TGT=$(echo $MODULE |sed "s,$RPM_BUILD_ROOT,.debugroot,")
|
||||
# install -m 755 -D $BASE$EXT $TGT
|
||||
done
|
||||
install -m 755 -d $RPM_BUILD_ROOT/boot/efi/EFI/redhat/
|
||||
install -m 755 grub.efi $RPM_BUILD_ROOT/boot/efi/EFI/redhat/grub.efi
|
||||
install -m 755 grub.efi $RPM_BUILD_ROOT/boot/efi/EFI/redhat/%{name}-efi/grub.efi
|
||||
cd ..
|
||||
%endif
|
||||
|
||||
|
|
@ -228,6 +232,10 @@ install -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/default/grub
|
|||
# TODO: rename locale files to grub2 and make sure gettext works correctly
|
||||
rm $RPM_BUILD_ROOT/usr/share/locale/*/LC_MESSAGES/grub.mo
|
||||
|
||||
mkdir ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
|
||||
ln -sf %{_sysconfdir}/default/grub \
|
||||
${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/grub
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
|
@ -307,6 +315,7 @@ fi
|
|||
%{_sysconfdir}/grub.d/README
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.cfg
|
||||
%config(noreplace) %{_sysconfdir}/default/grub
|
||||
%{_sysconfdir}/sysconfig/grub
|
||||
%dir /boot/%{name}
|
||||
%ghost %config(noreplace) /boot/%{name}/grub.cfg
|
||||
%doc grub-%{version}/COPYING grub-%{version}/INSTALL grub-%{version}/NEWS
|
||||
|
|
@ -321,7 +330,7 @@ fi
|
|||
%attr(0755,root,root)/boot/efi/EFI/redhat
|
||||
/etc/bash_completion.d/grub-efi
|
||||
%{_libdir}/grub2-efi
|
||||
%{_libdir}/grub/
|
||||
%{_libdir}/grub-efi/
|
||||
/sbin/grub2-efi-mkconfig
|
||||
/sbin/grub2-efi-mkdevicemap
|
||||
/sbin/grub2-efi-mknetdir
|
||||
|
|
@ -354,8 +363,8 @@ fi
|
|||
%{_sysconfdir}/grub.d/README
|
||||
%config(noreplace) %{_sysconfdir}/grub2-efi.cfg
|
||||
%config(noreplace) %{_sysconfdir}/default/grub
|
||||
%dir /boot/grub2-efi
|
||||
%ghost %config(noreplace) /boot/grub2-efi/grub.cfg
|
||||
%dir /boot/efi/EFI/redhat/grub2-efi
|
||||
%ghost %config(noreplace) /boot/efi/EFI/redhat/grub2-efi/grub.cfg
|
||||
%doc grub-%{version}/COPYING grub-%{version}/INSTALL grub-%{version}/NEWS
|
||||
%doc grub-%{version}/README grub-%{version}/THANKS grub-%{version}/TODO
|
||||
%doc grub-%{version}/ChangeLog grub-%{version}/README.Fedora
|
||||
|
|
@ -364,10 +373,23 @@ fi
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Dec 08 2011 Peter Jones <pjones@redhat.com>
|
||||
* Tue Mar 06 2012 Peter Jones <pjones@redhat.com> - 1.99-17
|
||||
- Add /etc/sysconfig/grub link to /etc/default/grub
|
||||
Resolves: rhbz#800152
|
||||
|
||||
* Tue Mar 06 2012 Peter Jones <pjones@redhat.com> - 1.99-16
|
||||
- ExcludeArch s390*, which is not supported by this package.
|
||||
Resolves: rhbz#758333
|
||||
|
||||
* Fri Feb 17 2012 Orion Poplawski <orion@cora.nwra.com> - 1:1.99-16
|
||||
- Build with -Os (bug 782144)
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.99-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Wed Dec 14 2011 Matthew Garrett <mjg@redhat.com> - 1.99-14
|
||||
- fix up various grub2-efi issues
|
||||
|
||||
* Thu Dec 08 2011 Adam Williamson <awilliam@redhat.com> - 1.99-13
|
||||
- fix hardwired call to grub-probe in 30_os-prober (rhbz#737203)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue