diff --git a/driver/build_script/aarch64/batch_compile.sh b/driver/build_script/aarch64/batch_compile.sh index 199310206..bea6658ac 100644 --- a/driver/build_script/aarch64/batch_compile.sh +++ b/driver/build_script/aarch64/batch_compile.sh @@ -1,5 +1,6 @@ #!/bin/bash mkdir -p /ko_output +rm -rf /ko_output || true BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '"' '{print $2}') KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}') UBUNTU_OR_DEBIAN_FLAG=$(cat /etc/*release | grep -iE "ubuntu|debian") diff --git a/driver/build_script/aarch64/batch_compile_el7.sh b/driver/build_script/aarch64/batch_compile_el7.sh index 6520c8feb..975754a3f 100644 --- a/driver/build_script/aarch64/batch_compile_el7.sh +++ b/driver/build_script/aarch64/batch_compile_el7.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -rf /ko_output || true mkdir -p /ko_output BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '"' '{print $2}') KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}') diff --git a/driver/build_script/aarch64/batch_compile_el8.sh b/driver/build_script/aarch64/batch_compile_el8.sh index 0c546b2f5..305e5d42b 100644 --- a/driver/build_script/aarch64/batch_compile_el8.sh +++ b/driver/build_script/aarch64/batch_compile_el8.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -rf /ko_output || true mkdir -p /ko_output BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '"' '{print $2}') KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}') diff --git a/driver/build_script/aarch64/batch_compile_ol8_uek.sh b/driver/build_script/aarch64/batch_compile_ol8_uek.sh index 305298866..7901168bb 100644 --- a/driver/build_script/aarch64/batch_compile_ol8_uek.sh +++ b/driver/build_script/aarch64/batch_compile_ol8_uek.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -rf /ko_output || true mkdir -p /ko_output BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '"' '{print $2}') KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}') diff --git a/driver/build_script/gen_ci_from_dockerfiles.py b/driver/build_script/gen_ci_from_dockerfiles.py index 26515714a..d6a263552 100644 --- a/driver/build_script/gen_ci_from_dockerfiles.py +++ b/driver/build_script/gen_ci_from_dockerfiles.py @@ -182,17 +182,17 @@ def gen_job(vminfo): OrderedDict({ "name": "Prepare artifact 2-1 ko", - "run": "mv -f ~/all_elkeid_drivers/*/*.ko elkeid_driver/ko || true" + "run": "BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '\"' '{print $2}') mv -f ~/all_elkeid_drivers/*/*$BUILD_VERSION*.ko elkeid_driver/ko || true" }), OrderedDict({ "name": "Prepare artifact 2-2 sign", - "run": "mv -f ~/all_elkeid_drivers/*/*.sign elkeid_driver/ko || true" + "run": "BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '\"' '{print $2}') mv -f ~/all_elkeid_drivers/*/*$BUILD_VERSION*.sign elkeid_driver/ko || true" }), OrderedDict({ "name": "Prepare artifact 2-3 log", - "run": "mv -f ~/all_elkeid_drivers/*/*.log elkeid_driver/log || true" + "run": "BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '\"' '{print $2}') mv -f ~/all_elkeid_drivers/*/*$BUILD_VERSION*.log elkeid_driver/log || true" }), OrderedDict({ diff --git a/driver/build_script/x86_64/batch_compile.sh b/driver/build_script/x86_64/batch_compile.sh index b84417c07..be821dc2b 100644 --- a/driver/build_script/x86_64/batch_compile.sh +++ b/driver/build_script/x86_64/batch_compile.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -rf /ko_output || true mkdir -p /ko_output BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '"' '{print $2}') KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}') diff --git a/driver/build_script/x86_64/batch_compile_el7.sh b/driver/build_script/x86_64/batch_compile_el7.sh index f8bba139a..6a404bb29 100644 --- a/driver/build_script/x86_64/batch_compile_el7.sh +++ b/driver/build_script/x86_64/batch_compile_el7.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -rf /ko_output || true mkdir -p /ko_output BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '"' '{print $2}') KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}') diff --git a/driver/build_script/x86_64/batch_compile_el7_centosplus.sh b/driver/build_script/x86_64/batch_compile_el7_centosplus.sh index 6245c0020..307d5d321 100644 --- a/driver/build_script/x86_64/batch_compile_el7_centosplus.sh +++ b/driver/build_script/x86_64/batch_compile_el7_centosplus.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -rf /ko_output || true mkdir -p /ko_output BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '"' '{print $2}') KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}') diff --git a/driver/build_script/x86_64/batch_compile_el8_plus.sh b/driver/build_script/x86_64/batch_compile_el8_plus.sh index 2fa0bf618..c92cd73fc 100644 --- a/driver/build_script/x86_64/batch_compile_el8_plus.sh +++ b/driver/build_script/x86_64/batch_compile_el8_plus.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -rf /ko_output || true mkdir -p /ko_output BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '"' '{print $2}') KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}') diff --git a/driver/build_script/x86_64/batch_compile_elrepo6.sh b/driver/build_script/x86_64/batch_compile_elrepo6.sh index c5a7355d3..d00c0b1f8 100644 --- a/driver/build_script/x86_64/batch_compile_elrepo6.sh +++ b/driver/build_script/x86_64/batch_compile_elrepo6.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -rf /ko_output || true mkdir -p /ko_output BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '"' '{print $2}') KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}') diff --git a/driver/build_script/x86_64/batch_compile_elrepo7_lt.sh b/driver/build_script/x86_64/batch_compile_elrepo7_lt.sh index 233b4b507..080e3e94d 100644 --- a/driver/build_script/x86_64/batch_compile_elrepo7_lt.sh +++ b/driver/build_script/x86_64/batch_compile_elrepo7_lt.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -rf /ko_output || true mkdir -p /ko_output BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '"' '{print $2}') KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}') diff --git a/driver/build_script/x86_64/batch_compile_elrepo7_lt_archive.sh b/driver/build_script/x86_64/batch_compile_elrepo7_lt_archive.sh index b511203cb..2dc521201 100644 --- a/driver/build_script/x86_64/batch_compile_elrepo7_lt_archive.sh +++ b/driver/build_script/x86_64/batch_compile_elrepo7_lt_archive.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -rf /ko_output || true mkdir -p /ko_output BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '"' '{print $2}') KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}') diff --git a/driver/build_script/x86_64/batch_compile_elrepo7_ml.sh b/driver/build_script/x86_64/batch_compile_elrepo7_ml.sh index d75036e27..b06905035 100644 --- a/driver/build_script/x86_64/batch_compile_elrepo7_ml.sh +++ b/driver/build_script/x86_64/batch_compile_elrepo7_ml.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -rf /ko_output || true mkdir -p /ko_output BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '"' '{print $2}') KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}') diff --git a/driver/build_script/x86_64/batch_compile_elrepo7_ml_archive.sh b/driver/build_script/x86_64/batch_compile_elrepo7_ml_archive.sh index 51866fb98..c3aa82f3d 100644 --- a/driver/build_script/x86_64/batch_compile_elrepo7_ml_archive.sh +++ b/driver/build_script/x86_64/batch_compile_elrepo7_ml_archive.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -rf /ko_output || true mkdir -p /ko_output BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '"' '{print $2}') KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}') diff --git a/driver/build_script/x86_64/batch_compile_elrepo8_lt.sh b/driver/build_script/x86_64/batch_compile_elrepo8_lt.sh index c5c5a9cc0..26d0018fc 100644 --- a/driver/build_script/x86_64/batch_compile_elrepo8_lt.sh +++ b/driver/build_script/x86_64/batch_compile_elrepo8_lt.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -rf /ko_output || true mkdir -p /ko_output BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '"' '{print $2}') KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}') diff --git a/driver/build_script/x86_64/batch_compile_elrepo8_ml.sh b/driver/build_script/x86_64/batch_compile_elrepo8_ml.sh index 5c499902e..52f0201f6 100644 --- a/driver/build_script/x86_64/batch_compile_elrepo8_ml.sh +++ b/driver/build_script/x86_64/batch_compile_elrepo8_ml.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -rf /ko_output || true mkdir -p /ko_output BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '"' '{print $2}') KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}') diff --git a/driver/build_script/x86_64/batch_compile_ol8_uek.sh b/driver/build_script/x86_64/batch_compile_ol8_uek.sh index 241efa436..e7a70848d 100644 --- a/driver/build_script/x86_64/batch_compile_ol8_uek.sh +++ b/driver/build_script/x86_64/batch_compile_ol8_uek.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -rf /ko_output || true mkdir -p /ko_output BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '"' '{print $2}') KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}') diff --git a/driver/build_script/x86_64/batch_compile_tencentos.sh b/driver/build_script/x86_64/batch_compile_tencentos.sh index 5bc40341c..f011ecb93 100644 --- a/driver/build_script/x86_64/batch_compile_tencentos.sh +++ b/driver/build_script/x86_64/batch_compile_tencentos.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -rf /ko_output || true mkdir -p /ko_output BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '"' '{print $2}') KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}') diff --git a/driver/dockerfiles.aarch64/Dockerfile.aliyun_linux3 b/driver/dockerfiles.aarch64/Dockerfile.aliyun_linux3 index 431cc36a1..fadedb04c 100644 --- a/driver/dockerfiles.aarch64/Dockerfile.aliyun_linux3 +++ b/driver/dockerfiles.aarch64/Dockerfile.aliyun_linux3 @@ -4,6 +4,7 @@ CMD [ "sh", "-c", "echo start" ] RUN sed -i "s/enabled=0/enabled=1/g" /etc/yum.repos.d/AliYun.repo; RUN dnf install -y wget perl gcc make tree elfutils-libelf-devel; RUN dnf groupinstall -y "Development Tools"; +RUN rm -rf /root/headers || true RUN mkdir /root/headers RUN for each_tag in `dnf --showduplicates list kernel-devel | grep kernel-devel | awk -c '{print $2}'`; do dnf -y install --downloadonly --downloaddir=/root/headers kernel-devel-$each_tag.aarch64; done RUN rpm --force -i /root/headers/*.rpm || true diff --git a/driver/dockerfiles.aarch64/Dockerfile.ol8_uek b/driver/dockerfiles.aarch64/Dockerfile.ol8_uek index 6d99e6141..f9fb6cbc1 100644 --- a/driver/dockerfiles.aarch64/Dockerfile.ol8_uek +++ b/driver/dockerfiles.aarch64/Dockerfile.ol8_uek @@ -6,7 +6,7 @@ RUN dnf install -y wget perl gcc make tree elfutils-libelf-devel gnutls-utils pc RUN dnf install -y wget perl gcc make tree openssl-devel openssl gcc-toolset-11 gcc-toolset-11-binutils-devel binutils-devel gcc-toolset-11-elfutils-libelf-devel; RUN dnf groupinstall -y "Development Tools"; - +RUN rm -rf /root/headers || true RUN mkdir /root/headers RUN dnf config-manager --set-enable ol8_UEKR7 diff --git a/driver/dockerfiles.aarch64/Dockerfile.rhel7 b/driver/dockerfiles.aarch64/Dockerfile.rhel7 index 2989b19ca..1df715f7f 100644 --- a/driver/dockerfiles.aarch64/Dockerfile.rhel7 +++ b/driver/dockerfiles.aarch64/Dockerfile.rhel7 @@ -5,7 +5,7 @@ RUN yum install -y wget perl gcc make tree elfutils-libelf-devel yumdownloader g RUN yum groupinstall -y "Development Tools"; RUN yum install -y centos-release-scl RUN yum install -y devtoolset-8 - +RUN rm -rf /root/headers || true RUN mkdir /root/headers ADD . /elkeid diff --git a/driver/dockerfiles.aarch64/Dockerfile.rhel8 b/driver/dockerfiles.aarch64/Dockerfile.rhel8 index 324eb3ba7..2cdb838e1 100644 --- a/driver/dockerfiles.aarch64/Dockerfile.rhel8 +++ b/driver/dockerfiles.aarch64/Dockerfile.rhel8 @@ -5,7 +5,7 @@ RUN dnf install -y wget perl gcc make tree elfutils-libelf-devel yumdownloader g RUN dnf groupinstall -y "Development Tools"; RUN dnf install -y centos-release-scl RUN dnf install -y devtoolset-8 - +RUN rm -rf /root/headers || true RUN mkdir /root/headers ADD . /elkeid diff --git a/driver/dockerfiles.x86_64/Dockerfile.aliyun_linux2 b/driver/dockerfiles.x86_64/Dockerfile.aliyun_linux2 index 2557228c7..01bdd4290 100644 --- a/driver/dockerfiles.x86_64/Dockerfile.aliyun_linux2 +++ b/driver/dockerfiles.x86_64/Dockerfile.aliyun_linux2 @@ -4,6 +4,7 @@ CMD [ "sh", "-c", "echo start" ] RUN sed -i "s/enabled=0/enabled=1/g" /etc/yum.repos.d/AliYun.repo; RUN yum install -y wget perl gcc make tree elfutils-libelf-devel yumdownloader; RUN yum groupinstall -y "Development Tools"; +RUN rm -rf /root/headers || true RUN mkdir /root/headers RUN for each_tag in `yum --showduplicates list kernel-devel | grep kernel-devel | awk -c '{print $2}'`; do yumdownloader --destdir /root/headers kernel-devel-$each_tag.x86_64; done RUN rpm --force -i /root/headers/*.rpm || true diff --git a/driver/dockerfiles.x86_64/Dockerfile.aliyun_linux3 b/driver/dockerfiles.x86_64/Dockerfile.aliyun_linux3 index e20e25052..eb78cdf5f 100644 --- a/driver/dockerfiles.x86_64/Dockerfile.aliyun_linux3 +++ b/driver/dockerfiles.x86_64/Dockerfile.aliyun_linux3 @@ -4,6 +4,7 @@ CMD [ "sh", "-c", "echo start" ] RUN sed -i "s/enabled=0/enabled=1/g" /etc/yum.repos.d/AliYun.repo; RUN dnf install -y wget perl gcc make tree elfutils-libelf-devel; RUN dnf groupinstall -y "Development Tools"; +RUN rm -rf /root/headers || true RUN mkdir /root/headers RUN for each_tag in `dnf --showduplicates list kernel-devel | grep kernel-devel | awk -c '{print $2}'`; do dnf -y install --downloadonly --downloaddir=/root/headers kernel-devel-$each_tag.x86_64; done RUN rpm --force -i /root/headers/*.rpm || true diff --git a/driver/dockerfiles.x86_64/Dockerfile.almalinux8 b/driver/dockerfiles.x86_64/Dockerfile.almalinux8 index 3372c02b7..70b1b6ccb 100644 --- a/driver/dockerfiles.x86_64/Dockerfile.almalinux8 +++ b/driver/dockerfiles.x86_64/Dockerfile.almalinux8 @@ -4,6 +4,7 @@ CMD [ "sh", "-c", "echo start" ] RUN sed -i "s/enabled=0/enabled=1/g" /etc/yum.repos.d/almalinux*.repo; RUN dnf install -y wget perl gcc make tree elfutils-libelf-devel; RUN dnf groupinstall -y "Development Tools"; +RUN rm -rf /root/headers || true RUN mkdir /root/headers RUN cd /root/headers; \ diff --git a/driver/dockerfiles.x86_64/Dockerfile.anolis8 b/driver/dockerfiles.x86_64/Dockerfile.anolis8 index ed6e18cc6..d171938e6 100644 --- a/driver/dockerfiles.x86_64/Dockerfile.anolis8 +++ b/driver/dockerfiles.x86_64/Dockerfile.anolis8 @@ -4,19 +4,20 @@ CMD [ "sh", "-c", "echo start" ] RUN sed -i "s/enabled=0/enabled=1/g" /etc/yum.repos.d/almalinux*.repo; RUN dnf install -y wget perl gcc make tree elfutils-libelf-devel; RUN dnf groupinstall -y "Development Tools"; +RUN rm -rf /root/headers || true RUN mkdir /root/headers RUN cd /root/headers; \ - wget -q -k -e robots=off -c -r -np -nd -nH -A 'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.2/BaseOS/x86_64/os/Packages/'; \ - wget -q -k -e robots=off -c -r -np -nd -nH -A 'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.2/Plus/x86_64/os/Packages/'; \ - wget -q -k -e robots=off -c -r -np -nd -nH -A 'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.4/BaseOS/x86_64/os/Packages/'; \ - wget -q -k -e robots=off -c -r -np -nd -nH -A 'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.4/Plus/x86_64/os/Packages/'; \ - wget -q -k -e robots=off -c -r -np -nd -nH -A 'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.5/BaseOS/x86_64/os/Packages/'; \ - wget -q -k -e robots=off -c -r -np -nd -nH -A 'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.5/Plus/x86_64/os/Packages/'; \ - wget -q -k -e robots=off -c -r -np -nd -nH -A 'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.6/BaseOS/x86_64/os/Packages/'; \ - wget -q -k -e robots=off -c -r -np -nd -nH -A 'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.6/Plus/x86_64/os/Packages/'; \ - wget -q -k -e robots=off -c -r -np -nd -nH -A 'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.8/BaseOS/x86_64/os/Packages/'; \ - wget -q -k -e robots=off -c -r -np -nd -nH -A 'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.8/Plus/x86_64/os/Packages/'; + wget -q -k -e robots=off -c -r -np -nd -nH -A 'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.2/BaseOS/x86_64/os/Packages/'; \ + wget -q -k -e robots=off -c -r -np -nd -nH -A 'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.2/Plus/x86_64/os/Packages/'; \ + wget -q -k -e robots=off -c -r -np -nd -nH -A 'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.4/BaseOS/x86_64/os/Packages/'; \ + wget -q -k -e robots=off -c -r -np -nd -nH -A 'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.4/Plus/x86_64/os/Packages/'; \ + wget -q -k -e robots=off -c -r -np -nd -nH -A 'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.5/BaseOS/x86_64/os/Packages/'; \ + wget -q -k -e robots=off -c -r -np -nd -nH -A 'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.5/Plus/x86_64/os/Packages/'; \ + wget -q -k -e robots=off -c -r -np -nd -nH -A 'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.6/BaseOS/x86_64/os/Packages/'; \ + wget -q -k -e robots=off -c -r -np -nd -nH -A 'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.6/Plus/x86_64/os/Packages/'; \ + wget -q -k -e robots=off -c -r -np -nd -nH -A 'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.8/BaseOS/x86_64/os/Packages/'; \ + wget -q -k -e robots=off -c -r -np -nd -nH -A 'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.8/Plus/x86_64/os/Packages/'; RUN rpm --force -i /root/headers/*.rpm || true diff --git a/driver/dockerfiles.x86_64/Dockerfile.ol8_uek b/driver/dockerfiles.x86_64/Dockerfile.ol8_uek index 1c6335a3f..9cc0bec60 100644 --- a/driver/dockerfiles.x86_64/Dockerfile.ol8_uek +++ b/driver/dockerfiles.x86_64/Dockerfile.ol8_uek @@ -2,7 +2,7 @@ FROM oraclelinux:8 AS rhel8 RUN dnf install -y wget perl gcc make tree openssl-devel openssl gcc-toolset-11 gcc-toolset-11-binutils-devel binutils-devel gcc-toolset-11-elfutils-libelf-devel; RUN dnf groupinstall -y "Development Tools"; - +RUN rm -rf /root/headers || true RUN mkdir /root/headers RUN dnf config-manager --set-enable ol8_UEKR7 RUN dnf config-manager --set-enable ol8_UEKR6 diff --git a/driver/dockerfiles.x86_64/Dockerfile.rhel6 b/driver/dockerfiles.x86_64/Dockerfile.rhel6 index 92b83cca2..cfe2f5d22 100644 --- a/driver/dockerfiles.x86_64/Dockerfile.rhel6 +++ b/driver/dockerfiles.x86_64/Dockerfile.rhel6 @@ -2,15 +2,15 @@ FROM centos:centos6 AS rhel6 RUN rm -f /etc/yum.repos.d/CentOS-Media.repo RUN sed -e "s|^mirrorlist=|#mirrorlist=|g" \ - -e "s|^#baseurl=http://mirror.centos.org/centos/\$releasever|baseurl=https://mirrors.aliyun.com/centos-vault/6.10|g" \ - -i.bak \ - /etc/yum.repos.d/CentOS-*.repo + -e "s|^#baseurl=http://mirror.centos.org/centos/\$releasever|baseurl=https://mirrors.aliyun.com/centos-vault/6.10|g" \ + -i.bak \ + /etc/yum.repos.d/CentOS-*.repo RUN yum install -y wget perl gcc make tree elfutils-libelf-devel unzip yum-utils; RUN yum groupinstall -y "Development Tools"; RUN sed -i "s/enabled=0/enabled=1/g" /etc/yum.repos.d/*.repo - +RUN rm -rf /root/headers || true RUN mkdir /root/headers RUN for each_tag in `yum --showduplicates list kernel-devel | grep kernel-devel | awk '{print $2}'`; do yumdownloader --destdir /root/headers kernel-devel-$each_tag.x86_64; done diff --git a/driver/dockerfiles.x86_64/Dockerfile.rhel7 b/driver/dockerfiles.x86_64/Dockerfile.rhel7 index 8925e9506..9e461ad32 100644 --- a/driver/dockerfiles.x86_64/Dockerfile.rhel7 +++ b/driver/dockerfiles.x86_64/Dockerfile.rhel7 @@ -7,7 +7,7 @@ RUN yum install -y centos-release-scl RUN yum install -y devtoolset-8 RUN yum install -y devtoolset-9 RUN yum install -y devtoolset-10 - +RUN rm -rf /root/headers || true RUN mkdir /root/headers ADD . /elkeid diff --git a/driver/dockerfiles.x86_64/Dockerfile.rhel7_centosplus b/driver/dockerfiles.x86_64/Dockerfile.rhel7_centosplus index 89a238c49..2dd58a4be 100644 --- a/driver/dockerfiles.x86_64/Dockerfile.rhel7_centosplus +++ b/driver/dockerfiles.x86_64/Dockerfile.rhel7_centosplus @@ -7,7 +7,7 @@ RUN yum install -y centos-release-scl RUN yum install -y devtoolset-8 RUN yum install -y devtoolset-9 RUN yum install -y devtoolset-10 - +RUN rm -rf /root/headers || true RUN mkdir /root/headers ADD . /elkeid diff --git a/driver/dockerfiles.x86_64/Dockerfile.rhel8 b/driver/dockerfiles.x86_64/Dockerfile.rhel8 index 895767c78..1b7281774 100644 --- a/driver/dockerfiles.x86_64/Dockerfile.rhel8 +++ b/driver/dockerfiles.x86_64/Dockerfile.rhel8 @@ -2,6 +2,7 @@ FROM oraclelinux:8 AS rhel8 RUN dnf install -y wget perl gcc make tree elfutils-libelf-devel openssl-devel openssl; RUN dnf groupinstall -y "Development Tools"; +RUN rm -rf /root/headers || true RUN mkdir /root/headers RUN for eachversion in `dnf --showduplicates list kernel-devel | grep kernel-devel.x86_64 | awk '{print $2}'` ; do dnf download --downloaddir=/root/headers kernel-devel-$eachversion.x86_64 || true ; done; diff --git a/driver/dockerfiles.x86_64/Dockerfile.rhel8_plus b/driver/dockerfiles.x86_64/Dockerfile.rhel8_plus index cfc7a6604..928567ea6 100644 --- a/driver/dockerfiles.x86_64/Dockerfile.rhel8_plus +++ b/driver/dockerfiles.x86_64/Dockerfile.rhel8_plus @@ -2,6 +2,7 @@ FROM cern/c8-base:latest AS rhel8 RUN yum install -y wget perl gcc make tree elfutils-libelf-devel pciutils-libs; RUN yum groupinstall -y "Development Tools"; +RUN rm -rf /root/headers || true RUN mkdir /root/headers RUN cd /root/headers; \ diff --git a/driver/dockerfiles.x86_64/Dockerfile.rocky8 b/driver/dockerfiles.x86_64/Dockerfile.rocky8 index b2dabe5d4..29e82d462 100644 --- a/driver/dockerfiles.x86_64/Dockerfile.rocky8 +++ b/driver/dockerfiles.x86_64/Dockerfile.rocky8 @@ -2,6 +2,7 @@ FROM rockylinux:8 AS rockylinux8 RUN yum install -y wget perl gcc make tree elfutils-libelf-devel; RUN yum groupinstall -y "Development Tools"; +RUN rm -rf /root/headers || true RUN mkdir /root/headers WORKDIR /root/headers diff --git a/driver/dockerfiles.x86_64/Dockerfile.rocky9 b/driver/dockerfiles.x86_64/Dockerfile.rocky9 index 4e4101935..1e5bf6488 100644 --- a/driver/dockerfiles.x86_64/Dockerfile.rocky9 +++ b/driver/dockerfiles.x86_64/Dockerfile.rocky9 @@ -3,6 +3,7 @@ FROM rockylinux:9 AS rockylinux9 RUN dnf install -y wget perl gcc make tree elfutils-libelf-devel openssl-devel; RUN yum groupinstall -y "Development Tools"; +RUN rm -rf /root/headers || true RUN mkdir /root/headers WORKDIR /root/headers