Skip to content

Commit 0dbc4a9

Browse files
authored
Remove CRIU zlinux libc package install (#4924)
- Since zlinux ubu22 has added support for glibc, remove previous temporary solution Signed-off-by: LongyuZhang <[email protected]>
1 parent 9811156 commit 0dbc4a9

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

external/dockerfile_functions.sh

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -402,19 +402,6 @@ print_criu_install() {
402402
"\n\t&& criu -V " \
403403
"\n" >> ${file}
404404

405-
# zlinux temporarily requires libc package from jammy-proposed repository
406-
if [[ "${platform}" == *"390"* ]]; then
407-
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 \\" \
408-
"\n\t&& echo \"# Configure apt to allow selective installs of packages from proposed\" > /etc/apt/preferences.d/proposed-updates \\" \
409-
"\n\t&& echo \"Package: libc6*\" >> /etc/apt/preferences.d/proposed-updates \\" \
410-
"\n\t&& echo \"Pin: release a=jammy-proposed\" >> /etc/apt/preferences.d/proposed-updates \\" \
411-
"\n\t&& echo \"Pin-Priority: 400\" >> /etc/apt/preferences.d/proposed-updates \\" \
412-
"\n\t&& apt-get update \\" \
413-
"\n\t&& apt-get install -y libc6=2.35-0ubuntu3.4 \\" \
414-
"\n\t&& /lib/ld64.so.1 --list-tunables " \
415-
"\n" >> ${file}
416-
fi
417-
418405
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 \\" \
419406
"\n\t&& export GLIBC_TUNABLES=glibc.pthread.rseq=0:glibc.cpu.hwcaps=-XSAVEC,-XSAVE,-AVX2,-ERMS,-AVX,-AVX_Fast_Unaligned_Load" \
420407
"\n" >> ${file}

0 commit comments

Comments
 (0)