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 198D6138552 for ; Sat, 19 Jan 2013 00:31:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5C9BE05BE; Sat, 19 Jan 2013 00:31:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 75B41E05BE for ; Sat, 19 Jan 2013 00:31:42 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 89A8133D92A for ; Sat, 19 Jan 2013 00:31:41 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id 4CE762171E; Sat, 19 Jan 2013 00:31:40 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/systemd/files: 197-0001-Disable-udev-targets.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: 197-0001-Disable-udev-targets.patch X-VCS-Directories: sys-apps/systemd/files X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130119003140.4CE762171E@flycatcher.gentoo.org> Date: Sat, 19 Jan 2013 00:31:40 +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: 8c0a7792-fe9c-4162-8934-e2bcf9587d03 X-Archives-Hash: d718970b32b7d707068cb5427396c4b7 mgorny 13/01/19 00:31:40 Modified: 197-0001-Disable-udev-targets.patch Log: Fix installing udev rules for the new udev location. (Portage version: 2.2.0_alpha154/cvs/Linux x86_64, signed Manifest commit with key 42B9401D) Revision Changes Path 1.3 sys-apps/systemd/files/197-0001-Disable-udev-targets.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/files/197-0001-Disable-udev-targets.patch?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/files/197-0001-Disable-udev-targets.patch?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/files/197-0001-Disable-udev-targets.patch?r1=1.2&r2=1.3 Index: 197-0001-Disable-udev-targets.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/files/197-0001-Disable-udev-targets.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 197-0001-Disable-udev-targets.patch 18 Jan 2013 18:24:35 -0000 1.2 +++ 197-0001-Disable-udev-targets.patch 19 Jan 2013 00:31:40 -0000 1.3 @@ -1,14 +1,14 @@ -From 75a1c1ea9b8438d0b1b7714d82a15fa40f33bb23 Mon Sep 17 00:00:00 2001 +From 39640ff78085e151b9f9fe03bde76efb47facdd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 18 Jan 2013 17:35:54 +0100 Subject: [PATCH] Disable udev & libsystemd-daemon for systemd ebuild. --- - Makefile.am | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) + Makefile.am | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am -index fb7d8fe..3c8f5b0 100644 +index fb7d8fe..09cf7c2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -293,8 +293,6 @@ dist_systemunit_DATA = \ @@ -30,10 +30,13 @@ units/debug-shell.service if HAVE_KMOD -@@ -1658,6 +1653,10 @@ systemd_tty_ask_password_agent_LDADD = \ +@@ -1658,6 +1653,13 @@ systemd_tty_ask_password_agent_LDADD = \ libsystemd-label.la \ libsystemd-shared.la ++dist_udevrules_DATA += \ ++ rules/99-systemd.rules ++ +# disable udev & systemd-daemon which are installed by sys-fs/udev +# ENABLE_GUDEV is something that won't be set in systemd ebuild +if ENABLE_GUDEV @@ -41,7 +44,7 @@ # ------------------------------------------------------------------------------ libsystemd_daemon_la_SOURCES = \ src/libsystemd-daemon/sd-daemon.c -@@ -2417,6 +2416,9 @@ dist_udevrules_DATA += \ +@@ -2417,6 +2419,9 @@ dist_udevrules_DATA += \ udevlibexec_PROGRAMS += \ mtd_probe