public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-206-r3.ebuild udev-9999.ebuild
@ 2013-08-11 18:29 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-08-11 18:29 UTC (permalink / raw
  To: gentoo-commits

ssuominen    13/08/11 18:29:21

  Modified:             ChangeLog udev-206-r3.ebuild udev-9999.ebuild
  Log:
  Move symlinking udevadm and renaming of udevd from multilib_src_install_all() to multilib_src_install() inside the if and else for multilib_is_native_abi.
  
  (Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

Revision  Changes    Path
1.954                sys-fs/udev/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.953
retrieving revision 1.954
diff -u -r1.953 -r1.954
--- ChangeLog	11 Aug 2013 17:47:52 -0000	1.953
+++ ChangeLog	11 Aug 2013 18:29:21 -0000	1.954
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.953 2013/08/11 17:47:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.954 2013/08/11 18:29:21 ssuominen Exp $
+
+  11 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> udev-206-r3.ebuild,
+  udev-9999.ebuild:
+  Move symlinking udevadm and renaming of udevd from multilib_src_install_all()
+  to multilib_src_install() inside the if and else for multilib_is_native_abi.
 
   11 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> udev-206-r3.ebuild,
   udev-9999.ebuild:



1.3                  sys-fs/udev/udev-206-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild?r1=1.2&r2=1.3

Index: udev-206-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- udev-206-r3.ebuild	11 Aug 2013 17:47:52 -0000	1.2
+++ udev-206-r3.ebuild	11 Aug 2013 18:29:21 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild,v 1.2 2013/08/11 17:47:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild,v 1.3 2013/08/11 18:29:21 ssuominen Exp $
 
 EAPI=5
 
@@ -359,6 +359,14 @@
 			emake -C docs/libudev DESTDIR="${D}" install
 			use gudev && emake -C docs/gudev DESTDIR="${D}" install
 		fi
+
+		# install udevadm compatibility symlink
+		dosym {../bin,sbin}/udevadm
+
+		# install udevd to /sbin and remove empty and redudant directory
+		# /lib/systemd because systemd is installed to /usr wrt #462750
+		mv "${D}"/{lib/systemd/systemd-,sbin/}udevd || die
+		rm -r "${D}"/lib/systemd
 	else
 		local lib_LTLIBRARIES="libudev.la" \
 			pkgconfiglib_DATA="src/libudev/libudev.pc" \
@@ -391,14 +399,6 @@
 	insinto /lib/udev/rules.d
 	doins "${T}"/40-gentoo.rules
 	doman "${T}"/{systemd-,}udevd.8
-
-	# install udevadm compatibility symlink
-	dosym {../bin,sbin}/udevadm
-
-	# install udevd to /sbin and remove empty and redudant directory
-	# /lib/systemd because systemd is installed to /usr wrt #462750
-	mv "${D}"/{lib/systemd/systemd-,sbin/}udevd || die
-	rm -r "${D}"/lib/systemd
 }
 
 pkg_preinst() {



1.249                sys-fs/udev/udev-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.249&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.249&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.248&r2=1.249

Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- udev-9999.ebuild	11 Aug 2013 17:47:52 -0000	1.248
+++ udev-9999.ebuild	11 Aug 2013 18:29:21 -0000	1.249
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.248 2013/08/11 17:47:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.249 2013/08/11 18:29:21 ssuominen Exp $
 
 EAPI=5
 
@@ -359,6 +359,14 @@
 			emake -C docs/libudev DESTDIR="${D}" install
 			use gudev && emake -C docs/gudev DESTDIR="${D}" install
 		fi
+
+		# install udevadm compatibility symlink
+		dosym {../bin,sbin}/udevadm
+
+		# install udevd to /sbin and remove empty and redudant directory
+		# /lib/systemd because systemd is installed to /usr wrt #462750
+		mv "${D}"/{lib/systemd/systemd-,sbin/}udevd || die
+		rm -r "${D}"/lib/systemd
 	else
 		local lib_LTLIBRARIES="libudev.la" \
 			pkgconfiglib_DATA="src/libudev/libudev.pc" \
@@ -391,14 +399,6 @@
 	insinto /lib/udev/rules.d
 	doins "${T}"/40-gentoo.rules
 	doman "${T}"/{systemd-,}udevd.8
-
-	# install udevadm compatibility symlink
-	dosym {../bin,sbin}/udevadm
-
-	# install udevd to /sbin and remove empty and redudant directory
-	# /lib/systemd because systemd is installed to /usr wrt #462750
-	mv "${D}"/{lib/systemd/systemd-,sbin/}udevd || die
-	rm -r "${D}"/lib/systemd
 }
 
 pkg_preinst() {





^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-206-r3.ebuild udev-9999.ebuild
@ 2013-08-12 13:50 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-08-12 13:50 UTC (permalink / raw
  To: gentoo-commits

ssuominen    13/08/12 13:50:35

  Modified:             ChangeLog udev-206-r3.ebuild udev-9999.ebuild
  Log:
  Only reload the hwdb.bin when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd.
  
  (Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

Revision  Changes    Path
1.956                sys-fs/udev/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.955
retrieving revision 1.956
diff -u -r1.955 -r1.956
--- ChangeLog	11 Aug 2013 19:01:21 -0000	1.955
+++ ChangeLog	12 Aug 2013 13:50:35 -0000	1.956
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.955 2013/08/11 19:01:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.956 2013/08/12 13:50:35 ssuominen Exp $
+
+  12 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> udev-206-r3.ebuild,
+  udev-9999.ebuild:
+  Only reload the hwdb.bin when we are not upgrading to avoid potential race w/
+  incompatible hwdb.bin and the running udevd.
 
   11 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> udev-206-r3.ebuild,
   udev-9999.ebuild:



1.5                  sys-fs/udev/udev-206-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild?r1=1.4&r2=1.5

Index: udev-206-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- udev-206-r3.ebuild	11 Aug 2013 19:01:21 -0000	1.4
+++ udev-206-r3.ebuild	12 Aug 2013 13:50:35 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild,v 1.4 2013/08/11 19:01:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild,v 1.5 2013/08/12 13:50:35 ssuominen Exp $
 
 EAPI=5
 
@@ -513,10 +513,13 @@
 	# Update hwdb database in case the format is changed by udev version.
 	if has_version 'sys-apps/hwids[udev]'; then
 		udevadm hwdb --update --root="${ROOT%/}"
-		# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
-			return 0
+		# 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
-		udevadm control --reload
 	fi
 }



1.251                sys-fs/udev/udev-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.251&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.251&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.250&r2=1.251

Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- udev-9999.ebuild	11 Aug 2013 19:01:21 -0000	1.250
+++ udev-9999.ebuild	12 Aug 2013 13:50:35 -0000	1.251
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.250 2013/08/11 19:01:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.251 2013/08/12 13:50:35 ssuominen Exp $
 
 EAPI=5
 
@@ -513,10 +513,13 @@
 	# Update hwdb database in case the format is changed by udev version.
 	if has_version 'sys-apps/hwids[udev]'; then
 		udevadm hwdb --update --root="${ROOT%/}"
-		# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
-			return 0
+		# 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
-		udevadm control --reload
 	fi
 }





^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-206-r3.ebuild udev-9999.ebuild
@ 2013-08-13 16:08 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-08-13 16:08 UTC (permalink / raw
  To: gentoo-commits

ssuominen    13/08/13 16:08:07

  Modified:             ChangeLog udev-206-r3.ebuild udev-9999.ebuild
  Log:
  Tell people exactly howto restart the daemon with sys-apps/openrc by Cardoe
  
  (Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

Revision  Changes    Path
1.957                sys-fs/udev/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.956
retrieving revision 1.957
diff -u -r1.956 -r1.957
--- ChangeLog	12 Aug 2013 13:50:35 -0000	1.956
+++ ChangeLog	13 Aug 2013 16:08:07 -0000	1.957
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.956 2013/08/12 13:50:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.957 2013/08/13 16:08:07 ssuominen Exp $
+
+  13 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> udev-206-r3.ebuild,
+  udev-9999.ebuild:
+  Tell people exactly howto restart the daemon with sys-apps/openrc by Cardoe
 
   12 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> udev-206-r3.ebuild,
   udev-9999.ebuild:



1.6                  sys-fs/udev/udev-206-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild?r1=1.5&r2=1.6

Index: udev-206-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- udev-206-r3.ebuild	12 Aug 2013 13:50:35 -0000	1.5
+++ udev-206-r3.ebuild	13 Aug 2013 16:08:07 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild,v 1.5 2013/08/12 13:50:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild,v 1.6 2013/08/13 16:08:07 ssuominen Exp $
 
 EAPI=5
 
@@ -503,6 +503,10 @@
 	ewarn "You need to restart udev as soon as possible to make the upgrade go"
 	ewarn "into effect."
 	ewarn "The method you use to do this depends on your init system."
+	if has_version 'sys-apps/openrc'; then
+		ewarn "For sys-apps/openrc users it is:"
+		ewarn "# /etc/init.d/udev --nodeps restart"
+	fi
 
 	elog
 	elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"



1.252                sys-fs/udev/udev-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.252&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.252&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.251&r2=1.252

Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- udev-9999.ebuild	12 Aug 2013 13:50:35 -0000	1.251
+++ udev-9999.ebuild	13 Aug 2013 16:08:07 -0000	1.252
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.251 2013/08/12 13:50:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.252 2013/08/13 16:08:07 ssuominen Exp $
 
 EAPI=5
 
@@ -503,6 +503,10 @@
 	ewarn "You need to restart udev as soon as possible to make the upgrade go"
 	ewarn "into effect."
 	ewarn "The method you use to do this depends on your init system."
+	if has_version 'sys-apps/openrc'; then
+		ewarn "For sys-apps/openrc users it is:"
+		ewarn "# /etc/init.d/udev --nodeps restart"
+	fi
 
 	elog
 	elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"





^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-08-13 16:08 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-12 13:50 [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-206-r3.ebuild udev-9999.ebuild Samuli Suominen (ssuominen)
  -- strict thread matches above, loose matches on Subject: below --
2013-08-13 16:08 Samuli Suominen (ssuominen)
2013-08-11 18:29 Samuli Suominen (ssuominen)

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