diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-03-06 14:52:10 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-03-06 14:52:10 +0000 |
| commit | 56976e9ab23db947aad796b8ff4be4e7fcde344a (patch) | |
| tree | 7ba890f8d200593f5f10f5ab89dc688f94c0f8c1 /sys-apps | |
| parent | sci-chemistry/gsim: Version BUmp, seems to fix segf #412303 (diff) | |
| download | gentoo-2-56976e9ab23db947aad796b8ff4be4e7fcde344a.tar.gz gentoo-2-56976e9ab23db947aad796b8ff4be4e7fcde344a.tar.bz2 gentoo-2-56976e9ab23db947aad796b8ff4be4e7fcde344a.zip | |
Rebase the future -198 build split patch on current git HEAD. Requested in bug #460538.
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/systemd/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/systemd/files/198-0001-Disable-udev-targets.patch | 34 |
2 files changed, 23 insertions, 18 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index ebfaad108bd1..ef232acaaba6 100644 --- a/sys-apps/systemd/ChangeLog +++ b/sys-apps/systemd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/systemd # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.79 2013/02/24 11:49:24 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.80 2013/03/06 14:52:10 mgorny Exp $ + + 06 Mar 2013; Michał Górny <mgorny@gentoo.org> + files/198-0001-Disable-udev-targets.patch: + Rebase the future -198 build split patch on current git HEAD. Requested in bug + #460538. 24 Feb 2013; Agostino Sarubbo <ago@gentoo.org> systemd-197-r1.ebuild: Add ~ppc64, wrt bug #458360 diff --git a/sys-apps/systemd/files/198-0001-Disable-udev-targets.patch b/sys-apps/systemd/files/198-0001-Disable-udev-targets.patch index 15e30d854f24..a415969c58f6 100644 --- a/sys-apps/systemd/files/198-0001-Disable-udev-targets.patch +++ b/sys-apps/systemd/files/198-0001-Disable-udev-targets.patch @@ -1,4 +1,4 @@ -From 501e4eda140f1cf676f821599a7992819eb8aace Mon Sep 17 00:00:00 2001 +From a354cd7838ef9c42b2f0b0b35eae78bfff9837ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> Date: Fri, 8 Feb 2013 18:16:52 +0100 Subject: [PATCH] Disable udev targets. @@ -9,11 +9,11 @@ Subject: [PATCH] Disable udev targets. 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/Makefile-man.am b/Makefile-man.am -index ee9a952..dd16432 100644 +index 8d48ee0..8dc145b 100644 --- a/Makefile-man.am +++ b/Makefile-man.am -@@ -69,7 +69,6 @@ MANPAGES += \ - man/systemd-system-update-generator.8 \ +@@ -70,7 +70,6 @@ MANPAGES += \ + man/systemd-system.conf.5 \ man/systemd-tmpfiles.8 \ man/systemd-tty-ask-password-agent.1 \ - man/systemd-udevd.service.8 \ @@ -37,22 +37,22 @@ index ee9a952..dd16432 100644 man/systemd-udevd-kernel.socket.8 \ - man/systemd-udevd.8 \ man/systemd-update-utmp-shutdown.service.8 \ - man/systemd-update-utmp.8 - man/SD_ALERT.3: man/sd-daemon.3 + man/systemd-update-utmp.8 \ + man/systemd-user.conf.5 diff --git a/Makefile.am b/Makefile.am -index 7bc6902..642a285 100644 +index 35ce1fb..5399659 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -368,8 +368,6 @@ dist_systemunit_DATA = \ +@@ -379,8 +379,6 @@ dist_systemunit_DATA = \ units/quotaon.service \ units/systemd-ask-password-wall.path \ units/systemd-ask-password-console.path \ - units/systemd-udevd-control.socket \ - units/systemd-udevd-kernel.socket \ - units/system-update.target - - nodist_systemunit_DATA = \ -@@ -399,9 +397,6 @@ nodist_systemunit_DATA = \ + units/system-update.target \ + units/initrd-parse-etc.service \ + units/initrd-cleanup.service \ +@@ -415,9 +413,6 @@ nodist_systemunit_DATA = \ units/systemd-kexec.service \ units/systemd-fsck@.service \ units/systemd-fsck-root.service \ @@ -62,7 +62,7 @@ index 7bc6902..642a285 100644 units/debug-shell.service dist_userunit_DATA = \ -@@ -1274,9 +1269,6 @@ nodist_systemunit_DATA += \ +@@ -1319,9 +1314,6 @@ nodist_systemunit_DATA += \ SYSINIT_TARGET_WANTS += \ systemd-modules-load.service @@ -72,7 +72,7 @@ index 7bc6902..642a285 100644 endif EXTRA_DIST += \ -@@ -1555,6 +1547,22 @@ EXTRA_DIST += \ +@@ -1604,6 +1596,22 @@ EXTRA_DIST += \ src/libsystemd-daemon/libsystemd-daemon.pc.in \ src/libsystemd-daemon/libsystemd-daemon.sym @@ -95,7 +95,7 @@ index 7bc6902..642a285 100644 # ------------------------------------------------------------------------------ if ENABLE_GTK_DOC SUBDIRS += \ -@@ -1565,7 +1573,7 @@ include_HEADERS += \ +@@ -1614,7 +1622,7 @@ include_HEADERS += \ src/libudev/libudev.h lib_LTLIBRARIES += \ @@ -104,7 +104,7 @@ index 7bc6902..642a285 100644 libudev_la_SOURCES =\ src/libudev/libudev-private.h \ -@@ -2217,6 +2225,9 @@ udevlibexec_PROGRAMS += \ +@@ -2266,6 +2274,9 @@ udevlibexec_PROGRAMS += \ mtd_probe # ------------------------------------------------------------------------------ @@ -115,5 +115,5 @@ index 7bc6902..642a285 100644 src/libsystemd-id128/sd-id128.c -- -1.8.1.2 +1.8.1.5 |