X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=dracut%2Fdracut.nm;h=b7e72c24fec4ee3cc52f6a3e3e940712acdbbbf6;hb=f55e2a21c45014acc599899915578df6395137dd;hp=8b49f4d5711ae78de3f6a06b8f093907a07c20e3;hpb=d51784276a43b567b282f703e0853395c5176e71;p=ipfire-3.x.git

diff --git a/dracut/dracut.nm b/dracut/dracut.nm
index 8b49f4d57..b7e72c24f 100644
--- a/dracut/dracut.nm
+++ b/dracut/dracut.nm
@@ -4,9 +4,8 @@
 ###############################################################################
 
 name       = dracut
-version    = 010
-release    = 5
-arch       = noarch
+version    = 046
+release    = 1
 
 groups     = System/Boot
 url        = http://sourceforge.net/apps/trac/dracut/wiki
@@ -17,22 +16,54 @@ 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
+		asciidoc
 		docbook-utils
 		docbook-xsl
+		kmod-devel >= 15
 	end
 
-	install
-		make install DESTDIR=%{BUILDROOT} \
-			sbindir=/sbin sysconfdir=/etc mandir=/usr/share/man
+	prepare_cmds
+		# Disable dash syntax check as we don't have dash.
+		sed -e "s/dash/true/g" -i Makefile
 
+		# The plymouth plugin contains a lot of hardcoded libexec paths.
+		# We don't use libexec and so we need to change this.
+		sed -e "s/libexec/lib/g" -i \
+			modules.d/50plymouth/module-setup.sh
+	end
+
+	dracutlibdir = %{prefix}/lib
+
+	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 "DRACUT_VERSION=%{version}-%{release}" > \
+			%{BUILDROOT}/%{dracutlibdir}/dracut/dracut-version.sh
+
+		# 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
 
@@ -49,12 +80,12 @@ packages
 			gzip
 			iputils
 			kbd
+			kpartx
 			less
-			libselinux
 			lvm2
 			mdadm
-			multipath-tools
 			sysvinit
+			systemd >= 187
 			udev
 			util-linux
 			which
@@ -76,24 +107,25 @@ packages
 		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