[OpenWrt-Devel] [PATCH] kernel: add missing kmod-video-videobuf2's object file in 4.4
CONFIG_VIDEOBUF2_CORE produces two object files in Linux >= 4.4. Conditionally add the new file to FILES of kmod-video-videobuf2. Signed-off-by: Jan Čermák--- package/kernel/linux/modules/video.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index 3b06a14..0fcacb2 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -127,9 +127,10 @@ define KernelPackage/video-videobuf2 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 - AUTOLOAD:=$(call AutoLoad,65,videobuf2-core videobuf2-memops videobuf2-vmalloc) + AUTOLOAD:=$(call AutoLoad,65,videobuf2-core videobuf-v4l2@ge4.4 videobuf2-memops videobuf2-vmalloc) $(call AddDepends/video) endef -- 2.7.0 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] kernel: add missing kmod-video-videobuf2's object file in 4.4
CONFIG_VIDEOBUF2_CORE produces two object files in Linux >= 4.4. Conditionally add the new file to FILES of kmod-video-videobuf2. Signed-off-by: Jan Čermák--- package/kernel/linux/modules/video.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index 3b06a14..741aea1 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -129,6 +129,9 @@ define KernelPackage/video-videobuf2 $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-core.ko \ $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-memops.ko \ $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-vmalloc.ko +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,4.4.0)),1) + FILES+=$(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-v4l2.ko +endif AUTOLOAD:=$(call AutoLoad,65,videobuf2-core videobuf2-memops videobuf2-vmalloc) $(call AddDepends/video) endef -- 2.7.0 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] kernel: add missing kmod-video-videobuf2's object file in 4.4
On 2016-01-14 16:55, Jan Čermák wrote: > CONFIG_VIDEOBUF2_CORE produces two object files in Linux >= 4.4. > Conditionally add the new file to FILES of kmod-video-videobuf2. > > Signed-off-by: Jan Čermák> --- > package/kernel/linux/modules/video.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/kernel/linux/modules/video.mk > b/package/kernel/linux/modules/video.mk > index 3b06a14..741aea1 100644 > --- a/package/kernel/linux/modules/video.mk > +++ b/package/kernel/linux/modules/video.mk > @@ -129,6 +129,9 @@ define KernelPackage/video-videobuf2 > $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-core.ko \ > $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-memops.ko \ > $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-vmalloc.ko > +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,4.4.0)),1) > + FILES+=$(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-v4l2.ko You could skip the ifeq and add @ge4.4 to the end. > +endif >AUTOLOAD:=$(call AutoLoad,65,videobuf2-core videobuf2-memops > videobuf2-vmalloc) Missing autoload for this module. - Felix ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel