From e356c9b3d74437150b45fabcc042129fa32aa1d8 Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Mar 14 2023 15:53:22 +0000 Subject: Replace mkinitrd dependency with dracut (bsc#1202353). Also update mkinitrd refrences in documentation and comments. Signed-off-by: Michal Suchanek --- diff --git a/doc/README.SUSE b/doc/README.SUSE index fb737a0..5e9d6eb 100644 --- a/doc/README.SUSE +++ b/doc/README.SUSE @@ -136,7 +136,7 @@ recommended way to produce a binary kernel is: (6) Install the kernel and the modules (``make modules_install'', followed by ``make install''). This will automatically create - an initrd for the new kernel as well (see ``mkinitrd -h''). + an initrd for the new kernel as well (see ``dracut -h''). (7) Add the kernel to the boot manager. When using lilo, run ``lilo'' to update the boot map. diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in index fee0a0a..0ffed92 100644 --- a/rpm/kernel-binary.spec.in +++ b/rpm/kernel-binary.spec.in @@ -184,21 +184,16 @@ Requires(post): modutils # test -x update-bootloader, having perl-Bootloader is not a hard requirement. # But, there is no way to tell rpm or yast to schedule the installation # of perl-Bootloader before kernel-binary.rpm if both are in the list of -# packages to install/update. Likewise, this is true for mkinitrd. +# packages to install/update. Likewise, this is true for dracut. # Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry Requires(post): perl-Bootloader >= 0.4.15 -%if %build_vanilla -Requires(post): mkinitrd -%else -# Require a mkinitrd that can handle usbhid/hid-generic built-in (bnc#773559) -Requires(post): mkinitrd >= 2.7.1 -%endif +Requires(post): dracut # Install the package providing /etc/SuSE-release early enough, so that # the grub entry has correct title (bnc#757565) Requires(post): distribution-release -# Do not install p-b and mkinitrd for the install check, the %post script is +# Do not install p-b and dracut for the install check, the %post script is # able to handle this -#!BuildIgnore: perl-Bootloader mkinitrd distribution-release +#!BuildIgnore: perl-Bootloader dracut distribution-release # Remove some packages that are installed automatically by the build system, # but are not needed to build the kernel #!BuildIgnore: autoconf automake gettext-runtime libtool cvs gettext-tools udev insserv @@ -1172,7 +1167,7 @@ Requires: %{name}_%_target_cpu = %version-%source_rel Requires(pre): coreutils awk Requires(post): modutils Requires(post): perl-Bootloader -Requires(post): mkinitrd +Requires(post): dracut @PROVIDES_OBSOLETES_EXTRA@ %obsolete_rebuilds %name-extra Supplements: packageand(product(SLED):%{name}_%_target_cpu) @@ -1238,7 +1233,7 @@ Requires: %name-extra_%_target_cpu = %version-%source_rel Requires(pre): coreutils awk Requires(post): modutils Requires(post): perl-Bootloader -Requires(post): mkinitrd +Requires(post): dracut @PROVIDES_OBSOLETES_OPTIONAL@ %obsolete_rebuilds %name-optional Supplements: packageand(product(Leap):%{name}_%_target_cpu)