dracut-102-1

d/dracut/dracut-vl.spec

@@ -15,7 +15,7 @@
 
 Name: dracut
 Summary: Initramfs generator using udev
-Version: 059
+Version: 102
 Release: %{dist_free_release}%{?_dist_release}%{?with_systemd:.systemd}
 Group: system,admin-tools
 Vendor: Project Vine
@@ -24,18 +24,36 @@ Distribution: Vine Linux
 # The entire source code is GPLv2+
 # except install/* which is LGPLv2+
 License: GPLv2+ and LGPLv2+
-URL: https://dracut.wiki.kernel.org/
-# Source can be generated by
-# http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%%{version};sf=tgz
-#Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.xz
-Source0: https://github.com/dracutdevs/dracut/archive/refs/tags/%{version}.tar.gz#/dracut-%{version}.tar.gz
+URL: https://github.com/dracut-ng/dracut-ng/wiki/
+Source0: https://github.com/dracut-ng/dracut-ng/archive/refs/tags/%{version}.tar.gz#/dracut-%{version}.tar.gz
 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
 Source2000: vine.conf
 Source2001: vine-module-setup.sh
 Source2002: vine-usb-pre-udev.sh
 Source2003: ChangeLog.fedora
+Source2004: pre-convertfs.sh
+
+# feat(hwdb): add hwdb module to install hwdb.bin on demand
+# Author: Pavel Valena <pvalena@redhat.com>
+Patch0001: 0001-feat-hwdb-add-hwdb-module-to-install-hwdb.bin-on-dem.patch
+# fix(rngd): install system service file
+# Author: Pavel Valena <pvalena@redhat.com>
+Patch0002: 0002-fix-rngd-install-system-service-file.patch
+# revert: "fix(install.d): correctly install pre-genned image and die if no args"
+# Author: Pavel Valena <pvalena@redhat.com>
+Patch0003: 0003-revert-fix-install.d-correctly-install-pre-genned-im.patch
+# feat(kernel-install): do nothing when $KERNEL_INSTALL_INITRD_GENERATOR says so
+# Author: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
+Patch0004: 0004-feat-kernel-install-do-nothing-when-KERNEL_INSTALL_I.patch
+# fix(kernel-install): do not generate an initrd when one was specified
+# Author: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
+Patch0005: 0005-fix-kernel-install-do-not-generate-an-initrd-when-on.patch
+# fix(crypt): decryption when rd.luks.name is set
+# Author: Laszlo Gombos <laszlo.gombos@gmail.com>
+Patch0006: 0006-fix-crypt-decryption-when-rd.luks.name-is-set.patch
 
 Patch1000: dracut-050-resolve-symlink.patch
+Patch1001: dracut-pre-convertfs.patch
 
 BuildRequires: bash git
 BuildRequires: kmod-devel >= 15
@@ -217,7 +235,7 @@ This package contains tools to assemble the local initrd and host configuration.
 
 
 %prep
-%autosetup -n %{name}-%{version} -S git_am
+%autosetup -n %{name}-ng-%{version} -S git
 
 cp %{SOURCE1} .
 cp %{SOURCE2003} .
@@ -242,8 +260,7 @@ make %{?_smp_mflags}
 %install
 rm -rf -- $RPM_BUILD_ROOT
 
-make %{?_smp_mflags} install \
-     DESTDIR=$RPM_BUILD_ROOT \
+%make_install %{?_smp_mflags} \
      libdir=%{_prefix}/lib
 
 echo "DRACUT_VERSION=%{version}-%{release}" > $RPM_BUILD_ROOT/%{dracutlibdir}/dracut-version.sh
@@ -259,8 +276,15 @@ rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00dash
 # we do not support mksh in the initramfs
 rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00mksh
 
-# remove gentoo specific modules
-rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/50gensplash
+# remove architecture specific modules
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/80cms
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/81cio_ignore
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/91zipl
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95dasd
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95dasd_mod
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95dcssblk
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95zfcp
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95znet
 
 %if %{defined _unitdir}
 # with systemd IMA and selinux modules do not make sense
@@ -276,6 +300,7 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log
 mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/initramfs
 
 install -m 0644 %{SOURCE2000} %{buildroot}%{dracutlibdir}/dracut.conf.d/01-dist.conf
+rm -f $RPM_BUILD_ROOT%{_mandir}/man?/*suse*
 
 %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
 install -m 0644 dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/40-fips.conf
@@ -293,20 +318,11 @@ mkdir -p %{buildroot}%{dracutlibdir}/modules.d/70ehci_first
 install -m755 %{SOURCE2001} %{buildroot}%{dracutlibdir}/modules.d/70ehci_first/module-setup.sh
 install -m755 %{SOURCE2002} %{buildroot}%{dracutlibdir}/modules.d/70ehci_first/usb-pre-udev.sh
 
-# fix path to rngd
-sed -i -e 's|/usr/sbin/|/sbin/|' \
-	%{buildroot}%{dracutlibdir}/modules.d/06rngd/rngd.service
-
-# drop a unshipped file
-rm -f %{buildroot}%{_mandir}/man8/mkinitrd-suse.8*
-
-
-%clean
-rm -rf -- $RPM_BUILD_ROOT
+# pre-convertfs
+install -m755 %{SOURCE2004} %{buildroot}%{dracutlibdir}/modules.d/30convertfs/
 
 
 %files
-%defattr(-,root,root,0755)
 %if %{with doc}
 %doc README* AUTHORS dracut.html
 %endif
@@ -354,7 +370,9 @@ rm -rf -- $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/00warpclock
 %{dracutlibdir}/modules.d/01systemd-ac-power
 %{dracutlibdir}/modules.d/01systemd-ask-password
+%{dracutlibdir}/modules.d/01systemd-bsod
 %{dracutlibdir}/modules.d/01systemd-coredump
+%{dracutlibdir}/modules.d/01systemd-creds
 %{dracutlibdir}/modules.d/01systemd-hostnamed
 %{dracutlibdir}/modules.d/01systemd-initrd
 %{dracutlibdir}/modules.d/01systemd-integritysetup
@@ -366,7 +384,6 @@ rm -rf -- $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/01systemd-pstore
 %{dracutlibdir}/modules.d/01systemd-repart
 %{dracutlibdir}/modules.d/01systemd-resolved
-%{dracutlibdir}/modules.d/01systemd-rfkill
 %{dracutlibdir}/modules.d/01systemd-sysext
 %{dracutlibdir}/modules.d/01systemd-sysctl
 %{dracutlibdir}/modules.d/01systemd-sysusers
@@ -386,6 +403,7 @@ rm -rf -- $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/09dbus
 %{dracutlibdir}/modules.d/10i18n
 %{dracutlibdir}/modules.d/30convertfs
+%{dracutlibdir}/modules.d/45net-lib
 %{dracutlibdir}/modules.d/45url-lib
 %{dracutlibdir}/modules.d/50drm
 %{dracutlibdir}/modules.d/50plymouth
@@ -408,20 +426,22 @@ rm -rf -- $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/90mdraid
 %{dracutlibdir}/modules.d/90multipath
 %{dracutlibdir}/modules.d/90nvdimm
+%{dracutlibdir}/modules.d/90numlock
 %{dracutlibdir}/modules.d/90overlayfs
 %{dracutlibdir}/modules.d/90ppcmac
+%{dracutlibdir}/modules.d/90pcmcia
 %{dracutlibdir}/modules.d/90qemu
+%{dracutlibdir}/modules.d/90systemd-cryptsetup
 %{dracutlibdir}/modules.d/91crypt-gpg
 %{dracutlibdir}/modules.d/91crypt-loop
-	
 %{dracutlibdir}/modules.d/91fido2
 %{dracutlibdir}/modules.d/91pcsc
 %{dracutlibdir}/modules.d/91pkcs11
 %{dracutlibdir}/modules.d/91tpm2-tss
 %{dracutlibdir}/modules.d/95debug
 %{dracutlibdir}/modules.d/95fstab-sys
+%{dracutlibdir}/modules.d/95hwdb
 %{dracutlibdir}/modules.d/95lunmask
-%{dracutlibdir}/modules.d/95nvmf
 %{dracutlibdir}/modules.d/95resume
 %{dracutlibdir}/modules.d/95rootfs-block
 %{dracutlibdir}/modules.d/95terminfo
@@ -434,22 +454,8 @@ rm -rf -- $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/91zipl
 %{dracutlibdir}/modules.d/95dasd
 %{dracutlibdir}/modules.d/95dasd_mod
-%{dracutlibdir}/modules.d/95dasd_rules
 %{dracutlibdir}/modules.d/95dcssblk
-%{dracutlibdir}/modules.d/95qeth_rules
 %{dracutlibdir}/modules.d/95zfcp
-%{dracutlibdir}/modules.d/95zfcp_rules
-%else
-%exclude %{dracutlibdir}/modules.d/80cms
-%exclude %{dracutlibdir}/modules.d/81cio_ignore
-%exclude %{dracutlibdir}/modules.d/91zipl
-%exclude %{dracutlibdir}/modules.d/95dasd
-%exclude %{dracutlibdir}/modules.d/95dasd_mod
-%exclude %{dracutlibdir}/modules.d/95dasd_rules
-%exclude %{dracutlibdir}/modules.d/95dcssblk
-%exclude %{dracutlibdir}/modules.d/95qeth_rules
-%exclude %{dracutlibdir}/modules.d/95zfcp
-%exclude %{dracutlibdir}/modules.d/95zfcp_rules
 %endif
 %if %{undefined _unitdir}
 %{dracutlibdir}/modules.d/96securityfs
@@ -457,11 +463,11 @@ rm -rf -- $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/98integrity
 %endif
 %{dracutlibdir}/modules.d/97biosdevname
+%{dracutlibdir}/modules.d/98dracut-systemd
 %{dracutlibdir}/modules.d/98ecryptfs
 %{dracutlibdir}/modules.d/98pollcdrom
 %{dracutlibdir}/modules.d/98selinux
 %{dracutlibdir}/modules.d/98syslog
-%{dracutlibdir}/modules.d/98dracut-systemd
 %{dracutlibdir}/modules.d/98usrmount
 %{dracutlibdir}/modules.d/99base
 %{dracutlibdir}/modules.d/99memstrack
@@ -498,7 +504,6 @@ rm -rf -- $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/35connman
 %{dracutlibdir}/modules.d/35network-legacy
 %{dracutlibdir}/modules.d/35network-manager
-%{dracutlibdir}/modules.d/35network-wicked
 %{dracutlibdir}/modules.d/40network
 %{dracutlibdir}/modules.d/90kernel-network-modules
 %{dracutlibdir}/modules.d/95fcoe
@@ -507,12 +512,11 @@ rm -rf -- $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/95cifs
 %{dracutlibdir}/modules.d/95nbd
 %{dracutlibdir}/modules.d/95nfs
+%{dracutlibdir}/modules.d/95nvmf
 %{dracutlibdir}/modules.d/95ssh-client
 %{dracutlibdir}/modules.d/45ifcfg
 %ifarch s390 s390x
 %{dracutlibdir}/modules.d/95znet
-%else
-%exclude %{dracutlibdir}/modules.d/95znet
 %endif
 %{dracutlibdir}/modules.d/95fcoe-uefi
 %{dracutlibdir}/modules.d/99uefi-lib
@@ -564,6 +568,9 @@ rm -rf -- $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 03 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 102-1
+- new upstream release.
+
 * Sun May 14 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 059-1
 - new upstream release.