From acefa465b33d68aa6ad20e5d0e8fe06f4cc6ee445c9b3c2abcfb0c2c69252c52 Mon Sep 17 00:00:00 2001 From: Dario Faggioli Date: Mon, 9 Aug 2021 15:12:50 +0000 Subject: [PATCH 1/2] Accepting request 911022 from home:fcrozat:branches: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/911022 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/crun?expand=0&rev=7 --- crun.changes | 6 ++++++ crun.spec | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/crun.changes b/crun.changes index 22c6908..c15b7bb 100644 --- a/crun.changes +++ b/crun.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 6 13:37:49 UTC 2021 - Frederic Crozat + +- 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 diff --git a/crun.spec b/crun.spec index 467eb70..ca7fdd8 100644 --- a/crun.spec +++ b/crun.spec @@ -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 From fb30f9b72b5fcf0b0b88fc47172ccb9cd9e48a88dfe034c54d7fc8e86c24c13b Mon Sep 17 00:00:00 2001 From: Dario Faggioli Date: Mon, 9 Aug 2021 16:13:56 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/crun?expand=0&rev=8 --- libkrun-dlopen.patch | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 libkrun-dlopen.patch diff --git a/libkrun-dlopen.patch b/libkrun-dlopen.patch deleted file mode 100644 index ae8838b..0000000 --- a/libkrun-dlopen.patch +++ /dev/null @@ -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;