Fix repo for opencl-icd, workaround build issues and cherry-pick openssl-qat-engine changes

.github/workflows/lib-publish.yaml

@@ -39,8 +39,8 @@ jobs:
           - intel-xpumanager-sidecar
 
           # # Demo images
-          - crypto-perf
-          - opae-nlb-demo
+          #- crypto-perf
+          #- opae-nlb-demo
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5

demo/accel-config-demo/Dockerfile

@@ -31,7 +31,7 @@ RUN cd / && git clone --recurse-submodules --depth 1 --branch v1.5.0 https://git
 
 FROM debian:unstable-slim
 
-RUN apt-get update && apt-get install -y --no-install-recommends pciutils accel-config accel-config-test && rm -rf /var/lib/apt/lists/\*
+RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends pciutils accel-config accel-config-test kmod && rm -rf /var/lib/apt/lists/\*
 
 RUN sed -i -e '420,429d;480,489d' /usr/libexec/accel-config/test/iaa_user_test_runner.sh
 COPY --from=builder /usr/local /usr/local

demo/crypto-perf/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:sid-slim as builder
+FROM debian:unstable-slim as builder
 
 ARG DIR=/dpdk-build
 WORKDIR $DIR
@@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget build-esse
 ARG DPDK_TARBALL=dpdk-24.03.tar.xz
 ARG DPDK_TARBALL_SHA256="33ed973b3945af4f5923096ddca250b401dc80be3b5c6393b4e4fe43a1a6c2ad"
 
-RUN wget -q https://git.dpdk.org/dpdk/snapshot/$DPDK_TARBALL \
+RUN wget -q https://fast.dpdk.org/rel/$DPDK_TARBALL \
     && echo "$DPDK_TARBALL_SHA256 $DPDK_TARBALL" | sha256sum -c - \
     && tar -xf $DPDK_TARBALL && rm $DPDK_TARBALL
 
@@ -37,8 +37,8 @@ RUN mkdir -p /install_root/licenses/dpdk && \
     cd /install_root/licenses/dpdk && \
     apt-get source --download-only -y libatomic1 libnuma1
 
-FROM debian:sid-slim
-RUN apt-get update && apt-get install -y --no-install-recommends libipsec-mb1 libnuma1 libatomic1 && ldconfig -v
+FROM debian:unstable-slim
+RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends libipsec-mb1 libnuma1 libatomic1 && ldconfig -v
 COPY --from=builder /install_root /
 COPY run-dpdk-test /usr/bin/
 

demo/intel-opencl-icd/Dockerfile

@@ -3,7 +3,7 @@ FROM ubuntu:22.04
 ARG APT="env DEBIAN_FRONTEND=noninteractive apt"
 
 RUN ${APT} update && ${APT} install -y curl gpg-agent \
-    && echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/graphics/ubuntu jammy flex' | \
+    && echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/gpu/ubuntu jammy/lts/2350 unified' | \
        tee -a /etc/apt/sources.list.d/intel.list \
     && curl -s https://repositories.intel.com/graphics/intel-graphics.key | \
        gpg --dearmor --output /usr/share/keyrings/intel-graphics.gpg \

demo/opae-nlb-demo/Dockerfile

@@ -26,7 +26,7 @@ RUN cd /usr/src/opae/opae-sdk-${OPAE_RELEASE} && \
 
 FROM debian:unstable-slim
 
-RUN apt-get update && apt-get install --no-install-recommends -y libjson-c5
+RUN apt-get update && apt-get upgrade -y && apt-get install --no-install-recommends -y libjson-c5
 
 # Copy required nlb* utils and their dependencies to the final image
 COPY --from=builder /usr/src/opae/opae-sdk-*/build/bin/nlb* /usr/local/bin/

demo/openssl-qat-engine/Dockerfile

@@ -1,89 +1,4 @@
-FROM ubuntu:22.04 as builder
-
-ARG QATLIB_VERSION="24.02.0"
-ARG QAT_ENGINE_VERSION="v1.5.0"
-ARG ASYNC_NGINX_VERSION="v0.5.1"
-ARG IPSEC_MB_VERSION="v1.5"
-ARG IPP_CRYPTO_VERSION="ippcp_2021.11.0"
+FROM ubuntu:24.04
 
 RUN apt update && \
-    env DEBIAN_FRONTEND=noninteractive apt install -y \
-    libudev-dev \
-    make \
-    gcc \
-    g++ \
-    nasm \
-    pkg-config \
-    libssl-dev \
-    zlib1g-dev \
-    wget \
-    git \
-    nasm \
-    autoconf \
-    cmake \
-    libtool && \
-    git clone --depth 1 -b $ASYNC_NGINX_VERSION https://github.com/intel/asynch_mode_nginx.git && \
-    git clone --depth 1 -b $QAT_ENGINE_VERSION https://github.com/intel/QAT_Engine && \
-    git clone --depth 1 -b $IPP_CRYPTO_VERSION https://github.com/intel/ipp-crypto && \
-    git clone --depth 1 -b $IPSEC_MB_VERSION https://github.com/intel/intel-ipsec-mb && \
-    git clone --depth 1 -b $QATLIB_VERSION https://github.com/intel/qatlib
-
-RUN cd /qatlib && \
-    ./autogen.sh && \
-    ./configure \
-    --prefix=/usr \
-    --enable-systemd=no && \
-    make -j && \
-    make install samples-install
-
-RUN cd /ipp-crypto/sources/ippcp/crypto_mb && \
-    cmake . -B"../build" \
-    -DOPENSSL_INCLUDE_DIR=/usr/include/openssl \
-    -DOPENSSL_LIBRARIES=/usr/lib64 \
-    -DOPENSSL_ROOT_DIR=/usr/bin/openssl && \
-    cd ../build && \
-    make crypto_mb && make install
-
-RUN cd /intel-ipsec-mb && \
-    make && make install LIB_INSTALL_DIR=/usr/lib64
-
-RUN cd /QAT_Engine && \
-    ./autogen.sh && \
-    ./configure \
-    --enable-qat_sw && \
-    make && make install
-
-RUN cd /asynch_mode_nginx && \
-    ./configure \
-    --prefix=/var/www \
-    --conf-path=/usr/share/nginx/conf/nginx.conf \
-    --sbin-path=/usr/bin/nginx \
-    --pid-path=/run/nginx.pid \
-    --lock-path=/run/lock/nginx.lock \
-    --modules-path=/usr/lib64/nginx \
-    --without-http_rewrite_module \
-    --with-http_ssl_module \
-    --add-dynamic-module=modules/nginx_qat_module/ \
-    --with-cc-opt="-DNGX_SECURE_MEM -I/include -Wno-error=deprecated-declarations" \
-    --with-ld-opt="-L/src" && \
-    make && make install
-
-FROM ubuntu:22.04
-
-COPY --from=builder /usr/bin/*_sample* /usr/bin/
-COPY --from=builder /usr/lib/libqat.so.4.2.0 /usr/lib/
-COPY --from=builder /usr/lib/libusdm.so.0.1.0 /usr/lib/
-COPY --from=builder /usr/lib64/libIPSec_MB.so.1 /usr/lib/x86_64-linux-gnu/
-COPY --from=builder /usr/local/lib/libcrypto_mb.so.11.12 /usr/lib/x86_64-linux-gnu/
-COPY --from=builder /usr/lib/x86_64-linux-gnu/engines-3/qatengine.so /usr/lib/x86_64-linux-gnu/engines-3/qatengine.so
-COPY --from=builder /var/www/ /var/www/
-COPY --from=builder /usr/lib64/nginx/* /usr/lib64/nginx/
-COPY --from=builder /usr/bin/nginx /usr/bin
-COPY --from=builder /usr/share/qat/calgary32 /usr/share/qat/
-COPY --from=builder /usr/share/nginx/conf/* /usr/share/nginx/conf/
-COPY --from=builder /qatlib/LICENSE /usr/share/package-licenses/qatlib/LICENSE
-COPY --from=builder /QAT_Engine/LICENSE /usr/share/package-licenses/QAT_Engine/LICENSE
-COPY --from=builder /ipp-crypto/LICENSE /usr/share/package-licenses/ipp-crypto/LICENSE
-COPY --from=builder /asynch_mode_nginx/LICENSE /usr/share/package-licenses/asynch_mode_nginx/LICENSE
-COPY --from=builder /intel-ipsec-mb/LICENSE /usr/share/package-licenses/intel-ipsec-mb/LICENSE
-RUN ldconfig && apt update && env DEBIAN_FRONTEND=noninteractive apt install -y openssl haproxy
+    apt install --no-install-recommends -y qatengine qatlib-examples qatzip openssl