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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/, sys-apps/systemd/files/
@ 2012-09-03 21:31 Michał Górny
  0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2012-09-03 21:31 UTC (permalink / raw
  To: gentoo-commits

commit:     51c02c597b187616c0dfa10fb21e605e326c0fea
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  3 21:31:56 2012 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep  3 21:31:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=51c02c59

Re-add mountpoint units for /var/lock & /var/run.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=433607

---
 sys-apps/systemd/files/var-lock.mount |   19 +++++++++++++++++++
 sys-apps/systemd/files/var-run.mount  |   19 +++++++++++++++++++
 sys-apps/systemd/systemd-9999.ebuild  |    6 ++++--
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/sys-apps/systemd/files/var-lock.mount b/sys-apps/systemd/files/var-lock.mount
new file mode 100644
index 0000000..07277ad
--- /dev/null
+++ b/sys-apps/systemd/files/var-lock.mount
@@ -0,0 +1,19 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Lock Directory
+Before=local-fs.target
+# skip mounting if the directory does not exist or is a symlink
+ConditionPathIsDirectory=/var/lock
+ConditionPathIsSymbolicLink=!/var/lock
+
+[Mount]
+What=/run/lock
+Where=/var/lock
+Type=bind
+Options=bind

diff --git a/sys-apps/systemd/files/var-run.mount b/sys-apps/systemd/files/var-run.mount
new file mode 100644
index 0000000..ab4da42
--- /dev/null
+++ b/sys-apps/systemd/files/var-run.mount
@@ -0,0 +1,19 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Runtime Directory
+Before=local-fs.target
+# skip mounting if the directory does not exist or is a symlink
+ConditionPathIsDirectory=/var/run
+ConditionPathIsSymbolicLink=!/var/run
+
+[Mount]
+What=/run
+Where=/var/run
+Type=bind
+Options=bind

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index f3a6682..158f8a8 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -145,8 +145,10 @@ src_install() {
 	rm "${D}"/usr/share/man/man1/init.1 || die
 
 	# Create /run/lock as required by new baselay/OpenRC compat.
-	insinto /usr/lib/tmpfiles.d
-	doins "${FILESDIR}"/gentoo-run.conf
+	systemd_dotmpfilesd "${FILESDIR}"/gentoo-run.conf
+
+	# Add mount-rules for /var/lock and /var/run, bug #433607
+	systemd_dounit "${FILESDIR}"/var-{lock,run}.mount
 
 	# Check whether we won't break user's system.
 	[[ -x "${D}"/bin/systemd ]] || die '/bin/systemd symlink broken, aborting.'


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

* [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/, sys-apps/systemd/files/
@ 2012-12-02 11:00 Michał Górny
  0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2012-12-02 11:00 UTC (permalink / raw
  To: gentoo-commits

commit:     2941efa8517fb2069fea74ef568632962f8087b6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  2 11:00:11 2012 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  2 11:00:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=2941efa8

sys-apps/systemd: Sync.

Package-Manager: portage-2.2.0_alpha144

---
 ...0.patch => 197-0001-Disable-udev-targets.patch} |   69 ++++++++++++--------
 sys-apps/systemd/systemd-9999.ebuild               |   24 ++++---
 2 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/sys-apps/systemd/files/191-0001-Disable-udev-targets-for-udev-190.patch b/sys-apps/systemd/files/197-0001-Disable-udev-targets.patch
similarity index 84%
rename from sys-apps/systemd/files/191-0001-Disable-udev-targets-for-udev-190.patch
rename to sys-apps/systemd/files/197-0001-Disable-udev-targets.patch
index fb70b80..ab37916 100644
--- a/sys-apps/systemd/files/191-0001-Disable-udev-targets-for-udev-190.patch
+++ b/sys-apps/systemd/files/197-0001-Disable-udev-targets.patch
@@ -1,17 +1,17 @@
-From 202a70158973fee73432816d2b7612161824cc29 Mon Sep 17 00:00:00 2001
+From 4ee2bb842f9ed3cacab607bce3b0d229dfd88946 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Wed, 15 Aug 2012 14:02:07 +0200
-Subject: [PATCH] Disable udev targets, for udev-190.
+Subject: [PATCH] Disable udev targets.
 
 ---
- Makefile.am | 190 +-----------------------------------------------------------
- 1 file changed, 1 insertion(+), 189 deletions(-)
+ Makefile.am | 203 +-----------------------------------------------------------
+ 1 file changed, 1 insertion(+), 202 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 64dfe81..a378007 100644
+index e253aa2..cb60abb 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -309,8 +309,6 @@ dist_systemunit_DATA = \
+@@ -317,8 +317,6 @@ dist_systemunit_DATA = \
  	units/systemd-ask-password-wall.path \
  	units/systemd-ask-password-console.path \
  	units/syslog.target \
@@ -20,7 +20,7 @@ index 64dfe81..a378007 100644
  	units/system-update.target
  
  nodist_systemunit_DATA = \
-@@ -340,9 +338,6 @@ nodist_systemunit_DATA = \
+@@ -348,9 +346,6 @@ nodist_systemunit_DATA = \
  	units/systemd-kexec.service \
  	units/systemd-fsck@.service \
  	units/systemd-fsck-root.service \
@@ -29,8 +29,8 @@ index 64dfe81..a378007 100644
 -	units/systemd-udev-settle.service \
  	units/debug-shell.service
  
- dist_userunit_DATA = \
-@@ -1643,12 +1638,6 @@ SUBDIRS += \
+ if HAVE_KMOD
+@@ -1781,12 +1776,6 @@ SUBDIRS += \
  	docs/libudev
  endif
  
@@ -43,7 +43,7 @@ index 64dfe81..a378007 100644
  libudev_la_SOURCES =\
  	src/libudev/libudev-private.h \
  	src/libudev/libudev.c \
-@@ -1671,9 +1660,6 @@ libudev_la_LDFLAGS = \
+@@ -1811,9 +1800,6 @@ libudev_la_LDFLAGS = \
  libudev_la_LIBADD = \
  	libsystemd-shared.la
  
@@ -53,7 +53,7 @@ index 64dfe81..a378007 100644
  EXTRA_DIST += \
  	src/libudev/libudev.pc.in \
  	src/libudev/libudev.sym
-@@ -1694,12 +1680,7 @@ libudev-install-move-hook:
+@@ -1834,12 +1820,7 @@ libudev-install-move-hook:
  libudev-uninstall-move-hook:
  	rm -f $(DESTDIR)$(rootlibdir)/libudev.so*
  
@@ -66,7 +66,7 @@ index 64dfe81..a378007 100644
  
  libudev_private_la_SOURCES =\
  	$(libudev_la_SOURCES) \
-@@ -1714,15 +1695,6 @@ libudev_private_la_LIBADD = \
+@@ -1854,15 +1835,6 @@ libudev_private_la_LIBADD = \
  	libsystemd-shared.la
  
  # ------------------------------------------------------------------------------
@@ -82,7 +82,7 @@ index 64dfe81..a378007 100644
  
  man/systemd-udevd.8: man/systemd-udevd.service.8
  man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8
-@@ -1734,28 +1706,7 @@ udev-confdirs:
+@@ -1875,40 +1847,7 @@ udev-confdirs:
  INSTALL_DATA_HOOKS += udev-confdirs
  
  dist_udevrules_DATA += \
@@ -98,9 +98,21 @@ index 64dfe81..a378007 100644
 -	rules/75-net-description.rules \
 -	rules/75-tty-description.rules \
 -	rules/78-sound-card.rules \
--	rules/80-drivers.rules \
 -	rules/95-udev-late.rules
 -
+-if HAVE_KMOD
+-dist_udevrules_DATA += \
+-	rules/80-drivers.rules
+-endif
+-
+-dist_udevhwdb_DATA = \
+-	hwdb/20-pci-vendor-product.hwdb \
+-	hwdb/20-pci-classes.hwdb \
+-	hwdb/20-usb-vendor-product.hwdb \
+-	hwdb/20-usb-classes.hwdb \
+-	hwdb/20-acpi-vendor.hwdb \
+-	hwdb/20-OUI.hwdb
+-
 -udevconfdir = $(sysconfdir)/udev
 -dist_udevconf_DATA = \
 -	src/udev/udev.conf
@@ -112,7 +124,7 @@ index 64dfe81..a378007 100644
  
  EXTRA_DIST += \
  	rules/99-systemd.rules.in \
-@@ -1783,17 +1734,6 @@ systemd-install-hook:
+@@ -1936,17 +1875,6 @@ systemd-install-hook:
  	ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service
  	ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
  
@@ -130,8 +142,8 @@ index 64dfe81..a378007 100644
  libudev_core_la_SOURCES = \
  	src/udev/udev.h \
  	src/udev/udev-event.c \
-@@ -1860,14 +1800,6 @@ udevadm_LDADD = \
- 	libsystemd-shared.la
+@@ -2033,14 +1961,6 @@ hwdb-remove-hook:
+ 	-test -n "$(DESTDIR)" || rm -f $(HWDB_BIN)
  
  # ------------------------------------------------------------------------------
 -TESTS += \
@@ -145,7 +157,7 @@ index 64dfe81..a378007 100644
  test_libudev_SOURCES = \
  	src/test/test-libudev.c
  
-@@ -1917,8 +1849,6 @@ ata_id_LDADD = \
+@@ -2090,8 +2010,6 @@ ata_id_LDADD = \
  	libudev-private.la \
  	libsystemd-shared.la
  
@@ -154,7 +166,7 @@ index 64dfe81..a378007 100644
  
  # ------------------------------------------------------------------------------
  cdrom_id_SOURCES = \
-@@ -1928,12 +1858,6 @@ cdrom_id_LDADD = \
+@@ -2101,12 +2019,6 @@ cdrom_id_LDADD = \
  	-ludev \
  	libsystemd-shared.la
  
@@ -167,7 +179,7 @@ index 64dfe81..a378007 100644
  # ------------------------------------------------------------------------------
  collect_SOURCES = \
  	src/udev/collect/collect.c
-@@ -1941,9 +1865,6 @@ collect_SOURCES = \
+@@ -2114,9 +2026,6 @@ collect_SOURCES = \
  collect_LDADD = \
  	libudev-private.la
  
@@ -177,7 +189,7 @@ index 64dfe81..a378007 100644
  # ------------------------------------------------------------------------------
  scsi_id_SOURCES =\
  	src/udev/scsi_id/scsi_id.c \
-@@ -1955,9 +1876,6 @@ scsi_id_LDADD = \
+@@ -2128,9 +2037,6 @@ scsi_id_LDADD = \
  	libudev-private.la \
  	libsystemd-shared.la
  
@@ -187,7 +199,7 @@ index 64dfe81..a378007 100644
  EXTRA_DIST += \
  	src/udev/scsi_id/README
  
-@@ -1968,12 +1886,6 @@ v4l_id_SOURCES = \
+@@ -2141,12 +2047,6 @@ v4l_id_SOURCES = \
  v4l_id_LDADD = \
  	-ludev
  
@@ -200,7 +212,7 @@ index 64dfe81..a378007 100644
  # ------------------------------------------------------------------------------
  accelerometer_SOURCES = \
  	src/udev/accelerometer/accelerometer.c
-@@ -1982,12 +1894,6 @@ accelerometer_LDADD = \
+@@ -2155,12 +2055,6 @@ accelerometer_LDADD = \
  	-ludev -lm \
  	libsystemd-shared.la
  
@@ -213,7 +225,7 @@ index 64dfe81..a378007 100644
  # ------------------------------------------------------------------------------
  if ENABLE_GUDEV
  if ENABLE_GTK_DOC
-@@ -2168,99 +2074,11 @@ nodist_keymap_SOURCES = \
+@@ -2341,100 +2235,11 @@ nodist_keymap_SOURCES = \
  BUILT_SOURCES += \
  	$(nodist_keymap_SOURCES)
  
@@ -267,6 +279,7 @@ index 64dfe81..a378007 100644
 -	keymaps/hewlett-packard-presario-2100 \
 -	keymaps/hewlett-packard-tablet \
 -	keymaps/hewlett-packard-tx2 \
+-	keymaps/hewlett-packard_elitebook-8440p \
 -	keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
 -	keymaps/inventec-symphony_6.0_7.0 \
 -	keymaps/lenovo-3000 \
@@ -293,7 +306,7 @@ index 64dfe81..a378007 100644
 -	keymaps/onkyo \
 -	keymaps/oqo-model2 \
 -	keymaps/samsung-other \
--	keymaps/samsung-90x3a \
+-	keymaps/samsung-series-9 \
 -	keymaps/samsung-sq1us \
 -	keymaps/samsung-sx20s \
 -	keymaps/toshiba-satellite_a100 \
@@ -307,13 +320,13 @@ index 64dfe81..a378007 100644
 -	keymaps-force-release/dell-xps \
 -	keymaps-force-release/hp-other \
 -	keymaps-force-release/samsung-other \
--	keymaps-force-release/samsung-90x3a \
+-	keymaps-force-release/samsung-series-9 \
 -	keymaps-force-release/common-volume-keys
 -
  src/udev/keymap/keys.txt: Makefile
  	$(AM_V_at)$(MKDIR_P) $(dir $@)
  	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
-@@ -2288,12 +2106,6 @@ mtd_probe_SOURCES =  \
+@@ -2462,12 +2267,6 @@ mtd_probe_SOURCES =  \
  mtd_probe_CPPFLAGS = \
  	$(AM_CPPFLAGS)
  
@@ -327,5 +340,5 @@ index 64dfe81..a378007 100644
  libsystemd_id128_la_SOURCES = \
  	src/libsystemd-id128/sd-id128.c
 -- 
-1.7.12
+1.8.0
 

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index b5c23b5..b58d0b3 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -12,7 +12,9 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${PN}
 inherit git-2
 #endif
 
-inherit autotools-utils bash-completion-r1 linux-info pam systemd user
+PYTHON_COMPAT=( python2_7 )
+inherit autotools-utils bash-completion-r1 linux-info pam \
+	python-single-r1 systemd user
 
 DESCRIPTION="System and service manager for Linux"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
@@ -21,8 +23,8 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
 LICENSE="GPL-2 LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="acl audit cryptsetup gcrypt http lzma pam qrcode selinux tcpd
-	vanilla xattr"
+IUSE="acl audit cryptsetup gcrypt http lzma pam python qrcode selinux
+	tcpd vanilla xattr"
 
 MINKV="2.6.39"
 
@@ -38,6 +40,7 @@ COMMON_DEPEND=">=sys-apps/dbus-1.4.10
 	http? ( net-libs/libmicrohttpd )
 	lzma? ( app-arch/xz-utils )
 	pam? ( virtual/pam )
+	python? ( ${PYTHON_DEPS} )
 	qrcode? ( media-gfx/qrencode )
 	selinux? ( sys-libs/libselinux )
 	tcpd? ( sys-apps/tcp-wrappers )
@@ -75,6 +78,8 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
 pkg_setup() {
 	enewgroup lock # used by var-lock.mount
 	enewgroup tty 5 # used by mount-setup for /dev/pts
+
+	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -85,7 +90,7 @@ src_prepare() {
 	sed -i -e 's:libudev\.la:-ludev:' Makefile.am
 
 	local PATCHES=(
-		"${FILESDIR}"/191-0001-Disable-udev-targets-for-udev-190.patch
+		"${FILESDIR}"/197-0001-Disable-udev-targets.patch
 	)
 
 #if LIVE
@@ -107,11 +112,6 @@ 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
-		# disable python for now
-		--without-python
 		# make sure we get /bin:/sbin in $PATH
 		--enable-split-usr
 		# udev parts
@@ -125,6 +125,8 @@ src_configure() {
 		$(use_enable http microhttpd)
 		$(use_enable lzma xz)
 		$(use_enable pam)
+		$(use_with python)
+		$(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python})
 		$(use_enable qrcode qrencode)
 		$(use_enable selinux)
 		$(use_enable tcpd tcpwrap)
@@ -166,6 +168,10 @@ src_install() {
 		systemd_enable_service sysinit.target var-run.mount
 	fi
 
+	# Disable storing coredumps in journald, bug #433457
+	mv "${D}"/usr/lib/sysctl.d/coredump.conf \
+		"${D}"/etc/sysctl.d/coredump.conf.disabled || die
+
 	# Preserve empty dirs in /etc & /var, bug #437008
 	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
 		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd


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

* [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/, sys-apps/systemd/files/
@ 2012-09-26  5:51 Michał Górny
  0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2012-09-26  5:51 UTC (permalink / raw
  To: gentoo-commits

commit:     e056443d464e87e3efbdbf28dbc1165cda961764
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 26 05:52:02 2012 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 26 05:52:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=e056443d

sys-apps/systemd: Rename the patch to match gx86.

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

---
 ...1-0001-Disable-udev-targets-for-udev-190.patch} |    0
 sys-apps/systemd/systemd-9999.ebuild               |    2 +-
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-190.patch b/sys-apps/systemd/files/191-0001-Disable-udev-targets-for-udev-190.patch
similarity index 100%
rename from sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-190.patch
rename to sys-apps/systemd/files/191-0001-Disable-udev-targets-for-udev-190.patch

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index ccaef1f..35f77cf 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -82,7 +82,7 @@ src_prepare() {
 	sed -i -e 's:libudev\.la:-ludev:' Makefile.am
 
 	local PATCHES=(
-		"${FILESDIR}"/0001-Disable-udev-targets-for-udev-190.patch
+		"${FILESDIR}"/191-0001-Disable-udev-targets-for-udev-190.patch
 	)
 
 #if LIVE


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

* [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/, sys-apps/systemd/files/
@ 2012-09-21 21:32 Michał Górny
  0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2012-09-21 21:32 UTC (permalink / raw
  To: gentoo-commits

commit:     5f862c398fdceb60530fb2b2b4e78e19a1ea2bdb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 21 21:32:58 2012 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep 21 21:32:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=5f862c39

sys-apps/systemd: Update for v190.

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

---
 ...> 0001-Disable-udev-targets-for-udev-190.patch} |   45 ++++++++++----------
 sys-apps/systemd/systemd-9999.ebuild               |   10 ++++-
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch b/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-190.patch
similarity index 88%
rename from sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch
rename to sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-190.patch
index 05b4a9d..fb70b80 100644
--- a/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch
+++ b/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-190.patch
@@ -1,17 +1,17 @@
-From 700023b0263f1f014443144a10e4544f18113458 Mon Sep 17 00:00:00 2001
+From 202a70158973fee73432816d2b7612161824cc29 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Wed, 15 Aug 2012 14:02:07 +0200
-Subject: [PATCH] Disable udev targets, for udev-189.
+Subject: [PATCH] Disable udev targets, for udev-190.
 
 ---
- Makefile.am | 189 +-----------------------------------------------------------
- 1 file changed, 1 insertion(+), 188 deletions(-)
+ Makefile.am | 190 +-----------------------------------------------------------
+ 1 file changed, 1 insertion(+), 189 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 8de4aa4..5fa3085 100644
+index 64dfe81..a378007 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -307,8 +307,6 @@ dist_systemunit_DATA = \
+@@ -309,8 +309,6 @@ dist_systemunit_DATA = \
  	units/systemd-ask-password-wall.path \
  	units/systemd-ask-password-console.path \
  	units/syslog.target \
@@ -20,7 +20,7 @@ index 8de4aa4..5fa3085 100644
  	units/system-update.target
  
  nodist_systemunit_DATA = \
-@@ -338,9 +336,6 @@ nodist_systemunit_DATA = \
+@@ -340,9 +338,6 @@ nodist_systemunit_DATA = \
  	units/systemd-kexec.service \
  	units/systemd-fsck@.service \
  	units/systemd-fsck-root.service \
@@ -30,7 +30,7 @@ index 8de4aa4..5fa3085 100644
  	units/debug-shell.service
  
  dist_userunit_DATA = \
-@@ -1588,12 +1583,6 @@ SUBDIRS += \
+@@ -1643,12 +1638,6 @@ SUBDIRS += \
  	docs/libudev
  endif
  
@@ -43,7 +43,7 @@ index 8de4aa4..5fa3085 100644
  libudev_la_SOURCES =\
  	src/libudev/libudev-private.h \
  	src/libudev/libudev.c \
-@@ -1616,9 +1605,6 @@ libudev_la_LDFLAGS = \
+@@ -1671,9 +1660,6 @@ libudev_la_LDFLAGS = \
  libudev_la_LIBADD = \
  	libsystemd-shared.la
  
@@ -53,7 +53,7 @@ index 8de4aa4..5fa3085 100644
  EXTRA_DIST += \
  	src/libudev/libudev.pc.in \
  	src/libudev/libudev.sym
-@@ -1639,12 +1625,7 @@ libudev-install-move-hook:
+@@ -1694,12 +1680,7 @@ libudev-install-move-hook:
  libudev-uninstall-move-hook:
  	rm -f $(DESTDIR)$(rootlibdir)/libudev.so*
  
@@ -66,7 +66,7 @@ index 8de4aa4..5fa3085 100644
  
  libudev_private_la_SOURCES =\
  	$(libudev_la_SOURCES) \
-@@ -1659,15 +1640,6 @@ libudev_private_la_LIBADD = \
+@@ -1714,15 +1695,6 @@ libudev_private_la_LIBADD = \
  	libsystemd-shared.la
  
  # ------------------------------------------------------------------------------
@@ -82,7 +82,7 @@ index 8de4aa4..5fa3085 100644
  
  man/systemd-udevd.8: man/systemd-udevd.service.8
  man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8
-@@ -1679,27 +1651,7 @@ udev-confdirs:
+@@ -1734,28 +1706,7 @@ udev-confdirs:
  INSTALL_DATA_HOOKS += udev-confdirs
  
  dist_udevrules_DATA += \
@@ -94,6 +94,7 @@ index 8de4aa4..5fa3085 100644
 -	rules/60-persistent-input.rules \
 -	rules/60-persistent-alsa.rules \
 -	rules/60-persistent-storage.rules \
+-	rules/64-btrfs.rules \
 -	rules/75-net-description.rules \
 -	rules/75-tty-description.rules \
 -	rules/78-sound-card.rules \
@@ -111,7 +112,7 @@ index 8de4aa4..5fa3085 100644
  
  EXTRA_DIST += \
  	rules/99-systemd.rules.in \
-@@ -1727,17 +1679,6 @@ systemd-install-hook:
+@@ -1783,17 +1734,6 @@ systemd-install-hook:
  	ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service
  	ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
  
@@ -129,7 +130,7 @@ index 8de4aa4..5fa3085 100644
  libudev_core_la_SOURCES = \
  	src/udev/udev.h \
  	src/udev/udev-event.c \
-@@ -1803,14 +1744,6 @@ udevadm_LDADD = \
+@@ -1860,14 +1800,6 @@ udevadm_LDADD = \
  	libsystemd-shared.la
  
  # ------------------------------------------------------------------------------
@@ -144,7 +145,7 @@ index 8de4aa4..5fa3085 100644
  test_libudev_SOURCES = \
  	src/test/test-libudev.c
  
-@@ -1860,8 +1793,6 @@ ata_id_LDADD = \
+@@ -1917,8 +1849,6 @@ ata_id_LDADD = \
  	libudev-private.la \
  	libsystemd-shared.la
  
@@ -153,7 +154,7 @@ index 8de4aa4..5fa3085 100644
  
  # ------------------------------------------------------------------------------
  cdrom_id_SOURCES = \
-@@ -1871,12 +1802,6 @@ cdrom_id_LDADD = \
+@@ -1928,12 +1858,6 @@ cdrom_id_LDADD = \
  	-ludev \
  	libsystemd-shared.la
  
@@ -166,7 +167,7 @@ index 8de4aa4..5fa3085 100644
  # ------------------------------------------------------------------------------
  collect_SOURCES = \
  	src/udev/collect/collect.c
-@@ -1884,9 +1809,6 @@ collect_SOURCES = \
+@@ -1941,9 +1865,6 @@ collect_SOURCES = \
  collect_LDADD = \
  	libudev-private.la
  
@@ -176,7 +177,7 @@ index 8de4aa4..5fa3085 100644
  # ------------------------------------------------------------------------------
  scsi_id_SOURCES =\
  	src/udev/scsi_id/scsi_id.c \
-@@ -1898,9 +1820,6 @@ scsi_id_LDADD = \
+@@ -1955,9 +1876,6 @@ scsi_id_LDADD = \
  	libudev-private.la \
  	libsystemd-shared.la
  
@@ -186,7 +187,7 @@ index 8de4aa4..5fa3085 100644
  EXTRA_DIST += \
  	src/udev/scsi_id/README
  
-@@ -1911,12 +1830,6 @@ v4l_id_SOURCES = \
+@@ -1968,12 +1886,6 @@ v4l_id_SOURCES = \
  v4l_id_LDADD = \
  	-ludev
  
@@ -199,7 +200,7 @@ index 8de4aa4..5fa3085 100644
  # ------------------------------------------------------------------------------
  accelerometer_SOURCES = \
  	src/udev/accelerometer/accelerometer.c
-@@ -1925,12 +1838,6 @@ accelerometer_LDADD = \
+@@ -1982,12 +1894,6 @@ accelerometer_LDADD = \
  	-ludev -lm \
  	libsystemd-shared.la
  
@@ -212,7 +213,7 @@ index 8de4aa4..5fa3085 100644
  # ------------------------------------------------------------------------------
  if ENABLE_GUDEV
  if ENABLE_GTK_DOC
-@@ -2111,99 +2018,11 @@ nodist_keymap_SOURCES = \
+@@ -2168,99 +2074,11 @@ nodist_keymap_SOURCES = \
  BUILT_SOURCES += \
  	$(nodist_keymap_SOURCES)
  
@@ -312,7 +313,7 @@ index 8de4aa4..5fa3085 100644
  src/udev/keymap/keys.txt: Makefile
  	$(AM_V_at)$(MKDIR_P) $(dir $@)
  	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
-@@ -2231,12 +2050,6 @@ mtd_probe_SOURCES =  \
+@@ -2288,12 +2106,6 @@ mtd_probe_SOURCES =  \
  mtd_probe_CPPFLAGS = \
  	$(AM_CPPFLAGS)
  

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 6d60efa..db1d6ed 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -28,7 +28,7 @@ MINKV="2.6.39"
 COMMON_DEPEND=">=sys-apps/dbus-1.4.10
 	>=sys-apps/kmod-5
 	>=sys-apps/util-linux-2.20
-	~sys-fs/udev-189
+	~sys-fs/udev-190
 	sys-libs/libcap
 	acl? ( sys-apps/acl )
 	audit? ( >=sys-process/audit-2 )
@@ -48,12 +48,15 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!<sys-libs/glibc-2.10
 	!~sys-fs/udev-187"
+
+# sys-fs/quota is necessary to store correct paths in unit files
 DEPEND="${COMMON_DEPEND}
 	app-arch/xz-utils
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	dev-util/gperf
 	dev-util/intltool
+	sys-fs/quota
 	>=sys-kernel/linux-headers-${MINKV}"
 
 #if LIVE
@@ -79,7 +82,7 @@ src_prepare() {
 	sed -i -e 's:libudev\.la:-ludev:' Makefile.am
 
 	local PATCHES=(
-		"${FILESDIR}"/0001-Disable-udev-targets-for-udev-189.patch
+		"${FILESDIR}"/0001-Disable-udev-targets-for-udev-190.patch
 	)
 
 #if LIVE
@@ -119,6 +122,9 @@ src_configure() {
 		$(use_enable qrcode qrencode)
 		$(use_enable selinux)
 		$(use_enable tcpd tcpwrap)
+
+		# Disable Python for now.
+		PYTHON=:
 	)
 
 	autotools-utils_src_configure


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

* [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/, sys-apps/systemd/files/
@ 2012-08-24 17:20 Michał Górny
  0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2012-08-24 17:20 UTC (permalink / raw
  To: gentoo-commits

commit:     bc864496715c0ba9b30691cb687f226589730f54
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 24 16:38:08 2012 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Aug 24 16:38:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=bc864496

sys-apps/systemd: Update to -189.

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

---
 ...> 0001-Disable-udev-targets-for-udev-189.patch} |   17 +++++++++--------
 sys-apps/systemd/metadata.xml                      |    2 ++
 sys-apps/systemd/systemd-9999.ebuild               |   10 +++++++---
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-188.patch b/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch
similarity index 95%
rename from sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-188.patch
rename to sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch
index e6819ee..05b4a9d 100644
--- a/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-188.patch
+++ b/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch
@@ -1,14 +1,14 @@
-From d8f51d193f93c442795b8c91d750f1e3ffdad544 Mon Sep 17 00:00:00 2001
+From 700023b0263f1f014443144a10e4544f18113458 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Wed, 15 Aug 2012 14:02:07 +0200
-Subject: [PATCH] Disable udev targets, for udev-188.
+Subject: [PATCH] Disable udev targets, for udev-189.
 
 ---
- Makefile.am | 188 +-----------------------------------------------------------
- 1 file changed, 1 insertion(+), 187 deletions(-)
+ Makefile.am | 189 +-----------------------------------------------------------
+ 1 file changed, 1 insertion(+), 188 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 39afb62..4997902 100644
+index 8de4aa4..5fa3085 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -307,8 +307,6 @@ dist_systemunit_DATA = \
@@ -212,7 +212,7 @@ index 39afb62..4997902 100644
  # ------------------------------------------------------------------------------
  if ENABLE_GUDEV
  if ENABLE_GTK_DOC
-@@ -2111,98 +2018,11 @@ nodist_keymap_SOURCES = \
+@@ -2111,99 +2018,11 @@ nodist_keymap_SOURCES = \
  BUILT_SOURCES += \
  	$(nodist_keymap_SOURCES)
  
@@ -287,6 +287,7 @@ index 39afb62..4997902 100644
 -	keymaps/module-sony \
 -	keymaps/module-sony-old \
 -	keymaps/module-sony-vgn \
+-	keymaps/module-sony-vpc \
 -	keymaps/olpc-xo \
 -	keymaps/onkyo \
 -	keymaps/oqo-model2 \
@@ -311,7 +312,7 @@ index 39afb62..4997902 100644
  src/udev/keymap/keys.txt: Makefile
  	$(AM_V_at)$(MKDIR_P) $(dir $@)
  	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
-@@ -2230,12 +2050,6 @@ mtd_probe_SOURCES =  \
+@@ -2231,12 +2050,6 @@ mtd_probe_SOURCES =  \
  mtd_probe_CPPFLAGS = \
  	$(AM_CPPFLAGS)
  
@@ -325,5 +326,5 @@ index 39afb62..4997902 100644
  libsystemd_id128_la_SOURCES = \
  	src/libsystemd-id128/sd-id128.c
 -- 
-1.7.11.1
+1.7.12
 

diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 2c289e2..74a2018 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -9,5 +9,7 @@
 		<!-- XXX: describe those two better -->
 		<flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag>
 		<flag name='cryptsetup'>Use libcryptsetup</flag>
+		<flag name='gcrypt'>Enable sealing of journal files using gcrypt</flag>
+		<flag name='qrcode'>Enable qrcode output support in journal</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 50d787a..e754b22 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -21,7 +21,7 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
 LICENSE="GPL-2 LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="acl audit cryptsetup lzma pam selinux tcpd"
+IUSE="acl audit cryptsetup gcrypt lzma pam qrcode selinux tcpd"
 
 # We need to depend on sysvinit for sulogin which is used in the rescue
 # mode. Bug #399615.
@@ -31,13 +31,15 @@ MINKV="2.6.39"
 COMMON_DEPEND=">=sys-apps/dbus-1.4.10
 	>=sys-apps/kmod-5
 	>=sys-apps/util-linux-2.20
-	~sys-fs/udev-188
+	~sys-fs/udev-189
 	sys-libs/libcap
 	acl? ( sys-apps/acl )
 	audit? ( >=sys-process/audit-2 )
 	cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5 )
 	lzma? ( app-arch/xz-utils )
 	pam? ( virtual/pam )
+	qrcode? ( media-gfx/qrencode )
 	selinux? ( sys-libs/libselinux )
 	tcpd? ( sys-apps/tcp-wrappers )"
 
@@ -78,7 +80,7 @@ src_prepare() {
 	sed -i -e 's:libudev\.la:-ludev:' Makefile.am
 
 	local PATCHES=(
-		"${FILESDIR}"/0001-Disable-udev-targets-for-udev-188.patch
+		"${FILESDIR}"/0001-Disable-udev-targets-for-udev-189.patch
 	)
 
 #if LIVE
@@ -112,8 +114,10 @@ src_configure() {
 		$(use_enable acl)
 		$(use_enable audit)
 		$(use_enable cryptsetup libcryptsetup)
+		$(use_enable gcrypt)
 		$(use_enable lzma xz)
 		$(use_enable pam)
+		$(use_enable qrcode qrencode)
 		$(use_enable selinux)
 		$(use_enable tcpd tcpwrap)
 	)


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

* [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/, sys-apps/systemd/files/
@ 2012-08-15 16:04 Michał Górny
  0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2012-08-15 16:04 UTC (permalink / raw
  To: gentoo-commits

commit:     fa953f3de2e51ac17845891577f8738ebeac95af
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 15 16:05:22 2012 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 16:05:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=fa953f3d

sys-apps/systemd: Sync the udev-188 changes.

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

---
 ...> 0001-Disable-udev-targets-for-udev-188.patch} |   82 +++++++++++---------
 sys-apps/systemd/systemd-9999.ebuild               |    7 +-
 2 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/sys-apps/systemd/files/0001-Disable-udev-targets.patch b/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-188.patch
similarity index 79%
rename from sys-apps/systemd/files/0001-Disable-udev-targets.patch
rename to sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-188.patch
index 8e1f0e9..e6819ee 100644
--- a/sys-apps/systemd/files/0001-Disable-udev-targets.patch
+++ b/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-188.patch
@@ -1,17 +1,36 @@
-From 86f115fa46ed6af9717899e1e2251b68abd96d5b Mon Sep 17 00:00:00 2001
+From d8f51d193f93c442795b8c91d750f1e3ffdad544 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 11 Aug 2012 01:38:23 +0200
-Subject: [PATCH] Disable udev targets.
+Date: Wed, 15 Aug 2012 14:02:07 +0200
+Subject: [PATCH] Disable udev targets, for udev-188.
 
 ---
- Makefile.am | 189 +-----------------------------------------------------------
- 1 file changed, 1 insertion(+), 188 deletions(-)
+ Makefile.am | 188 +-----------------------------------------------------------
+ 1 file changed, 1 insertion(+), 187 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 39afb62..de22af7 100644
+index 39afb62..4997902 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -1588,12 +1588,6 @@ SUBDIRS += \
+@@ -307,8 +307,6 @@ dist_systemunit_DATA = \
+ 	units/systemd-ask-password-wall.path \
+ 	units/systemd-ask-password-console.path \
+ 	units/syslog.target \
+-	units/systemd-udevd-control.socket \
+-	units/systemd-udevd-kernel.socket \
+ 	units/system-update.target
+ 
+ nodist_systemunit_DATA = \
+@@ -338,9 +336,6 @@ nodist_systemunit_DATA = \
+ 	units/systemd-kexec.service \
+ 	units/systemd-fsck@.service \
+ 	units/systemd-fsck-root.service \
+-	units/systemd-udevd.service \
+-	units/systemd-udev-trigger.service \
+-	units/systemd-udev-settle.service \
+ 	units/debug-shell.service
+ 
+ dist_userunit_DATA = \
+@@ -1588,12 +1583,6 @@ SUBDIRS += \
  	docs/libudev
  endif
  
@@ -24,7 +43,7 @@ index 39afb62..de22af7 100644
  libudev_la_SOURCES =\
  	src/libudev/libudev-private.h \
  	src/libudev/libudev.c \
-@@ -1616,9 +1610,6 @@ libudev_la_LDFLAGS = \
+@@ -1616,9 +1605,6 @@ libudev_la_LDFLAGS = \
  libudev_la_LIBADD = \
  	libsystemd-shared.la
  
@@ -34,7 +53,7 @@ index 39afb62..de22af7 100644
  EXTRA_DIST += \
  	src/libudev/libudev.pc.in \
  	src/libudev/libudev.sym
-@@ -1639,12 +1630,7 @@ libudev-install-move-hook:
+@@ -1639,12 +1625,7 @@ libudev-install-move-hook:
  libudev-uninstall-move-hook:
  	rm -f $(DESTDIR)$(rootlibdir)/libudev.so*
  
@@ -47,7 +66,7 @@ index 39afb62..de22af7 100644
  
  libudev_private_la_SOURCES =\
  	$(libudev_la_SOURCES) \
-@@ -1659,15 +1645,6 @@ libudev_private_la_LIBADD = \
+@@ -1659,15 +1640,6 @@ libudev_private_la_LIBADD = \
  	libsystemd-shared.la
  
  # ------------------------------------------------------------------------------
@@ -63,7 +82,7 @@ index 39afb62..de22af7 100644
  
  man/systemd-udevd.8: man/systemd-udevd.service.8
  man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8
-@@ -1679,27 +1656,7 @@ udev-confdirs:
+@@ -1679,27 +1651,7 @@ udev-confdirs:
  INSTALL_DATA_HOOKS += udev-confdirs
  
  dist_udevrules_DATA += \
@@ -92,10 +111,12 @@ index 39afb62..de22af7 100644
  
  EXTRA_DIST += \
  	rules/99-systemd.rules.in \
-@@ -1729,15 +1686,6 @@ systemd-install-hook:
- 
- INSTALL_DATA_HOOKS += systemd-install-hook
+@@ -1727,17 +1679,6 @@ systemd-install-hook:
+ 	ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service
+ 	ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
  
+-INSTALL_DATA_HOOKS += systemd-install-hook
+-
 -bin_PROGRAMS += \
 -	udevadm
 -
@@ -108,7 +129,7 @@ index 39afb62..de22af7 100644
  libudev_core_la_SOURCES = \
  	src/udev/udev.h \
  	src/udev/udev-event.c \
-@@ -1803,14 +1751,6 @@ udevadm_LDADD = \
+@@ -1803,14 +1744,6 @@ udevadm_LDADD = \
  	libsystemd-shared.la
  
  # ------------------------------------------------------------------------------
@@ -123,7 +144,7 @@ index 39afb62..de22af7 100644
  test_libudev_SOURCES = \
  	src/test/test-libudev.c
  
-@@ -1860,8 +1800,6 @@ ata_id_LDADD = \
+@@ -1860,8 +1793,6 @@ ata_id_LDADD = \
  	libudev-private.la \
  	libsystemd-shared.la
  
@@ -132,7 +153,7 @@ index 39afb62..de22af7 100644
  
  # ------------------------------------------------------------------------------
  cdrom_id_SOURCES = \
-@@ -1871,12 +1809,6 @@ cdrom_id_LDADD = \
+@@ -1871,12 +1802,6 @@ cdrom_id_LDADD = \
  	-ludev \
  	libsystemd-shared.la
  
@@ -145,7 +166,7 @@ index 39afb62..de22af7 100644
  # ------------------------------------------------------------------------------
  collect_SOURCES = \
  	src/udev/collect/collect.c
-@@ -1884,9 +1816,6 @@ collect_SOURCES = \
+@@ -1884,9 +1809,6 @@ collect_SOURCES = \
  collect_LDADD = \
  	libudev-private.la
  
@@ -155,7 +176,7 @@ index 39afb62..de22af7 100644
  # ------------------------------------------------------------------------------
  scsi_id_SOURCES =\
  	src/udev/scsi_id/scsi_id.c \
-@@ -1898,9 +1827,6 @@ scsi_id_LDADD = \
+@@ -1898,9 +1820,6 @@ scsi_id_LDADD = \
  	libudev-private.la \
  	libsystemd-shared.la
  
@@ -165,7 +186,7 @@ index 39afb62..de22af7 100644
  EXTRA_DIST += \
  	src/udev/scsi_id/README
  
-@@ -1911,12 +1837,6 @@ v4l_id_SOURCES = \
+@@ -1911,12 +1830,6 @@ v4l_id_SOURCES = \
  v4l_id_LDADD = \
  	-ludev
  
@@ -178,7 +199,7 @@ index 39afb62..de22af7 100644
  # ------------------------------------------------------------------------------
  accelerometer_SOURCES = \
  	src/udev/accelerometer/accelerometer.c
-@@ -1925,12 +1845,6 @@ accelerometer_LDADD = \
+@@ -1925,12 +1838,6 @@ accelerometer_LDADD = \
  	-ludev -lm \
  	libsystemd-shared.la
  
@@ -191,7 +212,7 @@ index 39afb62..de22af7 100644
  # ------------------------------------------------------------------------------
  if ENABLE_GUDEV
  if ENABLE_GTK_DOC
-@@ -2111,98 +2025,11 @@ nodist_keymap_SOURCES = \
+@@ -2111,98 +2018,11 @@ nodist_keymap_SOURCES = \
  BUILT_SOURCES += \
  	$(nodist_keymap_SOURCES)
  
@@ -290,7 +311,7 @@ index 39afb62..de22af7 100644
  src/udev/keymap/keys.txt: Makefile
  	$(AM_V_at)$(MKDIR_P) $(dir $@)
  	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
-@@ -2230,12 +2057,6 @@ mtd_probe_SOURCES =  \
+@@ -2230,12 +2050,6 @@ mtd_probe_SOURCES =  \
  mtd_probe_CPPFLAGS = \
  	$(AM_CPPFLAGS)
  
@@ -303,21 +324,6 @@ index 39afb62..de22af7 100644
  # ------------------------------------------------------------------------------
  libsystemd_id128_la_SOURCES = \
  	src/libsystemd-id128/sd-id128.c
-@@ -3244,14 +3065,6 @@ systemd_multi_seat_x_LDADD = \
- rootlibexec_PROGRAMS += \
- 	systemd-multi-seat-x
- 
--dist_udevrules_DATA += \
--	src/login/70-uaccess.rules \
--	src/login/70-power-switch.rules
--
--nodist_udevrules_DATA += \
--	src/login/71-seat.rules \
--	src/login/73-seat-late.rules
--
- MANPAGES += \
- 	man/systemd-logind.service.8 \
- 	man/logind.conf.5 \
 -- 
 1.7.11.1
 

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 5b54737..50d787a 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -31,7 +31,7 @@ MINKV="2.6.39"
 COMMON_DEPEND=">=sys-apps/dbus-1.4.10
 	>=sys-apps/kmod-5
 	>=sys-apps/util-linux-2.20
-	>=sys-fs/udev-187
+	~sys-fs/udev-188
 	sys-libs/libcap
 	acl? ( sys-apps/acl )
 	audit? ( >=sys-process/audit-2 )
@@ -45,7 +45,8 @@ COMMON_DEPEND=">=sys-apps/dbus-1.4.10
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/hwids
 	sys-apps/sysvinit
-	!<sys-libs/glibc-2.10"
+	!<sys-libs/glibc-2.10
+	!~sys-fs/udev-187"
 DEPEND="${COMMON_RDEPEND}
 	app-arch/xz-utils
 	app-text/docbook-xsl-stylesheets
@@ -77,7 +78,7 @@ src_prepare() {
 	sed -i -e 's:libudev\.la:-ludev:' Makefile.am
 
 	local PATCHES=(
-		"${FILESDIR}"/0001-Disable-udev-targets.patch
+		"${FILESDIR}"/0001-Disable-udev-targets-for-udev-188.patch
 	)
 
 #if LIVE


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

* [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/, sys-apps/systemd/files/
@ 2012-08-11  7:37 Michał Górny
  0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2012-08-11  7:37 UTC (permalink / raw
  To: gentoo-commits

commit:     13aba75d76944cd45f7ea1a6e482bb86c31baff9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 11 07:38:22 2012 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 11 07:38:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=13aba75d

sys-apps/systemd: Update the ebuild not to install udev.

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

---
 .../systemd/files/0001-Disable-udev-targets.patch  |  323 ++++++++++++++++++++
 ...add-lib-udev-rules.d-to-rules-directories.patch |   31 --
 sys-apps/systemd/files/40-gentoo.rules             |   14 -
 sys-apps/systemd/metadata.xml                      |    5 -
 sys-apps/systemd/systemd-9999.ebuild               |   38 +--
 5 files changed, 337 insertions(+), 74 deletions(-)

diff --git a/sys-apps/systemd/files/0001-Disable-udev-targets.patch b/sys-apps/systemd/files/0001-Disable-udev-targets.patch
new file mode 100644
index 0000000..8e1f0e9
--- /dev/null
+++ b/sys-apps/systemd/files/0001-Disable-udev-targets.patch
@@ -0,0 +1,323 @@
+From 86f115fa46ed6af9717899e1e2251b68abd96d5b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 11 Aug 2012 01:38:23 +0200
+Subject: [PATCH] Disable udev targets.
+
+---
+ Makefile.am | 189 +-----------------------------------------------------------
+ 1 file changed, 1 insertion(+), 188 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 39afb62..de22af7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1588,12 +1588,6 @@ SUBDIRS += \
+ 	docs/libudev
+ endif
+ 
+-include_HEADERS += \
+-	src/libudev/libudev.h
+-
+-lib_LTLIBRARIES += \
+-	-ludev
+-
+ libudev_la_SOURCES =\
+ 	src/libudev/libudev-private.h \
+ 	src/libudev/libudev.c \
+@@ -1616,9 +1610,6 @@ libudev_la_LDFLAGS = \
+ libudev_la_LIBADD = \
+ 	libsystemd-shared.la
+ 
+-pkgconfiglib_DATA += \
+-	src/libudev/libudev.pc
+-
+ EXTRA_DIST += \
+ 	src/libudev/libudev.pc.in \
+ 	src/libudev/libudev.sym
+@@ -1639,12 +1630,7 @@ libudev-install-move-hook:
+ libudev-uninstall-move-hook:
+ 	rm -f $(DESTDIR)$(rootlibdir)/libudev.so*
+ 
+-INSTALL_EXEC_HOOKS += libudev-install-move-hook
+-UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook
+-
+ # ------------------------------------------------------------------------------
+-noinst_LTLIBRARIES += \
+-	libudev-private.la
+ 
+ libudev_private_la_SOURCES =\
+ 	$(libudev_la_SOURCES) \
+@@ -1659,15 +1645,6 @@ libudev_private_la_LIBADD = \
+ 	libsystemd-shared.la
+ 
+ # ------------------------------------------------------------------------------
+-MANPAGES += \
+-	man/udev.7 \
+-	man/udevadm.8 \
+-	man/systemd-udevd.service.8
+-
+-MANPAGES_ALIAS += \
+-	man/systemd-udevd.8 \
+-	man/systemd-udevd-control.socket.8 \
+-	man/systemd-udevd-kernel.socket.8
+ 
+ man/systemd-udevd.8: man/systemd-udevd.service.8
+ man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8
+@@ -1679,27 +1656,7 @@ udev-confdirs:
+ INSTALL_DATA_HOOKS += udev-confdirs
+ 
+ dist_udevrules_DATA += \
+-	rules/99-systemd.rules \
+-	rules/42-usb-hid-pm.rules \
+-	rules/50-udev-default.rules \
+-	rules/60-persistent-storage-tape.rules \
+-	rules/60-persistent-serial.rules \
+-	rules/60-persistent-input.rules \
+-	rules/60-persistent-alsa.rules \
+-	rules/60-persistent-storage.rules \
+-	rules/75-net-description.rules \
+-	rules/75-tty-description.rules \
+-	rules/78-sound-card.rules \
+-	rules/80-drivers.rules \
+-	rules/95-udev-late.rules
+-
+-udevconfdir = $(sysconfdir)/udev
+-dist_udevconf_DATA = \
+-	src/udev/udev.conf
+-
+-sharepkgconfigdir = $(datadir)/pkgconfig
+-sharepkgconfig_DATA = \
+-	src/udev/udev.pc
++	rules/99-systemd.rules
+ 
+ EXTRA_DIST += \
+ 	rules/99-systemd.rules.in \
+@@ -1729,15 +1686,6 @@ systemd-install-hook:
+ 
+ INSTALL_DATA_HOOKS += systemd-install-hook
+ 
+-bin_PROGRAMS += \
+-	udevadm
+-
+-rootlibexec_PROGRAMS += \
+-	systemd-udevd
+-
+-noinst_LTLIBRARIES += \
+-	libudev-core.la
+-
+ libudev_core_la_SOURCES = \
+ 	src/udev/udev.h \
+ 	src/udev/udev-event.c \
+@@ -1803,14 +1751,6 @@ udevadm_LDADD = \
+ 	libsystemd-shared.la
+ 
+ # ------------------------------------------------------------------------------
+-TESTS += \
+-	test/udev-test.pl \
+-	test/rules-test.sh
+-
+-noinst_PROGRAMS += \
+-	test-libudev \
+-	test-udev
+-
+ test_libudev_SOURCES = \
+ 	src/test/test-libudev.c
+ 
+@@ -1860,8 +1800,6 @@ ata_id_LDADD = \
+ 	libudev-private.la \
+ 	libsystemd-shared.la
+ 
+-udevlibexec_PROGRAMS += \
+-	ata_id
+ 
+ # ------------------------------------------------------------------------------
+ cdrom_id_SOURCES = \
+@@ -1871,12 +1809,6 @@ cdrom_id_LDADD = \
+ 	-ludev \
+ 	libsystemd-shared.la
+ 
+-udevlibexec_PROGRAMS += \
+-	cdrom_id
+-
+-dist_udevrules_DATA += \
+-	rules/60-cdrom_id.rules
+-
+ # ------------------------------------------------------------------------------
+ collect_SOURCES = \
+ 	src/udev/collect/collect.c
+@@ -1884,9 +1816,6 @@ collect_SOURCES = \
+ collect_LDADD = \
+ 	libudev-private.la
+ 
+-udevlibexec_PROGRAMS += \
+-	collect
+-
+ # ------------------------------------------------------------------------------
+ scsi_id_SOURCES =\
+ 	src/udev/scsi_id/scsi_id.c \
+@@ -1898,9 +1827,6 @@ scsi_id_LDADD = \
+ 	libudev-private.la \
+ 	libsystemd-shared.la
+ 
+-udevlibexec_PROGRAMS += \
+-	scsi_id
+-
+ EXTRA_DIST += \
+ 	src/udev/scsi_id/README
+ 
+@@ -1911,12 +1837,6 @@ v4l_id_SOURCES = \
+ v4l_id_LDADD = \
+ 	-ludev
+ 
+-udevlibexec_PROGRAMS += \
+-	v4l_id
+-
+-dist_udevrules_DATA += \
+-	rules/60-persistent-v4l.rules
+-
+ # ------------------------------------------------------------------------------
+ accelerometer_SOURCES = \
+ 	src/udev/accelerometer/accelerometer.c
+@@ -1925,12 +1845,6 @@ accelerometer_LDADD = \
+ 	-ludev -lm \
+ 	libsystemd-shared.la
+ 
+-udevlibexec_PROGRAMS += \
+-	accelerometer
+-
+-dist_udevrules_DATA += \
+-	rules/61-accelerometer.rules
+-
+ # ------------------------------------------------------------------------------
+ if ENABLE_GUDEV
+ if ENABLE_GTK_DOC
+@@ -2111,98 +2025,11 @@ nodist_keymap_SOURCES = \
+ BUILT_SOURCES += \
+ 	$(nodist_keymap_SOURCES)
+ 
+-udevlibexec_PROGRAMS += \
+-	keymap
+-
+-dist_doc_DATA += \
+-	src/udev/keymap/README.keymap.txt
+-
+-dist_udevrules_DATA += \
+-	src/udev/keymap/95-keymap.rules \
+-	src/udev/keymap/95-keyboard-force-release.rules
+-
+-dist_udevhome_SCRIPTS = \
+-	src/udev/keymap/findkeyboards \
+-	src/udev/keymap/keyboard-force-release.sh
+-
+-TESTS += \
+-	src/udev/keymap/check-keymaps.sh
+-
+ CLEANFILES += \
+ 	src/udev/keymap/keys.txt \
+ 	src/udev/keymap/keys-from-name.gperf \
+ 	src/udev/keymap/keyboard-force-release.sh
+ 
+-udevkeymapdir = $(udevlibexecdir)/keymaps
+-dist_udevkeymap_DATA = \
+-	keymaps/acer \
+-	keymaps/acer-aspire_5720 \
+-	keymaps/acer-aspire_8930 \
+-	keymaps/acer-aspire_5920g \
+-	keymaps/acer-aspire_6920 \
+-	keymaps/acer-travelmate_c300 \
+-	keymaps/asus \
+-	keymaps/compaq-e_evo \
+-	keymaps/dell \
+-	keymaps/dell-latitude-xt2 \
+-	keymaps/everex-xt5000 \
+-	keymaps/fujitsu-amilo_li_2732 \
+-	keymaps/fujitsu-amilo_pa_2548 \
+-	keymaps/fujitsu-amilo_pro_edition_v3505 \
+-	keymaps/fujitsu-amilo_pro_v3205 \
+-	keymaps/fujitsu-amilo_si_1520 \
+-	keymaps/fujitsu-esprimo_mobile_v5 \
+-	keymaps/fujitsu-esprimo_mobile_v6 \
+-	keymaps/genius-slimstar-320 \
+-	keymaps/hewlett-packard \
+-	keymaps/hewlett-packard-2510p_2530p \
+-	keymaps/hewlett-packard-compaq_elitebook \
+-	keymaps/hewlett-packard-pavilion \
+-	keymaps/hewlett-packard-presario-2100 \
+-	keymaps/hewlett-packard-tablet \
+-	keymaps/hewlett-packard-tx2 \
+-	keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
+-	keymaps/inventec-symphony_6.0_7.0 \
+-	keymaps/lenovo-3000 \
+-	keymaps/lenovo-ideapad \
+-	keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
+-	keymaps/lenovo-thinkpad_x6_tablet \
+-	keymaps/lenovo-thinkpad_x200_tablet \
+-	keymaps/lg-x110 \
+-	keymaps/logitech-wave \
+-	keymaps/logitech-wave-cordless \
+-	keymaps/logitech-wave-pro-cordless \
+-	keymaps/maxdata-pro_7000 \
+-	keymaps/medion-fid2060 \
+-	keymaps/medionnb-a555 \
+-	keymaps/micro-star \
+-	keymaps/module-asus-w3j \
+-	keymaps/module-ibm \
+-	keymaps/module-lenovo \
+-	keymaps/module-sony \
+-	keymaps/module-sony-old \
+-	keymaps/module-sony-vgn \
+-	keymaps/olpc-xo \
+-	keymaps/onkyo \
+-	keymaps/oqo-model2 \
+-	keymaps/samsung-other \
+-	keymaps/samsung-90x3a \
+-	keymaps/samsung-sq1us \
+-	keymaps/samsung-sx20s \
+-	keymaps/toshiba-satellite_a100 \
+-	keymaps/toshiba-satellite_a110 \
+-	keymaps/toshiba-satellite_m30x \
+-	keymaps/zepto-znote
+-
+-udevkeymapforcereldir = $(udevlibexecdir)/keymaps/force-release
+-dist_udevkeymapforcerel_DATA = \
+-	keymaps-force-release/dell-touchpad \
+-	keymaps-force-release/dell-xps \
+-	keymaps-force-release/hp-other \
+-	keymaps-force-release/samsung-other \
+-	keymaps-force-release/samsung-90x3a \
+-	keymaps-force-release/common-volume-keys
+-
+ src/udev/keymap/keys.txt: Makefile
+ 	$(AM_V_at)$(MKDIR_P) $(dir $@)
+ 	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
+@@ -2230,12 +2057,6 @@ mtd_probe_SOURCES =  \
+ mtd_probe_CPPFLAGS = \
+ 	$(AM_CPPFLAGS)
+ 
+-dist_udevrules_DATA += \
+-	rules/75-probe_mtd.rules
+-
+-udevlibexec_PROGRAMS += \
+-	mtd_probe
+-
+ # ------------------------------------------------------------------------------
+ libsystemd_id128_la_SOURCES = \
+ 	src/libsystemd-id128/sd-id128.c
+@@ -3244,14 +3065,6 @@ systemd_multi_seat_x_LDADD = \
+ rootlibexec_PROGRAMS += \
+ 	systemd-multi-seat-x
+ 
+-dist_udevrules_DATA += \
+-	src/login/70-uaccess.rules \
+-	src/login/70-power-switch.rules
+-
+-nodist_udevrules_DATA += \
+-	src/login/71-seat.rules \
+-	src/login/73-seat-late.rules
+-
+ MANPAGES += \
+ 	man/systemd-logind.service.8 \
+ 	man/logind.conf.5 \
+-- 
+1.7.11.1
+

diff --git a/sys-apps/systemd/files/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch b/sys-apps/systemd/files/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch
deleted file mode 100644
index 318df1b..0000000
--- a/sys-apps/systemd/files/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d395d7616d089eae34c5b2a81e5cefa13c32acb1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 13 Jul 2012 16:15:14 +0200
-Subject: [PATCH] udev: add /lib/udev/rules.d to rules directories
-
-This adds /lib if split-usr is enabled
-to the directories where udev searches for rules.d.
-
-This is needed if split-usr is enabled because some software still
-installs rules in /lib/udev/rules.d.
----
- src/udev/udev-rules.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
-index d3b33e4..f30fa5a 100644
---- a/src/udev/udev-rules.c
-+++ b/src/udev/udev-rules.c
-@@ -1760,6 +1760,9 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
-         rules->dirs = strv_new(SYSCONFDIR "/udev/rules.d",
-                                "/run/udev/rules.d",
-                                UDEVLIBEXECDIR "/rules.d",
-+#ifdef HAVE_SPLIT_USR
-+                               "/lib/udev/rules.d",
-+#endif
-                                NULL);
-         if (!rules->dirs) {
-                 log_error("failed to build config directory array");
--- 
-1.7.8.6
-

diff --git a/sys-apps/systemd/files/40-gentoo.rules b/sys-apps/systemd/files/40-gentoo.rules
deleted file mode 100644
index fa99ba9..0000000
--- a/sys-apps/systemd/files/40-gentoo.rules
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/metadata.xml b/sys-apps/systemd/metadata.xml
index 4a129bb..2c289e2 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -9,10 +9,5 @@
 		<!-- XXX: describe those two better -->
 		<flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag>
 		<flag name='cryptsetup'>Use libcryptsetup</flag>
-		<flag name='doc'>Build gtk-doc API docs</flag>
-		<flag name='gudev'>Enable libudev gobject interface</flag>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			for introspection</flag>
-		<flag name='plymouth'>Enable support for <pkg>sys-boot/plymouth</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index e4a9dfb..509d4df 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -21,7 +21,7 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
 LICENSE="GPL-2 LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="acl audit cryptsetup doc gudev introspection lzma pam selinux tcpd"
+IUSE="acl audit cryptsetup lzma pam selinux tcpd"
 
 # We need to depend on sysvinit for sulogin which is used in the rescue
 # mode. Bug #399615.
@@ -31,25 +31,20 @@ MINKV="2.6.39"
 COMMON_DEPEND=">=sys-apps/dbus-1.4.10
 	>=sys-apps/kmod-5
 	>=sys-apps/util-linux-2.20
+	>=sys-fs/udev-187
 	sys-libs/libcap
 	acl? ( sys-apps/acl )
 	audit? ( >=sys-process/audit-2 )
 	cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 )
-	gudev? ( dev-libs/glib:2 )
-	introspection? ( dev-libs/gobject-introspection )
 	lzma? ( app-arch/xz-utils )
 	pam? ( virtual/pam )
 	selinux? ( sys-libs/libselinux )
 	tcpd? ( sys-apps/tcp-wrappers )"
 
 # sysvinit for sulogin
-# udev is bundled
-# udev-init-scripts not to break systems running openrc
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/hwids
 	sys-apps/sysvinit
-	>=sys-fs/udev-init-scripts-14
-	!sys-fs/udev
 	!<sys-libs/glibc-2.10"
 DEPEND="${COMMON_RDEPEND}
 	app-arch/xz-utils
@@ -57,8 +52,7 @@ DEPEND="${COMMON_RDEPEND}
 	dev-libs/libxslt
 	dev-util/gperf
 	dev-util/intltool
-	>=sys-kernel/linux-headers-${MINKV}
-	doc? ( dev-util/gtk-doc )"
+	>=sys-kernel/linux-headers-${MINKV}"
 
 #if LIVE
 SRC_URI=
@@ -79,18 +73,21 @@ 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
+	# link against external udev.
+	sed -i -e 's:libudev\.la:-ludev:' Makefile.am
 
 	local PATCHES=(
-		"${FILESDIR}"/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch
+		"${FILESDIR}"/0001-Disable-udev-targets.patch
 	)
 
-#if LIVE /* XXX: do something about it... */
+#if LIVE
 	gtkdocize --docdir docs/ || die
 #endif
+
 	autotools-utils_src_prepare
+
+	# XXX: support it within eclass
+	eautomake
 }
 
 src_configure() {
@@ -105,16 +102,15 @@ src_configure() {
 		# this avoids dep on pciutils & usbutils
 		--with-pci-ids-path=/usr/share/misc/pci.ids
 		--with-usb-ids-path=/usr/share/misc/usb.ids
-		# firmware search path
-		--with-firmware-path=/usr/lib/firmware/updates:/usr/lib/firmware:/lib/firmware/updates:/lib/firmware
 		# make sure we get /bin:/sbin in $PATH
 		--enable-split-usr
+		# udev parts
+		--disable-introspection
+		--disable-gudev
 		$(use_enable acl)
 		$(use_enable audit)
 		$(use_enable cryptsetup libcryptsetup)
 		$(use_enable doc gtk-doc)
-		$(use_enable gudev)
-		$(use_enable introspection)
 		$(use_enable lzma xz)
 		$(use_enable pam)
 		$(use_enable selinux)
@@ -147,15 +143,9 @@ src_install() {
 	insinto /usr/lib/tmpfiles.d
 	doins "${FILESDIR}"/gentoo-run.conf
 
-	# 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.
 	[[ -x "${D}"/bin/systemd ]] || die '/bin/systemd symlink broken, aborting.'
 	[[ -x "${D}"/usr/bin/systemd ]] || die '/usr/bin/systemd symlink broken, aborting.'
-#endif
 }
 
 pkg_preinst() {


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

* [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/, sys-apps/systemd/files/
@ 2012-08-11  7:37 Michał Górny
  0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2012-08-11  7:37 UTC (permalink / raw
  To: gentoo-commits

commit:     128e2d650fe02d28263f510e0f380efc7a15a4c8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  6 16:18:53 2012 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug  6 16:19:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=128e2d65

sys-apps/systemd: sync changes from udev.

---
 ...add-lib-udev-rules.d-to-rules-directories.patch |   31 ++++++++++++++++++++
 sys-apps/systemd/systemd-9999.ebuild               |   10 ++++++-
 2 files changed, 40 insertions(+), 1 deletions(-)

diff --git a/sys-apps/systemd/files/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch b/sys-apps/systemd/files/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch
new file mode 100644
index 0000000..318df1b
--- /dev/null
+++ b/sys-apps/systemd/files/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch
@@ -0,0 +1,31 @@
+From d395d7616d089eae34c5b2a81e5cefa13c32acb1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 13 Jul 2012 16:15:14 +0200
+Subject: [PATCH] udev: add /lib/udev/rules.d to rules directories
+
+This adds /lib if split-usr is enabled
+to the directories where udev searches for rules.d.
+
+This is needed if split-usr is enabled because some software still
+installs rules in /lib/udev/rules.d.
+---
+ src/udev/udev-rules.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
+index d3b33e4..f30fa5a 100644
+--- a/src/udev/udev-rules.c
++++ b/src/udev/udev-rules.c
+@@ -1760,6 +1760,9 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
+         rules->dirs = strv_new(SYSCONFDIR "/udev/rules.d",
+                                "/run/udev/rules.d",
+                                UDEVLIBEXECDIR "/rules.d",
++#ifdef HAVE_SPLIT_USR
++                               "/lib/udev/rules.d",
++#endif
+                                NULL);
+         if (!rules->dirs) {
+                 log_error("failed to build config directory array");
+-- 
+1.7.8.6
+

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 910eba1..35c7b2f 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -44,9 +44,11 @@ COMMON_DEPEND=">=sys-apps/dbus-1.4.10
 
 # sysvinit for sulogin
 # udev is bundled
+# udev-init-scripts not to break systems running openrc
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/hwids
 	sys-apps/sysvinit
+	>=sys-fs/udev-init-scripts-14
 	!sys-fs/udev
 	!<sys-libs/glibc-2.10"
 DEPEND="${COMMON_RDEPEND}
@@ -81,6 +83,10 @@ src_prepare() {
 	sed -e '/GROUP=/s:dialout:uucp:' \
 		-i rules/*.rules || die
 
+	local PATCHES=(
+		"${FILESDIR}"/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch
+	)
+
 #if LIVE /* XXX: do something about it... */
 	gtkdocize --docdir docs/ || die
 #endif
@@ -89,6 +95,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		--localstatedir=/var
 		--with-distro=gentoo
 		# install everything to /usr
 		--with-rootprefix=/usr
@@ -98,7 +105,8 @@ src_configure() {
 		# 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
+		# firmware search path
+		--with-firmware-path=/usr/lib/firmware/updates:/usr/lib/firmware:/lib/firmware/updates:/lib/firmware
 		# make sure we get /bin:/sbin in $PATH
 		--enable-split-usr
 		$(use_enable acl)


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

* [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/, sys-apps/systemd/files/
@ 2012-07-09 22:03 Michał Górny
  0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2012-07-09 22:03 UTC (permalink / raw
  To: gentoo-commits

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
 }



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

* [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/, sys-apps/systemd/files/
@ 2012-01-06 10:17 Michał Górny
  0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2012-01-06 10:17 UTC (permalink / raw
  To: gentoo-commits

commit:     339601a030c05fb9e8e2f873b05c11cc73c0d9bb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 09:49:49 2012 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 09:49:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=339601a0

sys-apps/systemd: Migrate to /usr.

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

---
 .../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               |   28 ++++++++++++++++++-
 4 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/sys-apps/systemd/files/update-etc-systemd-symlinks.path b/sys-apps/systemd/files/update-etc-systemd-symlinks.path
new file mode 100644
index 0000000..33a9576
--- /dev/null
+++ b/sys-apps/systemd/files/update-etc-systemd-symlinks.path
@@ -0,0 +1,5 @@
+[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
new file mode 100644
index 0000000..c05a194
--- /dev/null
+++ b/sys-apps/systemd/files/update-etc-systemd-symlinks.service
@@ -0,0 +1,6 @@
+[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
new file mode 100755
index 0000000..ce81bba
--- /dev/null
+++ b/sys-apps/systemd/files/update-etc-systemd-symlinks.sh
@@ -0,0 +1,19 @@
+#!/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 da2e400..c13decc 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -77,14 +77,18 @@ pkg_setup() {
 src_prepare() {
 	# Force the rebuild of .vala sources
 	touch src/*.vala || die
+
+	# Fix hardcoded path in .vala.
+	sed -i -e 's:/lib/systemd:/usr/lib/systemd:g' src/*.vala || die
+
 	autotools-utils_src_prepare
 }
 
 src_configure() {
 	local myeconfargs=(
 		--with-distro=gentoo
-		--with-rootprefix=
-		--with-rootlibdir=/$(get_libdir)
+		--with-rootprefix=/usr
+		--with-rootlibdir=/usr/$(get_libdir)
 		--localstatedir=/var
 		--docdir=/tmp/docs
 		$(use_enable acl)
@@ -108,6 +112,9 @@ src_install() {
 	autotools-utils_src_install \
 		bashcompletiondir=/tmp
 
+	# compat for init= use
+	dosym ../usr/bin/systemd /bin/systemd
+
 	# move files as necessary
 	newbashcomp "${D}"/tmp/systemd-bash-completion.sh ${PN}
 	dodoc "${D}"/tmp/docs/*
@@ -122,6 +129,12 @@ src_install() {
 	# Create /run/lock as required by new baselay/OpenRC compat.
 	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
 }
 
 pkg_preinst() {
@@ -160,4 +173,15 @@ 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
 }



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

* [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/, sys-apps/systemd/files/
@ 2011-12-12 12:09 Michał Górny
  0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2011-12-12 12:09 UTC (permalink / raw
  To: gentoo-commits

commit:     776b93ed0d89ffe34f385895058ca3c24b78c693
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 12 08:00:57 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 08:00:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=776b93ed

sys-apps/systemd: Create /run/lock as enforced by new OpenRC.

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

---
 sys-apps/systemd/files/gentoo-run.conf |    5 +++++
 sys-apps/systemd/systemd-9999.ebuild   |    4 ++++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/sys-apps/systemd/files/gentoo-run.conf b/sys-apps/systemd/files/gentoo-run.conf
new file mode 100644
index 0000000..5b3bcab
--- /dev/null
+++ b/sys-apps/systemd/files/gentoo-run.conf
@@ -0,0 +1,5 @@
+# New OpenRC versions replace /var/lock with a symlink to /run/lock.
+# We just create that directory for now, just in case.
+# Of course, it's not guaranteed that'll satisfy all relevant packages.
+
+d /run/lock 0755 root root -

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index b113b73..57c0028 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -118,6 +118,10 @@ src_install() {
 	done
 
 	keepdir /run
+
+	# Create /run/lock as required by new baselay/OpenRC compat.
+	insinto /usr/lib/tmpfiles.d
+	doins "${FILESDIR}"/gentoo-run.conf
 }
 
 pkg_preinst() {



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

end of thread, other threads:[~2012-12-02 11:00 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-03 21:31 [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/, sys-apps/systemd/files/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2012-12-02 11:00 Michał Górny
2012-09-26  5:51 Michał Górny
2012-09-21 21:32 Michał Górny
2012-08-24 17:20 Michał Górny
2012-08-15 16:04 Michał Górny
2012-08-11  7:37 Michał Górny
2012-08-11  7:37 Michał Górny
2012-07-09 22:03 Michał Górny
2012-01-06 10:17 Michał Górny
2011-12-12 12:09 Michał Górny

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