Skip to content

refactor(dkms): reorganize patches by kernel version #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
khaiwenng wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −19
Open

refactor(dkms): reorganize patches by kernel version #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions dkms.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,29 @@ 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
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
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down
0 .../0039-ipu-bridge-port-6.12.0-to-bkc.patch → ...es/6.12/0039-ipu-bridge-port-to-bkc.patch
View file
Open in desktop
File renamed without changes.
0 patches/0040-ipu-bridge-6.12-makefile.patch → patches/6.12/0040-ipu-bridge-makefile.patch
View file
Open in desktop
File renamed without changes.
0 ...s/0041-ipu-bridge-6.12-bkc-backport.patch → ...s/6.12/0041-ipu-bridge-bkc-backport.patch
View file
Open in desktop
File renamed without changes.
0 ...hes/0042-ipu-bridge-6.12-add-sensor.patch → ...hes/6.12/0042-ipu-bridge-add-sensor.patch
View file
Open in desktop
File renamed without changes.
0 ...-v4l2-core-makefile-adaptation-6.17.patch → ...-dkms-v4l2-core-makefile-adaptation.patch
View file
Open in desktop
File renamed without changes.
0 ...-v4l2_subdev_enable_streams_api-tru.patch → ...-set-v4l2_subdev_enable_streams_api.patch
View file
Open in desktop
File renamed without changes.
0 ...sable-tuner-build-in-v4l2-core-6.17.patch → ...ms-disable-tuner-build-in-v4l2-core.patch
View file
Open in desktop
File renamed without changes.
0 patches/0040-ipu-bridge-6.17-makefile.patch → patches/6.17/0040-ipu-bridge-makefile.patch
View file
Open in desktop
File renamed without changes.
0 ...s/0041-ipu-bridge-6.17-bkc-backport.patch → ...s/6.17/0041-ipu-bridge-bkc-backport.patch
View file
Open in desktop
File renamed without changes.
0 ...hes/0042-ipu-bridge-6.17-add-sensor.patch → ...hes/6.17/0042-ipu-bridge-add-sensor.patch
View file
Open in desktop
File renamed without changes.
0 ...Fix-error-handling-on-steps-after-f.patch → ...Fix-error-handling-on-steps-after-f.patch
View file
Open in desktop
File renamed without changes.
0 ...0063-media-mc-Add-INTERNAL-pad-flag.patch → ...0063-media-mc-Add-INTERNAL-pad-flag.patch
View file
Open in desktop
File renamed without changes.
0 ...-v4l2-core-makefile-adaptation-6.18.patch → ...-dkms-v4l2-core-makefile-adaptation.patch
View file
Open in desktop
File renamed without changes.
0 ...v4l2_subdev_enable_streams_api-6.18.patch → ...-set-v4l2_subdev_enable_streams_api.patch
View file
Open in desktop
File renamed without changes.
0 ...sable-tuner-build-in-v4l2-core-6.18.patch → ...ms-disable-tuner-build-in-v4l2-core.patch
View file
Open in desktop
File renamed without changes.
0 patches/0040-ipu-bridge-6.18-makefile.patch → patches/6.18/0040-ipu-bridge-makefile.patch
View file
Open in desktop
File renamed without changes.
0 ...s/0041-ipu-bridge-6.18-bkc-backport.patch → ...s/6.18/0041-ipu-bridge-bkc-backport.patch
View file
Open in desktop
File renamed without changes.
0 ...hes/0042-ipu-bridge-6.18-add-sensor.patch → ...hes/6.18/0042-ipu-bridge-add-sensor.patch
View file
Open in desktop
File renamed without changes.
0 ...54-ipu6-isys-kernel-6.18-api-compat.patch → patches/6.18/0054-ipu6-isys-api-compat.patch
View file
Open in desktop
File renamed without changes.