Accepting request 914070 from home:dfaggioli:branches:Virtualization:containers
- make libkrun support conditional, so we can have crun (without libkrun, of course) on all arches, which may help with bsc#1188914. OBS-URL: https://build.opensuse.org/request/show/914070 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/crun?expand=0&rev=9
This commit is contained in:
parent
fb30f9b72b
commit
765bc91827
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Aug 23 15:22:18 UTC 2021 - Dario Faggioli <dfaggioli@suse.com>
|
||||||
|
|
||||||
|
- make libkrun support conditional, so we can have crun (without
|
||||||
|
libkrun, of course) on all arches, which may help with
|
||||||
|
bsc#1188914.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Aug 6 13:37:49 UTC 2021 - Frederic Crozat <fcrozat@suse.com>
|
Fri Aug 6 13:37:49 UTC 2021 - Frederic Crozat <fcrozat@suse.com>
|
||||||
|
|
||||||
|
14
crun.spec
14
crun.spec
@ -24,7 +24,6 @@ Release: 0
|
|||||||
Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz
|
||||||
Source1: crun-rpmlintrc
|
Source1: crun-rpmlintrc
|
||||||
URL: https://github.com/containers/crun
|
URL: https://github.com/containers/crun
|
||||||
ExclusiveArch: x86_64 aarch64
|
|
||||||
# We always run autogen.sh
|
# We always run autogen.sh
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
@ -33,7 +32,6 @@ BuildRequires: git-core
|
|||||||
BuildRequires: glibc-devel-static
|
BuildRequires: glibc-devel-static
|
||||||
BuildRequires: go-md2man
|
BuildRequires: go-md2man
|
||||||
BuildRequires: libcap-devel
|
BuildRequires: libcap-devel
|
||||||
BuildRequires: libkrun >= 0.1.4
|
|
||||||
BuildRequires: libseccomp-devel
|
BuildRequires: libseccomp-devel
|
||||||
BuildRequires: libselinux-devel
|
BuildRequires: libselinux-devel
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
@ -44,7 +42,10 @@ BuildRequires: systemd-devel
|
|||||||
%ifnarch %ix86
|
%ifnarch %ix86
|
||||||
BuildRequires: criu-devel >= 3.15
|
BuildRequires: criu-devel >= 3.15
|
||||||
%endif
|
%endif
|
||||||
|
%ifarch x86_64 aarch64
|
||||||
|
BuildRequires: libkrun >= 0.1.4
|
||||||
Requires: libkrun >= 0.1.7
|
Requires: libkrun >= 0.1.7
|
||||||
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
crun is a runtime for running OCI containers. It is built with libkrun support
|
crun is a runtime for running OCI containers. It is built with libkrun support
|
||||||
@ -53,15 +54,20 @@ crun is a runtime for running OCI containers. It is built with libkrun support
|
|||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
%ifarch x86_64 aarch64
|
||||||
|
export LIBKRUN="--with-libkrun"
|
||||||
|
%endif
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
%configure --disable-silent-rules --with-libkrun CFLAGS='-I /usr/include/libseccomp'
|
%configure --disable-silent-rules $LIBKRUN CFLAGS='-I /usr/include/libseccomp'
|
||||||
%make_build
|
%make_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install
|
%make_install
|
||||||
rm -rf %{buildroot}/%{_libdir}/lib*
|
rm -rf %{buildroot}/%{_libdir}/lib*
|
||||||
|
%ifarch x86_64 aarch64
|
||||||
# allow easy krun usage with podman
|
# allow easy krun usage with podman
|
||||||
ln -s %{_bindir}/crun %{buildroot}%{_bindir}/krun
|
ln -s %{_bindir}/crun %{buildroot}%{_bindir}/krun
|
||||||
|
%endif
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@ -69,7 +75,9 @@ ln -s %{_bindir}/crun %{buildroot}%{_bindir}/krun
|
|||||||
%doc README.md
|
%doc README.md
|
||||||
%doc SECURITY.md
|
%doc SECURITY.md
|
||||||
%{_bindir}/%{name}
|
%{_bindir}/%{name}
|
||||||
|
%ifarch x86_64 aarch64
|
||||||
%{_bindir}/krun
|
%{_bindir}/krun
|
||||||
|
%endif
|
||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user