demo: update idxd-config to v4.1.4

Signed-off-by: Mikko Ylinen <[email protected]>

Author: mythi

demo/accel-config-demo/Dockerfile

@@ -12,57 +12,33 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ubuntu:22.04 AS builder
+FROM debian:unstable-slim AS builder
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    gcc g++ nasm make cmake patch autoconf automake libtool pkg-config git curl ca-certificates \
-    libjson-c-dev uuid-dev zlib1g-dev libssl-dev
+ARG ACCEL_CONFIG_VERSION="4.1.4-1"
 
-ARG ACCEL_CONFIG_VERSION="4.1"
-ARG ACCEL_CONFIG_DOWNLOAD_URL="https://github.com/intel/idxd-config/archive/accel-config-v$ACCEL_CONFIG_VERSION.tar.gz"
-ARG ACCEL_CONFIG_SHA256="26bed5f5fdef226ae90aebf296f1fa355c7a134aa321a468fbc5be894ff0b91b"
+RUN apt-get update && apt-get install -y --no-install-recommends libaccel-config-dev=${ACCEL_CONFIG_VERSION} \
+    gcc g++ nasm make cmake autoconf automake libtool pkg-config git ca-certificates uuid-dev
 
-RUN curl -fsSL "$ACCEL_CONFIG_DOWNLOAD_URL" -o accel-config.tar.gz && echo "$ACCEL_CONFIG_SHA256 accel-config.tar.gz" | sha256sum -c - && tar -xzf accel-config.tar.gz
-
-COPY idxd-reset.patch /
-COPY test_runner_disable_shared_queues.patch /
-
-RUN cd idxd-config-accel-config-v$ACCEL_CONFIG_VERSION && \
-    patch -p1 < ../idxd-reset.patch && \
-    patch -p1 < ../test_runner_disable_shared_queues.patch && \
-    ./git-version-gen && \
-    autoreconf -i && \
-    ./configure -q --libdir=/usr/lib64 --enable-test=yes --disable-docs && \
-    make install
-
-RUN cd / && git clone --recurse-submodules --branch v1.1.0 --depth 1 https://github.com/intel/DML.git && \
+RUN cd / && git clone --recurse-submodules --branch v1.1.1 --depth 1 https://github.com/intel/DML.git && \
     mkdir DML/build && cd DML/build && \
     cmake .. && \
     make install && \
     mv -v /usr/local/bin/tests /usr/local/bin/dml_tests && \
     mv -v /usr/local/bin/tests_mt /usr/local/bin/dml_tests_mt
 
-RUN cd / && git clone --recursive --depth 1 --branch v1.3.0 https://github.com/intel/qpl.git && \
+RUN cd / && git clone --recursive --depth 1 --branch v1.3.1 https://github.com/intel/qpl.git && \
     mkdir qpl/build && cd qpl/build && \
     cmake -DLOG_HW_INIT=ON .. && \
     make install
 
-FROM ubuntu:22.04
+FROM debian:unstable-slim
 
-RUN apt-get update && apt-get install -y --no-install-recommends libjson-c5 libssl3 && rm -rf /var/lib/apt/lists/\*
-
-COPY --from=builder /usr/lib64/libaccel-config.so.1.0.0 "/lib/x86_64-linux-gnu/"
-RUN ldconfig
-
-COPY --from=builder /usr/bin/accel-config /usr/bin/
-COPY --from=builder /usr/libexec/accel-config/test /test
-COPY --from=builder /idxd-reset.patch /usr/local/share/package-sources/
-COPY --from=builder /test_runner_disable_shared_queues.patch /usr/local/share/package-sources/
+ARG ACCEL_CONFIG_VERSION="4.1.4-1"
+RUN apt-get update && apt-get install -y --no-install-recommends accel-config-test=${ACCEL_CONFIG_VERSION} && rm -rf /var/lib/apt/lists/\*
 
+RUN sed -i -e '442,450d' /usr/libexec/accel-config/test/iaa_user_test_runner.sh
 COPY --from=builder /usr/local /usr/local
 COPY --from=builder /qpl/build/examples /usr/local/bin/
 
 COPY dml-test.sh /usr/local/bin/
 COPY qpl-test.sh /usr/local/bin/
-
-ENTRYPOINT cd /test && /bin/bash -e ./dsa_user_test_runner.sh