@@ -15,6 +15,7 @@ FROM ${DTK_AUTO} as builder
1515ARG PMT_RELEASE
1616ARG I915_RELEASE
1717ARG FIRMWARE_RELEASE
18+ ARG KERNEL_FULL_VERSION
1819
1920WORKDIR /build
2021
@@ -37,10 +38,17 @@ RUN git clone -b ${I915_RELEASE} --single-branch https://github.com/intel-gpu/in
3738 && cp defconfigs/drm .config \
3839 && make olddefconfig && make -j $(nproc) && make modules_install
3940
41+ # Create /build/modules directory with all *.ko and *.ko.xz files
42+ RUN mkdir -p /build/modules \
43+ && find /lib/modules/${KERNEL_FULL_VERSION}/ \
44+ -name "*.ko" -o -name "*.ko.xz" -o -name "modules.order" -o -name "modules.builtin" -type f \
45+ | xargs -I {} install -D {} /build/modules/
46+
4047# Firmware
4148RUN git clone -b ${FIRMWARE_RELEASE} --single-branch https://github.com/intel-gpu/intel-gpu-firmware.git \
4249 && install -D /build/intel-gpu-firmware/COPYRIGHT /licenses/firmware/COPYRIGHT \
43- && install -D /build/intel-gpu-firmware/COPYRIGHT /build/intel-gpu-firmware/firmware/license/COPYRIGHT
50+ && install -D /build/intel-gpu-firmware/COPYRIGHT /build/firmware/license/COPYRIGHT \
51+ && install -D /build/intel-gpu-firmware/firmware/dg2* /build/firmware/
4452
4553FROM registry.redhat.io/ubi8/ubi-minimal:latest
4654ARG DRIVER_VERSION
@@ -63,7 +71,7 @@ RUN microdnf update -y && rm -rf /var/cache/yum
6371RUN microdnf -y install kmod findutils && microdnf clean all
6472COPY --from=builder /licenses/ /licenses/
6573COPY --from=builder /etc/driver-toolkit-release.json /etc/
66- COPY --from=builder /lib /modules/${KERNEL_FULL_VERSION} / /opt/lib/modules/${KERNEL_FULL_VERSION}/
67- COPY --from=builder /build/intel-gpu-firmware/ firmware/ /firmware/i915/
74+ COPY --from=builder /build /modules/ /opt/lib/modules/${KERNEL_FULL_VERSION}/
75+ COPY --from=builder /build/firmware/ /firmware/i915/
6876
69- RUN depmod -b /opt ${KERNEL_FULL_VERSION}
77+ RUN depmod -b /opt ${KERNEL_FULL_VERSION}
0 commit comments