package/criu: new package
PATCH v5 1/1 package/criu: new package
Checkpoint/Restore In Userspace (CRIU), is a software tool for the Linux operating system to make it possible to freeze a running application and checkpoint it to persistent storage as a collection of files.
---
Notes:
v2:
- Addressed comments from Thomas.
- Tested on ARM target and on x86_64 with qemu.
v3:
- set CONFIG_CHECKPOINT_RESTORE in kernel config
- Only be available for ARMv6, ARMv7 and ARMv8
v4:
- set SUBARCH for armv6, armv7 and armv8
- Use github download helper
Result from test-pkg:
bootlin-armv5-uclibc [1/6]: SKIPPED
bootlin-armv7-glibc [2/6]: OK
bootlin-armv7m-uclibc [3/6]: SKIPPED
bootlin-x86-64-musl [4/6]: OK
br-arm-full-static [5/6]: SKIPPED
sourcery-arm [6/6]: SKIPPED
6 builds, 4 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
v5:
- Remove support for s390 arch
- Depend on BR2_HOST_GCC_AT_LEAST_8
- Depend on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18
- Depend on !BR2_TOOLCHAIN_USES_UCLIBC
- Use BR2_NORMALIZED_ARCH instead of BR2_ARCH
DEVELOPERS | 1 + package/Config.in | 1 + package/criu/Config.in | 55 ++++++++++++++++++++++++++++++++ package/criu/criu.hash | 3 ++ package/criu/criu.mk | 71 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 131 insertions(+) create mode 100644 package/criu/Config.in create mode 100644 package/criu/criu.hash create mode 100644 package/criu/criu.mk
DEVELOPERS +1 -0
@@ -2007,6 +2007,7 @@ F: support/testing/tests/package/test_python_pytest.py F: support/testing/tests/package/test_python_pytest_asyncio.py N: Marcus Folkesson <[email protected]> +F: package/criu/ F: package/libcamera/ F: package/libcamera-apps/ F: package/libostree/
package/Config.in +1 -0
@@ -2678,6 +2678,7 @@ menu "System tools" source "package/coreutils/Config.in" source "package/cpulimit/Config.in" source "package/cpuload/Config.in" + source "package/criu/Config.in" source "package/crun/Config.in" source "package/daemon/Config.in" source "package/dc3dd/Config.in"
package/criu/Config.in new file +55 -0
55 lines not on this page · raw message
package/criu/criu.hash new file +3 -0
@@ -0,0 +1,3 @@ +# Locally calculated +sha256 6a9997981c9fe4730c848ce59346b3a22fad69b803607cb67a3f6ec0557fa474 criu-3.18.tar.gz +sha256 568a1fa9d90e18a1a1a61ea58ec2eece16b56a5042cc72c1b4f8d4455ae6fcb7 COPYING
package/criu/criu.mk new file +71 -0
71 lines not on this page · raw message
Signature · 6 lines
2.42.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Hi Marcus,
Thanks for this updated v5 patch!
I confirm I successfully tested this patch on branch master at commit a9d2040 with commands:
utils/docker-run make check-package
...
0 warnings generated
cat >criu.config <<EOF
BR2_PACKAGE_HOST_PYTHON3=y
BR2_PACKAGE_CRIU=y
EOF
utils/test-pkg -a -c criu.config -p criu
arm-aarch64 [ 1/45]: OK
bootlin-aarch64-glibc [ 2/45]: SKIPPED
bootlin-arcle-hs38-uclibc [ 3/45]: SKIPPED
bootlin-armv5-uclibc [ 4/45]: SKIPPED
bootlin-armv7-glibc [ 5/45]: OK
bootlin-armv7m-uclibc [ 6/45]: SKIPPED
bootlin-armv7-musl [ 7/45]: SKIPPED
bootlin-m68k-5208-uclibc [ 8/45]: SKIPPED
bootlin-m68k-68040-uclibc [ 9/45]: SKIPPED
bootlin-microblazeel-uclibc [10/45]: SKIPPED
bootlin-mipsel32r6-glibc [11/45]: SKIPPED
bootlin-mipsel-uclibc [12/45]: SKIPPED
bootlin-nios2-glibc [13/45]: SKIPPED
bootlin-openrisc-uclibc [14/45]: SKIPPED
bootlin-powerpc64le-power8-glibc [15/45]: SKIPPED
bootlin-powerpc-e500mc-uclibc [16/45]: SKIPPED
bootlin-riscv32-glibc [17/45]: SKIPPED
bootlin-riscv64-glibc [18/45]: SKIPPED
bootlin-riscv64-musl [19/45]: SKIPPED
bootlin-s390x-z13-glibc [20/45]: SKIPPED
bootlin-sh4-uclibc [21/45]: SKIPPED
bootlin-sparc64-glibc [22/45]: SKIPPED
bootlin-sparc-uclibc [23/45]: SKIPPED
bootlin-x86-64-glibc [24/45]: OK
bootlin-x86-64-musl [25/45]: SKIPPED
bootlin-x86-64-uclibc [26/45]: SKIPPED
bootlin-xtensa-uclibc [27/45]: SKIPPED
br-arm-basic [28/45]: SKIPPED
br-arm-full-nothread [29/45]: SKIPPED
br-arm-full-static [30/45]: SKIPPED
br-i386-pentium4-full [31/45]: SKIPPED
br-i386-pentium-mmx-musl [32/45]: SKIPPED
br-mips64-n64-full [33/45]: SKIPPED
br-mips64r6-el-hf-glibc [34/45]: SKIPPED
br-powerpc-603e-basic-cpp [35/45]: SKIPPED
br-powerpc64-power7-glibc [36/45]: SKIPPED
linaro-aarch64-be [37/45]: SKIPPED
linaro-aarch64 [38/45]: SKIPPED
linaro-arm [39/45]: SKIPPED
sourcery-arm-armv4t [40/45]: SKIPPED
sourcery-arm [41/45]: SKIPPED
sourcery-arm-thumb2 [42/45]: SKIPPED
sourcery-mips64 [43/45]: SKIPPED
sourcery-mips [44/45]: SKIPPED
sourcery-nios2 [45/45]: SKIPPED
45 builds, 42 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
I also tested with the runtime test from:
https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/
support/testing/run-tests \
-d dl -o output_folder \
tests.package.test_criu
...
OKI have also few minor comments.
Quoted 82 lines · Marcus Folkesson
Checkpoint/Restore In Userspace (CRIU), is a software tool for the Linux operating system to make it possible to freeze a running application and checkpoint it to persistent storage as a collection of files.
Signed-off-by Marcus Folkesson <[email protected]>---
Notes:
v2:
- Addressed comments from Thomas.
- Tested on ARM target and onx86_64with qemu.v3:
- setCONFIG_CHECKPOINT_RESTOREin kernel config
- Only be available for ARMv6, ARMv7 and ARMv8v4:
- set SUBARCH for armv6, armv7 and armv8
- Use github download helperResult from test-pkg:
bootlin-armv5-uclibc [1/6]: SKIPPED
bootlin-armv7-glibc [2/6]: OK
bootlin-armv7m-uclibc [3/6]: SKIPPED
bootlin-x86-64-musl [4/6]: OK
br-arm-full-static [5/6]: SKIPPED
sourcery-arm [6/6]: SKIPPED
6 builds, 4 skipped, 0 build failed, 0 legal-info failed, 0
show-info failedv5:
- Remove support for s390 arch
- Depend onBR2_HOST_GCC_AT_LEAST_8
- Depend onBR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18
- Depend on !BR2_TOOLCHAIN_USES_UCLIBC
- UseBR2_NORMALIZED_ARCHinstead ofBR2_ARCHDEVELOPERS | 1 + package/Config.in | 1 + package/criu/Config.in | 55 ++++++++++++++++++++++++++++++++ package/criu/criu.hash | 3 ++ package/criu/criu.mk | 71 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 131 insertions(+) create mode 100644 package/criu/Config.in create mode 100644 package/criu/criu.hash create mode 100644 package/criu/criu.mkDEVELOPERS +0
-0@@ -2007,6 +2007,7 @@F:
support/testing/tests/package/test_python_pytest.py
F:support/testing/tests/package/test_python_pytest_asyncio.pyN: Marcus Folkesson <[email protected]>
DEVELOPERS +1
-0+F: package/criu/ F: package/libcamera/ F: package/libcamera-apps/ F: package/libostree/package/Config.in +1
-0@@ -2678,6 +2678,7 @@ menu "System tools" source "package/coreutils/Config.in" source "package/cpulimit/Config.in" source "package/cpuload/Config.in" + source "package/criu/Config.in" source "package/crun/Config.in" source "package/daemon/Config.in" source "package/dc3dd/Config.in"package/criu/Config.in new file +4
-0@@ -0,0 +1,55 @@ +# criu only builds on certain architectures +config BR2_PACKAGE_CRIU_ARCH_SUPPORTS + bool + default y if BR2_ARM_CPU_ARMV6
package/criu/Config.in line 14
Quoted 10 lines
package/criu/Config.in new file +10
-0+ default y if BR2_ARM_CPU_ARMV7A + default y if BR2_ARM_CPU_ARMV7M + default y if BR2_ARM_CPU_ARMV8A + default y if BR2_ARM_CPU_ARMV8M + default y if BR2_aarch64 + default y if BR2_i386 + default y if BR2_mips + default y if BR2_x86_64 + default y if BR2_BR2_powerpc64le #Only support powerpc64 with LE + #default y if BR2_s390x
I think this BR2_s390x Kconfig line can be removed. Keeping only the following comment will be sufficient.
package/criu/Config.in line 20
Quoted 6 lines
package/criu/Config.in new file +6
-0+ #CRIU has "some" support for s390 but it is not included due to + #BE/LE endian issues. + +menuconfig BR2_PACKAGE_CRIU + bool "criu" + depends on BR2_HOST_GCC_AT_LEAST_8 # -march=armv7-a+fp
This should be BR2_TOOLCHAIN_GCC_AT_LEAST_8 (i.e. target gcc). It should then replace the "depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8" you already have for protobuf. I didn't see any build failure, as it is probably hidden with the kernel headers >= 4.18 dependency.
package/criu/Config.in line 28
Quoted 8 lines
package/criu/Config.in new file +8
-0+ depends on BR2_PACKAGE_CRIU_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_PYTHON3 # host-python3-ssl + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP # protobuf + depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, libnl + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf
This line should be replaced by BR2_HOST_GCC_AT_LEAST_8, as commented earlier.
Quoted 13 lines
package/criu/Config.in new file +13
-0+ depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 # rseq.h + depends on !BR2_TOOLCHAIN_USES_UCLIBC # no aio.h + depends on !BR2_STATIC_LIBS # protobuf, libbsd + depends on BR2_USE_WCHAR # libbsd + depends on BR2_USE_MMU # libcap + select BR2_PACKAGE_HOST_PYTHON3_SSL + select BR2_PACKAGE_PROTOBUF + select BR2_PACKAGE_PROTOBUF_C + select BR2_PACKAGE_LIBAIO + select BR2_PACKAGE_LIBBSD + select BR2_PACKAGE_LIBCAP + select BR2_PACKAGE_LIBNET + select BR2_PACKAGE_LIBNL
package/criu/Config.in line 51
Quoted 10 lines
package/criu/Config.in new file +10
-0+ select BR2_PACKAGE_PYTHON3 + help + Checkpoint/Restore In Userspace (CRIU), is a software + tool for the Linux operating system to make it possible + to freeze a running application and checkpoint it to + persistent storage as a collection of files. + + https://criu.org/Main_Page + +comment "criu needs a toolchain w/ threads, dynamic library, wchar"
The comment should be slightly refined, with something like,
in one line:
"criu needs a glibc or musl toolchain w/ threads, gcc >= 8, headers >= 4.18, dynamic library, wchar"
package/criu/Config.in line 52
Quoted 1 line
package/criu/Config.in new file +1
-0+ depends on !BR2_HOST_GCC_AT_LEAST_8 || !BR2_TOOLCHAIN_HAS_THREADS \
The change I proposed earlier should also be reflected here:
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || ...
Quoted 94 lines
package/criu/Config.in new file +3
-0+ || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 \ + || BR2_TOOLCHAIN_USES_UCLIBC \ + || BR2_STATIC_LIBS || !BR2_USE_WCHARpackage/criu/criu.hash new file +2
-0@@ -0,0 +1,3 @@ +# Locally calculated +sha256
6a9997981c9fe4730c848ce59346b3a22fad69b803607cb67a3f6ec0557fa474criu-3.18.tar.gz +sha256568a1fa9d90e18a1a1a61ea58ec2eece16b56a5042cc72c1b4f8d4455ae6fcb7COPYINGpackage/criu/criu.mk new file +63
-0@@ -0,0 +1,71 @@ +################################################################################ +# +# CRIU +# +################################################################################ + +CRIU_VERSION = 3.18 +CRIU_SITE = $(call github,checkpoint-restore,criu,v$(CRIU_VERSION)) + +CRIU_LICENSE = GPL-2.0 +CRIU_LICENSE_FILES = COPYING +CRIU_DEPENDENCIES =\ + host-pkgconf \ + host-protobuf-c \ + host-python3 \ + host-python-pip \ + libaio \ + libbsd \ + libcap \ + libnet \ + libnl \ + protobuf \ + protobuf-c \ + python3 + +CRIU_MAKE_ENV =\ + $(TARGET_MAKE_ENV) \ + $(TARGET_CONFIGURE_OPTS) \ + CROSS_COMPILE=$(TARGET_CROSS) \ + WERROR=0 + +#Remap to match the used in criu. +ifeq ($(BR2_NORMALIZED_ARCH),"x86_64") +CRIU_MAKE_ENV += ARCH=x86 +else ifeq ($(BR2_NORMALIZED_ARCH),"powerpc") +CRIU_MAKE_ENV += ARCH=ppc64 +else ifeq ($(BR2_NORMALIZED_ARCH),"arm64") +CRIU_MAKE_ENV += ARCH=aarch64 +else +CRIU_MAKE_ENV += ARCH=$(BR2_NORMALIZED_ARCH) +endif + +ifeq ($(BR2_ARM_CPU_ARMV6), y) +CRIU_MAKE_ENV += SUBARCH=armv6 +else ifeq ($(BR2_ARM_CPU_ARMV7A), y) +CRIU_MAKE_ENV += SUBARCH=armv7 +else ifeq ($(BR2_ARM_CPU_ARMV7M), y) +CRIU_MAKE_ENV += SUBARCH=armv7 +else ifeq ($(BR2_ARM_CPU_ARMV8A), y) +CRIU_MAKE_ENV += SUBARCH=armv8 +else ifeq ($(BR2_ARM_CPU_ARMV8M), y) +CRIU_MAKE_ENV += SUBARCH=armv8 +endif + +# Criu needs Kernel Checkpoint/restore support which is not enabled +# by default. +define CRIU_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_CHECKPOINT_RESTORE) +endef + +define CRIU_BUILD_CMDS + rm -rf $(@D)/images/google/protobuf/descriptor.proto + ln -s $(STAGING_DIR)/usr/include/google/protobuf/descriptor.proto$(@D)/images/google/protobuf/descriptor.proto
package/criu/criu.mk new file +5
-0+ $(CRIU_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define CRIU_INSTALL_TARGET_CMDS + $(CRIU_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D)install-criu install-lib install-compel
package/criu/criu.mk new file +3
-1+endef + +$(eval $(generic-package)) --
Quoted 1 line
2.42.0
Best regards,
Julien.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot