systemd: bump to v36

2 of the 3 analyze patches have been applied upstream, delete them

(From meta-openembedded rev: fb0d50c16fafb6956a94c472b7c6a74a456e38b6)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-oe/recipes-core/systemd/systemd/0001-analyze-always-draw-1s-marker-for-scale.patch b/meta-openembedded/meta-oe/recipes-core/systemd/systemd/0001-analyze-always-draw-1s-marker-for-scale.patch
deleted file mode 100644 (file)
index 6097893..0000000
--- a/meta-openembedded/meta-oe/recipes-core/systemd/systemd/0001-analyze-always-draw-1s-marker-for-scale.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0797320a7a8d6a8bd899a4149322486db7f5baa2 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Thu, 22 Sep 2011 11:27:13 +0200
-Subject: [PATCH 1/3] analyze: always draw 1s marker for scale
-
-In situations like this:
-
-root@omap4430-panda:~# systemd-analyze
-Startup finished in 1499ms (kernel) + 916ms (userspace) = 2416ms
-
-The svg plot will only have the 0s marker and no subsequent markers for scale. This patch forces the 1s marker to always be drawn.
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- src/systemd-analyze |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/systemd-analyze b/src/systemd-analyze
-index ae7dcfb..649d0e1 100755
---- a/src/systemd-analyze
-+++ b/src/systemd-analyze
-@@ -147,7 +147,7 @@ elif sys.argv[1] == 'plot':
-         context.set_line_width(1)
-         context.set_source_rgb(0.7, 0.7, 0.7)
- 
--        for x in range(0, (finish_time - start_time)/10000, 100):
-+        for x in range(0, max((finish_time - start_time)/10000,110), 100):
-                 context.move_to(x, 0)
-                 context.line_to(x, height-border*2)
- 
-@@ -163,7 +163,7 @@ elif sys.argv[1] == 'plot':
-         banner = "Running on %s (%s %s) %s" % (os.uname()[1], os.uname()[2], os.uname()[3], os.uname()[4])
-         draw_text(context, 0, -15, banner, hcenter = 0, vcenter = 1)
- 
--        for x in range(0, (finish_time - start_time)/10000, 100):
-+        for x in range(0, max((finish_time - start_time)/10000,110), 100):
-                 draw_text(context, x, -5, "%lus" % (x/100), vcenter = 0, hcenter = 0)
- 
-         y = 0
--- 
-1.6.6.1
-

diff --git a/meta-openembedded/meta-oe/recipes-core/systemd/systemd/0002-analyze-report-startup-time-in-plot-mode-as-well.patch b/meta-openembedded/meta-oe/recipes-core/systemd/systemd/0002-analyze-report-startup-time-in-plot-mode-as-well.patch
deleted file mode 100644 (file)
index 67b7b77..0000000
--- a/meta-openembedded/meta-oe/recipes-core/systemd/systemd/0002-analyze-report-startup-time-in-plot-mode-as-well.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 88b284f5c079536f5151c3f1dcfc0e692ef26da6 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Thu, 22 Sep 2011 14:55:17 +0200
-Subject: [PATCH 2/3] analyze: report startup time in plot mode as well
-
-It now prints something like "Startup finished in 1507ms (kernel) + 850ms (userspace) = 2357ms" below the legend.
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- src/systemd-analyze |   12 ++++++++++++
- 1 files changed, 12 insertions(+), 0 deletions(-)
-
-diff --git a/src/systemd-analyze b/src/systemd-analyze
-index 649d0e1..d0db984 100755
---- a/src/systemd-analyze
-+++ b/src/systemd-analyze
-@@ -221,6 +221,18 @@ elif sys.argv[1] == 'plot':
- 
-         draw_text(context, 0, height-border*2, "Legend: Red = Activating; Pink = Active; Dark Pink = Deactivating", hcenter = 0, vcenter = -1)
- 
-+        if initrd_time > 0:                                                                                  
-+                draw_text(context, 0, height-border*2 + bar_height, "Startup finished in %lums (kernel) + %lums (initrd) + %lums (userspace) = %lums" % ( \
-+                        initrd_time/1000, \
-+                        (start_time - initrd_time)/1000, \
-+                        (finish_time - start_time)/1000, \
-+                        finish_time/1000), hcenter = 0, vcenter = -1)
-+        else:                                                                                                                                  
-+                draw_text(context, 0, height-border*2 + bar_height, "Startup finished in %lums (kernel) + %lums (userspace) = %lums" % ( \
-+                        start_time/1000, \
-+                        (finish_time - start_time)/1000, \
-+                        finish_time/1000), hcenter = 0, vcenter = -1)
-+      
-         surface.finish()
- elif sys.argv[1] in ("help", "--help", "-h"):
-         help()
--- 
-1.6.6.1
-

diff --git a/meta-openembedded/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-openembedded/meta-oe/recipes-core/systemd/systemd_git.bb
index fd20a68..b895f0d 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-openembedded/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -14,15 +14,13 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r3"
+PR = "r0"
 
 inherit autotools vala perlnative
 
-SRCREV = "a2f5666d06fe8233025738047115bb9e3959df3e"
+SRCREV = "7c83341a593160e2b4739bdb8a1ad76b21bbdf9e"
 
 SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \
-           file://0001-analyze-always-draw-1s-marker-for-scale.patch \
-           file://0002-analyze-report-startup-time-in-plot-mode-as-well.patch \
            file://0003-analyze-draw-kernel-boot-time-as-well.patch \
            ${UCLIBCPATCHES} \
           "