diff options
| author | Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | 2020-05-19 23:27:11 +0800 | 
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2020-05-28 21:27:02 -0700 | 
| commit | 6fbfbc4b1239b4b2f492b45103fa7a3f6e4b2f18 (patch) | |
| tree | a5ce749b9149ca084eaf59ff090fafed7d1dcec4 | |
| parent | 65cd3aa82ef673258ac4760ec860d3cb9bc1f6f8 (diff) | |
| download | meta-openembedded-6fbfbc4b1239b4b2f492b45103fa7a3f6e4b2f18.tar.gz | |
dstat: Fix runtime error that depend python.
Make dstat to depend python3.
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 5a825b5ce781aef64f347a6c9a76307406a4f295)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/dstat/dstat/0001-change-dstat-to-python3.patch | 89 | ||||
| -rw-r--r-- | meta-oe/recipes-support/dstat/dstat_0.7.4.bb | 4 | 
2 files changed, 92 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/dstat/dstat/0001-change-dstat-to-python3.patch b/meta-oe/recipes-support/dstat/dstat/0001-change-dstat-to-python3.patch new file mode 100644 index 0000000000..06a8498f3c --- /dev/null +++ b/meta-oe/recipes-support/dstat/dstat/0001-change-dstat-to-python3.patch  | |||
| @@ -0,0 +1,89 @@ | |||
| 1 | From ce0528cb48666843fed2ad10ece5ecb0ac0b8cf8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | ||
| 3 | Date: Fri, 15 May 2020 12:38:49 +0900 | ||
| 4 | Subject: [PATCH] change dstat to python3. | ||
| 5 | |||
| 6 | Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | ||
| 7 | --- | ||
| 8 | dstat | 2 +- | ||
| 9 | examples/curstest | 2 +- | ||
| 10 | examples/devtest.py | 2 +- | ||
| 11 | examples/mmpipe.py | 2 +- | ||
| 12 | examples/mstat.py | 2 +- | ||
| 13 | examples/read.py | 2 +- | ||
| 14 | examples/tdbtest | 2 +- | ||
| 15 | 7 files changed, 7 insertions(+), 7 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/dstat b/dstat | ||
| 18 | index 9359965..f250f06 100755 | ||
| 19 | --- a/dstat | ||
| 20 | +++ b/dstat | ||
| 21 | @@ -1,4 +1,4 @@ | ||
| 22 | -#!/usr/bin/env python | ||
| 23 | +#!/usr/bin/env python3 | ||
| 24 | |||
| 25 | ### This program is free software; you can redistribute it and/or | ||
| 26 | ### modify it under the terms of the GNU General Public License | ||
| 27 | diff --git a/examples/curstest b/examples/curstest | ||
| 28 | index afc4e70..d720cca 100755 | ||
| 29 | --- a/examples/curstest | ||
| 30 | +++ b/examples/curstest | ||
| 31 | @@ -1,4 +1,4 @@ | ||
| 32 | -#!/usr/bin/python | ||
| 33 | +#!/usr/bin/python3 | ||
| 34 | import curses, sys | ||
| 35 | |||
| 36 | #c = curses.wrapper(s) | ||
| 37 | diff --git a/examples/devtest.py b/examples/devtest.py | ||
| 38 | index 0e9e969..e53babd 100755 | ||
| 39 | --- a/examples/devtest.py | ||
| 40 | +++ b/examples/devtest.py | ||
| 41 | @@ -1,4 +1,4 @@ | ||
| 42 | -#!/usr/bin/python | ||
| 43 | +#!/usr/bin/python3 | ||
| 44 | |||
| 45 | import sys | ||
| 46 | sys.path.insert(0, '/usr/share/dstat/') | ||
| 47 | diff --git a/examples/mmpipe.py b/examples/mmpipe.py | ||
| 48 | index 5c93567..f91515f 100755 | ||
| 49 | --- a/examples/mmpipe.py | ||
| 50 | +++ b/examples/mmpipe.py | ||
| 51 | @@ -1,4 +1,4 @@ | ||
| 52 | -#!/usr/bin/python | ||
| 53 | +#!/usr/bin/python3 | ||
| 54 | import select, sys, os | ||
| 55 | |||
| 56 | def readpipe(file, tmout = 0.001): | ||
| 57 | diff --git a/examples/mstat.py b/examples/mstat.py | ||
| 58 | index abf4d07..ac157e4 100755 | ||
| 59 | --- a/examples/mstat.py | ||
| 60 | +++ b/examples/mstat.py | ||
| 61 | @@ -1,4 +1,4 @@ | ||
| 62 | -#!/usr/bin/python | ||
| 63 | +#!/usr/bin/python3 | ||
| 64 | |||
| 65 | ### Example2: simple sub-second monitor (ministat) | ||
| 66 | |||
| 67 | diff --git a/examples/read.py b/examples/read.py | ||
| 68 | index 556b7ae..a925109 100755 | ||
| 69 | --- a/examples/read.py | ||
| 70 | +++ b/examples/read.py | ||
| 71 | @@ -1,4 +1,4 @@ | ||
| 72 | -#!/usr/bin/python | ||
| 73 | +#!/usr/bin/python3 | ||
| 74 | |||
| 75 | ### Example 1: Direct accessing stats | ||
| 76 | ### This is a quick example showing how you can access dstat data | ||
| 77 | diff --git a/examples/tdbtest b/examples/tdbtest | ||
| 78 | index 528a8ea..ae7fef9 100755 | ||
| 79 | --- a/examples/tdbtest | ||
| 80 | +++ b/examples/tdbtest | ||
| 81 | @@ -1,4 +1,4 @@ | ||
| 82 | -#!/usr/bin/python | ||
| 83 | +#!/usr/bin/python3 | ||
| 84 | import sys, tdb | ||
| 85 | |||
| 86 | db = tdb.tdb('/var/cache/samba/connections.tdb') | ||
| 87 | -- | ||
| 88 | 2.17.1 | ||
| 89 | |||
diff --git a/meta-oe/recipes-support/dstat/dstat_0.7.4.bb b/meta-oe/recipes-support/dstat/dstat_0.7.4.bb index 2e37dd72eb..74af54ca53 100644 --- a/meta-oe/recipes-support/dstat/dstat_0.7.4.bb +++ b/meta-oe/recipes-support/dstat/dstat_0.7.4.bb  | |||
| @@ -9,7 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
| 9 | 9 | ||
| 10 | DEPENDS += "asciidoc-native xmlto-native" | 10 | DEPENDS += "asciidoc-native xmlto-native" | 
| 11 | 11 | ||
| 12 | SRC_URI = "git://github.com/dagwieers/dstat.git" | 12 | SRC_URI = "git://github.com/dagwieers/dstat.git \ | 
| 13 | file://0001-change-dstat-to-python3.patch \ | ||
| 14 | " | ||
| 13 | 15 | ||
| 14 | SRCREV = "6f5db0aed26bf8cf2700d4ffe90a9bd3436ac728" | 16 | SRCREV = "6f5db0aed26bf8cf2700d4ffe90a9bd3436ac728" | 
| 15 | 17 | ||
