mirror of
https://dev.iopsys.eu/feed/iopsys.git
synced 2025-12-10 07:44:50 +01:00
crun: use openwrt upstream version
This commit is contained in:
Sukru Senli
parent
c48cd18584
commit
8540d5ebbf
2 changed files with 55 additions and 240 deletions
|
|
@ -1,50 +1,82 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=crun
|
PKG_NAME:=crun
|
||||||
PKG_VERSION:=0.17
|
PKG_VERSION:=0.18
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=$(AUTORELEASE)
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_URL:=https://github.com/containers/crun.git
|
PKG_SOURCE_URL:=https://github.com/containers/crun.git
|
||||||
PKG_SOURCE_VERSION:=0e9229ae34caaebcb86f1fde18de3acaf18c6d9a
|
PKG_SOURCE_DATE:=2021-03-18
|
||||||
|
PKG_SOURCE_VERSION:=496e81bdd69f117f10e4477e4204e4611a94b68f
|
||||||
|
PKG_MIRROR_HASH:=26941b0d84bbeabeb5e982af48d131f55d0aa16f4a2f2ca3279a5c812cdeea8b
|
||||||
|
|
||||||
PKG_LICENSE:=GPL-2.0
|
PKG_BUILD_DEPENDS:=argp-standalone
|
||||||
PKG_LICENSE_FILES:=COPYING
|
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
|
||||||
|
|
||||||
PKG_INSTALL:=1
|
|
||||||
PKG_BUILD_PARALLEL:=1
|
PKG_BUILD_PARALLEL:=1
|
||||||
|
PKG_FIXUP:=autoreconf
|
||||||
|
PKG_INSTALL:=1
|
||||||
|
|
||||||
|
PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
|
||||||
|
PKG_LICENSE:=GPL-2.0-or-later
|
||||||
|
PKG_LICENSE_FILES:=COPYING
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
define Package/crun
|
define Package/crun
|
||||||
SECTION:=utils
|
SECTION:=utils
|
||||||
CATEGORY:=Utilities
|
CATEGORY:=Utilities
|
||||||
DEPENDS:=+yajl +argp-standalone +libcap +libseccomp
|
TITLE:=crun
|
||||||
TITLE:=A fast and low-memory footprint OCI Container Runtime fully written in C
|
URL:=https://github.com/containers/crun
|
||||||
|
DEPENDS:=@!arc +libseccomp +libcap
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/crun/description
|
define Package/crun/description
|
||||||
crun conforms to the OCI Container Runtime specifications
|
A fast and low-memory footprint OCI Container Runtime fully written in C.
|
||||||
endef
|
endef
|
||||||
|
|
||||||
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
|
CONFIGURE_ARGS+= \
|
||||||
TARGET_LDFLAGS += -largp
|
--disable-systemd \
|
||||||
|
--enable-embedded-yajl \
|
||||||
|
--enable-caps \
|
||||||
|
--enable-dl \
|
||||||
|
--enable-seccomp \
|
||||||
|
--enable-bpf
|
||||||
|
|
||||||
MAKE_FLAGS := \
|
define Build/Prepare
|
||||||
$(TARGET_CONFIGURE_OPTS) \
|
$(call Build/Prepare/Default)
|
||||||
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
|
$(SED) '/#include <git-version.h>/d' $(PKG_BUILD_DIR)/src/crun.c
|
||||||
LDFLAGS="$(TARGET_LDFLAGS)"
|
endef
|
||||||
|
|
||||||
define Build/Configure
|
define Build/Configure
|
||||||
cd $(PKG_BUILD_DIR)/ && sh autogen.sh && ./configure
|
$(call Build/Configure/Default)
|
||||||
|
|
||||||
|
$(SED) '/#define PACKAGE \"/d' $(PKG_BUILD_DIR)/config.h
|
||||||
|
$(SED) '/#define VERSION \"/d' $(PKG_BUILD_DIR)/config.h
|
||||||
|
$(SED) '/#define GIT_VERSION \"/d' $(PKG_BUILD_DIR)/config.h
|
||||||
|
$(SED) '/#define PACKAGE_BUGREPORT \"/d' $(PKG_BUILD_DIR)/config.h
|
||||||
|
$(SED) '/#define PACKAGE_NAME \"/d' $(PKG_BUILD_DIR)/config.h
|
||||||
|
$(SED) '/#define PACKAGE_STRING \"/d' $(PKG_BUILD_DIR)/config.h
|
||||||
|
$(SED) '/#define PACKAGE_TARNAME \"/d' $(PKG_BUILD_DIR)/config.h
|
||||||
|
$(SED) '/#define PACKAGE_VERSION \"/d' $(PKG_BUILD_DIR)/config.h
|
||||||
|
|
||||||
|
echo "#define PACKAGE \"$(PKG_NAME)\"" >> $(PKG_BUILD_DIR)/config.h
|
||||||
|
echo "#define VERSION \"$(PKG_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
|
||||||
|
echo "#define PACKAGE_NAME \"$(PKG_NAME)\"" >> $(PKG_BUILD_DIR)/config.h
|
||||||
|
echo "#define PACKAGE_VERSION \"$(PKG_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
|
||||||
|
echo "#define PACKAGE_STRING \"$(PKG_NAME) $(PKG_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
|
||||||
|
echo "#define PACKAGE_TARNAME \"$(PKG_NAME)\"" >> $(PKG_BUILD_DIR)/config.h
|
||||||
|
echo "#define PACKAGE_BUGREPORT \"bugs@openwrt.org\"" >> $(PKG_BUILD_DIR)/config.h
|
||||||
|
echo "#define GIT_VERSION \"$(PKG_SOURCE_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/crun/install
|
define Package/crun/install
|
||||||
$(INSTALL_DIR) $(1)/usr/bin/
|
$(INSTALL_DIR) $(1)/usr/bin/
|
||||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/bin/crun $(1)/usr/bin/
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/crun $(1)/usr/bin/
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Build/InstallDev
|
||||||
|
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib
|
||||||
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/crun $(1)/usr/bin/
|
||||||
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcrun.* $(1)/usr/lib/
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(eval $(call BuildPackage,crun))
|
$(eval $(call BuildPackage,crun))
|
||||||
|
|
|
||||||
|
|
@ -1,217 +0,0 @@
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 5e9f2f9..5ed99bd 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -52,16 +52,6 @@ AS_IF([test "x$enable_seccomp" != "xno"], [
|
|
||||||
])
|
|
||||||
])
|
|
||||||
|
|
||||||
-dnl libsystemd
|
|
||||||
-AC_ARG_ENABLE([systemd],
|
|
||||||
- AS_HELP_STRING([--disable-systemd], [Ignore systemd and disable support]))
|
|
||||||
-AS_IF([test "x$enable_systemd" != "xno"], [
|
|
||||||
- AC_CHECK_HEADERS([systemd/sd-bus.h], [], [AC_MSG_ERROR([*** Missing libsystemd headers])])
|
|
||||||
- AS_IF([test "$ac_cv_header_systemd_sd_bus_h" = "yes"], [
|
|
||||||
- AC_SEARCH_LIBS(sd_bus_match_signal_async, [systemd], [AC_DEFINE([HAVE_SYSTEMD], 1, [Define if libsystemd is available])], [AC_MSG_ERROR([*** Failed to find libsystemd])])
|
|
||||||
- ])
|
|
||||||
-])
|
|
||||||
-
|
|
||||||
dnl ebpf
|
|
||||||
AC_ARG_ENABLE([bpf],
|
|
||||||
AS_HELP_STRING([--disable-bpf], [Ignore eBPF and disable support]))
|
|
||||||
@@ -114,26 +104,6 @@ AS_IF([test "x$enable_criu" != "xno"], [
|
|
||||||
FOUND_LIBS=$LIBS
|
|
||||||
LIBS=""
|
|
||||||
|
|
||||||
-AC_MSG_CHECKING([for new mount API (fsconfig)])
|
|
||||||
-AC_COMPILE_IFELSE(
|
|
||||||
- [AC_LANG_SOURCE([[
|
|
||||||
- #include <linux/mount.h>
|
|
||||||
- int cmd = FSCONFIG_CMD_CREATE;
|
|
||||||
- ]])],
|
|
||||||
- [AC_MSG_RESULT(yes)
|
|
||||||
- AC_DEFINE([HAVE_FSCONFIG_CMD_CREATE], 1, [Define if FSCONFIG_CMD_CREATE is available])],
|
|
||||||
- [AC_MSG_RESULT(no)])
|
|
||||||
-
|
|
||||||
-AC_MSG_CHECKING([for seccomp notify API])
|
|
||||||
-AC_COMPILE_IFELSE(
|
|
||||||
- [AC_LANG_SOURCE([[
|
|
||||||
- #include <linux/seccomp.h>
|
|
||||||
- int cmd = SECCOMP_GET_NOTIF_SIZES;
|
|
||||||
- ]])],
|
|
||||||
- [AC_MSG_RESULT(yes)
|
|
||||||
- AC_DEFINE([HAVE_SECCOMP_GET_NOTIF_SIZES], 1, [Define if SECCOMP_GET_NOTIF_SIZES is available])],
|
|
||||||
- [AC_MSG_RESULT(no)])
|
|
||||||
-
|
|
||||||
AC_DEFINE([LIBCRUN_PUBLIC], [__attribute__((visibility("default"))) extern], [LIBCRUN_PUBLIC])
|
|
||||||
AC_SUBST([FOUND_LIBS])
|
|
||||||
AC_SUBST([CRUN_LDFLAGS])
|
|
||||||
diff --git a/src/libcrun/cgroup.c b/src/libcrun/cgroup.c
|
|
||||||
index 29c1f7a..77dc441 100644
|
|
||||||
--- a/src/libcrun/cgroup.c
|
|
||||||
+++ b/src/libcrun/cgroup.c
|
|
||||||
@@ -575,23 +575,6 @@ get_file_owner (const char *path, uid_t *uid, gid_t *gid)
|
|
||||||
struct stat st;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
-#ifdef HAVE_STATX
|
|
||||||
- struct statx stx;
|
|
||||||
-
|
|
||||||
- ret = statx (AT_FDCWD, path, AT_STATX_DONT_SYNC, STATX_UID | STATX_GID, &stx);
|
|
||||||
- if (UNLIKELY (ret < 0))
|
|
||||||
- {
|
|
||||||
- if (errno == ENOSYS || errno == EINVAL)
|
|
||||||
- goto fallback;
|
|
||||||
-
|
|
||||||
- return ret;
|
|
||||||
- }
|
|
||||||
- *uid = stx.stx_uid;
|
|
||||||
- *gid = stx.stx_gid;
|
|
||||||
- return ret;
|
|
||||||
-
|
|
||||||
-fallback:
|
|
||||||
-#endif
|
|
||||||
ret = stat (path, &st);
|
|
||||||
if (UNLIKELY (ret < 0))
|
|
||||||
return ret;
|
|
||||||
diff --git a/src/libcrun/error.h b/src/libcrun/error.h
|
|
||||||
index aa3f3aa..477a2fe 100644
|
|
||||||
--- a/src/libcrun/error.h
|
|
||||||
+++ b/src/libcrun/error.h
|
|
||||||
@@ -18,9 +18,6 @@
|
|
||||||
#ifndef ERROR_H
|
|
||||||
#define ERROR_H
|
|
||||||
#include <config.h>
|
|
||||||
-#ifdef HAVE_ERROR_H
|
|
||||||
-# include <error.h>
|
|
||||||
-#else
|
|
||||||
# define error(status, errno, fmt, ...) \
|
|
||||||
do \
|
|
||||||
{ \
|
|
||||||
@@ -35,7 +32,6 @@
|
|
||||||
exit (status); \
|
|
||||||
} \
|
|
||||||
while (0)
|
|
||||||
-#endif
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdbool.h>
|
|
||||||
diff --git a/src/libcrun/utils.c b/src/libcrun/utils.c
|
|
||||||
index cbde9b6..5ef7f5f 100644
|
|
||||||
--- a/src/libcrun/utils.c
|
|
||||||
+++ b/src/libcrun/utils.c
|
|
||||||
@@ -164,22 +164,6 @@ get_file_type_fd (int fd, mode_t *mode)
|
|
||||||
struct stat st;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
-#ifdef HAVE_STATX
|
|
||||||
- struct statx stx;
|
|
||||||
-
|
|
||||||
- ret = statx (fd, "", AT_EMPTY_PATH | AT_STATX_DONT_SYNC, STATX_TYPE, &stx);
|
|
||||||
- if (UNLIKELY (ret < 0))
|
|
||||||
- {
|
|
||||||
- if (errno == ENOSYS || errno == EINVAL)
|
|
||||||
- goto fallback;
|
|
||||||
-
|
|
||||||
- return ret;
|
|
||||||
- }
|
|
||||||
- *mode = stx.stx_mode;
|
|
||||||
- return ret;
|
|
||||||
-
|
|
||||||
-fallback:
|
|
||||||
-#endif
|
|
||||||
ret = fstat (fd, &st);
|
|
||||||
*mode = st.st_mode;
|
|
||||||
return ret;
|
|
||||||
@@ -191,22 +175,6 @@ get_file_type_at (int dirfd, mode_t *mode, bool nofollow, const char *path)
|
|
||||||
struct stat st;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
-#ifdef HAVE_STATX
|
|
||||||
- struct statx stx;
|
|
||||||
-
|
|
||||||
- ret = statx (dirfd, path, (nofollow ? AT_SYMLINK_NOFOLLOW : 0) | AT_STATX_DONT_SYNC, STATX_TYPE, &stx);
|
|
||||||
- if (UNLIKELY (ret < 0))
|
|
||||||
- {
|
|
||||||
- if (errno == ENOSYS || errno == EINVAL)
|
|
||||||
- goto fallback;
|
|
||||||
-
|
|
||||||
- return ret;
|
|
||||||
- }
|
|
||||||
- *mode = stx.stx_mode;
|
|
||||||
- return ret;
|
|
||||||
-
|
|
||||||
-fallback:
|
|
||||||
-#endif
|
|
||||||
ret = fstatat (dirfd, path, &st, nofollow ? AT_SYMLINK_NOFOLLOW : 0);
|
|
||||||
*mode = st.st_mode;
|
|
||||||
return ret;
|
|
||||||
@@ -550,22 +518,7 @@ get_file_size (int fd, off_t *size)
|
|
||||||
{
|
|
||||||
struct stat st;
|
|
||||||
int ret;
|
|
||||||
-#ifdef HAVE_STATX
|
|
||||||
- struct statx stx;
|
|
||||||
-
|
|
||||||
- ret = statx (fd, "", AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW | AT_STATX_DONT_SYNC, STATX_SIZE, &stx);
|
|
||||||
- if (UNLIKELY (ret < 0))
|
|
||||||
- {
|
|
||||||
- if (errno == ENOSYS || errno == EINVAL)
|
|
||||||
- goto fallback;
|
|
||||||
- return ret;
|
|
||||||
- }
|
|
||||||
- *size = stx.stx_size;
|
|
||||||
-
|
|
||||||
- return ret;
|
|
||||||
|
|
||||||
-fallback:
|
|
||||||
-#endif
|
|
||||||
ret = fstat (fd, &st);
|
|
||||||
*size = st.st_size;
|
|
||||||
return ret;
|
|
||||||
@@ -1060,7 +1013,6 @@ run_process (char **args, libcrun_error_t *err)
|
|
||||||
_exit (EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
|
|
||||||
-#ifndef HAVE_FGETPWENT_R
|
|
||||||
static unsigned
|
|
||||||
atou (char **s)
|
|
||||||
{
|
|
||||||
@@ -1126,7 +1078,6 @@ fgetpwent_r (FILE *f, struct passwd *pw, char *line, size_t size, struct passwd
|
|
||||||
errno = rv;
|
|
||||||
return rv;
|
|
||||||
}
|
|
||||||
-#endif
|
|
||||||
|
|
||||||
int
|
|
||||||
set_home_env (uid_t id)
|
|
||||||
@@ -1690,29 +1641,6 @@ copy_rec_stat_file_at (int dfd, const char *path, mode_t *mode, off_t *size, dev
|
|
||||||
struct stat st;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
-#ifdef HAVE_STATX
|
|
||||||
- struct statx stx;
|
|
||||||
-
|
|
||||||
- ret = statx (dfd, path, AT_SYMLINK_NOFOLLOW | AT_STATX_DONT_SYNC,
|
|
||||||
- STATX_TYPE | STATX_MODE | STATX_SIZE | STATX_UID | STATX_GID, &stx);
|
|
||||||
- if (UNLIKELY (ret < 0))
|
|
||||||
- {
|
|
||||||
- if (errno == ENOSYS || errno == EINVAL)
|
|
||||||
- goto fallback;
|
|
||||||
-
|
|
||||||
- return ret;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- *mode = stx.stx_mode;
|
|
||||||
- *size = stx.stx_size;
|
|
||||||
- *rdev = makedev (stx.stx_rdev_major, stx.stx_rdev_minor);
|
|
||||||
- *uid = stx.stx_uid;
|
|
||||||
- *gid = stx.stx_gid;
|
|
||||||
-
|
|
||||||
- return ret;
|
|
||||||
-
|
|
||||||
-fallback:
|
|
||||||
-#endif
|
|
||||||
ret = fstatat (dfd, path, &st, AT_SYMLINK_NOFOLLOW);
|
|
||||||
|
|
||||||
*mode = st.st_mode;
|
|
||||||
Loading…
Add table
Reference in a new issue