ssuominen 14/07/30 18:11:24 Modified: udev-9999.ebuild ChangeLog Log: Use udev_reload() function from udev.eclass to avoid duplicating code. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path 1.314 sys-fs/udev/udev-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.314&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.314&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.313&r2=1.314 Index: udev-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v retrieving revision 1.313 retrieving revision 1.314 diff -u -r1.313 -r1.314 --- udev-9999.ebuild 25 Jul 2014 04:03:58 -0000 1.313 +++ udev-9999.ebuild 30 Jul 2014 18:11:23 -0000 1.314 @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.313 2014/07/25 04:03:58 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.314 2014/07/30 18:11:23 ssuominen Exp $ EAPI=5 -inherit autotools bash-completion-r1 eutils linux-info multilib multilib-minimal toolchain-funcs user versionator +inherit autotools bash-completion-r1 eutils linux-info multilib multilib-minimal toolchain-funcs udev user versionator if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd" @@ -497,12 +497,7 @@ if has_version 'sys-apps/hwids[udev]'; then udevadm hwdb --update --root="${ROOT%/}" # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd - if [[ -z ${REPLACING_VERSIONS} ]]; then - # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda - if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then - return 0 - fi - udevadm control --reload - fi + # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda + [[ -z ${REPLACING_VERSIONS} ]] && udev_reload fi } 1.1074 sys-fs/udev/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.1074&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.1074&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.1073&r2=1.1074 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v retrieving revision 1.1073 retrieving revision 1.1074 diff -u -r1.1073 -r1.1074 --- ChangeLog 29 Jul 2014 19:23:12 -0000 1.1073 +++ ChangeLog 30 Jul 2014 18:11:23 -0000 1.1074 @@ -1,6 +1,9 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1073 2014/07/29 19:23:12 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1074 2014/07/30 18:11:23 ssuominen Exp $ + + 30 Jul 2014; Samuli Suominen <[email protected]> udev-9999.ebuild: + Use udev_reload() function from udev.eclass to avoid duplicating code. 29 Jul 2014; Markus Meier <[email protected]> udev-215-r1.ebuild: arm stable, bug #517106
