* [Buildroot] [PATCH v6] package/criu: new package
@ 2023-11-01 15:22 Marcus Folkesson
2023-11-01 17:31 ` Yann E. MORIN
0 siblings, 1 reply; 2+ messages in thread
From: Marcus Folkesson @ 2023-11-01 15:22 UTC (permalink / raw)
To: buildroot, Thomas Petazzoni, Julien Olivain; +Cc: 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 <marcus.folkesson@gmail.com>
---
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
v6:
- Replace dependency BR2_HOST_GCC_AT_LEAST_8 with BR2_TOOLCHAIN_GCC_AT_LEAST_8
- Remove dependency BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
- Reflect changes in comment
DEVELOPERS | 1 +
package/Config.in | 1 +
package/criu/Config.in | 53 +++++++++++++++++++++++++++++++
package/criu/criu.hash | 3 ++
package/criu/criu.mk | 71 ++++++++++++++++++++++++++++++++++++++++++
5 files changed, 129 insertions(+)
create mode 100644 package/criu/Config.in
create mode 100644 package/criu/criu.hash
create mode 100644 package/criu/criu.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 57015e245e..2047827bd9 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -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 <marcus.folkesson@gmail.com>
+F: package/criu/
F: package/libcamera/
F: package/libcamera-apps/
F: package/libostree/
diff --git a/package/Config.in b/package/Config.in
index 4e489c4706..9e2099f6a5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/criu/Config.in b/package/criu/Config.in
new file mode 100644
index 0000000000..fbc66d322b
--- /dev/null
+++ b/package/criu/Config.in
@@ -0,0 +1,53 @@
+# criu only builds on certain architectures
+config BR2_PACKAGE_CRIU_ARCH_SUPPORTS
+ bool
+ default y if BR2_ARM_CPU_ARMV6
+ 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
+ #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_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_GCC_AT_LEAST_8 # -march=armv7-a+fp
+ depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, libnl
+ 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
+ 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 glibc or musl toolchain w/ threads, gcc >= 8, headers >= 4.18, dynamic library, wchar"
+ depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || !BR2_TOOLCHAIN_HAS_THREADS \
+ || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 \
+ || BR2_TOOLCHAIN_USES_UCLIBC \
+ || BR2_STATIC_LIBS || !BR2_USE_WCHAR
diff --git a/package/criu/criu.hash b/package/criu/criu.hash
new file mode 100644
index 0000000000..2c4a07252b
--- /dev/null
+++ b/package/criu/criu.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 6a9997981c9fe4730c848ce59346b3a22fad69b803607cb67a3f6ec0557fa474 criu-3.18.tar.gz
+sha256 568a1fa9d90e18a1a1a61ea58ec2eece16b56a5042cc72c1b4f8d4455ae6fcb7 COPYING
diff --git a/package/criu/criu.mk b/package/criu/criu.mk
new file mode 100644
index 0000000000..9814e4a0de
--- /dev/null
+++ b/package/criu/criu.mk
@@ -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
+ $(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
+endef
+
+$(eval $(generic-package))
--
2.42.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Buildroot] [PATCH v6] package/criu: new package
2023-11-01 15:22 [Buildroot] [PATCH v6] package/criu: new package Marcus Folkesson
@ 2023-11-01 17:31 ` Yann E. MORIN
0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2023-11-01 17:31 UTC (permalink / raw)
To: Marcus Folkesson; +Cc: Julien Olivain, Thomas Petazzoni, buildroot
Marcus, All,
On 2023-11-01 16:22 +0100, Marcus Folkesson spake thusly:
> 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 <marcus.folkesson@gmail.com>
$ ./utils/docker-run make check-package
package/criu/Config.in:8: BR2_ARM_CPU_ARMV8M referenced but not defined
package/criu/Config.in:13: BR2_BR2_powerpc64le referenced but not defined
package/criu/criu.mk:51: BR2_ARM_CPU_ARMV8M referenced but not defined
Indeed, BR2_ARM_CPU_ARMV8M does not exist at all in Buildroot: we (so
far) do not have support for non-A armv8.
BR2_BR2_powerpc64le is just a typo (who am I to complain about typoes?).
I fixed those, and did quite some changes too:
- BR2_ARM_CPU_ARMV8M does not exist
- BR2_BR2_powerpc64le misspelled
- move all arch dependencies to BR2_PACKAGE_CRIU_ARCH_SUPPORTS
- comment hidden with arch dependencies
- select host-python3, don't depend on it
- extend legal-info: LPLG-2.1 for lib/, MIT for images/
- PREFIX is also used at compile time for PLUGINDIR
- copy .proto file, rather than symlinking
- wrap long lines
Please have a look at the resulting package and check I did not totally
bork it.
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
>
> 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
>
> v6:
> - Replace dependency BR2_HOST_GCC_AT_LEAST_8 with BR2_TOOLCHAIN_GCC_AT_LEAST_8
> - Remove dependency BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
> - Reflect changes in comment
>
> DEVELOPERS | 1 +
> package/Config.in | 1 +
> package/criu/Config.in | 53 +++++++++++++++++++++++++++++++
> package/criu/criu.hash | 3 ++
> package/criu/criu.mk | 71 ++++++++++++++++++++++++++++++++++++++++++
> 5 files changed, 129 insertions(+)
> create mode 100644 package/criu/Config.in
> create mode 100644 package/criu/criu.hash
> create mode 100644 package/criu/criu.mk
>
> diff --git a/DEVELOPERS b/DEVELOPERS
> index 57015e245e..2047827bd9 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -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 <marcus.folkesson@gmail.com>
> +F: package/criu/
> F: package/libcamera/
> F: package/libcamera-apps/
> F: package/libostree/
> diff --git a/package/Config.in b/package/Config.in
> index 4e489c4706..9e2099f6a5 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -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"
> diff --git a/package/criu/Config.in b/package/criu/Config.in
> new file mode 100644
> index 0000000000..fbc66d322b
> --- /dev/null
> +++ b/package/criu/Config.in
> @@ -0,0 +1,53 @@
> +# criu only builds on certain architectures
> +config BR2_PACKAGE_CRIU_ARCH_SUPPORTS
> + bool
> + default y if BR2_ARM_CPU_ARMV6
> + 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
> + #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_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_GCC_AT_LEAST_8 # -march=armv7-a+fp
> + depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, libnl
> + 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
> + 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 glibc or musl toolchain w/ threads, gcc >= 8, headers >= 4.18, dynamic library, wchar"
> + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || !BR2_TOOLCHAIN_HAS_THREADS \
> + || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 \
> + || BR2_TOOLCHAIN_USES_UCLIBC \
> + || BR2_STATIC_LIBS || !BR2_USE_WCHAR
> diff --git a/package/criu/criu.hash b/package/criu/criu.hash
> new file mode 100644
> index 0000000000..2c4a07252b
> --- /dev/null
> +++ b/package/criu/criu.hash
> @@ -0,0 +1,3 @@
> +# Locally calculated
> +sha256 6a9997981c9fe4730c848ce59346b3a22fad69b803607cb67a3f6ec0557fa474 criu-3.18.tar.gz
> +sha256 568a1fa9d90e18a1a1a61ea58ec2eece16b56a5042cc72c1b4f8d4455ae6fcb7 COPYING
> diff --git a/package/criu/criu.mk b/package/criu/criu.mk
> new file mode 100644
> index 0000000000..9814e4a0de
> --- /dev/null
> +++ b/package/criu/criu.mk
> @@ -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
> + $(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
> +endef
> +
> +$(eval $(generic-package))
> --
> 2.42.0
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-11-01 17:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-01 15:22 [Buildroot] [PATCH v6] package/criu: new package Marcus Folkesson
2023-11-01 17:31 ` Yann E. MORIN
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.