From 0ec0c8e88a27435dd5a9f601039ea13fb52c0527 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 19 Feb 2018 12:24:05 -0300 Subject: [PATCH] dracut: update to 047. Closes: #11745 [via git-merge-pr] --- .../dracut/patches/network_install_grep.patch | 21 ------------------- srcpkgs/dracut/template | 17 +++++++++------ 2 files changed, 11 insertions(+), 27 deletions(-) delete mode 100644 srcpkgs/dracut/patches/network_install_grep.patch diff --git a/srcpkgs/dracut/patches/network_install_grep.patch b/srcpkgs/dracut/patches/network_install_grep.patch deleted file mode 100644 index ba3978ae19..0000000000 --- a/srcpkgs/dracut/patches/network_install_grep.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- modules.d/40network/module-setup.sh 2017-08-11 13:44:06.000000000 +0200 -+++ modules.d/40network/module-setup.sh 2017-12-12 19:47:35.691067368 +0100 -@@ -4,7 +4,7 @@ - check() { - local _program - -- require_binaries ip dhclient || return 1 -+ require_binaries ip dhclient sed awk grep || return 1 - require_any_binary arping arping2 || return 1 - - return 255 -@@ -24,7 +24,7 @@ - # called by dracut - install() { - local _arch _i _dir -- inst_multiple ip dhclient sed awk -+ inst_multiple ip dhclient sed awk grep - - inst_multiple -o arping arping2 - strstr "$(arping 2>&1)" "ARPing 2" && mv "$initdir/bin/arping" "$initdir/bin/arping2" - diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 86a5500235..a98b9fbeb4 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,12 +1,12 @@ # Template file for 'dracut' pkgname=dracut -version=046 -revision=2 +version=047 +revision=1 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc" -hostmakedepends="libxslt docbook-xsl asciidoc pkg-config" +hostmakedepends="asciidoc pkg-config" makedepends="libkmod-devel" -depends="bash psmisc cpio coreutils" +depends="bash coreutils cpio psmisc" conf_files="/etc/dracut.conf" make_dirs=" /etc/dracut.conf.d 0755 root root @@ -14,9 +14,9 @@ make_dirs=" homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html" short_desc="A new initramfs infrastructure" maintainer="Juan RP " -license="GPL-2" +license="GPL-2.0-or-later" distfiles="${KERNEL_SITE}/utils/boot/$pkgname/$pkgname-$version.tar.xz" -checksum=3cb206abc198811972d452d53e88c32f29dd1b0bb24e35e23b4056aa74824f99 +checksum=b0afd3bdd886b2f756743c91a00a155da9df0644625b1c565c3d5ef78cd76ab2 case "$XBPS_TARGET_MACHINE" in *-musl) # Add musl-fts implementation @@ -30,6 +30,11 @@ do_build() { esac } +do_check() { + # Requires the distfile to be a git repository + : +} + post_install() { # kernel hooks. vinstall ${FILESDIR}/kernel-hook-postinst 755 etc/kernel.d/post-install 20-dracut