rpm/grub2
SHA256
1
0
Fork 0
forked from pool/grub2
Code Pull Requests Activity

Accepting request 125780 from devel:openSUSE:Factory

Browse Source 
Please help to review the patch. Thanks a lot. (forwarded request 125772 from michael-chang)

OBS-URL: https://build.opensuse.org/request/show/125780
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=36
This commit is contained in:
Stephan Kulow 2012-06-25 12:40:52 +00:00 committed by Git OBS Bridge
parent e9b50f7cb0
commit fa1a8de3ed
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
grub2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jun 22 08:50:12 UTC 2012 - mchang@suse.com
- do not package grub.cfg, as it's generated at runtime and the
presence of it would confuse pygrub (bnc#768063)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 16 06:38:05 UTC 2012 - mchang@suse.com Wed May 16 06:38:05 UTC 2012 - mchang@suse.com

12
grub2.spec
View File

@ -215,7 +215,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
# Ghost config file # Ghost config file
install -d $RPM_BUILD_ROOT/boot/%{name}-efi install -d $RPM_BUILD_ROOT/boot/%{name}-efi
touch $RPM_BUILD_ROOT/boot/%{name}-efi/grub.cfg 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/opensuse/ install -m 755 -d $RPM_BUILD_ROOT/boot/efi/EFI/opensuse/
install -m 755 grub.efi $RPM_BUILD_ROOT/boot/efi/EFI/opensuse/grub.efi install -m 755 grub.efi $RPM_BUILD_ROOT/boot/efi/EFI/opensuse/grub.efi
@ -236,7 +235,6 @@ install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/
# Ghost config file # Ghost config file
install -d $RPM_BUILD_ROOT/boot/%{name} install -d $RPM_BUILD_ROOT/boot/%{name}
touch $RPM_BUILD_ROOT/boot/%{name}/grub.cfg touch $RPM_BUILD_ROOT/boot/%{name}/grub.cfg
ln -s ../boot/%{name}/grub.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.cfg
# Remove devel files # Remove devel files
rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/*/*.h rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/*/*.h
@ -320,11 +318,8 @@ fi
%dir %{_sysconfdir}/grub.d %dir %{_sysconfdir}/grub.d
%{_sysconfdir}/grub.d/README %{_sysconfdir}/grub.d/README
%config %{_sysconfdir}/grub.d/??_* %config %{_sysconfdir}/grub.d/??_*
%{_sysconfdir}/%{name}.cfg
%dir /boot/%{name} %dir /boot/%{name}
# Actually, this is replaced by update-grub from scriptlets, %ghost /boot/%{name}/grub.cfg
# but it takes care of modified persistent part
%config(noreplace) /boot/%{name}/grub.cfg
%doc grub-%{version}/COPYING grub-%{version}/NEWS %doc grub-%{version}/COPYING grub-%{version}/NEWS
%doc grub-%{version}/README grub-%{version}/THANKS grub-%{version}/TODO %doc grub-%{version}/README grub-%{version}/THANKS grub-%{version}/TODO
%doc grub-%{version}/ChangeLog grub-%{version}/README.openSUSE %doc grub-%{version}/ChangeLog grub-%{version}/README.openSUSE
@ -366,11 +361,8 @@ fi
%{_sbindir}/grub2-efi-ofpathname %{_sbindir}/grub2-efi-ofpathname
%endif %endif
%{_bindir}/grub2-efi-script-check %{_bindir}/grub2-efi-script-check
%{_sysconfdir}/grub2-efi.cfg
%dir /boot/grub2-efi %dir /boot/grub2-efi
# Actually, this is replaced by update-grub from scriptlets, %ghost /boot/grub2-efi/grub.cfg
# but it takes care of modified persistent part
%config(noreplace) /boot/grub2-efi/grub.cfg
%doc grub-%{version}/COPYING grub-%{version}/NEWS %doc grub-%{version}/COPYING grub-%{version}/NEWS
%doc grub-%{version}/README grub-%{version}/THANKS grub-%{version}/TODO %doc grub-%{version}/README grub-%{version}/THANKS grub-%{version}/TODO
%doc grub-%{version}/ChangeLog grub-%{version}/README.openSUSE %doc grub-%{version}/ChangeLog grub-%{version}/README.openSUSE