diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2009-09-06 12:41:53 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2009-09-06 12:41:53 +0000 |
| commit | 1abb8545896524f2d5b6731736ff164ac2ddfd4d (patch) | |
| tree | 3dede99d8bd3c05e2b524cb1492e48b80784fe0e /sys-fs | |
| parent | Mask dev-games/kyra and games-puzzle/gemhun for removal. (diff) | |
| download | gentoo-2-1abb8545896524f2d5b6731736ff164ac2ddfd4d.tar.gz gentoo-2-1abb8545896524f2d5b6731736ff164ac2ddfd4d.tar.bz2 gentoo-2-1abb8545896524f2d5b6731736ff164ac2ddfd4d.zip | |
Only execute the lib->lib64 move code if it is really needed, bug #281338. Only test for INOTIFY_USER, bug #283763. Block older lvm2 versions and all device-mapper versions, as the included udev-rules are too old and still using vol_id, bug #283727.
(Portage version: 2.2_rc40/cvs/Linux i686)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/udev/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-fs/udev/udev-145-r1.ebuild | 25 |
2 files changed, 23 insertions, 10 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index a843e93ef2c3..d3ce55273d9e 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.488 2009/09/06 09:32:46 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.489 2009/09/06 12:41:53 zzam Exp $ + + 06 Sep 2009; Matthias Schwarzott <zzam@gentoo.org> udev-145-r1.ebuild: + Only execute the lib->lib64 move code if it is really needed, bug #281338. + Only test for INOTIFY_USER, bug #283763. Block older lvm2 versions and all + device-mapper versions, as the included udev-rules are too old and still + using vol_id, bug #283727. 06 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> udev-145-r1.ebuild: Missed one check. diff --git a/sys-fs/udev/udev-145-r1.ebuild b/sys-fs/udev/udev-145-r1.ebuild index 513418fbd7a4..c6bab42fbfe2 100644 --- a/sys-fs/udev/udev-145-r1.ebuild +++ b/sys-fs/udev/udev-145-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145-r1.ebuild,v 1.4 2009/09/06 09:32:46 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145-r1.ebuild,v 1.5 2009/09/06 12:41:53 zzam Exp $ EAPI="1" @@ -37,7 +37,8 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} !sys-apps/coldplug - !<sys-fs/device-mapper-1.02.19-r1 + !<sys-fs/lvm2-2.02.45 + !sys-fs/device-mapper >=sys-apps/baselayout-1.12.5" if [[ ${PV} == "9999" ]]; then @@ -50,7 +51,7 @@ if [[ ${PV} == "9999" ]]; then fi # required kernel options -CONFIG_CHECK="~INOTIFY ~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2" +CONFIG_CHECK="~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2" # We need the lib/rcscripts/addon support PROVIDE="virtual/dev-manager" @@ -188,13 +189,19 @@ src_install() { into / emake DESTDIR="${D}" install || die "make install failed" + # without this code, multilib-strict is angry if [[ "$(get_libdir)" != "lib" ]]; then - # we can not just rename /lib to /lib64, because - # make install creates /lib64 and /lib - # without this code, multilib-strict is angry - mkdir -p "${D}/$(get_libdir)" - mv "${D}"/lib/* "${D}/$(get_libdir)/" - rmdir "${D}"/lib + # check if this code is needed, bug #281338 + if [[ -d "${D}/lib" ]]; then + # we can not just rename /lib to /lib64, because + # make install creates /lib64 and /lib + einfo "Moving lib to $(get_libdir)" + mkdir -p "${D}/$(get_libdir)" + mv "${D}"/lib/* "${D}/$(get_libdir)/" + rmdir "${D}"/lib + else + einfo "There is no ${D}/lib, move code can be deleted." + fi fi exeinto "${udev_libexec_dir}" |