From 30e942780d4d24c37af095d4b67b180186569f90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Sun, 21 Nov 2021 11:37:44 +0100 Subject: [PATCH 1/2] spec: build u2mfn only for Xen --- kernel.spec.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel.spec.in b/kernel.spec.in index 68537791..88b84bcd 100644 --- a/kernel.spec.in +++ b/kernel.spec.in @@ -2,6 +2,7 @@ # Based on the Open SUSE kernel-spec & Fedora kernel-spec. # +%define backend_vmm @BACKEND_VMM@ %define variant qubes %define plainrel @REL@%{?dist} %define rel %{plainrel}.%{variant} @@ -209,8 +210,10 @@ tar -x -C %_builddir -zf %{SOURCE1} rm -rf %_builddir/dummy-backlight tar -x -C %_builddir -zf %{SOURCE2} +%if "%{?backend_vmm}" == "xen" rm -rf %_builddir/u2mfn tar -x -C %_builddir -zf %{SOURCE3} --strip-components=2 linux-utils/kernel-modules/u2mfn +%endif #rm -rf %_builddir/macbook12-spi-driver #tar -x -C %_builddir -f %{SOURCE6} @@ -232,10 +235,12 @@ if [ -d "%_builddir/dummy-backlight" ]; then make -C %kernel_build_dir M=%_builddir/dummy-backlight modules fi -# Build u2mfn module +%if "%{?backend_vmm}" == "xen" +# Build u2mfn module on Xen if [ -d "%_builddir/u2mfn" ]; then make -C %kernel_build_dir M=%_builddir/u2mfn modules fi +%endif # Build applespi, apple-ibridge, apple-ib-tb, apple-ib-als modules #if [ -d "%_builddir/macbook12-spi-driver" ]; then From 5ec37e9746468aa47c7edce2dc3071ac55a3b381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Sun, 21 Nov 2021 11:39:56 +0100 Subject: [PATCH 2/2] spec: add virtio modules to initrams for KVM --- kernel.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel.spec.in b/kernel.spec.in index 88b84bcd..4926888e 100644 --- a/kernel.spec.in +++ b/kernel.spec.in @@ -460,7 +460,7 @@ PATH="/sbin:$PATH" dracut --nomdadmconf --nolvmconf \ --kmoddir %buildroot/lib/modules/%kernelrelease \ --modules "kernel-modules qubes-vm-simple" \ --conf /dev/null --confdir /var/empty \ - -d "xenblk xen-blkfront cdrom ext4 jbd2 crc16 dm_snapshot" \ + -d "xenblk xen-blkfront cdrom ext4 virtio virtio_blk jbd2 crc16 dm_snapshot" \ %buildroot/%vm_install_dir/initramfs %kernelrelease || exit 1 # workaround for buggy dracut-044 in Fedora 25