diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0002-Revert-analyze-use-GDBus-instead-of-dbus-python.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0002-Revert-analyze-use-GDBus-instead-of-dbus-python.patch | 94 |
1 files changed, 0 insertions, 94 deletions
diff --git a/meta/recipes-core/systemd/systemd/0002-Revert-analyze-use-GDBus-instead-of-dbus-python.patch b/meta/recipes-core/systemd/systemd/0002-Revert-analyze-use-GDBus-instead-of-dbus-python.patch deleted file mode 100644 index 96ad323509..0000000000 --- a/meta/recipes-core/systemd/systemd/0002-Revert-analyze-use-GDBus-instead-of-dbus-python.patch +++ /dev/null | |||
@@ -1,94 +0,0 @@ | |||
1 | Upstream-Status: Backport [revert] | ||
2 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | |||
4 | From 8079db861b8ffdce69fa10a9ab9ef4740045187f Mon Sep 17 00:00:00 2001 | ||
5 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
6 | Date: Mon, 10 Dec 2012 12:25:00 +0100 | ||
7 | Subject: [PATCH 2/2] Revert "analyze: use GDBus instead of dbus-python" | ||
8 | |||
9 | This reverts commit 4940c64240541e91411620b7dc0963e012aa6b91. | ||
10 | |||
11 | Python-gobject is too old in current OE | ||
12 | --- | ||
13 | src/analyze/systemd-analyze | 31 ++++++++++++++----------------- | ||
14 | 1 files changed, 14 insertions(+), 17 deletions(-) | ||
15 | |||
16 | diff --git a/src/analyze/systemd-analyze b/src/analyze/systemd-analyze | ||
17 | index 87a83dd..636fd74 100755 | ||
18 | --- a/src/analyze/systemd-analyze | ||
19 | +++ b/src/analyze/systemd-analyze | ||
20 | @@ -1,15 +1,14 @@ | ||
21 | #!/usr/bin/python | ||
22 | |||
23 | -import getopt, sys, os | ||
24 | -from gi.repository import Gio | ||
25 | +import getopt, dbus, sys, os | ||
26 | try: | ||
27 | import cairo | ||
28 | except ImportError: | ||
29 | cairo = None | ||
30 | |||
31 | def acquire_time_data(): | ||
32 | - manager = Gio.DBusProxy.new_for_bus_sync(bus, Gio.DBusProxyFlags.NONE, | ||
33 | - None, 'org.freedesktop.systemd1', '/org/freedesktop/systemd1', 'org.freedesktop.systemd1.Manager', None) | ||
34 | + | ||
35 | + manager = dbus.Interface(bus.get_object('org.freedesktop.systemd1', '/org/freedesktop/systemd1'), 'org.freedesktop.systemd1.Manager') | ||
36 | units = manager.ListUnits() | ||
37 | |||
38 | l = [] | ||
39 | @@ -18,25 +17,23 @@ def acquire_time_data(): | ||
40 | if i[5] != "": | ||
41 | continue | ||
42 | |||
43 | - properties = Gio.DBusProxy.new_for_bus_sync(bus, Gio.DBusProxyFlags.NONE, | ||
44 | - None, 'org.freedesktop.systemd1', i[6], 'org.freedesktop.DBus.Properties', None) | ||
45 | + properties = dbus.Interface(bus.get_object('org.freedesktop.systemd1', i[6]), 'org.freedesktop.DBus.Properties') | ||
46 | |||
47 | - ixt = properties.Get('(ss)', 'org.freedesktop.systemd1.Unit', 'InactiveExitTimestampMonotonic') | ||
48 | - aet = properties.Get('(ss)', 'org.freedesktop.systemd1.Unit', 'ActiveEnterTimestampMonotonic') | ||
49 | - axt = properties.Get('(ss)', 'org.freedesktop.systemd1.Unit', 'ActiveExitTimestampMonotonic') | ||
50 | - iet = properties.Get('(ss)', 'org.freedesktop.systemd1.Unit', 'InactiveEnterTimestampMonotonic') | ||
51 | + ixt = int(properties.Get('org.freedesktop.systemd1.Unit', 'InactiveExitTimestampMonotonic')) | ||
52 | + aet = int(properties.Get('org.freedesktop.systemd1.Unit', 'ActiveEnterTimestampMonotonic')) | ||
53 | + axt = int(properties.Get('org.freedesktop.systemd1.Unit', 'ActiveExitTimestampMonotonic')) | ||
54 | + iet = int(properties.Get('org.freedesktop.systemd1.Unit', 'InactiveEnterTimestampMonotonic')) | ||
55 | |||
56 | l.append((str(i[0]), ixt, aet, axt, iet)) | ||
57 | |||
58 | return l | ||
59 | |||
60 | def acquire_start_time(): | ||
61 | - properties = Gio.DBusProxy.new_for_bus_sync(bus, Gio.DBusProxyFlags.NONE, | ||
62 | - None, 'org.freedesktop.systemd1', '/org/freedesktop/systemd1', 'org.freedesktop.DBus.Properties', None) | ||
63 | + properties = dbus.Interface(bus.get_object('org.freedesktop.systemd1', '/org/freedesktop/systemd1'), 'org.freedesktop.DBus.Properties') | ||
64 | |||
65 | - initrd_time = properties.Get('(ss)', 'org.freedesktop.systemd1.Manager', 'InitRDTimestampMonotonic') | ||
66 | - userspace_time = properties.Get('(ss)', 'org.freedesktop.systemd1.Manager', 'UserspaceTimestampMonotonic') | ||
67 | - finish_time = properties.Get('(ss)', 'org.freedesktop.systemd1.Manager', 'FinishTimestampMonotonic') | ||
68 | + initrd_time = int(properties.Get('org.freedesktop.systemd1.Manager', 'InitRDTimestampMonotonic')) | ||
69 | + userspace_time = int(properties.Get('org.freedesktop.systemd1.Manager', 'UserspaceTimestampMonotonic')) | ||
70 | + finish_time = int(properties.Get('org.freedesktop.systemd1.Manager', 'FinishTimestampMonotonic')) | ||
71 | |||
72 | if finish_time == 0: | ||
73 | sys.stderr.write("Bootup is not yet finished. Please try again later.\n") | ||
74 | @@ -284,7 +281,7 @@ def unknown_verb(): | ||
75 | usage() | ||
76 | sys.exit(1) | ||
77 | |||
78 | -bus = Gio.BusType.SYSTEM | ||
79 | +bus = dbus.SystemBus() | ||
80 | |||
81 | try: | ||
82 | opts, args = getopt.gnu_getopt(sys.argv[1:], "h", ["help", "user"]) | ||
83 | @@ -296,7 +293,7 @@ for o, a in opts: | ||
84 | if o in ("-h", "--help"): | ||
85 | help() | ||
86 | elif o == '--user': | ||
87 | - bus = Gio.BusType.SESSION | ||
88 | + bus = dbus.SessionBus() | ||
89 | else: | ||
90 | assert False, "unhandled option" | ||
91 | |||
92 | -- | ||
93 | 1.7.7.6 | ||
94 | |||