dracut: added patch from git master to silence pkg-config warnings.
This commit is contained in:
parent
b3d6af28ee
commit
d3badab289
2 changed files with 48 additions and 1 deletions
|
@ -0,0 +1,47 @@
|
||||||
|
From 2cf4f4fb747803ff31d53507bc047232c4ef99ea Mon Sep 17 00:00:00 2001
|
||||||
|
From: Juan RP <xtraeme@gmail.com>
|
||||||
|
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
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'dracut'
|
# Template file for 'dracut'
|
||||||
pkgname=dracut
|
pkgname=dracut
|
||||||
version=019
|
version=019
|
||||||
revision=1
|
revision=2
|
||||||
noarch=yes
|
noarch=yes
|
||||||
build_style=gnu-makefile
|
build_style=gnu-makefile
|
||||||
make_build_args="sysconfdir=/etc systemdsystemunitdir=/lib/systemd/system"
|
make_build_args="sysconfdir=/etc systemdsystemunitdir=/lib/systemd/system"
|
||||||
|
|
Loading…
Reference in a new issue