From: Hauke Mehrtens Date: Fri, 2 Nov 2018 19:41:37 +0000 (+0100) Subject: kernel: Adapt to new location of video-videobuf2 in kernel 4.19 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b688ec64331336793d97611af1c5572f018000bd;p=openwrt%2Fstaging%2Fzorun.git 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 --- 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