From d0aa731ad4717ee20e9a3c35ca16aecea17755ee Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 29 Jun 2012 16:36:15 +0200 Subject: [PATCH] dracut: update to 020. --- srcpkgs/dracut/dracut.rshlibs | 1 + ...warnings-when-pkg-config-is-not-inst.patch | 47 ------------------- srcpkgs/dracut/template | 7 ++- 3 files changed, 4 insertions(+), 51 deletions(-) create mode 100644 srcpkgs/dracut/dracut.rshlibs delete mode 100644 srcpkgs/dracut/patches/0001-Avoid-annonying-warnings-when-pkg-config-is-not-inst.patch diff --git a/srcpkgs/dracut/dracut.rshlibs b/srcpkgs/dracut/dracut.rshlibs new file mode 100644 index 00000000000..631aa1dda40 --- /dev/null +++ b/srcpkgs/dracut/dracut.rshlibs @@ -0,0 +1 @@ +libc.so.6 diff --git a/srcpkgs/dracut/patches/0001-Avoid-annonying-warnings-when-pkg-config-is-not-inst.patch b/srcpkgs/dracut/patches/0001-Avoid-annonying-warnings-when-pkg-config-is-not-inst.patch deleted file mode 100644 index 6f215cf2201..00000000000 --- a/srcpkgs/dracut/patches/0001-Avoid-annonying-warnings-when-pkg-config-is-not-inst.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2cf4f4fb747803ff31d53507bc047232c4ef99ea Mon Sep 17 00:00:00 2001 -From: Juan RP -Date: Wed, 6 Jun 2012 14:19:59 +0200 -Subject: [PATCH 01/18] Avoid annonying warnings when pkg-config is not - installed. - ---- - dracut-functions.sh | 2 +- - modules.d/95udev-rules/module-setup.sh | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index f788878..4180f03 100755 ---- dracut-functions.sh -+++ dracut-functions.sh -@@ -531,7 +531,7 @@ inst_symlink() { - ln -sfn $(convert_abs_rel "${_target}" "${_realsrc}") "$initdir/$_target" - } - --udevdir=$(pkg-config udev --variable=udevdir) -+udevdir=$(pkg-config udev --variable=udevdir 2>/dev/null) - if ! [[ -d "$udevdir" ]]; then - [[ -d /lib/udev ]] && udevdir=/lib/udev - [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev -diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh -index e8c1c04..ff47021 100755 ---- modules.d/95udev-rules/module-setup.sh -+++ modules.d/95udev-rules/module-setup.sh -@@ -5,13 +5,13 @@ - install() { - local _i - -- systemdutildir=$(pkg-config systemd --variable=systemdutildir) -+ systemdutildir=$(pkg-config systemd --variable=systemdutildir 2>/dev/null) - if ! [[ -d "$systemdutildir" ]]; then - [[ -d /lib/systemd ]] && systemdutildir=/lib/systemd - [[ -d /usr/lib/systemd ]] && systemdutildir=/usr/lib/systemd - fi - -- udevdir=$(pkg-config udev --variable=udevdir) -+ udevdir=$(pkg-config udev --variable=udevdir 2>/dev/null) - if ! [[ -d "$udevdir" ]]; then - [[ -d /lib/udev ]] && udevdir=/lib/udev - [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev --- -1.7.10.4 - diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 19a064cfad9..217c21dff77 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,8 +1,7 @@ # Template file for 'dracut' pkgname=dracut -version=019 -revision=2 -noarch=yes +version=020 +revision=1 build_style=gnu-makefile make_build_args="sysconfdir=/etc systemdsystemunitdir=/lib/systemd/system" make_install_args="sysconfdir=/etc systemdsystemunitdir=/lib/systemd/system" @@ -16,7 +15,7 @@ short_desc="A new initramfs infrastructure" maintainer="Juan RP " license="GPL-2" distfiles="${KERNEL_SITE}/utils/boot/$pkgname/$pkgname-$version.tar.xz" -checksum=5e151519c9cd7aaf81bf7749a3ed6b23724b8591b1cf034add3454697a286fe1 +checksum=b1a4573031bbbefb827880a6a9815aadecc22412a233200ed93e322047db1edc 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