From 0dbc4a9266a677cdc8ae541f792e06e71d9f02a6 Mon Sep 17 00:00:00 2001 From: LongyuZhang Date: Wed, 13 Dec 2023 15:12:59 -0500 Subject: [PATCH] Remove CRIU zlinux libc package install (#4924) - Since zlinux ubu22 has added support for glibc, remove previous temporary solution Signed-off-by: LongyuZhang --- external/dockerfile_functions.sh | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/external/dockerfile_functions.sh b/external/dockerfile_functions.sh index 4b8ff1c6a5..628385b667 100755 --- a/external/dockerfile_functions.sh +++ b/external/dockerfile_functions.sh @@ -402,19 +402,6 @@ print_criu_install() { "\n\t&& criu -V " \ "\n" >> ${file} - # zlinux temporarily requires libc package from jammy-proposed repository - if [[ "${platform}" == *"390"* ]]; then - echo -e "\nRUN echo \"deb http://ports.ubuntu.com/ubuntu-ports jammy-proposed restricted main multiverse universe\" >> /etc/apt/sources.list.d/ubuntu-jammy-proposed.list \\" \ - "\n\t&& echo \"# Configure apt to allow selective installs of packages from proposed\" > /etc/apt/preferences.d/proposed-updates \\" \ - "\n\t&& echo \"Package: libc6*\" >> /etc/apt/preferences.d/proposed-updates \\" \ - "\n\t&& echo \"Pin: release a=jammy-proposed\" >> /etc/apt/preferences.d/proposed-updates \\" \ - "\n\t&& echo \"Pin-Priority: 400\" >> /etc/apt/preferences.d/proposed-updates \\" \ - "\n\t&& apt-get update \\" \ - "\n\t&& apt-get install -y libc6=2.35-0ubuntu3.4 \\" \ - "\n\t&& /lib/ld64.so.1 --list-tunables " \ - "\n" >> ${file} - fi - 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}