mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-23 21:43:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

package/crun: bump to version 1.12

Browse Source 
Changes:
https://github.com/containers/crun/releases/tag/1.12

Also add a patch to fix crun compile without libseccomp libcap issue

Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Xiangyu Chen 2023-12-15 11:10:19 +08:00 committed by Peter Korsgaard
parent e6ae677128
commit ea59fd8827
3 changed files with 61 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
package/crun/0001-libcrun-fix-compile-error-without-libseccomp-and-lib.patch Normal file
View File

@ -0,0 +1,59 @@
From ea27b1363ef709ce4b169138017b67ef624b127b Mon Sep 17 00:00:00 2001
From: Xiangyu Chen <xiangyu.chen@windriver.com>
Date: Tue, 12 Dec 2023 10:47:42 +0800
Subject: [PATCH] libcrun: fix compile error without libseccomp and libcap
Fixed compile error without libseccomp and libcap, running
clang-format to format the code style.
Upstream: https://github.com/containers/crun/commit/ea27b1363ef709ce4b169138017b67ef624b127b
Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
---
src/libcrun/container.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/libcrun/container.c b/src/libcrun/container.c
index 34649f8..ffcdb24 100644
--- a/src/libcrun/container.c
+++ b/src/libcrun/container.c
@@ -23,7 +23,9 @@
#include "container.h"
#include "utils.h"
#include "seccomp.h"
-#include <seccomp.h>
+#ifdef HAVE_SECCOMP
+# include <seccomp.h>
+#endif
#include "scheduler.h"
#include "seccomp_notify.h"
#include "custom-handler.h"
@@ -47,7 +49,9 @@
#include <sys/signalfd.h>
#include <sys/epoll.h>
#include <sys/socket.h>
-#include <sys/capability.h>
+#ifdef HAVE_CAP
+# include <sys/capability.h>
+#endif
#include <sys/ioctl.h>
#include <termios.h>
#include <grp.h>
@@ -3829,6 +3833,7 @@ populate_array_field (char ***field, char *array[], size_t num_elements)
(*field)[i] = NULL;
}
+#ifdef HAVE_CAP
static void
populate_capabilities (struct features_info_s *info, char ***capabilities, size_t *num_capabilities)
{
@@ -3876,6 +3881,7 @@ populate_capabilities (struct features_info_s *info, char ***capabilities, size_
(*capabilities)[index] = NULL; // Terminate the array with NULL
populate_array_field (&(info->linux.capabilities), *capabilities, *num_capabilities);
}
+#endif
static void
retrieve_mount_options (struct features_info_s **info)
--
2.34.1

2
package/crun/crun.hash
View File

@ -1,4 +1,4 @@
# Locally computed
sha256 5b8b5adb1dff7af768b69d2b0b4f2cd785ec931e7aa10138aa29812c46ee09ff crun-1.8.4.tar.gz
sha256 a76982ac076a5c9bf9f85bd8d25b1dc6344e252399a7e9231504357fc019f7cc crun-1.12.tar.gz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.libcrun

2
package/crun/crun.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
CRUN_VERSION = 1.8.4
CRUN_VERSION = 1.12
CRUN_SITE = https://github.com/containers/crun/releases/download/$(CRUN_VERSION)
CRUN_DEPENDENCIES = host-pkgconf yajl