rpms/gnu-efi
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Include ia32 bits in the x86_64 packages instead of making a separate

Browse Source 
32-bit package

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2017-03-13 14:34:33 -04:00
parent 991ed0c491
commit ef8a4f5a61
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gnu-efi.spec
View File

@ -76,32 +76,37 @@ git config --unset user.name
%build %build
# Package cannot build with %{?_smp_mflags}. # Package cannot build with %{?_smp_mflags}.
make make
%ifarch x86_64
make ARCH=ia32 SUBDIRS=gnuefi
%endif
make apps make apps
%ifarch x86_64
setarch linux32 -B make ARCH=ia32 PREFIX=%{_prefix} LIBDIR=%{_prefix}/lib
setarch linux32 -B make ARCH=ia32 PREFIX=%{_prefix} LIBDIR=%{_prefix}/lib apps
%endif
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_libdir} mkdir -p %{buildroot}/%{_libdir}/gnuefi
mkdir -p %{buildroot}/boot/efi/EFI/%{efidir}/%{efiarch}
make PREFIX=%{_prefix} LIBDIR=%{_libdir} INSTALLROOT=%{buildroot} install make PREFIX=%{_prefix} LIBDIR=%{_libdir} INSTALLROOT=%{buildroot} install
mv %{buildroot}/%{_libdir}/*.lds %{buildroot}/%{_libdir}/*.o %{buildroot}/%{_libdir}/gnuefi
mv %{efiarch}/apps/{route80h.efi,modelist.efi} %{buildroot}/boot/efi/EFI/%{efidir}/%{efiarch}/
%ifarch x86_64 %ifarch x86_64
setarch linux32 -B make PREFIX=%{_prefix} LIBDIR=%{_libdir} INSTALLROOT=%{buildroot} ARCH=ia32 install mkdir -p %{buildroot}/%{_prefix}/lib/gnuefi
mkdir -p %{buildroot}/boot/efi/EFI/%{efidir}/ia32
setarch linux32 -B make PREFIX=%{_prefix} LIBDIR=%{_prefix}/lib INSTALLROOT=%{buildroot} ARCH=ia32 install
mv %{buildroot}/%{_prefix}/lib/*.{lds,o} %{buildroot}/%{_prefix}/lib/gnuefi/
mv ia32/apps/{route80h.efi,modelist.efi} %{buildroot}/boot/efi/EFI/%{efidir}/ia32/
%endif %endif
mkdir -p %{buildroot}/%{_libdir}/gnuefi
mv %{buildroot}/%{_libdir}/*.lds %{buildroot}/%{_libdir}/*.o %{buildroot}/%{_libdir}/gnuefi
mkdir -p %{buildroot}/boot/efi/EFI/%{efidir}/
mv %{efiarch}/apps/{route80h.efi,modelist.efi} %{buildroot}/boot/efi/EFI/%{efidir}/
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
%files %files
%{_libdir}/* %{_prefix}/lib*/*
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -110,7 +115,7 @@ rm -rf %{buildroot}
%files utils %files utils
%dir /boot/efi/EFI/%{efidir}/ %dir /boot/efi/EFI/%{efidir}/
%attr(0644,root,root) /boot/efi/EFI/%{efidir}/*.efi %attr(0644,root,root) /boot/efi/EFI/%{efidir}/*/*.efi
%changelog %changelog
* Mon Mar 13 2017 Peter Jones <pjones@redhat.com> - 3.0.5-6 * Mon Mar 13 2017 Peter Jones <pjones@redhat.com> - 3.0.5-6