summaryrefslogtreecommitdiffstats
path: root/meta-oe/dynamic-layers/meta-python/recipes-support
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2020-03-11 16:42:05 +0800
committerKhem Raj <raj.khem@gmail.com>2020-03-11 08:58:57 -0700
commitd178745cbf5c97b7cdcf274108a58c8e1f88d3ca (patch)
treeab1cf2f60e724eeecbfbf4a6c1973c4b5fee2c65 /meta-oe/dynamic-layers/meta-python/recipes-support
parentf5d2bf55a8169a9446c2f96f327b3e5d91a6e6cc (diff)
downloadmeta-openembedded-d178745cbf5c97b7cdcf274108a58c8e1f88d3ca.tar.gz
conf/layer.conf: add BBFILES_DYNAMIC and dynamic layers
some recipes under meta-oe have dependency on meta-python, and test_world of yocto-check-layer will failed with error like: ERROR: test_world (common.CommonCheckLayer) ERROR: Nothing PROVIDES 'python3-pytoml-native' (but /meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb DEPENDS on or otherwise requires it). Close matches: python3-numpy-native python3-pycairo-native python3-rpm-native ERROR: Required build target 'meta-world-pkgdata' has no buildable providers. Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'mozjs', 'python3-pytoml-native'] fix by make these recipes only active when identified layers are present Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/dynamic-layers/meta-python/recipes-support')
-rw-r--r--meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch53
-rw-r--r--meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem_1.5.bb43
2 files changed, 96 insertions, 0 deletions
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch b/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch
new file mode 100644
index 0000000000..5c1be5a0a2
--- /dev/null
+++ b/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch
@@ -0,0 +1,53 @@
1From 3ff78f1f00973393d1a7ee4e467a2bacf1c807f3 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net>
3Date: Wed, 5 Feb 2020 16:14:21 +0000
4Subject: [PATCH] smem: fix support for --source option (python3)
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Using --source doesn't work without this patch:
10Traceback (most recent call last):
11 File "./smem", line 727, in <module>
12 showpids()
13 File "./smem", line 299, in showpids
14 showtable(pt.keys(), fields, columns.split(), options.sort or 'pss')
15 File "./smem", line 519, in showtable
16 mt = totalmem()
17 File "./smem", line 118, in totalmem
18 _totalmem = memory()['memtotal']
19 File "./smem", line 193, in memory
20 m = f.match(l)
21TypeError: cannot use a string pattern on a bytes-like object
22
23python3's tarfile returns bytes, whereas all of the rest of
24the code assumes str.
25
26Fix the tarfile usage to convert to str before returning the
27results.
28
29Signed-off-by: André Draszik <git@andred.net>
30Upstream-Status: Inappropriate [upstream wants to support python2 & python3]
31---
32 smem | 4 ++--
33 1 file changed, 2 insertions(+), 2 deletions(-)
34
35diff --git a/smem b/smem
36index 46a3189..54d40dd 100755
37--- a/smem
38+++ b/smem
39@@ -90,9 +90,9 @@ class tardata(procdata):
40 d,f = ti.name.split('/')
41 yield d
42 def _read(self, f):
43- return self.tar.extractfile(f).read()
44+ return self.tar.extractfile(f).read().decode()
45 def _readlines(self, f):
46- return self.tar.extractfile(f).readlines()
47+ return [l.decode() for l in self.tar.extractfile(f).readlines()]
48 def piduser(self, p):
49 t = self.tar.getmember("%d" % p)
50 if t.uname:
51--
522.23.0.rc1
53
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem_1.5.bb b/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem_1.5.bb
new file mode 100644
index 0000000000..90db9c3f3e
--- /dev/null
+++ b/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem_1.5.bb
@@ -0,0 +1,43 @@
1SUMMARY = "Report application memory usage in a meaningful way"
2DESCRIPTION = "smem is a tool that can give numerous reports on memory usage on Linux \
3systems. Unlike existing tools, smem can report proportional set size (PSS), \
4which is a more meaningful representation of the amount of memory used by \
5libraries and applications in a virtual memory system."
6HOMEPAGE = "http://www.selenic.com/smem/"
7SECTION = "Applications/System"
8
9LICENSE = "GPLv2+"
10LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
11
12HG_CHANGESET = "98273ce331bb"
13SRC_URI = "https://selenic.com/repo/${BPN}/archive/${HG_CHANGESET}.tar.bz2;downloadfilename=${BP}.tar.bz2 \
14 file://0001-smem-fix-support-for-source-option-python3.patch"
15SRC_URI[md5sum] = "51c3989779360f42b42ef46b2831be3a"
16SRC_URI[sha256sum] = "161131c686a6d9962a0e96912526dd46308e022d62e3f8acaed5a56fda8e08ce"
17
18UPSTREAM_CHECK_URI = "https://selenic.com/repo/smem/tags"
19UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
20
21S = "${WORKDIR}/${BPN}-${HG_CHANGESET}"
22
23do_compile() {
24 ${CC} ${CFLAGS} ${LDFLAGS} smemcap.c -o smemcap
25}
26
27do_install() {
28 install -d ${D}/${bindir}/
29 install -d ${D}/${mandir}/man8
30 install -m 0755 ${S}/smem ${D}${bindir}/
31 sed -i -e '1s,#!.*python.*,#!${USRBINPATH}/env python3,' ${D}${bindir}/smem
32 install -m 0755 ${S}/smemcap ${D}${bindir}/
33 install -m 0644 ${S}/smem.8 ${D}/${mandir}/man8/
34}
35
36RDEPENDS_${PN} = "python3-core python3-compression"
37RRECOMMENDS_${PN} = "python3-matplotlib python3-numpy"
38
39PACKAGE_BEFORE_PN = "smemcap"
40
41FILES_smemcap = "${bindir}/smemcap"
42
43BBCLASSEXTEND = "native"