Merge pull request #337 from WebPlatformForEmbedded/development/lxc-kernel-5.10

Container related kernel configuration changes for 5.10.

Author: pwielders

board/raspberrypi/rpi23-linux-5.10-container.config

@@ -0,0 +1,103 @@
+BR2_arm=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_NEON_VFPV4=y
+BR2_ARM_INSTRUCTIONS_THUMB2=y
+BR2_CCACHE=y
+BR2_OPTIMIZE_2=y
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_BINUTILS_VERSION_2_33_X=y
+BR2_GCC_VERSION_9_X=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+BR2_TARGET_GENERIC_ROOT_PASSWD="root"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="--rpi-wifi --add-miniuart-bt-overlay --overclock-pi3 --tvmode-720 --gpu_mem_1024=384 --silent --1w --i2c --spi"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rpi-5.10.y"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/raspberrypi/rpi23-linux-5.10-container.config"
+BR2_LINUX_KERNEL_LZ4=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OPUS=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ICYDEMUX=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_INTERLEAVE=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MPG123=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DASH=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS=y
+BR2_PACKAGE_GST_OMX=y
+BR2_PACKAGE_BITSTREAM_VERA=y
+BR2_PACKAGE_RPI_BT_FIRMWARE=y
+BR2_PACKAGE_RPI_FIRMWARE=y
+BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG=y
+BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
+BR2_PACKAGE_RNG_TOOLS=y
+BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_WPEFRAMEWORK=y
+BR2_PACKAGE_WPEFRAMEWORK_CDMI_CLEARKEY=y
+BR2_PACKAGE_WPEFRAMEWORK_CDMI_PLAYREADY_MODULE=y
+BR2_PACKAGE_WPEFRAMEWORK_CDMI_PLAYREADY_CERTIFICATE_LABEL="playready4"
+BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_MODULE=y
+BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_DEVICE_CERTIFICATE="Widevine/cert.bin"
+BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_NEW_CENC_INTERFACE=y
+BR2_PACKAGE_WPEFRAMEWORK_COMPOSITOR=y
+BR2_PACKAGE_WPEFRAMEWORK_DHCPSERVER=y
+BR2_PACKAGE_WPEFRAMEWORK_LOCATIONSYNC=y
+BR2_PACKAGE_WPEFRAMEWORK_LOCATIONSYNC_URI="http://jsonip.metrological.com/?maf=true"
+BR2_PACKAGE_WPEFRAMEWORK_MONITOR=y
+BR2_PACKAGE_WPEFRAMEWORK_REMOTECONTROL=y
+BR2_PACKAGE_WPEFRAMEWORK_REMOTECONTROL_DEVINPUT=y
+BR2_PACKAGE_WPEFRAMEWORK_SNAPSHOT=y
+BR2_PACKAGE_WPEFRAMEWORK_TIMESYNC=y
+BR2_PACKAGE_WPEFRAMEWORK_TRACECONTROL=y
+BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER=y
+BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_STARTURL="file:///www/index.html"
+BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_MEMORYPRESSURE="databaseprocess:50m,networkprocess:80m,webprocess:250m,rpcprocess:80m"
+BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_DISKCACHE="512m"
+BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_XHRCACHE=y
+BR2_PACKAGE_WPEFRAMEWORK_YOUTUBE=y
+BR2_PACKAGE_WPEFRAMEWORK_UX=y
+BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_THREADEDPAINTING="2"
+BR2_PACKAGE_WPEFRAMEWORK_WEBSERVER=y
+BR2_PACKAGE_WPEFRAMEWORK_WIFICONTROL=y
+BR2_PACKAGE_WPEWEBKIT2_22=y
+BR2_PACKAGE_ORC=y
+BR2_PACKAGE_SHARED_MIME_INFO=y
+BR2_PACKAGE_DROPBEAR=y
+BR2_PACKAGE_RDKSPLASHSCREEN=y
+BR2_PACKAGE_RDKSPLASHSCREEN_OPERATOR="metrological"
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+#BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_DEBUG=y
+#BR2_PACKAGE_WPEFRAMEWORK_APPS=y
+BR2_PACKAGE_LIBCGROUP=y
+BR2_PACKAGE_LIBCGROUP_TOOLS=y
+BR2_PACKAGE_COLLECTD=y
+BR2_PACKAGE_COLLECTD_CGROUPS=y
+BR2_PACKAGE_BRIDGE_UTILS=y
+BR2_PACKAGE_IPTABLES=y
+BR2_PACKAGE_CGROUPFS_MOUNT=y
+BR2_PACKAGE_LXC=y
+BR2_PACKAGE_HOST_MTOOLS=y

configs/raspberrypi3_wpe_ml_container_defconfig

@@ -2330,6 +2330,7 @@ menu "System tools"
 	source "package/kvmtool/Config.in"
 	source "package/libostree/Config.in"
 	source "package/lxc/Config.in"
+	source "package/crun/Config.in"
 	source "package/mender/Config.in"
 	source "package/mender-grubenv/Config.in"
 	source "package/mfoc/Config.in"

package/Config.in

@@ -0,0 +1,150 @@
+From 5edb3adc3a5d64113d056da46db634ecc2871e75 Mon Sep 17 00:00:00 2001
+From: Michal Pogoda <[email protected]>
+Date: Tue, 17 Mar 2020 16:55:20 +0100
+Subject: [PATCH 1/2] Preparing for library build
+
+---
+ Makefile.am             | 19 +++++++++++++++++++
+ configure.ac            |  5 ++++-
+ libcrun.pc.in           | 11 +++++++++++
+ libocispec/Makefile.am  | 13 +++----------
+ src/libcrun/container.c |  2 +-
+ src/libcrun/error.c     |  2 +-
+ 6 files changed, 39 insertions(+), 13 deletions(-)
+ create mode 100644 libcrun.pc.in
+
+diff --git a/Makefile.am b/Makefile.am
+index 8f96a4f..5e86199 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -38,6 +38,25 @@ libcrun_la_SOURCES = src/libcrun/utils.c \
+ libcrun_la_CFLAGS = -I $(abs_top_builddir)/libocispec/src -I $(abs_top_srcdir)/libocispec/src
+ libcrun_la_LIBADD = libocispec/libocispec.la
+ 
++pkginclude_HEADERS = src/libcrun/container.h \
++		     config.h \
++		     src/libcrun/error.h \
++		     src/libcrun/status.h \
++		     src/libcrun/utils.h \
++		     libocispec/src/runtime_spec_schema_config_schema.h \
++		     libocispec/src/runtime_spec_schema_config_linux.h \
++		     libocispec/src/runtime_spec_schema_config_solaris.h \
++		     libocispec/src/runtime_spec_schema_config_windows.h \
++		     libocispec/src/runtime_spec_schema_config_vm.h \
++		     libocispec/src/runtime_spec_schema_defs.h \
++		     libocispec/src/runtime_spec_schema_defs_linux.h \
++		     libocispec/src/runtime_spec_schema_defs_windows.h \
++		     libocispec/src/runtime_spec_schema_defs_vm.h \
++		     libocispec/src/json_common.h
++
++pkgconfigdir = @pkgconfigdir@
++pkgconfig_DATA = libcrun.pc
++
+ if PYTHON_BINDINGS
+ pyexec_LTLIBRARIES = python_crun.la
+ python_crun_la_SOURCES = python/crun_python.c
+diff --git a/configure.ac b/configure.ac
+index ea6ed11..cab11ec 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -123,7 +123,10 @@ AC_SEARCH_LIBS([argp_parse], [argp], [], [AC_MSG_ERROR([*** argp functions not f
+ AM_CONDITIONAL([PYTHON_BINDINGS], [test "x$with_python_bindings" = "xyes"])
+ AM_CONDITIONAL([CRIU_SUPPORT], [test "x$have_criu" = "xyes"])
+ 
+-AC_CONFIG_FILES([Makefile rpm/crun.spec])
++PKG_INSTALLDIR
++AC_SUBST(pkgconfigdir)
++
++AC_CONFIG_FILES([Makefile rpm/crun.spec libcrun.pc])
+ 
+ AC_CONFIG_SUBDIRS([libocispec])
+ AC_OUTPUT
+diff --git a/libcrun.pc.in b/libcrun.pc.in
+new file mode 100644
+index 0000000..54ee2eb
+--- /dev/null
++++ b/libcrun.pc.in
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: LibCRun
++Description: Library for running the OCI containers
++Version: 0.1.13
++Requires: libseccomp libcap yajl
++Cflags: -I${includedir}/crun -I${includedir}
++Libs: -L${libdir} -lseccomp -lcap -lyajl -lcrun 
+\ No newline at end of file
+diff --git a/libocispec/Makefile.am b/libocispec/Makefile.am
+index 65bed45..53a8b32 100644
+--- a/libocispec/Makefile.am
++++ b/libocispec/Makefile.am
+@@ -4,8 +4,7 @@ AM_CFLAGS = $(WARN_CFLAGS) -I$(top_srcdir)/src -I$(top_builddir)/src
+ 
+ GITIGNOREFILES = build-aux/ gtk-doc.make config.h.in aclocal.m4
+ 
+-noinst_LTLIBRARIES = libocispec.la
+-noinst_LIBRARIES = libocispec.a
++lib_LTLIBRARIES = libocispec.la
+ 
+ SOURCE_FILES = src/json_common.c \
+ 	src/image_spec_schema_config_schema.c \
+@@ -25,9 +24,8 @@ SOURCE_FILES = src/json_common.c \
+ 	src/runtime_spec_schema_defs_vm.c \
+ 	src/runtime_spec_schema_defs_windows.c \
+ 	src/runtime_spec_schema_state_schema.c \
+-	src/image_manifest_items_image_manifest_items_schema.c \
+-	src/json_common.c
+-
++	src/image_manifest_items_image_manifest_items_schema.c 
++	
+ HEADER_FILES = $(SOURCE_FILES:.c=.h)
+ 
+ src/json_common.h src/json_common.c:
+@@ -61,15 +59,10 @@ BUILT_SOURCES = $(HEADER_FILES) $(SOURCE_FILES)
+ libocispec_la_SOURCES = $(SOURCE_FILES) \
+ 	src/read-file.c
+ 
+-libocispec_a_SOURCES =
+-
+ CLEANFILES += $(HEADER_FILES) $(SOURCE_FILES)
+ 
+ TESTS_LDADD = libocispec.la $(SELINUX_LIBS) $(YAJL_LIBS)
+ 
+-libocispec.a: libocispec.la
+-	$(LIBTOOL) --mode=link $(GCC) libocispec.la -o libocispec.a
+-
+ tests_test_1_SOURCES = tests/test-1.c
+ tests_test_1_LDADD = $(TESTS_LDADD)
+ 
+diff --git a/src/libcrun/container.c b/src/libcrun/container.c
+index 22cb41f..7f7dafc 100644
+--- a/src/libcrun/container.c
++++ b/src/libcrun/container.c
+@@ -1778,7 +1778,7 @@ libcrun_container_run (libcrun_context_t *context, libcrun_container_t *containe
+       crun_set_output_handler (log_write_to_stderr, NULL, false);
+       libcrun_fail_with_error ((*err)->status, "%s", (*err)->msg);
+     }
+-  exit (ret);
++  _exit (ret);
+ }
+ 
+ int
+diff --git a/src/libcrun/error.c b/src/libcrun/error.c
+index cb49b0d..56ea309 100644
+--- a/src/libcrun/error.c
++++ b/src/libcrun/error.c
+@@ -386,7 +386,7 @@ libcrun_fail_with_error (int errno_, const char *msg, ...)
+   va_start (args_list, msg);
+   write_log (errno_, false, msg, args_list);
+   va_end (args_list);
+-  exit (EXIT_FAILURE);
++  _exit (EXIT_FAILURE);
+ }
+ 
+ int
+-- 
+2.20.1
+

package/crun/0001-Preparing-for-library-build.patch

@@ -0,0 +1,25 @@
+From 0679805f6105d6b226fda00d265bdb3690eeeda2 Mon Sep 17 00:00:00 2001
+From: Michal Pogoda <[email protected]>
+Date: Thu, 9 Apr 2020 16:07:43 +0200
+Subject: [PATCH 2/2] Fix cpuacct not beeing created
+
+---
+ src/libcrun/cgroup.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libcrun/cgroup.c b/src/libcrun/cgroup.c
+index 6947eaf..9a5d34d 100644
+--- a/src/libcrun/cgroup.c
++++ b/src/libcrun/cgroup.c
+@@ -39,7 +39,7 @@
+ 
+ static const cgroups_subsystem_t cgroups_subsystems[] = { "cpuset", "cpu", "devices", "pids", "memory",
+                                                           "net_cls,net_prio", "freezer", "blkio",
+-                                                          "hugetlb", "cpu,cpuacct", "perf_event",
++                                                          "hugetlb", "cpu", "cpuacct", "perf_event",
+                                                           "unified", NULL};
+ 
+ const cgroups_subsystem_t *
+-- 
+2.20.1
+

package/crun/0002-Fix-cpuacct-not-beeing-created.patch

@@ -0,0 +1,8 @@
+config BR2_PACKAGE_CRUN
+	bool "crun"
+	select BR2_PACKAGE_YAJL
+	select BR2_PACKAGE_LIBSECCOMP
+	select BR2_PACKAGE_LIBCAP
+	help
+	  this package installs 'crun', which is a
+	  runc reimplementation in C

package/crun/Config.in

@@ -0,0 +1,18 @@
+################################################################################
+#
+# crun
+#
+################################################################################
+
+CRUN_VERSION = 0.13
+CRUN_SITE = https://github.com/containers/crun/releases/download/$(CRUN_VERSION)
+CRUN_LICENSE = GPLv2+
+CRUN_LICENSE_FILES = COPYING
+CRUN_INSTALL_STAGING = YES
+CRUN_AUTORECONF = YES
+CRUN_DEPENDENCIES = host-python3 yajl libcap libseccomp
+
+CRUN_CONF_OPTS = --disable-systemd --enable-shared
+CRUN_CONF_ENV = PYTHON=python3
+
+$(eval $(autotools-package))