Accepting request 911076 from Virtualization:containers

- Drop libkrun-dlopen.patch and adapt to libkrun new package name,
  it is a plugin, not a regular shared library.

OBS-URL: https://build.opensuse.org/request/show/911076
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/crun?expand=0&rev=3
This commit is contained in:
Richard Brown 2021-08-11 09:47:08 +00:00 committed by Git OBS Bridge
commit dcc0408fa7
3 changed files with 8 additions and 20 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Aug 6 13:37:49 UTC 2021 - Frederic Crozat <fcrozat@suse.com>
- Drop libkrun-dlopen.patch and adapt to libkrun new package name,
it is a plugin, not a regular shared library.
-------------------------------------------------------------------
Fri Aug 6 09:55:53 UTC 2021 - Frederic Crozat <fcrozat@suse.com>

View File

@ -23,8 +23,6 @@ Version: 0.21
Release: 0
Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz
Source1: crun-rpmlintrc
# PATCH-FIX-OPENSUSE libkrun-dlopen.patch fcrozat@suse.com -- use soname when dlopening libkrun
Patch0: libkrun-dlopen.patch
URL: https://github.com/containers/crun
ExclusiveArch: x86_64 aarch64
# We always run autogen.sh
@ -35,7 +33,7 @@ BuildRequires: git-core
BuildRequires: glibc-devel-static
BuildRequires: go-md2man
BuildRequires: libcap-devel
BuildRequires: libkrun-devel >= 0.1.4
BuildRequires: libkrun >= 0.1.4
BuildRequires: libseccomp-devel
BuildRequires: libselinux-devel
BuildRequires: libtool
@ -46,7 +44,7 @@ BuildRequires: systemd-devel
%ifnarch %ix86
BuildRequires: criu-devel >= 3.15
%endif
Requires: libkrun0 >= 0.1.4
Requires: libkrun >= 0.1.7
%description
crun is a runtime for running OCI containers. It is built with libkrun support

View File

@ -1,16 +0,0 @@
Index: crun-0.18/src/libcrun/container.c
===================================================================
--- crun-0.18.orig/src/libcrun/container.c 2021-02-18 16:25:28.000000000 +0100
+++ crun-0.18/src/libcrun/container.c 2021-08-06 11:54:48.798850933 +0200
@@ -712,9 +712,9 @@
#endif
#if HAVE_DLOPEN && HAVE_LIBKRUN
- handle = dlopen ("libkrun.so", RTLD_NOW);
+ handle = dlopen ("libkrun.so.0", RTLD_NOW);
if (handle == NULL)
- return crun_make_error (err, 0, "could not load `libkrun.so`: %s", dlerror ());
+ return crun_make_error (err, 0, "could not load `libkrun.so.0`: %s", dlerror ());
args->exec_func = libkrun_do_exec;
args->exec_func_arg = handle;