bcc: Upgrade to 0.35.0 release

Fixes build with cmake 4+
Drop upstreamed patches

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

4 files changed, 4 insertions, 160 deletions

diff --git a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-CMakeLists.txt-don-t-modify-.gitconfig-on-build-host.patch b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-CMakeLists.txt-don-t-modify-.gitconfig-on-build-host.patch
deleted file mode 100644
index 1484b6a..0000000
--- a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-CMakeLists.txt-don-t-modify-.gitconfig-on-build-host.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 9ee5d9ca2e1ea709571613326b81e8e651fa9f00 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <martin.jansa@gmail.com>
-Date: Thu, 7 Sep 2023 11:43:25 +0200
-Subject: [PATCH] CMakeLists.txt: don't modify .gitconfig on build host nor try
- to update git submodules
-
-* bitbake fetcher will correctly handle safe.directory issues and
-  blazesym or libbpf submodules are managed by gitsm:// fetcher
-  we don't want to call git from CMake in do_configure
-
-Upstream-Status: Pending
-Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
----
- CMakeLists.txt | 62 --------------------------------------------------
- 1 file changed, 62 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dfed06e5..ffd88043 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,68 +26,6 @@ endif()
- 
- enable_testing()
- 
--execute_process(COMMAND git config --global --add safe.directory ${CMAKE_CURRENT_SOURCE_DIR}
--                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
--                RESULT_VARIABLE CONFIG_RESULT)
--if(CONFIG_RESULT AND NOT CONFIG_RESULT EQUAL 0)
--  message(WARNING "Failed to add root source directory to safe.directory")
--endif()
--
--# populate submodule blazesym
--if(NOT NO_BLAZESYM)
--  execute_process(COMMAND git config --global --add safe.directory ${CMAKE_CURRENT_SOURCE_DIR}/libbpf-tools/blazesym
--                  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
--                  RESULT_VARIABLE CONFIG_RESULT)
--  if(CONFIG_RESULT AND NOT CONFIG_RESULT EQUAL 0)
--    message(WARNING "Failed to add blazesym source directory to safe.directory")
--  endif()
--
--  execute_process(COMMAND git submodule update --init --recursive -- libbpf-tools/blazesym
--                  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
--                  RESULT_VARIABLE UPDATE_RESULT)
--  if(UPDATE_RESULT AND NOT UPDATE_RESULT EQUAL 0)
--    message(WARNING "Failed to update submodule blazesym")
--  endif()
--endif()
--
--# populate submodules (libbpf)
--if(NOT CMAKE_USE_LIBBPF_PACKAGE)
--  execute_process(COMMAND git config --global --add safe.directory ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf
--                  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
--                  RESULT_VARIABLE CONFIG_RESULT)
--  if(CONFIG_RESULT AND NOT CONFIG_RESULT EQUAL 0)
--    message(WARNING "Failed to add libbpf source directory to safe.directory")
--  endif()
--  execute_process(COMMAND git config --global --add safe.directory ${CMAKE_CURRENT_SOURCE_DIR}/libbpf-tools/bpftool
--                  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
--                  RESULT_VARIABLE CONFIG_RESULT)
--  if(CONFIG_RESULT AND NOT CONFIG_RESULT EQUAL 0)
--    message(WARNING "Failed to add bpftool source directory to safe.directory")
--  endif()
--
--  if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf/src)
--    execute_process(COMMAND git submodule update --init --recursive
--                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
--                    RESULT_VARIABLE UPDATE_RESULT)
--    if(UPDATE_RESULT AND NOT UPDATE_RESULT EQUAL 0)
--      message(WARNING "Failed to update submodule libbpf")
--    endif()
--  else()
--    execute_process(COMMAND git diff --shortstat ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf/
--                    OUTPUT_VARIABLE DIFF_STATUS)
--    if("${DIFF_STATUS}" STREQUAL "")
--      execute_process(COMMAND git submodule update --init --recursive
--                      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
--                      RESULT_VARIABLE UPDATE_RESULT)
--      if(UPDATE_RESULT AND NOT UPDATE_RESULT EQUAL 0)
--        message(WARNING "Failed to update submodule libbpf")
--      endif()
--    else()
--      message(WARNING "submodule libbpf dirty, so no sync")
--    endif()
--  endif()
--endif()
--
- # It's possible to use other kernel headers with
- # KERNEL_INCLUDE_DIRS build variable, like:
- #  $ cd <kernel-dir>
diff --git a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/bpf_stack_id.patch b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/bpf_stack_id.patch
deleted file mode 100644
index 18221be..0000000
--- a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/bpf_stack_id.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Upstream-Status: Submitted [https://github.com/iovisor/bcc/pull/5292]
-Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
-
---- a/tests/cc/test_bpf_table.cc
-+++ b/tests/cc/test_bpf_table.cc
-@@ -260,6 +260,7 @@
-   /* libc locations on different distributions are added below*/
-   bpf.add_module("/lib/x86_64-linux-gnu/libc.so.6"); //Location of libc in ubuntu
-   bpf.add_module("/lib64/libc.so.6"); //Location of libc fedora machine
-+  bpf.add_module("/lib/libc.so.6");//location of libc in image
-
-   int stack_id = id[0];
-   REQUIRE(stack_id >= 0);
diff --git a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/support_finish_task_switch_isra_0.patch b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/support_finish_task_switch_isra_0.patch
deleted file mode 100644
index 92a3f7b..0000000
--- a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/support_finish_task_switch_isra_0.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Upstream-Status: Backport [https://github.com/iovisor/bcc/pull/5302/commits/b24519e1ba7b87c9676ae3a7f70772215cd5819d]
-Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
-
-diff --git a/tests/python/test_histogram.py b/tests/python/test_histogram.py
---- a/tests/python/test_histogram.py
-+++ b/tests/python/test_histogram.py
-@@ -64,7 +64,7 @@
- #include <linux/version.h>
- typedef struct { char name[TASK_COMM_LEN]; u64 slot; } Key;
- BPF_HISTOGRAM(hist1, Key, 1024);
--int kprobe__finish_task_switch(struct pt_regs *ctx, struct task_struct *prev) {
-+int count_prev_task_start_time(struct pt_regs *ctx, struct task_struct *prev) {
- #if LINUX_VERSION_CODE < KERNEL_VERSION(5,5,0)
-     Key k = {.slot = bpf_log2l(prev->real_start_time)};
- #else
-@@ -77,6 +77,10 @@
-     return 0;
- }
- """)
-+        b.attach_kprobe(
-+            event_re=r'^finish_task_switch$|^finish_task_switch\.isra\.\d$',
-+            fn_name=b"count_prev_task_start_time"
-+        )
-         for i in range(0, 100): time.sleep(0.01)
-         b[b"hist1"].print_log2_hist()
-         b.cleanup()
-diff --git a/tests/python/test_clang.py b/tests/python/test_clang.py
---- a/tests/python/test_clang.py
-+++ b/tests/python/test_clang.py
-@@ -399,7 +399,7 @@
-   u32 curr_pid;
- };
- BPF_HASH(stats, struct key_t, u64, 1024);
--int kprobe__finish_task_switch(struct pt_regs *ctx, struct task_struct *prev) {
-+int count_sched(struct pt_regs *ctx, struct task_struct *prev) {
-   struct key_t key = {};
-   u64 zero = 0, *val;
-   key.curr_pid = bpf_get_current_pid_tgid();
-@@ -412,6 +412,10 @@
-   return 0;
- }
- """)
-+        b.attach_kprobe(
-+            event_re=r'^finish_task_switch$|^finish_task_switch\.isra\.\d$',
-+            fn_name=b"count_sched"
-+        )
- 
-     def test_probe_simple_assign(self):
-         b = BPF(text=b"""
diff --git a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc_0.33.0.bb b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc_0.35.0.bb
index 768b08e..20924f6 100644
--- a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc_0.33.0.bb
+++ b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc_0.35.0.bb
@@ -18,20 +18,15 @@ DEPENDS += "bison-native \
 RDEPENDS:${PN} += "bash python3 python3-core python3-setuptools xz"
 RDEPENDS:${PN}-ptest = "kernel-devsrc packagegroup-core-buildessential cmake bash python3 python3-netaddr python3-pyroute2"
 
-SRC_URI = "gitsm://github.com/iovisor/bcc;branch=master;protocol=https \
+SRC_URI = "gitsm://github.com/iovisor/bcc;branch=master;protocol=https;tag=v${PV} \
            file://0001-CMakeLists.txt-override-the-PY_CMD_ESCAPED.patch \
            file://0001-Vendor-just-enough-extra-headers-to-allow-libbpf-to-.patch \
-           file://0001-CMakeLists.txt-don-t-modify-.gitconfig-on-build-host.patch \
            file://run-ptest \
            file://ptest_wrapper.sh \
-           file://bpf_stack_id.patch \
-           file://support_finish_task_switch_isra_0.patch \
            file://fix_for_memleak.patch \
            "
 
-SRCREV = "92e32ff8a06616779f3a3191b75da6881d59fd17"
-
-PV .= "+git"
+SRCREV = "c31a1ca305f787ba53e001ead45ebf65233a32cf"
 
 PACKAGECONFIG ??= "examples"
 PACKAGECONFIG:remove:libc-musl = "examples"
@@ -72,11 +67,11 @@ do_install_ptest() {
     cp -rf ${S}/tests/python ${D}${PTEST_PATH}/tests/python
     install ${UNPACKDIR}/ptest_wrapper.sh ${D}${PTEST_PATH}/tests
     install ${S}/examples/networking/simulation.py ${D}${PTEST_PATH}/tests/python
-    find ${B}/../sources/bcc-0.33.0+git/tools/ -type f -name "*.py" -exec \
+    find ${S}/tools/ -type f -name "*.py" -exec \
     sed -i \
     -e 's@^#! */usr/bin/env python$@#!/usr/bin/env python3@' \
     -e 's@^#! */usr/bin/python.*@#!/usr/bin/env python3@' {} +
-    cp -rf ${B}/../sources/bcc-0.33.0+git/tools/ ${D}${PTEST_PATH}/../../tools/
+    cp -rf ${S}/tools/ ${D}${PTEST_PATH}/../../tools/
 }
 
 FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}"