From 5b29761e7bcb4ef4b15afb983a25e08b24726023 Mon Sep 17 00:00:00 2001 From: "Zheng, Qi" Date: Fri, 23 Sep 2022 09:08:10 +0800 Subject: [PATCH] [toolchain] Fix glibc deb package link path error --- tools/installer/deb/toolchains/glibc/rules | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/tools/installer/deb/toolchains/glibc/rules b/tools/installer/deb/toolchains/glibc/rules index e4b070aa..27a6b7eb 100755 --- a/tools/installer/deb/toolchains/glibc/rules +++ b/tools/installer/deb/toolchains/glibc/rules @@ -28,30 +28,26 @@ prepare_glibc: rm -rf $(tmp_build_dir) rm -rf $(install_dir) mkdir -p $(src_dir) - cd $(src_dir) - git clone -b occlum-glibc-2.31 https://github.com/occlum/glibc . + mkdir -p $(install_dir) override_dh_auto_build: prepare_glibc - mkdir -p $(tmp_build_dir)/build - cd $(tmp_build_dir)/build - unset LD_LIBRARY_PATH - ${src_dir}/configure \ - --prefix=${install_dir} --with-tls --without-selinux \ - --disable-nscd - make + echo "skip override_dh_auto_build" # We create symlinks in /usr/local override_dh_usrlocal: - echo "Skip ..." + echo "Skip override_dh_usrlocal" override_dh_fixperms: dh_fixperms + # Occlum need this to be executable + chmod 755 $(install_dir)/lib/ld-2.31.so + chmod 755 $(install_dir)/lib/libc.so.6 override_dh_install: - cd $(tmp_build_dir)/build - make install + mkdir -p $(install_dir) + cp -rf /opt/occlum/glibc/* $(install_dir)/ clean: dh_clean