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

Accepting request 149343 from home:michael-chang:branches:Base:System

Browse Source 
sorry. this commit has to be reverted as it breaks grub2-install on efi.

OBS-URL: https://build.opensuse.org/request/show/149343
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=10
This commit is contained in:
Michael Chang 2013-01-21 06:10:49 +00:00 committed by Git OBS Bridge
parent 5c92e57976
commit 5e5fcf39b1
2 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
grub2.changes
View File

@ -1,10 +1,3 @@
-------------------------------------------------------------------
Fri Jan 18 08:57:48 UTC 2013 - mchang@suse.com
- put 32-bit grub2 modules to /usr/lib/grub2
- put 64-bit grub2 modules to /usr/lib64/grub2 (x86_64-efi)
- put grub.efi to /usr/lib64/efi(x86_64) or /usr/lib/efi(i586)
-------------------------------------------------------------------
Fri Jan 18 07:39:18 UTC 2013 - mchang@suse.com

46
grub2.spec
View File

@ -51,13 +51,6 @@ BuildRequires: guile
# Modules always contain just 32-bit code
%define _libdir %{_exec_prefix}/lib
%ifarch x86_64
# x86_64-efi is 64-bit code, though ..
%define efi_libdir %{_exec_prefix}/lib64
%else
%define efi_libdir %{_libdir}
%endif
%ifarch ppc ppc64
%define grubcpu powerpc
%define platform ieee1275
@ -281,7 +274,6 @@ export CFLAGS CXXFLAGS FFLAGS
%configure \
TARGET_LDFLAGS=-static \
--target=%{_target_platform} \
--libdir=%{efi_libdir} \
--with-platform=efi \
--program-transform-name=s,grub,%{name},
make %{?_smp_mflags}
@ -346,8 +338,8 @@ make %{?_smp_mflags}
cd grub-efi-%{version}
make DESTDIR=$RPM_BUILD_ROOT install
install -m 755 -d $RPM_BUILD_ROOT%{efi_libdir}/efi
install -m 755 grub.efi $RPM_BUILD_ROOT%{efi_libdir}/efi/grub.efi
install -m 755 -d $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/
install -m 755 grub.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/grub.efi
cd ..
%endif
@ -370,14 +362,7 @@ install -d $RPM_BUILD_ROOT/boot/%{name}
touch $RPM_BUILD_ROOT/boot/%{name}/grub.cfg
# Remove devel files
%ifarch x86_64
%if ! 0%{?only_efi:1}
rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/*/*.h
%endif
rm $RPM_BUILD_ROOT/%{efi_libdir}/%{name}/*/*.h
%else
rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/*/*.h
%endif
%if 0%{?suse_version} >= 1140
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*.h
%endif
@ -584,6 +569,7 @@ fi
%{_bindir}/%{name}-mkstandalone
%{_bindir}/%{name}-mount
%{_bindir}/%{name}-script-check
%dir %{_libdir}/%{name}
%dir %{_datadir}/%{name}
%if 0%{?suse_version} >= 1140
%{_datadir}/%{name}/*.pf2
@ -595,7 +581,6 @@ fi
%if ! 0%{?only_efi:1}
%files %{grubarch}
%defattr(-,root,root,-)
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/%{grubarch}
%ifnarch ppc ppc64
%{_libdir}/%{name}/%{grubarch}/*.image
@ -625,18 +610,19 @@ fi
%files %{grubefiarch}
%defattr(-,root,root,-)
%dir %{efi_libdir}/efi
%dir %{efi_libdir}/%{name}
%dir %{efi_libdir}/%{name}/%{grubefiarch}
%{efi_libdir}/efi/grub.efi
%{efi_libdir}/%{name}/%{grubefiarch}/*.img
%{efi_libdir}/%{name}/%{grubefiarch}/*.lst
%{efi_libdir}/%{name}/%{grubefiarch}/*.mod
%{efi_libdir}/%{name}/%{grubefiarch}/*.module
%{efi_libdir}/%{name}/%{grubefiarch}/gdb_grub2
%{efi_libdir}/%{name}/%{grubefiarch}/gmodule.pl
%{efi_libdir}/%{name}/%{grubefiarch}/kernel.exec
%{efi_libdir}/%{name}/%{grubefiarch}/modinfo.sh
%dir /boot/efi
%dir /boot/efi/EFI
%dir /boot/efi/EFI/%{efidir}
%attr(0755,root,root)/boot/efi/EFI/%{efidir}/grub.efi
%dir %{_libdir}/%{name}/%{grubefiarch}
%{_libdir}/%{name}/%{grubefiarch}/*.img
%{_libdir}/%{name}/%{grubefiarch}/*.lst
%{_libdir}/%{name}/%{grubefiarch}/*.mod
%{_libdir}/%{name}/%{grubefiarch}/*.module
%{_libdir}/%{name}/%{grubefiarch}/gdb_grub2
%{_libdir}/%{name}/%{grubefiarch}/gmodule.pl
%{_libdir}/%{name}/%{grubefiarch}/kernel.exec
%{_libdir}/%{name}/%{grubefiarch}/modinfo.sh
%endif
%changelog