From 5532837daba00b0da1a5f85c9fbcd9da908ffd57 Mon Sep 17 00:00:00 2001 From: LongyuZhang Date: Fri, 1 Sep 2023 18:48:20 -0400 Subject: [PATCH] Update ibm criu repo branch and package (#4742) - Update ibm criu repo branch and package Signed-off-by: LongyuZhang --- external/dockerfile_functions.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/external/dockerfile_functions.sh b/external/dockerfile_functions.sh index 384ba63306..e855e22d77 100755 --- a/external/dockerfile_functions.sh +++ b/external/dockerfile_functions.sh @@ -388,7 +388,7 @@ print_criu_install() { # Method 2: build from source code echo -e "\n# Install dependent packages for criu" \ "\nRUN apt-get update \\" \ - "\n\t&& apt-get install -y --no-install-recommends iptables libbsd-dev libcap-dev libdrm-dev libnet1-dev libgnutls28-dev libgnutls30 libnftables-dev libnl-3-dev libprotobuf-dev python3-distutils protobuf-c-compiler protobuf-compiler xmlto libssl-dev python3-future libxt-dev libfontconfig1-dev python3-protobuf nftables libcups2-dev libasound2-dev libxtst-dev libexpat1-dev libfontconfig libaio-dev libffi-dev libx11-dev libprotobuf-c-dev libnuma-dev libfreetype6-dev libxrandr-dev libxrender-dev libelf-dev libxext-dev libdwarf-dev" \ + "\n\t&& apt-get install -y --no-install-recommends gcc iptables libbsd-dev libcap-dev libdrm-dev libnet1-dev libgnutls28-dev libgnutls30 libnftables-dev libnl-3-dev libprotobuf-dev python3-distutils pip protobuf-c-compiler protobuf-compiler xmlto libssl-dev python3-future libxt-dev libfontconfig1-dev python3-protobuf nftables libcups2-dev libasound2-dev libxtst-dev libexpat1-dev libfontconfig libaio-dev libffi-dev libx11-dev libprotobuf-c-dev libnuma-dev libfreetype6-dev libxrandr-dev libxrender-dev libelf-dev libxext-dev libdwarf-dev" \ "\n" >> ${file} echo -e "\n# Build criu and set capabilities" \ @@ -397,10 +397,11 @@ print_criu_install() { "\n\t&& git clone https://github.com/ibmruntimes/criu.git \\" \ "\n\t&& cd criu \\" \ "\n\t&& git fetch origin \\" \ - "\n\t&& git reset --hard origin/march_ea_23 \\" \ + "\n\t&& git reset --hard origin/0.40-release \\" \ "\n\t&& make PREFIX=/usr install \\" \ - "\n\t&& criu -V \\" \ - "\n\t&& setcap cap_checkpoint_restore,cap_chown,cap_dac_override,cap_dac_read_search,cap_fowner,cap_fsetid,cap_kill,cap_setgid,cap_setuid,cap_setpcap,cap_net_admin,cap_sys_chroot,cap_sys_ptrace,cap_sys_admin,cap_sys_resource,cap_sys_time,cap_audit_control=eip /usr/sbin/criu \\" \ + "\n\t&& criu -V " \ + "\n" >> ${file} + echo -e "\nRUN setcap cap_checkpoint_restore,cap_chown,cap_dac_override,cap_dac_read_search,cap_fowner,cap_fsetid,cap_kill,cap_setgid,cap_setuid,cap_setpcap,cap_net_admin,cap_sys_chroot,cap_sys_ptrace,cap_sys_admin,cap_sys_resource,cap_sys_time,cap_audit_control=eip /usr/sbin/criu \\" \ "\n\t&& export GLIBC_TUNABLES=glibc.pthread.rseq=0:glibc.cpu.hwcaps=-XSAVEC,-XSAVE,-AVX2,-ERMS,-AVX,-AVX_Fast_Unaligned_Load" \ "\n" >> ${file} fi