diff options
| author |   Amadeusz Piotr Żołnowski <aidecoe@gentoo.org> | 2012-08-09 16:17:55 +0000 |
|---|---|---|
| committer | Amadeusz Piotr Żołnowski <aidecoe@gentoo.org> | 2012-08-09 16:17:55 +0000 |
| commit | 8bc8b875f3aa6e1c4082adc928267a57ac7d8b70 (patch) | |
| tree | 26ee0912e206232a73735a11b0f9fff3df35ac56 /sys-kernel/dracut | |
| parent | x86 stable, see bug 418703 (diff) | |
| download | gentoo-2-8bc8b875f3aa6e1c4082adc928267a57ac7d8b70.tar.gz gentoo-2-8bc8b875f3aa6e1c4082adc928267a57ac7d8b70.tar.bz2 gentoo-2-8bc8b875f3aa6e1c4082adc928267a57ac7d8b70.zip | |
pkg-config is now used to configure udevdir path in the ebuild.
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'sys-kernel/dracut')
| -rw-r--r-- | sys-kernel/dracut/ChangeLog | 11 | ||||
| -rw-r--r-- | sys-kernel/dracut/dracut-022-r5.ebuild (renamed from sys-kernel/dracut/dracut-022-r4.ebuild) | 15 |
2 files changed, 17 insertions, 9 deletions
diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog index a722ccc289ff..28f57b81e31c 100644 --- a/sys-kernel/dracut/ChangeLog +++ b/sys-kernel/dracut/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-kernel/dracut # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.80 2012/08/04 11:13:35 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.81 2012/08/09 16:17:55 aidecoe Exp $ + +*dracut-022-r5 (09 Aug 2012) + + 09 Aug 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> -dracut-022-r4.ebuild, + +dracut-022-r5.ebuild: + pkg-config is now used to configure udevdir path in the ebuild. + + 09 Aug 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> dracut-022-r4.ebuild: + Use pkg-config to detect udevdir. 04 Aug 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> -dracut-019-r4.ebuild, -dracut-022-r3.ebuild: diff --git a/sys-kernel/dracut/dracut-022-r4.ebuild b/sys-kernel/dracut/dracut-022-r5.ebuild index 3fa25bd440b9..a44ba788507e 100644 --- a/sys-kernel/dracut/dracut-022-r4.ebuild +++ b/sys-kernel/dracut/dracut-022-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-022-r4.ebuild,v 1.1 2012/08/04 10:43:05 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-022-r5.ebuild,v 1.1 2012/08/09 16:17:55 aidecoe Exp $ EAPI=4 @@ -68,7 +68,6 @@ RDEPEND=" >=sys-apps/sysvinit-2.87-r3 >=sys-apps/util-linux-2.20 >=sys-fs/udev-166 - !>=sys-fs/udev-187 debug? ( dev-util/strace ) device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) ) @@ -97,6 +96,7 @@ DEPEND=" >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 + virtual/pkgconfig " # @@ -162,6 +162,11 @@ src_prepare() { epatch "${FILESDIR}/${PV}-0019-dracut.sh-create-relative-symlinks-for.patch" einfo "Removing ${S}/install/hashmap.o ..." rm "${S}/install/hashmap.o" || die + local udevdir="$($(tc-getPKG_CONFIG) udev --variable=udevdir)" + [[ ${udevdir} ]] || die "Couldn't detect udevdir" + einfo "Setting udevdir to ${udevdir}..." + sed -e "s@udevdir=.*@udevdir=${udevdir}@" \ + -i "${S}/dracut.conf.d/gentoo.conf.example" || die } src_compile() { @@ -260,10 +265,4 @@ pkg_postinst() { ewarn " CONFIG_MODULES" ewarn "" fi - - if has_version virtual/pkgconfig; then - elog "" - elog "virtual/pkgconfig is no longer needed by dracut." - elog "" - fi } |