ssuominen 14/04/03 19:16:02 Modified: udev-init-scripts-9999.ebuild ChangeLog Added: udev-init-scripts-26-r2.ebuild Log: If /etc/runlevels/sysinit is missing when we are installing for the first time, create the directory. This way we don't have to pull in sys-apps/openrc as a dependency, and sys-apps/systemd can continue to depend on this package unconditionally wrt #487080 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path 1.27 sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild?rev=1.27&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild?rev=1.27&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild?r1=1.26&r2=1.27 Index: udev-init-scripts-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- udev-init-scripts-9999.ebuild 3 Apr 2014 18:37:57 -0000 1.26 +++ udev-init-scripts-9999.ebuild 3 Apr 2014 19:16:01 -0000 1.27 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.26 2014/04/03 18:37:57 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.27 2014/04/03 19:16:01 ssuominen Exp $ EAPI=5 @@ -25,8 +25,7 @@ RESTRICT="test" -RDEPEND="sys-apps/openrc - >=virtual/udev-180 +RDEPEND=">=virtual/udev-180 !<sys-fs/udev-186" DEPEND="${RDEPEND}" @@ -41,13 +40,15 @@ # the first install of this package. if [[ -z ${REPLACING_VERSIONS} ]] then - if [[ -x "${ROOT}"etc/init.d/udev \ - && -d "${ROOT}"etc/runlevels/sysinit ]] + if [[ ! -d "${ROOT}"etc/runlevels/sysinit ]] + then + mkdir -p "${ROOT}"etc/runlevels/sysinit + fi + if [[ -x "${ROOT}"etc/init.d/udev ]] then ln -s /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev fi - if [[ -x "${ROOT}"etc/init.d/udev-mount \ - && -d "${ROOT}"etc/runlevels/sysinit ]] + if [[ -x "${ROOT}"etc/init.d/udev-mount ]] then ln -s /etc/init.d/udev-mount \ "${ROOT}"etc/runlevels/sysinit/udev-mount 1.92 sys-fs/udev-init-scripts/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog?rev=1.92&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog?rev=1.92&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog?r1=1.91&r2=1.92 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- ChangeLog 3 Apr 2014 18:37:57 -0000 1.91 +++ ChangeLog 3 Apr 2014 19:16:01 -0000 1.92 @@ -1,6 +1,15 @@ # ChangeLog for sys-fs/udev-init-scripts # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.91 2014/04/03 18:37:57 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.92 2014/04/03 19:16:01 ssuominen Exp $ + +*udev-init-scripts-26-r2 (03 Apr 2014) + + 03 Apr 2014; Samuli Suominen <[email protected]> + +udev-init-scripts-26-r2.ebuild, udev-init-scripts-9999.ebuild: + If /etc/runlevels/sysinit is missing when we are installing for the first + time, create the directory. This way we don't have to pull in sys-apps/openrc + as a dependency, and sys-apps/systemd can continue to depend on this package + unconditionally wrt #487080 03 Apr 2014; Samuli Suominen <[email protected]> udev-init-scripts-26-r1.ebuild, udev-init-scripts-26.ebuild, 1.1 sys-fs/udev-init-scripts/udev-init-scripts-26-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26-r2.ebuild?rev=1.1&content-type=text/plain Index: udev-init-scripts-26-r2.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26-r2.ebuild,v 1.1 2014/04/03 19:16:01 ssuominen Exp $ EAPI=5 inherit eutils udev if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/udev-gentoo-scripts.git" inherit git-2 fi DESCRIPTION="udev startup scripts for openrc" HOMEPAGE="http://www.gentoo.org"; LICENSE="GPL-2" SLOT="0" IUSE="" if [ "${PV}" != "9999" ]; then SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"; KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi RESTRICT="test" RDEPEND=">=virtual/udev-180 !<sys-fs/udev-186" DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { epatch_user } src_install() { default # These are now part of >=net-misc/netifrc-0.2.1: rm -f "${D}"/$(get_udevdir)/{net.sh,rules.d/90-network.rules} } pkg_postinst() { # Add udev and udev-mount to the sysinit runlevel automatically if this is # the first install of this package. if [[ -z ${REPLACING_VERSIONS} ]] then if [[ ! -d "${ROOT}"etc/runlevels/sysinit ]] then mkdir -p "${ROOT}"etc/runlevels/sysinit fi if [[ -x "${ROOT}"etc/init.d/udev ]] then ln -s /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev fi if [[ -x "${ROOT}"etc/init.d/udev-mount ]] then ln -s /etc/init.d/udev-mount \ "${ROOT}"etc/runlevels/sysinit/udev-mount fi fi # Warn the user about adding the scripts to their sysinit runlevel if [[ -e "${ROOT}"etc/runlevels/sysinit ]] then if [[ ! -e "${ROOT}"etc/runlevels/sysinit/udev ]] then ewarn ewarn "You need to add udev to the sysinit runlevel." ewarn "If you do not do this," ewarn "your system will not be able to boot!" ewarn "Run this command:" ewarn "\trc-update add udev sysinit" fi if [[ ! -e "${ROOT}"etc/runlevels/sysinit/udev-mount ]] then ewarn ewarn "You need to add udev-mount to the sysinit runlevel." ewarn "If you do not do this," ewarn "your system will not be able to boot!" ewarn "Run this command:" ewarn "\trc-update add udev-mount sysinit" fi fi if ! has_version "sys-fs/eudev[rule-generator]" && \ [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then ewarn "The udev-postmount service has been removed because the reasons for" ewarn "its existance have been removed upstream." ewarn "Please remove it from your runlevels." fi }
