coreutils: Update to 8.16.

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

diff --git a/dracut/dracut.nm b/dracut/dracut.nm
index bedfd4e17cda72c311f7beebd93eb665a29568ce..8c0f9c7b7b4e2394df2ad8b90ac68f945fab66fc 100644 (file)
--- a/dracut/dracut.nm
+++ b/dracut/dracut.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = dracut
-version    = 010
-release    = 5
+version    = 017
+release    = 1
 arch       = noarch
 
 groups     = System/Boot
@@ -17,8 +17,8 @@ description
        dracut is a new, event-driven initramfs infrastructure based around udev.
 end
 
-source_dl  =
-sources    = %{thisapp}.tar.bz2
+source_dl  = http://www.kernel.org/pub/linux/utils/boot/dracut/
+sources    = %{thisapp}.tar.xz
 
 build
        requires
@@ -26,13 +26,31 @@ build
                docbook-xsl
        end
 
+       dracutlibdir = %{prefix}/lib/dracut
+
        install
                make install DESTDIR=%{BUILDROOT} \
-                       sbindir=/sbin sysconfdir=/etc mandir=/usr/share/man
+                       sysconfdir=/etc mandir=/usr/share/man
 
                # 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
+
+               # Remove Gentoo specific module.
+               rm -rvf %{BUILDROOT}%{dracutlibdir}/modules.d/50gensplash
+
+               mkdir -pv %{BUILDROOT}/boot/dracut
+               mkdir -pv %{BUILDROOT}/var/lib/dracut/overlay
+               mkdir -pv %{BUILDROOT}/var/lib/initramfs
+               mkdir -pv %{BUILDROOT}%{localstatedir}/log
+               touch %{BUILDROOT}%{localstatedir}/log/dracut.log
+
+               mkdir -pv %{BUILDROOT}/etc/logrotate.d
+               install -m 0644 dracut.logrotate %{BUILDROOT}/etc/logrotate.d/dracut_log
        end
 end
 
@@ -60,40 +78,41 @@ packages
                        which
                end
        end
-       
+
        package %{name}-network
                summary = Network support for the initramdisk.
                description
                        This package requires everything which is needed to build a generic
                        all purpose initramfs with network support with dracut.
                end
-       
+
                requires
                        bridge-utils
                        dhclient
                        iproute2
                        nfs-utils
                end
-       
+
                files
-                       /usr/share/dracut/modules.d/40network
-                       /usr/share/dracut/modules.d/95fcoe
-                       /usr/share/dracut/modules.d/95iscsi
-                       /usr/share/dracut/modules.d/95nbd
-                       /usr/share/dracut/modules.d/95nfs
-                       /usr/share/dracut/modules.d/45ifcfg
-                       /usr/share/dracut/modules.d/95znet
+                       /usr/lib/dracut/modules.d/40network
+                       /usr/lib/dracut/modules.d/95fcoe
+                       /usr/lib/dracut/modules.d/95iscsi
+                       /usr/lib/dracut/modules.d/95nbd
+                       /usr/lib/dracut/modules.d/95nfs
+                       /usr/lib/dracut/modules.d/45ifcfg
+                       /usr/lib/dracut/modules.d/95znet
                end
        end
-       
-       
+
        package %{name}-utils
                summary = Command line utils for dracut.
                description = %{summary}
-       
+
                files
-                       /sbin/dracut-*
-                       /sbin/*initrd
+                       /boot/dracut
+                       /usr/bin/dracut-*
+                       /usr/share/man/man8/dracut-*
+                       /var/lib/dracut
                end
        end
 end