From 4edcadedd3f3029087e0f7a04924080643250462 Mon Sep 17 00:00:00 2001 From: Jon Mulder Date: Wed, 22 May 2024 15:53:05 -0400 Subject: [PATCH] fix(framework-laptop): ensure only in one kmod stream --- Containerfile.common | 1 + Containerfile.extra | 1 - build_files/{extra => common}/build-kmod-framework-laptop.sh | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename build_files/{extra => common}/build-kmod-framework-laptop.sh (100%) diff --git a/Containerfile.common b/Containerfile.common index b60186a2..f3707bf0 100644 --- a/Containerfile.common +++ b/Containerfile.common @@ -36,6 +36,7 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \ if grep -qv "asus" <<< "${KERNEL_FLAVOR}"; then \ /tmp/build-kmod-evdi.sh \ ; fi && \ + /tmp/build-kmod-framework-laptop.sh && \ /tmp/build-kmod-kvmfr.sh && \ /tmp/build-kmod-openrazer.sh && \ /tmp/build-kmod-v4l2loopback.sh && \ diff --git a/Containerfile.extra b/Containerfile.extra index 7d1b8119..16850437 100644 --- a/Containerfile.extra +++ b/Containerfile.extra @@ -41,7 +41,6 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \ /tmp/build-kmod-ayn-platform.sh && \ /tmp/build-kmod-bmi260.sh && \ /tmp/build-kmod-facetimehd.sh \ - /tmp/build-kmod-framework-laptop.sh && \ /tmp/build-kmod-gcadapter_oc.sh && \ /tmp/build-kmod-nct6687d.sh && \ /tmp/build-kmod-rtl8814au.sh && \ diff --git a/build_files/extra/build-kmod-framework-laptop.sh b/build_files/common/build-kmod-framework-laptop.sh similarity index 100% rename from build_files/extra/build-kmod-framework-laptop.sh rename to build_files/common/build-kmod-framework-laptop.sh