bcc: Upgrade to 0.33.0+

Fix version string and add missing dependencies for ptests

Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 3 insertions, 32 deletions

diff --git a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-tests-cc-Use-c-14-standard.patch b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-tests-cc-Use-c-14-standard.patch
deleted file mode 100644
index dcd9dc1..0000000
--- a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-tests-cc-Use-c-14-standard.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9f45e12ad4689ca2c41844b77c6d789d21509a13 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 6 Mar 2023 13:26:11 -0800
-Subject: [PATCH] tests/cc: Use c++14 standard
-
-default c++ standard was bumped to c++17 when using clang16+ compiler
-via 907b89cc9, however, tests which use check tool is not yet ported
-to work with c++17 standard, therefore use c++14 on tests
-
-Upstream-Status: Submitted [https://github.com/iovisor/bcc/pull/4506]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Cc: Hengqi Chen <chenhengqi@outlook.com>
----
- tests/cc/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/tests/cc/CMakeLists.txt
-+++ b/tests/cc/CMakeLists.txt
-@@ -27,6 +27,10 @@ if(${LLVM_PACKAGE_VERSION} VERSION_EQUAL
- set(CMAKE_CXX_STANDARD 14)
- endif()
- 
-+if(${LLVM_PACKAGE_VERSION} VERSION_EQUAL 16 OR ${LLVM_PACKAGE_VERSION} VERSION_GREATER 16)
-+set(CMAKE_CXX_STANDARD 14)
-+endif()
-+
- if(ENABLE_USDT)
- set(TEST_LIBBCC_SOURCES
-        test_libbcc.cc
diff --git a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc_0.30.0.bb b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc_0.33.0.bb
index 4c461bb..7e5c870 100644
--- a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc_0.30.0.bb
+++ b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc_0.33.0.bb
@@ -16,18 +16,17 @@ DEPENDS += "bison-native \
             "
 
 RDEPENDS:${PN} += "bash python3 python3-core python3-setuptools xz"
-RDEPENDS:${PN}-ptest = "cmake python3 python3-netaddr python3-pyroute2"
+RDEPENDS:${PN}-ptest = "kernel-devsrc packagegroup-core-buildessential cmake python3 python3-netaddr python3-pyroute2"
 
 SRC_URI = "gitsm://github.com/iovisor/bcc;branch=master;protocol=https \
            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 \
            file://0001-CMakeLists.txt-don-t-modify-.gitconfig-on-build-host.patch \
            file://run-ptest \
            file://ptest_wrapper.sh \
            "
 
-SRCREV = "1d8daaa395f066b328a56a36fbd40a0de3a7b3c1"
+SRCREV = "92e32ff8a06616779f3a3191b75da6881d59fd17"
 
 PV .= "+git"
 
@@ -40,6 +39,7 @@ PACKAGECONFIG[manpages] = "-DENABLE_MAN=ON,-DENABLE_MAN=OFF,"
 PACKAGECONFIG[examples] = "-DENABLE_EXAMPLES=ON,-DENABLE_EXAMPLES=OFF,"
 
 EXTRA_OECMAKE = " \
+    -DREVISION='${PV}' \
     -DCMAKE_USE_LIBBPF_PACKAGE=ON \
     -DENABLE_LLVM_SHARED=ON \
     -DENABLE_CLANG_JIT=ON \