Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KVM #492

Draft
wants to merge 2 commits into
base: stable-5.10
Choose a base branch
from
Draft

KVM #492

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30e9427
spec: build u2mfn only for Xen
fepitre Nov 21, 2021
5ec37e9
spec: add virtio modules to initrams for KVM
fepitre Nov 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions kernel.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand All @@ -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
Expand Down Expand Up @@ -455,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
Expand Down