public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
Search results ordered by [date|relevance]  view[summary|nested|Atom feed]
thread overview below | download mbox.gz: |
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev-init-scripts: udev-init-scripts-9999.ebuild ChangeLog udev-init-scripts-14.ebuild
@ 2012-08-01 17:15 99% William Hubbs (williamh)
  0 siblings, 0 replies; 1+ results
From: William Hubbs (williamh) @ 2012-08-01 17:15 UTC (permalink / raw
  To: gentoo-commits

williamh    12/08/01 17:15:24

  Modified:             udev-init-scripts-9999.ebuild ChangeLog
  Added:                udev-init-scripts-14.ebuild
  Log:
  version bump and sync live ebuild
  
  (Portage version: 2.2.0_alpha120/cvs/Linux i686)

Revision  Changes    Path
1.9                  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.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild?rev=1.9&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.8&r2=1.9

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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- udev-init-scripts-9999.ebuild	3 May 2012 03:03:43 -0000	1.8
+++ udev-init-scripts-9999.ebuild	1 Aug 2012 17:15:24 -0000	1.9
@@ -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-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.8 2012/05/03 03:03:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.9 2012/08/01 17:15:24 williamh Exp $
 
 EAPI=4
 
@@ -22,10 +22,10 @@
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
-DEPEND="!<sys-fs/udev-182"
-RDEPEND="${DEPEND}
-	>=sys-fs/udev-182
-	sys-apps/openrc"
+DEPEND=""
+RDEPEND=">=sys-fs/udev-187
+	sys-apps/openrc
+	!<sys-fs/udev-186"
 
 src_compile()
 {
@@ -34,58 +34,30 @@
 
 pkg_postinst()
 {
-	local enable_postmount=false
-
-	# FIXME: inconsistent handling of init-scripts here
-	#  * udev is added to sysinit in openrc-ebuild
-	#  * we add udev-postmount to default in here
-	#
-
 	# If we are building stages, add udev to the sysinit runlevel automatically.
 	if use build
 	then
-		if [[ -x "${ROOT}"/etc/init.d/udev  \
+		if [[ -x "${ROOT}"/etc/init.d/udev \
 			&& -d "${ROOT}"/etc/runlevels/sysinit ]]
 		then
 			ln -s /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
 		fi
-		enable_postmount=true
 	fi
 
 	# migration to >=openrc-0.4
-	if [[ -e "${ROOT}"/etc/runlevels/sysinit && ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]]
+	if [[ -e "${ROOT}"/etc/runlevels/sysinit \
+		&& ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]]
 	then
 		ewarn
 		ewarn "You need to add the udev init script to the runlevel sysinit,"
-		ewarn "else your system will not be able to boot"
+		ewarn "otherwise your system will not be able to boot"
 		ewarn "after updating to >=openrc-0.4.0"
 		ewarn "Run this to enable udev for >=openrc-0.4.0:"
 		ewarn "\trc-update add udev sysinit"
 		ewarn
 	fi
 
-	# add udev-postmount to default runlevel instead of that ugly injecting
-	# like a hotplug event, 2009/10/15
-
-	# already enabled?
-	[[ -e "${ROOT}"/etc/runlevels/default/udev-postmount ]] && return
-
-	[[ -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=true
-	[[ "${ROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=true
-
-	if $enable_postmount
-	then
-		local initd=udev-postmount
-
-		if [[ -e ${ROOT}/etc/init.d/${initd} ]] && \
-			[[ ! -e ${ROOT}/etc/runlevels/default/${initd} ]]
-		then
-			ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/default/${initd}
-			elog "Auto-adding '${initd}' service to your default runlevel"
-		fi
-	else
-		elog "You should add the udev-postmount service to default runlevel."
-		elog "Run this to add it:"
-		elog "\trc-update add udev-postmount default"
-	fi
+	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."
 }



1.17                 sys-fs/udev-init-scripts/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog?r1=1.16&r2=1.17

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChangeLog	22 Jul 2012 19:01:21 -0000	1.16
+++ ChangeLog	1 Aug 2012 17:15:24 -0000	1.17
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udev-init-scripts
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.16 2012/07/22 19:01:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.17 2012/08/01 17:15:24 williamh Exp $
+
+*udev-init-scripts-14 (01 Aug 2012)
+
+  01 Aug 2012; William Hubbs <williamh@gentoo.org>
+  +udev-init-scripts-14.ebuild, udev-init-scripts-9999.ebuild:
+  version bump and sync live ebuild
 
   22 Jul 2012; Raúl Porcel <armin76@gentoo.org> udev-init-scripts-10.ebuild,
   udev-init-scripts-12.ebuild:



1.1                  sys-fs/udev-init-scripts/udev-init-scripts-14.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-14.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-14.ebuild?rev=1.1&content-type=text/plain

Index: udev-init-scripts-14.ebuild
===================================================================
# Copyright 1999-2012 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-14.ebuild,v 1.1 2012/08/01 17:15:24 williamh Exp $

EAPI=4

EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/udev-gentoo-scripts.git"

if [ "${PV}" = "9999" ]; then
	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="mirror://gentoo/${P}.tar.bz2"
	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
fi

DEPEND=""
RDEPEND=">=sys-fs/udev-187
	sys-apps/openrc
	!<sys-fs/udev-186"

src_compile()
{
	return 0
}

pkg_postinst()
{
	# If we are building stages, add udev to the sysinit runlevel automatically.
	if use build
	then
		if [[ -x "${ROOT}"/etc/init.d/udev \
			&& -d "${ROOT}"/etc/runlevels/sysinit ]]
		then
			ln -s /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
		fi
	fi

	# migration to >=openrc-0.4
	if [[ -e "${ROOT}"/etc/runlevels/sysinit \
		&& ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]]
	then
		ewarn
		ewarn "You need to add the udev init script to the runlevel sysinit,"
		ewarn "otherwise your system will not be able to boot"
		ewarn "after updating to >=openrc-0.4.0"
		ewarn "Run this to enable udev for >=openrc-0.4.0:"
		ewarn "\trc-update add udev sysinit"
		ewarn
	fi

	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."
}





^ permalink raw reply	[relevance 99%]

Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2012-08-01 17:15 99% [gentoo-commits] gentoo-x86 commit in sys-fs/udev-init-scripts: udev-init-scripts-9999.ebuild ChangeLog udev-init-scripts-14.ebuild William Hubbs (williamh)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox