diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph')
2 files changed, 128 insertions, 0 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch b/external/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch new file mode 100644 index 00000000..56981d96 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch @@ -0,0 +1,89 @@ +From 50cea8fd3c07ab27da6edce865a49339f16f3b57 Mon Sep 17 00:00:00 2001 +From: Naveen Saini <naveen.kumar.saini@intel.com> +Date: Tue, 18 Jun 2019 17:10:15 +0800 +Subject: [PATCH] Makefile: fix multilib build failure + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> +--- + Makefile | 50 +++++++++++++++++++++++++++----------------------- + 1 file changed, 27 insertions(+), 23 deletions(-) + +diff --git a/Makefile b/Makefile +index 8455415..4aa0786 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,30 +1,34 @@ + # SPDX-License-Identifier: GPL-2.0 + PREFIX ?= /usr + DESTDIR ?= ++BASELIB ?= + + all: + @echo "Nothing to build" + ++clean: ++ @echo "Nothing to clean" ++ + install : uninstall +- install -d $(DESTDIR)$(PREFIX)/lib/pm-graph +- install sleepgraph.py $(DESTDIR)$(PREFIX)/lib/pm-graph +- install bootgraph.py $(DESTDIR)$(PREFIX)/lib/pm-graph +- install -d $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/cgskip.txt $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/freeze-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/freeze.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/freeze-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/standby-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/standby.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/standby-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/suspend-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/suspend.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/suspend-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/suspend-x2-proc.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config ++ install -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph ++ install sleepgraph.py $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph ++ install bootgraph.py $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph ++ install -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/cgskip.txt $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/freeze-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/freeze.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/freeze-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/standby-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/standby.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/standby-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/suspend-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/suspend.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/suspend-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/suspend-x2-proc.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config + + install -d $(DESTDIR)$(PREFIX)/bin +- ln -s ../lib/pm-graph/bootgraph.py $(DESTDIR)$(PREFIX)/bin/bootgraph +- ln -s ../lib/pm-graph/sleepgraph.py $(DESTDIR)$(PREFIX)/bin/sleepgraph ++ ln -s ../$(BASELIB)/pm-graph/bootgraph.py $(DESTDIR)$(PREFIX)/bin/bootgraph ++ ln -s ../$(BASELIB)/pm-graph/sleepgraph.py $(DESTDIR)$(PREFIX)/bin/sleepgraph + + install -d $(DESTDIR)$(PREFIX)/share/man/man8 + install bootgraph.8 $(DESTDIR)$(PREFIX)/share/man/man8 +@@ -37,11 +41,11 @@ uninstall : + rm -f $(DESTDIR)$(PREFIX)/bin/bootgraph + rm -f $(DESTDIR)$(PREFIX)/bin/sleepgraph + +- rm -f $(DESTDIR)$(PREFIX)/lib/pm-graph/config/* +- if [ -d $(DESTDIR)$(PREFIX)/lib/pm-graph/config ] ; then \ +- rmdir $(DESTDIR)$(PREFIX)/lib/pm-graph/config; \ ++ rm -f $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config/* ++ if [ -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ] ; then \ ++ rmdir $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config; \ + fi; +- rm -f $(DESTDIR)$(PREFIX)/lib/pm-graph/* +- if [ -d $(DESTDIR)$(PREFIX)/lib/pm-graph ] ; then \ +- rmdir $(DESTDIR)$(PREFIX)/lib/pm-graph; \ ++ rm -f $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/* ++ if [ -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph ] ; then \ ++ rmdir $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph; \ + fi; +-- +2.17.1 + diff --git a/external/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch b/external/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch new file mode 100644 index 00000000..25c87093 --- /dev/null +++ b/external/meta-openembedded/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 <naveen.kumar.saini@intel.com> +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 <naveen.kumar.saini@intel.com> +--- + 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 + |