NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/conmon: fix libseccomp shared build

Browse Source 
Drop patch and disable libseccomp when building statically to avoid the
following build failure raised since commit
29834d8a12:

src/seccomp_notify.c: In function 'seccomp_notify_plugins_load':
src/seccomp_notify.c:136:42: warning: implicit declaration of function 'dlopen'; did you mean 'popen'? [-Wimplicit-function-declaration]
  136 |                 ctx->plugins[s].handle = dlopen(it, RTLD_NOW);
      |                                          ^~~~~~
      |                                          popen
src/seccomp_notify.c:136:53: error: 'RTLD_NOW' undeclared (first use in this function)
  136 |                 ctx->plugins[s].handle = dlopen(it, RTLD_NOW);
      |                                                     ^~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/13d3b46990720bba8621c922b5dce54ab650e96d

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Fabrice Fontaine 2023-09-16 14:51:32 +02:00 committed by Yann E. MORIN
parent 6898ca03a2
commit 8144dd1b4c
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
package/conmon/0001-remove-unused-dlfcn.h-header-file.patch
View File

@ -1,26 +0,0 @@
From e28634a0e847a14c58482f962bc9b1d69937387f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 12 Aug 2023 12:53:37 +0200
Subject: [PATCH] remove unused dlfcn.h header file
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Upstream: https://github.com/containers/conmon/issues/443
---
src/seccomp_notify.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/seccomp_notify.c b/src/seccomp_notify.c
index 8d34d9d..2a8371d 100644
--- a/src/seccomp_notify.c
+++ b/src/seccomp_notify.c
@@ -7,7 +7,6 @@
#include <errno.h>
#include <sys/ioctl.h>
-#include <dlfcn.h>
#include <sys/wait.h>
#include <sys/mount.h>
#include <signal.h>
--
2.39.2

2
package/conmon/conmon.mk
View File

@ -11,7 +11,7 @@ CONMON_LICENSE_FILES = LICENSE
CONMON_DEPENDENCIES = host-pkgconf libglib2
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
ifeq ($(BR2_PACKAGE_LIBSECCOMP):$(BR2_STATIC_LIBS),y:)
CONMON_DISABLE_SECCOMP = 0
CONMON_DEPENDENCIES += libseccomp
else