diff --git a/dkms.conf b/dkms.conf index 045609b..d6401b9 100644 --- a/dkms.conf +++ b/dkms.conf @@ -24,21 +24,21 @@ j=0 POST_ADD+=" drivers/media/v4l2-core" # V4L2 core patches for 6.17 -PATCH[$j]="0004-dkms-v4l2-core-makefile-adaptation-6.17.patch" +PATCH[$j]="6.17/0004-dkms-v4l2-core-makefile-adaptation.patch" PATCH_MATCH[$j]="^(6.1[7])" -PATCH[$((++j))]="0005-drivers-media-set-v4l2_subdev_enable_streams_api-tru.patch" +PATCH[$((++j))]="6.17/0005-drivers-media-set-v4l2_subdev_enable_streams_api.patch" PATCH_MATCH[$j]="^(6.1[7])" -PATCH[$((++j))]="0009-dkms-disable-tuner-build-in-v4l2-core-6.17.patch" +PATCH[$((++j))]="6.17/0009-dkms-disable-tuner-build-in-v4l2-core.patch" PATCH_MATCH[$j]="^(6.1[7])" -PATCH[$((++j))]="0062-media-v4l2-async-Fix-error-handling-on-steps-after-f.patch" +PATCH[$((++j))]="6.17/0062-media-v4l2-async-Fix-error-handling-on-steps-after-f.patch" PATCH_MATCH[$j]="^(6.1[7])" # V4L2 core patches for 6.18 -PATCH[$((++j))]="0004-dkms-v4l2-core-makefile-adaptation-6.18.patch" +PATCH[$((++j))]="6.18/0004-dkms-v4l2-core-makefile-adaptation.patch" PATCH_MATCH[$j]="^(6.1[8])" -PATCH[$((++j))]="0005-drivers-media-set-v4l2_subdev_enable_streams_api-6.18.patch" +PATCH[$((++j))]="6.18/0005-drivers-media-set-v4l2_subdev_enable_streams_api.patch" PATCH_MATCH[$j]="^(6.1[8])" -PATCH[$((++j))]="0009-dkms-disable-tuner-build-in-v4l2-core-6.18.patch" +PATCH[$((++j))]="6.18/0009-dkms-disable-tuner-build-in-v4l2-core.patch" PATCH_MATCH[$j]="^(6.1[8])" # IPU6 drivers @@ -46,7 +46,7 @@ PATCH[$((++j))]="0052-module-version-conditional-symbol-namespace.patch" PATCH_MATCH[$j]="^(6.1[278])" PATCH[$((++j))]="0053-ipu6-isys-disable-src_pad-validation-for-dkms.patch" PATCH_MATCH[$j]="^(6.1[78])" -PATCH[$((++j))]="0054-ipu6-isys-kernel-6.18-api-compat.patch" +PATCH[$((++j))]="6.18/0054-ipu6-isys-api-compat.patch" PATCH_MATCH[$j]="^(6.1[8])" # IPU7 drivers @@ -60,7 +60,7 @@ PATCH[$((++j))]="0100-media-ipu7-isys-let-v4l2-set-default-colorspace.patch" PATCH_MATCH[$j]="^(6.1[7])" POST_ADD+=" drivers/media/mc include/uapi/linux/media.h" -PATCH[$((++j))]="0063-media-mc-Add-INTERNAL-pad-flag.patch" +PATCH[$((++j))]="6.17/0063-media-mc-Add-INTERNAL-pad-flag.patch" PATCH_MATCH[$j]="^(6.1[7])" PATCH[$((++j))]="0006-media-pci-ipu7-Add-D4XX-support-to-IPU7.patch" @@ -176,13 +176,13 @@ STRIP[$i]=no if [ "$KERNEL_VER" -eq 6 ] && [ "$KERNEL_PATCH" -eq 12 ]; then POST_ADD+=" drivers/media/pci/intel/Kconfig drivers/media/pci/intel/Makefile drivers/media/pci/intel/ipu-bridge.c" -PATCH[$((++j))]="0039-ipu-bridge-port-6.12.0-to-bkc.patch" +PATCH[$((++j))]="6.12/0039-ipu-bridge-port-to-bkc.patch" PATCH_MATCH[$j]="^(6.1[2]-intel)" -PATCH[$((++j))]="0040-ipu-bridge-6.12-makefile.patch" +PATCH[$((++j))]="6.12/0040-ipu-bridge-makefile.patch" PATCH_MATCH[$j]="^(6.1[2])" -PATCH[$((++j))]="0041-ipu-bridge-6.12-bkc-backport.patch" +PATCH[$((++j))]="6.12/0041-ipu-bridge-bkc-backport.patch" PATCH_MATCH[$j]="^(6.1[2])" -PATCH[$((++j))]="0042-ipu-bridge-6.12-add-sensor.patch" +PATCH[$((++j))]="6.12/0042-ipu-bridge-add-sensor.patch" PATCH_MATCH[$j]="^(6.1[2])" BUILT_MODULE_NAME[$((++i))]="ipu-bridge" @@ -214,11 +214,11 @@ POST_ADD+=" drivers/media/pci/intel/Kconfig drivers/media/pci/intel/Makefile dri # Version-specific ipu-bridge patches and modules if [ "$KERNEL_PATCH" -eq 17 ]; then - PATCH[$((++j))]="0040-ipu-bridge-6.17-makefile.patch" + PATCH[$((++j))]="6.17/0040-ipu-bridge-makefile.patch" PATCH_MATCH[$j]="^(6.1[7])" - PATCH[$((++j))]="0041-ipu-bridge-6.17-bkc-backport.patch" + PATCH[$((++j))]="6.17/0041-ipu-bridge-bkc-backport.patch" PATCH_MATCH[$j]="^(6.1[7])" - PATCH[$((++j))]="0042-ipu-bridge-6.17-add-sensor.patch" + PATCH[$((++j))]="6.17/0042-ipu-bridge-add-sensor.patch" PATCH_MATCH[$j]="^(6.1[7])" BUILT_MODULE_NAME[$((++i))]="ipu-bridge" @@ -232,11 +232,11 @@ if [ "$KERNEL_PATCH" -eq 17 ]; then DEST_MODULE_LOCATION[$i]="/updates" STRIP[$i]=no else - PATCH[$((++j))]="0040-ipu-bridge-6.18-makefile.patch" + PATCH[$((++j))]="6.18/0040-ipu-bridge-makefile.patch" PATCH_MATCH[$j]="^(6.1[8])" - PATCH[$((++j))]="0041-ipu-bridge-6.18-bkc-backport.patch" + PATCH[$((++j))]="6.18/0041-ipu-bridge-bkc-backport.patch" PATCH_MATCH[$j]="^(6.1[8])" - PATCH[$((++j))]="0042-ipu-bridge-6.18-add-sensor.patch" + PATCH[$((++j))]="6.18/0042-ipu-bridge-add-sensor.patch" PATCH_MATCH[$j]="^(6.1[8])" BUILT_MODULE_NAME[$((++i))]="ipu-bridge" diff --git a/patches/0039-ipu-bridge-port-6.12.0-to-bkc.patch b/patches/6.12/0039-ipu-bridge-port-to-bkc.patch similarity index 100% rename from patches/0039-ipu-bridge-port-6.12.0-to-bkc.patch rename to patches/6.12/0039-ipu-bridge-port-to-bkc.patch diff --git a/patches/0040-ipu-bridge-6.12-makefile.patch b/patches/6.12/0040-ipu-bridge-makefile.patch similarity index 100% rename from patches/0040-ipu-bridge-6.12-makefile.patch rename to patches/6.12/0040-ipu-bridge-makefile.patch diff --git a/patches/0041-ipu-bridge-6.12-bkc-backport.patch b/patches/6.12/0041-ipu-bridge-bkc-backport.patch similarity index 100% rename from patches/0041-ipu-bridge-6.12-bkc-backport.patch rename to patches/6.12/0041-ipu-bridge-bkc-backport.patch diff --git a/patches/0042-ipu-bridge-6.12-add-sensor.patch b/patches/6.12/0042-ipu-bridge-add-sensor.patch similarity index 100% rename from patches/0042-ipu-bridge-6.12-add-sensor.patch rename to patches/6.12/0042-ipu-bridge-add-sensor.patch diff --git a/patches/0004-dkms-v4l2-core-makefile-adaptation-6.17.patch b/patches/6.17/0004-dkms-v4l2-core-makefile-adaptation.patch similarity index 100% rename from patches/0004-dkms-v4l2-core-makefile-adaptation-6.17.patch rename to patches/6.17/0004-dkms-v4l2-core-makefile-adaptation.patch diff --git a/patches/0005-drivers-media-set-v4l2_subdev_enable_streams_api-tru.patch b/patches/6.17/0005-drivers-media-set-v4l2_subdev_enable_streams_api.patch similarity index 100% rename from patches/0005-drivers-media-set-v4l2_subdev_enable_streams_api-tru.patch rename to patches/6.17/0005-drivers-media-set-v4l2_subdev_enable_streams_api.patch diff --git a/patches/0009-dkms-disable-tuner-build-in-v4l2-core-6.17.patch b/patches/6.17/0009-dkms-disable-tuner-build-in-v4l2-core.patch similarity index 100% rename from patches/0009-dkms-disable-tuner-build-in-v4l2-core-6.17.patch rename to patches/6.17/0009-dkms-disable-tuner-build-in-v4l2-core.patch diff --git a/patches/0040-ipu-bridge-6.17-makefile.patch b/patches/6.17/0040-ipu-bridge-makefile.patch similarity index 100% rename from patches/0040-ipu-bridge-6.17-makefile.patch rename to patches/6.17/0040-ipu-bridge-makefile.patch diff --git a/patches/0041-ipu-bridge-6.17-bkc-backport.patch b/patches/6.17/0041-ipu-bridge-bkc-backport.patch similarity index 100% rename from patches/0041-ipu-bridge-6.17-bkc-backport.patch rename to patches/6.17/0041-ipu-bridge-bkc-backport.patch diff --git a/patches/0042-ipu-bridge-6.17-add-sensor.patch b/patches/6.17/0042-ipu-bridge-add-sensor.patch similarity index 100% rename from patches/0042-ipu-bridge-6.17-add-sensor.patch rename to patches/6.17/0042-ipu-bridge-add-sensor.patch diff --git a/patches/0062-media-v4l2-async-Fix-error-handling-on-steps-after-f.patch b/patches/6.17/0062-media-v4l2-async-Fix-error-handling-on-steps-after-f.patch similarity index 100% rename from patches/0062-media-v4l2-async-Fix-error-handling-on-steps-after-f.patch rename to patches/6.17/0062-media-v4l2-async-Fix-error-handling-on-steps-after-f.patch diff --git a/patches/0063-media-mc-Add-INTERNAL-pad-flag.patch b/patches/6.17/0063-media-mc-Add-INTERNAL-pad-flag.patch similarity index 100% rename from patches/0063-media-mc-Add-INTERNAL-pad-flag.patch rename to patches/6.17/0063-media-mc-Add-INTERNAL-pad-flag.patch diff --git a/patches/0004-dkms-v4l2-core-makefile-adaptation-6.18.patch b/patches/6.18/0004-dkms-v4l2-core-makefile-adaptation.patch similarity index 100% rename from patches/0004-dkms-v4l2-core-makefile-adaptation-6.18.patch rename to patches/6.18/0004-dkms-v4l2-core-makefile-adaptation.patch diff --git a/patches/0005-drivers-media-set-v4l2_subdev_enable_streams_api-6.18.patch b/patches/6.18/0005-drivers-media-set-v4l2_subdev_enable_streams_api.patch similarity index 100% rename from patches/0005-drivers-media-set-v4l2_subdev_enable_streams_api-6.18.patch rename to patches/6.18/0005-drivers-media-set-v4l2_subdev_enable_streams_api.patch diff --git a/patches/0009-dkms-disable-tuner-build-in-v4l2-core-6.18.patch b/patches/6.18/0009-dkms-disable-tuner-build-in-v4l2-core.patch similarity index 100% rename from patches/0009-dkms-disable-tuner-build-in-v4l2-core-6.18.patch rename to patches/6.18/0009-dkms-disable-tuner-build-in-v4l2-core.patch diff --git a/patches/0040-ipu-bridge-6.18-makefile.patch b/patches/6.18/0040-ipu-bridge-makefile.patch similarity index 100% rename from patches/0040-ipu-bridge-6.18-makefile.patch rename to patches/6.18/0040-ipu-bridge-makefile.patch diff --git a/patches/0041-ipu-bridge-6.18-bkc-backport.patch b/patches/6.18/0041-ipu-bridge-bkc-backport.patch similarity index 100% rename from patches/0041-ipu-bridge-6.18-bkc-backport.patch rename to patches/6.18/0041-ipu-bridge-bkc-backport.patch diff --git a/patches/0042-ipu-bridge-6.18-add-sensor.patch b/patches/6.18/0042-ipu-bridge-add-sensor.patch similarity index 100% rename from patches/0042-ipu-bridge-6.18-add-sensor.patch rename to patches/6.18/0042-ipu-bridge-add-sensor.patch diff --git a/patches/0054-ipu6-isys-kernel-6.18-api-compat.patch b/patches/6.18/0054-ipu6-isys-api-compat.patch similarity index 100% rename from patches/0054-ipu6-isys-kernel-6.18-api-compat.patch rename to patches/6.18/0054-ipu6-isys-api-compat.patch