From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D31D613800E for ; Sat, 11 Aug 2012 07:38:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4395E0531; Sat, 11 Aug 2012 07:37:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 847CCE0531 for ; Sat, 11 Aug 2012 07:37:43 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C91C31B4156 for ; Sat, 11 Aug 2012 07:37:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 85C19E5439 for ; Sat, 11 Aug 2012 07:37:41 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1344269944.128e2d650fe02d28263f510e0f380efc7a15a4c8.mgorny@gentoo> Subject: [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/, sys-apps/systemd/files/ X-VCS-Repository: dev/mgorny X-VCS-Files: sys-apps/systemd/files/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch sys-apps/systemd/systemd-9999.ebuild X-VCS-Directories: sys-apps/systemd/ sys-apps/systemd/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 128e2d650fe02d28263f510e0f380efc7a15a4c8 X-VCS-Branch: master Date: Sat, 11 Aug 2012 07:37:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: faffa750-19b5-47a0-a8b0-a4deafd16809 X-Archives-Hash: e6e4fd6b7cd8bd315cc20851b386d8fc commit: 128e2d650fe02d28263f510e0f380efc7a15a4c8 Author: Michał Górny gentoo org> AuthorDate: Mon Aug 6 16:18:53 2012 +0000 Commit: Michał Górny gentoo 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?= +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 !