diff --git a/.gitmodules b/.gitmodules index e52c7737..acb25693 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,3 +8,6 @@ path = linux-utils url = https://github.com/QubesOS/qubes-linux-utils.git branch = release4.0 +[submodule "v4l2loopback"] + path = v4l2loopback + url = https://github.com/umlaeute/v4l2loopback diff --git a/.qubesbuilder b/.qubesbuilder index 92e6bd80..41dc7588 100644 --- a/.qubesbuilder +++ b/.qubesbuilder @@ -7,6 +7,7 @@ source: - linux-utils - dummy-psu - dummy-backlight + - v4l2loopback files: - url: https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-@VERSION@.tar.xz signature: https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-@VERSION@.tar.sign diff --git a/Makefile.builder b/Makefile.builder index 43effba4..3924b246 100644 --- a/Makefile.builder +++ b/Makefile.builder @@ -2,7 +2,7 @@ ifeq ($(PACKAGE_SET),dom0) RPM_SPEC_FILES := kernel.spec NO_ARCHIVE := 1 -INCLUDED_SOURCES = dummy-psu dummy-backlight linux-utils +INCLUDED_SOURCES = dummy-psu dummy-backlight linux-utils v4l2loopback SOURCE_COPY_IN := $(INCLUDED_SOURCES) $(INCLUDED_SOURCES): SRC_SUBDIR=$@ diff --git a/kernel.spec.in b/kernel.spec.in index 2751a1df..a5b81cd2 100644 --- a/kernel.spec.in +++ b/kernel.spec.in @@ -124,6 +124,7 @@ Source0: linux-%{upstream_version}.tar Source1: @dummy-psu@ Source2: @dummy-backlight@ Source3: @linux-utils@ +Source4: @v4l2loopback@ %if %{with_macbook_spi} Source6: macbook12-spi-driver-2905d318d1a3ee1a227052490bf20eddef2592f9.tar %endif @@ -232,6 +233,9 @@ tar -x -C %_builddir -zf %{SOURCE2} rm -rf %_builddir/u2mfn tar -x -C %_builddir -zf %{SOURCE3} --strip-components=2 linux-utils/kernel-modules/u2mfn +rm -rf %_builddir/v4l2loopback +tar -x -C %_builddir -zf %{SOURCE4} + %if %{with_macbook_spi} rm -rf %_builddir/macbook12-spi-driver tar -x -C %_builddir -f %{SOURCE6} @@ -264,6 +268,11 @@ if [ -d "%_builddir/u2mfn" ]; then make -C %kernel_build_dir M=%_builddir/u2mfn modules fi +# Build v4l2loopback module +if [ -d "%_builddir/v4l2loopback" ]; then + make -C %kernel_build_dir M=%_builddir/v4l2loopback modules +fi + %if %{with_macbook_spi} # Build applespi, apple-ibridge, apple-ib-tb, apple-ib-als modules if [ -d "%_builddir/macbook12-spi-driver" ]; then @@ -333,6 +342,9 @@ fi if [ -d "%_builddir/u2mfn" ]; then make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot M=%_builddir/u2mfn fi +if [ -d "%_builddir/v4l2loopback" ]; then + make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot M=%_builddir/v4l2loopback +fi %if %{with_macbook_spi} if [ -d "%_builddir/macbook12-spi-driver" ]; then make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot M=%_builddir/macbook12-spi-driver diff --git a/v4l2loopback b/v4l2loopback new file mode 160000 index 00000000..1ecf810f --- /dev/null +++ b/v4l2loopback @@ -0,0 +1 @@ +Subproject commit 1ecf810f0d687b647caa3050ae30cf51b5902afd