Skip to content

Commit

Permalink
Revert "Workaround for buggy dracut in Fedora 25"
Browse files Browse the repository at this point in the history
This isn't necessary anymore, R4.0 (with broken dracut) is EOL already.

This reverts commit 0923b40.

(cherry picked from commit b62da75)
  • Loading branch information
marmarek committed Jan 9, 2023
1 parent a6eceff commit 37c30b2
Showing 1 changed file with 1 addition and 23 deletions.
24 changes: 1 addition & 23 deletions kernel.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -463,29 +463,7 @@ PATH="/sbin:$PATH" dracut --nomdadmconf --nolvmconf \
--modules "kernel-modules qubes-vm-simple" \
--conf /dev/null --confdir /var/empty \
-d "xenblk xen-blkfront cdrom ext4 jbd2 crc16 dm_snapshot" \
%buildroot/%vm_install_dir/initramfs %kernelrelease || exit 1

# workaround for buggy dracut-044 in Fedora 25
# https://bugzilla.redhat.com/show_bug.cgi?id=1431317
# https://github.com/dracutdevs/dracut/issues/194
modules_dep=$(lsinitrd "%buildroot/%vm_install_dir/initramfs" \
"usr/lib/modules/%kernelrelease/modules.dep")
if [ -z "$modules_dep" ]; then
tmpdir=$(mktemp -d)
zcat "%buildroot/%vm_install_dir/initramfs" | cpio -imd -D "$tmpdir" || exit 1
mv "$tmpdir"/%buildroot/lib/modules/%kernelrelease/kernel \
"$tmpdir"/lib/modules/%kernelrelease/ || exit 1
depmod -F %buildroot/boot/System.map-%kernelrelease \
-b "$tmpdir" -a %kernelrelease || exit 1
pushd "$tmpdir"
if [ -n "$SOURCE_DATE_EPOCH" ]; then
find . -exec touch --no-dereference --date="@${SOURCE_DATE_EPOCH}" {} +
fi
find . -print0 | sort -z \
| cpio --null -R 0:0 -H newc -o --reproducible --quiet \
| gzip -n > %buildroot/%vm_install_dir/initramfs || exit 1
popd
fi
%buildroot/%vm_install_dir/initramfs %kernelrelease

cp -p arch/x86/boot/bzImage %buildroot/%vm_install_dir/vmlinuz

Expand Down

0 comments on commit 37c30b2

Please sign in to comment.