Allow version specific config files

.github/workflows/debian.yml

@@ -74,7 +74,7 @@ jobs:
           debian.master/config/amd64/config.common.amd64      \
           debian.master/config/amd64/config.flavour.generic   \
           ../ubuntu.config                                    \
-          ../surface.config
+          ../../../configs/surface-${KERNEL_VERSION%.*}.config
 
     - name: Setup secureboot certificate
       env:

.github/workflows/debian_lts.yml

@@ -74,7 +74,7 @@ jobs:
           debian.master/config/amd64/config.common.amd64      \
           debian.master/config/amd64/config.flavour.generic   \
           ../ubuntu.config                                    \
-          ../surface.config
+          ../../../configs/surface-${KERNEL_VERSION%.*}.config
 
     - name: Setup secureboot certificate
       env:

configs/surface-4.19.config

@@ -0,0 +1,30 @@
+#
+# Intel IPTS Touchscreen
+#
+CONFIG_INTEL_IPTS=m
+CONFIG_INTEL_IPTS_SURFACE=m
+
+#
+# Surface Aggregator Module
+#
+CONFIG_SURFACE_SAM=m
+CONFIG_SURFACE_SAM_SSH=m
+CONFIG_SURFACE_SAM_SSH_DEBUG_DEVICE=y
+CONFIG_SURFACE_SAM_SAN=m
+CONFIG_SURFACE_SAM_VHF=m
+CONFIG_SURFACE_SAM_DTX=m
+CONFIG_SURFACE_SAM_HPS=m
+CONFIG_SURFACE_SAM_SID=m
+CONFIG_SURFACE_SAM_SID_GPELID=m
+CONFIG_SURFACE_SAM_SID_PERFMODE=m
+CONFIG_SURFACE_SAM_SID_VHF=m
+CONFIG_SURFACE_SAM_SID_POWER=m
+
+#
+# Other Drivers
+#
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
+CONFIG_SURFACE_3_POWER_OPREGION=m
+CONFIG_SURFACE_3_BUTTON=m
+CONFIG_SURFACE_3_POWER_OPREGION=m
+CONFIG_SURFACE_PRO3_BUTTON=m

pkg/arch/kernel-lts/surface.config

@@ -1,30 +0,0 @@
-#
-# Intel IPTS Touchscreen
-#
-CONFIG_INTEL_IPTS=m
-CONFIG_INTEL_IPTS_SURFACE=m
-
-#
-# Surface Aggregator Module
-#
-CONFIG_SURFACE_SAM=m
-CONFIG_SURFACE_SAM_SSH=m
-CONFIG_SURFACE_SAM_SSH_DEBUG_DEVICE=y
-CONFIG_SURFACE_SAM_SAN=m
-CONFIG_SURFACE_SAM_VHF=m
-CONFIG_SURFACE_SAM_DTX=m
-CONFIG_SURFACE_SAM_HPS=m
-CONFIG_SURFACE_SAM_SID=m
-CONFIG_SURFACE_SAM_SID_GPELID=m
-CONFIG_SURFACE_SAM_SID_PERFMODE=m
-CONFIG_SURFACE_SAM_SID_VHF=m
-CONFIG_SURFACE_SAM_SID_POWER=m
-
-#
-# Other Drivers
-#
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PRO3_BUTTON=m

pkg/arch/kernel-lts/surface.config

@@ -0,0 +1 @@
+../../../configs/surface-4.19.config

pkg/arch/kernel/surface.config

@@ -1 +1 @@
-../../../surface.config
+../../../configs/surface-5.5.config

pkg/debian/surface.config

@@ -1 +0,0 @@
-../../surface.config

pkg/fedora/kernel-surface/kernel-surface.spec

@@ -70,7 +70,7 @@ Conflicts: xorg-x11-drv-vmmouse < 13.0.99
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
 Source0:    %{fedora_source}/snapshot/fedora-%{kernel_tag}.tar.gz
-Source1:    %{surface_source}/surface.config
+Source1:    %{surface_source}/configs/surface-%{kernel_majorver}.config
 Source2:    fedora.config
 
 Source20:    %{sb_crt}