From 255b755381e4876f1fad0b1a8b6e4be1a3b37935 Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Wed, 11 Sep 2019 13:31:03 +0800 Subject: pm-graph: upgrade 5.3 -> 5.5 This release has python3 support so updating python3 to RDEPENDS. python subprocess comes with python3-core, so removing from RDEPENDS. Removed patch, which is already merged in this release. Signed-off-by: Naveen Saini Signed-off-by: Khem Raj --- .../pm-graph/pm-graph/0001-bootgraph.py.patch | 32 ------------------ .../pm-graph/0001-sleepgraph.py-use-python3.patch | 39 ++++++++++++++++++++++ meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb | 22 ------------ meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb | 22 ++++++++++++ 4 files changed, 61 insertions(+), 54 deletions(-) delete mode 100644 meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch create mode 100644 meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch delete mode 100644 meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb create mode 100644 meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch deleted file mode 100644 index d49ce0138a..0000000000 --- a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0c94e32b218c31f31a7988577fb9bec595034e7b Mon Sep 17 00:00:00 2001 -From: Todd Brandt -Date: Fri, 10 May 2019 15:10:35 -0700 -Subject: [PATCH] bootgraph.py: - handle boot time start grep better, the regex - needs more complexity - -Upstream-Status: Backport [https://github.com/intel/pm-graph/commit/0c94e32b218c31f31a7988577fb9bec595034e7b] - -Signed-off-by: Liwei Song ---- - bootgraph.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/bootgraph.py b/bootgraph.py -index a2b1b1897307..d7f4bd152bf1 100755 ---- a/bootgraph.py -+++ b/bootgraph.py -@@ -333,9 +333,9 @@ def parseKernelLog(): - if(not sysvals.stamp['kernel']): - sysvals.stamp['kernel'] = sysvals.kernelVersion(msg) - continue -- m = re.match('.* setting system clock to (?P.*) UTC.*', msg) -+ m = re.match('.* setting system clock to (?P[0-9\-]*)[ A-Z](?P[0-9:]*) UTC.*', msg) - if(m): -- bt = datetime.strptime(m.group('t'), '%Y-%m-%d %H:%M:%S') -+ bt = datetime.strptime(m.group('d')+' '+m.group('t'), '%Y-%m-%d %H:%M:%S') - bt = bt - timedelta(seconds=int(ktime)) - data.boottime = bt.strftime('%Y-%m-%d_%H:%M:%S') - sysvals.stamp['time'] = bt.strftime('%B %d %Y, %I:%M:%S %p') --- -2.22.0 - diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch new file mode 100644 index 0000000000..25c87093f6 --- /dev/null +++ b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch @@ -0,0 +1,39 @@ +From 22ce65d997f99606a3bb9d2a660ead42eecc234a Mon Sep 17 00:00:00 2001 +From: Naveen Saini +Date: Wed, 11 Sep 2019 11:31:07 +0800 +Subject: [PATCH] sleepgraph.py: use python3 + +Already compatible with Python 3. +Same goes for bootgraph.py + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Naveen Saini +--- + bootgraph.py | 2 +- + sleepgraph.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/bootgraph.py b/bootgraph.py +index d3b99a1..efb5714 100755 +--- a/bootgraph.py ++++ b/bootgraph.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + # SPDX-License-Identifier: GPL-2.0-only + # + # Tool for analyzing boot timing +diff --git a/sleepgraph.py b/sleepgraph.py +index 1794c79..cfed8e0 100755 +--- a/sleepgraph.py ++++ b/sleepgraph.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + # SPDX-License-Identifier: GPL-2.0-only + # + # Tool for analyzing suspend/resume timing +-- +2.17.1 + diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb deleted file mode 100644 index a9f540ab86..0000000000 --- a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Timing analysis tools for suspend/resume/boot" -DESCRIPTION = "This tool suite is designed to assist kernel and OS developers \ -in optimizing their linux stack's suspend/resume & boot time." -HOMEPAGE = "https://01.org/pm-graph" -LICENSE = "GPL-2" -LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" - -SRCREV = "5be9a16547234cef5aca8bfaccd920490ea1cfa7" -SRC_URI = "git://github.com/intel/pm-graph.git \ - file://0001-Makefile-fix-multilib-build-failure.patch \ - file://0001-bootgraph.py.patch \ -" -S = "${WORKDIR}/git" - -COMPATIBLE_HOST='(i.86|x86_64).*' -EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} BASELIB=${baselib}" - -do_install() { - oe_runmake install -} - -RDEPENDS_${PN} += "python-core python-threading python-datetime python-subprocess python-compression" diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb new file mode 100644 index 0000000000..63a9fa88e9 --- /dev/null +++ b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb @@ -0,0 +1,22 @@ +SUMMARY = "Timing analysis tools for suspend/resume/boot" +DESCRIPTION = "This tool suite is designed to assist kernel and OS developers \ +in optimizing their linux stack's suspend/resume & boot time." +HOMEPAGE = "https://01.org/pm-graph" +LICENSE = "GPL-2" +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" + +SRCREV = "cf59527dc24fdd2f314ae4dcaeb3d68a117988f6" +SRC_URI = "git://github.com/intel/pm-graph.git \ + file://0001-Makefile-fix-multilib-build-failure.patch \ + file://0001-sleepgraph.py-use-python3.patch \ +" +S = "${WORKDIR}/git" + +COMPATIBLE_HOST='(i.86|x86_64).*' +EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} BASELIB=${baselib}" + +do_install() { + oe_runmake install +} + +RDEPENDS_${PN} += "python3-core python3-threading python3-datetime python3-compression" -- cgit 1.2.3-korg