From 319bd82dca84a3a98a8ff2af561305d8695eb968 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 27 May 2012 09:57:11 +0200 Subject: [PATCH] dracut: update to 018. --- srcpkgs/dracut-network | 1 - srcpkgs/dracut/dracut-network.template | 16 -------------- srcpkgs/dracut/template | 29 +++++++++++++------------- 3 files changed, 15 insertions(+), 31 deletions(-) delete mode 120000 srcpkgs/dracut-network delete mode 100644 srcpkgs/dracut/dracut-network.template diff --git a/srcpkgs/dracut-network b/srcpkgs/dracut-network deleted file mode 120000 index b3ae25a9bdd..00000000000 --- a/srcpkgs/dracut-network +++ /dev/null @@ -1 +0,0 @@ -dracut \ No newline at end of file diff --git a/srcpkgs/dracut/dracut-network.template b/srcpkgs/dracut/dracut-network.template deleted file mode 100644 index 3082696ead8..00000000000 --- a/srcpkgs/dracut/dracut-network.template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'dracut-network' -pkgname=dracut -depends="dracut>=014" -short_desc="${short_desc} - network modules" -long_desc="${long_desc} - This package contains some modules to allow booting from network, such as - via ISCSI, NFS, etc." - -noarch=yes - -do_install() { - for f in 40network 90livenet 95fcoe 95iscsi \ - 95nbd 95nfs 95zfcp 95znet; do - vmove usr/lib/dracut/modules.d/${f} usr/lib/dracut/modules.d - done -} diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 19d1d730f77..28216faf398 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,16 +1,20 @@ # Template file for 'dracut' pkgname=dracut -version=014 -revision=3 -distfiles="${KERNEL_SITE}/utils/boot/$pkgname/$pkgname-$version.tar.xz" +version=018 build_style=gnu-makefile -make_build_args="sysconfdir=/etc" -make_install_args="sysconfdir=/etc" +make_build_args="sysconfdir=/etc systemdsystemunitdir=/lib/systemd/system" +make_install_args="sysconfdir=/etc systemdsystemunitdir=/lib/systemd/system" depends="busybox psmisc>=22.14_2" makedepends="libxslt docbook-xsl" +conf_files="/etc/dracut.conf" +make_dirs="/etc/dracut.conf.d 0755 root root" +noarch=yes +homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html" short_desc="A new initramfs infrastructure" maintainer="Juan RP " -checksum=8766a0eecd51b4bc6647e7870ba269dffbbbe21954984b23c77f21ce1fd034d1 +license="GPL-2" +distfiles="${KERNEL_SITE}/utils/boot/$pkgname/$pkgname-$version.tar.xz" +checksum=0d761dc19d116db82d0d7bf93d0c8c23179fb32c8d7b3b843acfb27d3633d565 long_desc=" Unlike existing initramfs, this is an attempt at having as little as possible hard-coded into the initramfs as possible. The initramfs has (basically) one @@ -21,15 +25,12 @@ long_desc=" carry on. Having the root on MD, LVM2, LUKS is supported as well as NFS, iSCSI, NBD and FCOE with dracut-network." -noarch=yes -subpackages="dracut-network" -conf_files="/etc/dracut.conf" -make_dirs="/etc/dracut.conf.d 0755 root root" - - +pre_build() { + # Remove the nonsense syncheck target. + sed -i -e "s|all: syncheck|all:|g" Makefile +} pre_install() { # fix path to busybox. - sed -i "s|/sbin/busybox|/bin/busybox|g" \ - modules.d/05busybox/module-setup.sh + sed -i "s|/sbin/busybox|/bin/busybox|g" modules.d/05busybox/module-setup.sh }