dracut: Update to 024.

[ipfire-3.x.git] / dracut / dracut.nm

diff --git a/dracut/dracut.nm b/dracut/dracut.nm
index 6890ab18ec348a8373eb2f555ed8804f97e6561b..d0afc9a6272253f0b8dddf123c5d6123b3cff893 100644 (file)
--- a/dracut/dracut.nm
+++ b/dracut/dracut.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = dracut
-version    = 018
-release    = 2
+version    = 024
+release    = 1
 arch       = noarch
 
 groups     = System/Boot
@@ -22,6 +22,7 @@ sources    = %{thisapp}.tar.xz
 
 build
        requires
+               asciidoc
                docbook-utils
                docbook-xsl
        end
@@ -38,17 +39,19 @@ build
 
        dracutlibdir = %{prefix}/lib/dracut
 
-       install
-               make install DESTDIR=%{BUILDROOT} \
-                       sysconfdir=/etc mandir=/usr/share/man
+       make_install_targets += \
+               sysconfdir=%{sysconfdir} \
+               libdir=%{dracutlibdir} \
+               mandir=%{mandir}
 
+       install_cmds
                # Install local configuration.
                mkdir -pv %{BUILDROOT}/etc/dracut.conf.d
                cp -vf %{DIR_SOURCE}/ipfire.conf %{BUILDROOT}/etc/dracut.conf.d/ipfire.conf
 
                # Save package version.
-               echo "%{name}-%{version}-%{release}" > \
-                       %{BUILDROOT}%{dracutlibdir}/modules.d/10rpmversion/dracut-version
+               echo "DRACUT_VERSION=%{version}-%{release}" > \
+                       %{BUILDROOT}/%{dracutlibdir}/dracut-version.sh
 
                # Remove Gentoo specific module.
                rm -rvf %{BUILDROOT}%{dracutlibdir}/modules.d/50gensplash
@@ -77,11 +80,11 @@ packages
                        gzip
                        iputils
                        kbd
+                       kpartx
                        less
                        libselinux
                        lvm2
                        mdadm
-                       multipath-tools
                        sysvinit
                        udev
                        util-linux