rpms/gnu-efi
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some minor rpmlint complaints

Browse Source 
Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2019-08-26 11:49:09 -04:00
parent 7c7add1b8e
commit cace4cc8b2
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu-efi.patches
View File

@ -13,5 +13,5 @@ Patch0012: 0012-Make-travis-build-the-right-project.patch
Patch0013: 0013-Use-EFI-canonical-names-everywhere-the-compiler-does.patch Patch0013: 0013-Use-EFI-canonical-names-everywhere-the-compiler-does.patch
Patch0014: 0014-Fix-a-minor-coverity-complaint-in-some-apps.patch Patch0014: 0014-Fix-a-minor-coverity-complaint-in-some-apps.patch
Patch0015: 0015-Get-rid-of-some-unused-junk-that-has-the-BSD-4-claus.patch Patch0015: 0015-Get-rid-of-some-unused-junk-that-has-the-BSD-4-claus.patch
Patch0017: 0016-Make-CHAR8-and-similar-be-defined-the-same-way-edk2-.patch Patch0016: 0016-Make-CHAR8-and-similar-be-defined-the-same-way-edk2-.patch
Patch0018: 0017-CFLAGS-add-Wno-pointer-sign.patch Patch0017: 0017-CFLAGS-add-Wno-pointer-sign.patch

23
gnu-efi.spec
View File

@ -2,7 +2,7 @@ Name: gnu-efi
Epoch: 1 Epoch: 1
Version: 3.0.9 Version: 3.0.9
%global tarball_version 3.0.9 %global tarball_version 3.0.9
Release: 3%{?dist}%{?buildid} Release: 4%{?dist}%{?buildid}
Summary: Development Libraries and headers for EFI Summary: Development Libraries and headers for EFI
License: BSD License: BSD
URL: https://sourceforge.net/projects/gnu-efi/ URL: https://sourceforge.net/projects/gnu-efi/
@ -80,8 +80,8 @@ git config --unset user.name
make make
make apps make apps
%if %{efi_has_alt_arch} %if %{efi_has_alt_arch}
setarch linux32 -B make ARCH=%{efi_alt_arch} PREFIX=%{_prefix} LIBDIR=%{_prefix}/%{lib} setarch linux32 -B make ARCH=%{efi_alt_arch} PREFIX=%{_prefix} LIBDIR=%{_prefix}/%{lib}
setarch linux32 -B make ARCH=%{efi_alt_arch} PREFIX=%{_prefix} LIBDIR=%{_prefix}/%{lib} apps setarch linux32 -B make ARCH=%{efi_alt_arch} PREFIX=%{_prefix} LIBDIR=%{_prefix}/%{lib} apps
%endif %endif
%install %install
@ -92,12 +92,12 @@ mv %{buildroot}/%{_libdir}/*.lds %{buildroot}/%{_libdir}/*.o %{buildroot}/%{_lib
mv %{efi_arch}/apps/{route80h.efi,modelist.efi} %{buildroot}%{efi_esp_dir}/%{efi_arch}/ mv %{efi_arch}/apps/{route80h.efi,modelist.efi} %{buildroot}%{efi_esp_dir}/%{efi_arch}/
%if %{efi_has_alt_arch} %if %{efi_has_alt_arch}
mkdir -p %{buildroot}/%{_prefix}/%{lib}/gnuefi mkdir -p %{buildroot}/%{_prefix}/%{lib}/gnuefi
mkdir -p %{buildroot}%{efi_esp_dir}/%{efi_alt_arch} mkdir -p %{buildroot}%{efi_esp_dir}/%{efi_alt_arch}
setarch linux32 -B make PREFIX=%{_prefix} LIBDIR=%{_prefix}/%{lib} INSTALLROOT=%{buildroot} ARCH=%{efi_alt_arch} install setarch linux32 -B make PREFIX=%{_prefix} LIBDIR=%{_prefix}/%{lib} INSTALLROOT=%{buildroot} ARCH=%{efi_alt_arch} install
mv %{buildroot}/%{_prefix}/%{lib}/*.{lds,o} %{buildroot}/%{_prefix}/%{lib}/gnuefi/ mv %{buildroot}/%{_prefix}/%{lib}/*.{lds,o} %{buildroot}/%{_prefix}/%{lib}/gnuefi/
mv %{efi_alt_arch}/apps/{route80h.efi,modelist.efi} %{buildroot}%{efi_esp_dir}/%{efi_alt_arch}/ mv %{efi_alt_arch}/apps/{route80h.efi,modelist.efi} %{buildroot}%{efi_esp_dir}/%{efi_alt_arch}/
%endif %endif
cd %{buildroot}/%{_libdir}/gnuefi/ cd %{buildroot}/%{_libdir}/gnuefi/
if [[ -f crt0-efi-x64.o ]] ; then if [[ -f crt0-efi-x64.o ]] ; then
@ -127,11 +127,14 @@ fi
%dir %attr(0700,root,root) %{efi_esp_dir}/%{efi_arch}/ %dir %attr(0700,root,root) %{efi_esp_dir}/%{efi_arch}/
%attr(0700,root,root) %{efi_esp_dir}/%{efi_arch}/*.efi %attr(0700,root,root) %{efi_esp_dir}/%{efi_arch}/*.efi
%if %{efi_has_alt_arch} %if %{efi_has_alt_arch}
%dir %attr(0700,root,root) %{efi_esp_dir}/%{efi_alt_arch}/ %dir %attr(0700,root,root) %{efi_esp_dir}/%{efi_alt_arch}/
%attr(0700,root,root) %{efi_esp_dir}/%{efi_alt_arch}/*.efi %attr(0700,root,root) %{efi_esp_dir}/%{efi_alt_arch}/*.efi
%endif %endif
%changelog %changelog
* Tue Jan 21 2020 Peter Jones <pjones@redhat.com> - 3.0.9-4
- Fix some minor rpmlint complaints
* Tue Jan 21 2020 Peter Robinson <pbrobinson@fedoraproject.org> * Tue Jan 21 2020 Peter Robinson <pbrobinson@fedoraproject.org>
- Minor spec cleanups - Minor spec cleanups