4 files changed, 6 insertions, 85 deletions

diff --git a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-CMakeLists.txt-override-the-PY_CMD_ESCAPED.patch b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-CMakeLists.txt-override-the-PY_CMD_ESCAPED.patch
index 3e0a6aa..1f9c41d 100644
--- a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-CMakeLists.txt-override-the-PY_CMD_ESCAPED.patch
+++ b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-CMakeLists.txt-override-the-PY_CMD_ESCAPED.patch
@@ -21,7 +21,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
 
 --- a/src/python/CMakeLists.txt
 +++ b/src/python/CMakeLists.txt
-@@ -12,7 +12,7 @@ file(GLOB_RECURSE PYTHON_INCLUDES RELATI
+@@ -16,7 +16,7 @@ file(GLOB_RECURSE PYTHON_INCLUDES RELATI
  
  foreach(PY_CMD ${PYTHON_CMD})
    string(REPLACE "/" "-" PY_CMD_ESCAPED ${PY_CMD})
@@ -30,12 +30,12 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
  
    foreach(PY_SRC ${PYTHON_SOURCES})
      configure_file(${PY_SRC} ${PY_DIRECTORY}/${PY_SRC} COPYONLY)
-@@ -31,7 +31,7 @@ foreach(PY_CMD ${PYTHON_CMD})
+@@ -35,7 +35,7 @@ foreach(PY_CMD ${PYTHON_CMD})
      DEPENDS ${PYTHON_SOURCES} ${PYTHON_INCLUDES}
      COMMENT "Building sdist for ${PY_CMD}"
    )
 -  add_custom_target(bcc_py_${PY_CMD_ESCAPED} ALL DEPENDS ${PIP_INSTALLABLE})
 +  add_custom_target(bcc_py_python3 ALL DEPENDS ${PIP_INSTALLABLE})
  
-   install(
-     CODE "
+   if(NOT PYTHON_PREFIX)
+      set(PYTHON_PREFIX ${CMAKE_INSTALL_PREFIX})
diff --git a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-python-CMakeLists.txt-Remove-check-for-host-etc-debi.patch b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-python-CMakeLists.txt-Remove-check-for-host-etc-debi.patch
deleted file mode 100644
index 3ca7fdd..0000000
--- a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-python-CMakeLists.txt-Remove-check-for-host-etc-debi.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From cb3f032b55b32c50201862b26c76ea18ad37cb39 Mon Sep 17 00:00:00 2001
-From: Ovidiu Panait <ovidiu.panait@windriver.com>
-Date: Thu, 30 Jan 2020 14:19:33 +0200
-Subject: [PATCH] python/CMakeLists.txt: Remove check for host
- /etc/debian_version
-
-Fix the following error that occurs during do_install when using the native
-version of python3:
-usage: setup.py [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...]
-   or: setup.py --help [cmd1 cmd2 ...]
-   or: setup.py --help-commands
-   or: setup.py cmd --help
-
-error: option --install-layout not recognized
-
-Upstream-Status: Inappropriate [oe-specific]
-
-Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
----
- src/python/CMakeLists.txt | 4 ----
- 1 file changed, 4 deletions(-)
-
---- a/src/python/CMakeLists.txt
-+++ b/src/python/CMakeLists.txt
-@@ -5,10 +5,6 @@ if(NOT PYTHON_CMD)
-   set(PYTHON_CMD "python3")
- endif()
- 
--if(EXISTS "/etc/debian_version")
--  set(PYTHON_FLAGS "${PYTHON_FLAGS} --install-layout deb")
--endif()
--
- file(GLOB_RECURSE PYTHON_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-   ${CMAKE_CURRENT_SOURCE_DIR}/*.py)
- file(GLOB_RECURSE PYTHON_INCLUDES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-tools-trace.py-Fix-failing-to-exit.patch b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-tools-trace.py-Fix-failing-to-exit.patch
deleted file mode 100644
index 6ac7219..0000000
--- a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-tools-trace.py-Fix-failing-to-exit.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a9f59fc8605de1bcca0b6c2d8132585f40c3b9bc Mon Sep 17 00:00:00 2001
-From: He Zhe <zhe.he@windriver.com>
-Date: Thu, 13 Aug 2020 11:25:58 +0800
-Subject: [PATCH] tools/trace.py: Fix failing to exit
-
-Class Probe::print_event is used as a callback of a ctypes wrapper. With
-Yocto latest python v3.8.5, the exception raised by exit() is ignored and
-thus trace cannot exit. Use os._exit(0) instead.
-
-$ /usr/share/bcc/tools/trace do_sys_open -M 1
-PID TID COMM FUNC
-3740 3740 irqbalance do_sys_open
-Exception ignored on calling ctypes callback function:
-<function PerfEventArray.open_perf_buffer.<locals>.raw_cb at 0x7f7c9efea280>
-Traceback (most recent call last):
-File "/usr/lib64/python3.8/site-packages/bcc/table.py", line 685, in raw_cb_
-callback(cpu, data, size)
-File "/usr/share/bcc/tools/trace", line 630, in print_event
-exit()
-File "/usr/lib64/python3.8/sitebuiltins.py", line 26, in __call_
-raise SystemExit(code)
-SystemExit: None
-
-Upstream-Status: Pending
-
-Signed-off-by: He Zhe <zhe.he@windriver.com>
----
- tools/trace.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/tools/trace.py
-+++ b/tools/trace.py
-@@ -671,7 +671,7 @@ BPF_PERF_OUTPUT(%s);
-                     if self.aggregate:
-                         self.print_aggregate_events()
-                     sys.stdout.flush()
--                    exit()
-+                    os._exit(0)
- 
-         def attach(self, bpf, verbose):
-                 if len(self.library) == 0:
diff --git a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc_0.28.0.bb b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc_0.29.1.bb
index 5625e47..6690d82 100644
--- a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc_0.28.0.bb
+++ b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc_0.29.1.bb
@@ -25,8 +25,6 @@ RDEPENDS:${PN} += "bash python3 python3-core python3-setuptools xz"
 RDEPENDS:${PN}-ptest = "cmake python3 python3-netaddr python3-pyroute2"
 
 SRC_URI = "gitsm://github.com/iovisor/bcc;branch=master;protocol=https \
-           file://0001-python-CMakeLists.txt-Remove-check-for-host-etc-debi.patch \
-           file://0001-tools-trace.py-Fix-failing-to-exit.patch \
            file://0001-CMakeLists.txt-override-the-PY_CMD_ESCAPED.patch \
            file://0001-Vendor-just-enough-extra-headers-to-allow-libbpf-to-.patch \
            file://0001-tests-cc-Use-c-14-standard.patch \
@@ -35,9 +33,7 @@ SRC_URI = "gitsm://github.com/iovisor/bcc;branch=master;protocol=https \
            file://ptest_wrapper.sh \
            "
 
-SRCREV = "8422cd449ad2e60414a4508aa4a150a9db39c4a3"
-
-PV .= "+git${SRCPV}"
+SRCREV = "eb8ede2d70b17350757f2570ef76ea4c2e1dbff8"
 
 S = "${WORKDIR}/git"
 
@@ -51,6 +47,7 @@ EXTRA_OECMAKE = " \
     -DCMAKE_USE_LIBBPF_PACKAGE=ON \
     -DENABLE_LLVM_SHARED=ON \
     -DENABLE_CLANG_JIT=ON \
+    -DPY_SKIP_DEB_LAYOUT=ON \
     -DLLVM_PACKAGE_VERSION=${LLVMVERSION} \
     -DPYTHON_CMD=${PYTHON} \
     -DPYTHON_FLAGS=--install-lib=${PYTHON_SITEPACKAGES_DIR} \