aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-11-02 20:41:37 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-12-15 14:28:49 +0100
commitb688ec64331336793d97611af1c5572f018000bd (patch)
treedfb796beaddcc76ef9f4d2bde1729f0218125c94 /package/kernel
parentf12570659639276d9c253bc42a6bbfc48032ad69 (diff)
downloadupstream-b688ec64331336793d97611af1c5572f018000bd.tar.gz
upstream-b688ec64331336793d97611af1c5572f018000bd.tar.bz2
upstream-b688ec64331336793d97611af1c5572f018000bd.zip
kernel: Adapt to new location of video-videobuf2 in kernel 4.19
The video-videobuf2 kernel modules were moved to a new folder in kernel 4.19. videobuf2-v4l2.ko is only available since kernel 4.4, blacklist this kmod completely on kernel 3.18. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/linux/modules/video.mk14
1 files changed, 9 insertions, 5 deletions
diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk
index 3f46860f54..37b3cc0bc7 100644
--- a/package/kernel/linux/modules/video.mk
+++ b/package/kernel/linux/modules/video.mk
@@ -307,16 +307,20 @@ endef
define KernelPackage/video-videobuf2
TITLE:=videobuf2 lib
- DEPENDS:=+kmod-dma-buf
+ DEPENDS:=+kmod-dma-buf @!LINUX_3_18
KCONFIG:= \
CONFIG_VIDEOBUF2_CORE \
CONFIG_VIDEOBUF2_MEMOPS \
CONFIG_VIDEOBUF2_VMALLOC
FILES:= \
- $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-core.ko \
- $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-v4l2.ko@ge4.4 \
- $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-memops.ko \
- $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-vmalloc.ko
+ $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-core.ko@lt4.16 \
+ $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-v4l2.ko@lt4.16 \
+ $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-memops.ko@lt4.16 \
+ $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-vmalloc.ko@lt4.16 \
+ $(LINUX_DIR)/drivers/media/common/videobuf2/videobuf2-common.ko@ge4.16 \
+ $(LINUX_DIR)/drivers/media/common/videobuf2/videobuf2-v4l2.ko@ge4.16 \
+ $(LINUX_DIR)/drivers/media/common/videobuf2/videobuf2-memops.ko@ge4.16 \
+ $(LINUX_DIR)/drivers/media/common/videobuf2/videobuf2-vmalloc.ko@ge4.16
AUTOLOAD:=$(call AutoLoad,65,videobuf2-core videobuf-v4l2@ge4.4 videobuf2-memops videobuf2-vmalloc)
$(call AddDepends/video)
endef