[gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/, sys-apps/systemd/files/

[Michał Górny]

commit:     304d659d5f00e5da67ad87c7f8b51c5df3ea0956
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  9 21:16:09 2012 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 21:16:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=304d659d

sys-apps/systemd: Update the udev code, and remove the (old already) /usr update code.

(Portage version: 2.2.0_alpha114/git/Linux x86_64, unsigned Manifest commit)

---
 sys-apps/systemd/files/40-gentoo.rules             |   14 +++++
 .../systemd/files/update-etc-systemd-symlinks.path |    5 --
 .../files/update-etc-systemd-symlinks.service      |    6 --
 .../systemd/files/update-etc-systemd-symlinks.sh   |   19 -------
 sys-apps/systemd/systemd-9999.ebuild               |   57 ++++++++------------
 5 files changed, 37 insertions(+), 64 deletions(-)

diff --git a/sys-apps/systemd/files/40-gentoo.rules b/sys-apps/systemd/files/40-gentoo.rules
new file mode 100644
index 0000000..fa99ba9
--- /dev/null
+++ b/sys-apps/systemd/files/40-gentoo.rules
@@ -0,0 +1,14 @@
+# do not edit this file, it will be overwritten on update
+
+# setting permissions
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
+
+# dialout devices
+KERNEL=="ippp*|isdn*|dcbri*|rfcomm*|ttyACM[0-9]*|pilot", GROUP="uucp"
+
+# sound devices (oss)
+SUBSYSTEM=="snd",	GROUP="audio"
+
+# Sony Vaio Jogdial sonypi device
+KERNEL=="sonypi",	MODE="0666"
+

diff --git a/sys-apps/systemd/files/update-etc-systemd-symlinks.path b/sys-apps/systemd/files/update-etc-systemd-symlinks.path
deleted file mode 100644
index 33a9576..0000000
--- a/sys-apps/systemd/files/update-etc-systemd-symlinks.path
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=Update /etc/systemd/system symlinks for units moved to /usr
-
-[Path]
-PathChanged=/lib/systemd/system

diff --git a/sys-apps/systemd/files/update-etc-systemd-symlinks.service b/sys-apps/systemd/files/update-etc-systemd-symlinks.service
deleted file mode 100644
index c05a194..0000000
--- a/sys-apps/systemd/files/update-etc-systemd-symlinks.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Update /etc/systemd/system symlinks for units moved to /usr
-
-[Service]
-Type=oneshot
-ExecStart=/usr/libexec/systemd/update-etc-systemd-symlinks.sh

diff --git a/sys-apps/systemd/files/update-etc-systemd-symlinks.sh b/sys-apps/systemd/files/update-etc-systemd-symlinks.sh
deleted file mode 100755
index ce81bba..0000000
--- a/sys-apps/systemd/files/update-etc-systemd-symlinks.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-# Update symlinks to systemd units moved into /usr/systemd.
-# (c) 2012 Michał Górny
-# Released under the terms of the 2-clause BSD license
-
-IFS_SAVE=${IFS}
-IFS='
-'
-# follow + symlink type will match broken symlinks only
-set -- $(find -L /etc/systemd/system -type l -print)
-IFS=${IFS_SAVE}
-
-for f; do
-	old_path=$(readlink "${f}")
-	new_path=/usr/lib${old_path#/lib}
-	if [ -f "${new_path}" ]; then
-		ln -v -s -f "${new_path}" "${f}"
-	fi
-done

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 4db8f77..910eba1 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="System and service manager for Linux"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
 SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="acl audit cryptsetup doc gudev introspection lzma pam selinux tcpd"
@@ -26,18 +26,10 @@ IUSE="acl audit cryptsetup doc gudev introspection lzma pam selinux tcpd"
 # We need to depend on sysvinit for sulogin which is used in the rescue
 # mode. Bug #399615.
 
-# A little higher than upstream requires
-# but I had real trouble with 2.6.37 and systemd.
-MINKV="2.6.38"
+MINKV="2.6.39"
 
-# dbus version because of systemd units
-# sysvinit for sulogin
-RDEPEND="!sys-fs/udev
-	>=sys-apps/dbus-1.4.10
+COMMON_DEPEND=">=sys-apps/dbus-1.4.10
 	>=sys-apps/kmod-5
-	sys-apps/pciutils
-	sys-apps/sysvinit
-	sys-apps/usbutils
 	>=sys-apps/util-linux-2.20
 	sys-libs/libcap
 	acl? ( sys-apps/acl )
@@ -50,7 +42,14 @@ RDEPEND="!sys-fs/udev
 	selinux? ( sys-libs/libselinux )
 	tcpd? ( sys-apps/tcp-wrappers )"
 
-DEPEND="${RDEPEND}
+# sysvinit for sulogin
+# udev is bundled
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/hwids
+	sys-apps/sysvinit
+	!sys-fs/udev
+	!<sys-libs/glibc-2.10"
+DEPEND="${COMMON_RDEPEND}
 	app-arch/xz-utils
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
@@ -67,6 +66,8 @@ DEPEND="dev-libs/gobject-introspection
 	dev-util/gtk-doc"
 #endif
 
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
 pkg_setup() {
 	enewgroup lock # used by var-lock.mount
 	enewgroup tty 5 # used by mount-setup for /dev/pts
@@ -76,6 +77,10 @@ src_prepare() {
 	# systemd-analyze is for python2.7 only nowadays.
 	sed -i -e '1s/python/&2.7/' src/analyze/systemd-analyze
 
+	# change rules back to group uucp instead of dialout for now
+	sed -e '/GROUP=/s:dialout:uucp:' \
+		-i rules/*.rules || die
+
 #if LIVE /* XXX: do something about it... */
 	gtkdocize --docdir docs/ || die
 #endif
@@ -90,6 +95,9 @@ src_configure() {
 		--with-rootlibdir=/usr/$(get_libdir)
 		# but pam modules have to lie in /lib*
 		--with-pamlibdir=/$(get_libdir)/security
+		# this avoids dep on pciutils & usbutils
+		--with-pci-ids-path=/usr/share/misc/pci.ids
+		--with-usb-ids-path=/usr/share/misc/usb.ids
 		--localstatedir=/var
 		# make sure we get /bin:/sbin in $PATH
 		--enable-split-usr
@@ -131,11 +139,9 @@ src_install() {
 	insinto /usr/lib/tmpfiles.d
 	doins "${FILESDIR}"/gentoo-run.conf
 
-	# Migration helpers.
-	exeinto /usr/libexec/systemd
-	doexe "${FILESDIR}"/update-etc-systemd-symlinks.sh
-	systemd_dounit "${FILESDIR}"/update-etc-systemd-symlinks.{service,path}
-	systemd_enable_service sysinit.target update-etc-systemd-symlinks.path
+	# Gentoo rules for udev.
+	insinto /usr/lib/udev/rules.d
+	doins "${FILESDIR}"/40-gentoo.rules
 #if LIVE
 
 	# Check whether we won't break user's system.
@@ -176,12 +182,6 @@ pkg_postinst() {
 		ewarn
 	fi
 
-	elog "You may need to perform some additional configuration for some programs"
-	elog "to work, see the systemd manpages for loading modules and handling tmpfiles:"
-	elog "	$ man modules-load.d"
-	elog "	$ man tmpfiles.d"
-	elog
-
 	elog "To get additional features, a number of optional runtime dependencies may"
 	elog "be installed:"
 	optfeature 'for systemd-analyze' \
@@ -197,15 +197,4 @@ pkg_postinst() {
 	ewarn "responsibility. Please remember than you can pass:"
 	ewarn "	init=/sbin/init"
 	ewarn "to your kernel to boot using sysvinit / OpenRC."
-
-	# Don't run it if we're outta /
-	if [[ ! ${ROOT%/} ]]; then
-		# Update symlinks to moved units.
-		sh "${FILESDIR}"/update-etc-systemd-symlinks.sh
-
-		# Try to start migration unit.
-		ebegin "Trying to start migration helper path monitoring."
-		systemctl --system start update-etc-systemd-symlinks.path 2>/dev/null
-		eend ${?}
-	fi
 }