Enable grub2 support on ARMv7

This commit is contained in:
Peter Robinson 2018-08-11 17:06:46 +01:00
parent f49e3f995d
commit 2a1c733423

View File

@ -44,24 +44,21 @@ as well as container tools like flatpak and the atomic CLI.
%package libs %package libs
Summary: Development headers for %{name} Summary: Development headers for %{name}
Group: Development/Libraries
%description libs %description libs
The %{name}-libs provides shared libraries for %{name}. The %{name}-libs provides shared libraries for %{name}.
%package devel %package devel
Summary: Development headers for %{name} Summary: Development headers for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
%description devel %description devel
The %{name}-devel package includes the header files for the %{name} library. The %{name}-devel package includes the header files for the %{name} library.
%ifnarch s390 s390x %{arm} %ifnarch s390 s390x
%package grub2 %package grub2
Summary: GRUB2 integration for OSTree Summary: GRUB2 integration for OSTree
Group: Development/Libraries %ifnarch aarch64 %{arm}
%ifnarch aarch64
Requires: grub2 Requires: grub2
%else %else
Requires: grub2-efi Requires: grub2-efi
@ -140,7 +137,7 @@ find %{buildroot} -name '*.la' -delete
%{_datadir}/gtk-doc/html/ostree %{_datadir}/gtk-doc/html/ostree
%{_datadir}/gir-1.0/OSTree-1.0.gir %{_datadir}/gir-1.0/OSTree-1.0.gir
%ifnarch s390 s390x %{arm} %ifnarch s390 s390x
%files grub2 %files grub2
%{_sysconfdir}/grub.d/*ostree %{_sysconfdir}/grub.d/*ostree
%dir %{_libexecdir}/libostree %dir %{_libexecdir}/libostree
@ -153,6 +150,9 @@ find %{buildroot} -name '*.la' -delete
%{_libexecdir}/libostree/ostree-trivial-httpd %{_libexecdir}/libostree/ostree-trivial-httpd
%changelog %changelog
* Sun Aug 12 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.7-2
- Enable grub2 support on ARMv7
* Fri Jul 20 2018 Colin Walters <walters@verbum.org> - 2018.7-1 * Fri Jul 20 2018 Colin Walters <walters@verbum.org> - 2018.7-1
- https://github.com/ostreedev/ostree/releases/tag/v2018.7 - https://github.com/ostreedev/ostree/releases/tag/v2018.7