Skip to content

Commit 707fdea

Browse files
committed
Merge remote-tracking branch 'origin/pr/712'
* origin/pr/712: spec: put dummy_conf in builddir config-qubes: remove STRUCTLEAK configs for Fedora 37 spec: newer dracut does't support /dev/null as conf
2 parents da58899 + 1c59b39 commit 707fdea

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

kernel.spec.in

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,13 @@ pathfix.py -i "%{__python3} %{py3_shbang_opts}" -p -n \
204204

205205
cd %kernel_build_dir
206206

207+
# FIXME: Find a modular way to include configuration per dist
208+
# On GCC12+, STRUCTLEAK configs are not needed anymore
209+
%if 0%{?fedora} >= 37
210+
sed -i '/CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y/d' %{SOURCE101}
211+
sed -i 's/CONFIG_GCC_PLUGIN_STRUCTLEAK=y/CONFIG_INIT_STACK_ALL_ZERO=y/' %{SOURCE101}
212+
%endif
213+
207214
# Create QubesOS config kernel
208215
%{SOURCE34} %{SOURCE100} %{SOURCE101}
209216

@@ -501,11 +508,12 @@ mv %buildroot/lib/firmware-all %buildroot/lib/firmware/%kernelrelease
501508

502509
# Prepare initramfs for Qubes VM
503510
mkdir -p %buildroot/%vm_install_dir
511+
touch %_builddir/dummy_conf
504512
PATH="/sbin:$PATH" dracut --nomdadmconf --nolvmconf --no-hostonly \
505513
--kmoddir %buildroot/lib/modules/%kernelrelease \
506514
--modules "kernel-modules qubes-vm-simple busybox" \
507515
--omit "nss-softokn extra-modules qubes-pciback qubes-udev" \
508-
--conf /dev/null --confdir /var/empty \
516+
--conf %_builddir/dummy_conf --confdir /var/empty \
509517
-d "xenblk xen-blkfront cdrom ext4 jbd2 crc16 dm_snapshot" \
510518
%buildroot/%vm_install_dir/initramfs %kernelrelease
511519

0 commit comments

Comments
 (0)