From 61faae011fb95712064f2c58abe6293f0daeeab5 Mon Sep 17 00:00:00 2001
From: He Zhe <zhe.he@windriver.com>
Date: Tue, 3 Nov 2020 06:51:55 +0000
Subject: bcc: Upgrade 0.15.0 -> 0.17.0

To support kernel v5.9 and remove patches that have been merged upstream.

Signed-off-by: He Zhe <zhe.he@windriver.com>
---
 .../recipes-devtools/bcc/bcc_0.15.0.bb             | 48 ----------------------
 .../recipes-devtools/bcc/bcc_0.17.0.bb             | 46 +++++++++++++++++++++
 2 files changed, 46 insertions(+), 48 deletions(-)
 delete mode 100644 dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.15.0.bb
 create mode 100644 dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.17.0.bb

(limited to 'dynamic-layers')

diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.15.0.bb b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.15.0.bb
deleted file mode 100644
index 0d4748d..0000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.15.0.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-SUMMARY = "BPF Compiler Collection (BCC)"
-HOMEPAGE = "https://github.com/iovisor/bcc"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e3fc50a88d0a364313df4b21ef20c29e"
-
-inherit cmake python3native manpages
-
-DEPENDS += "bison-native \
-            flex-native \
-            elfutils \
-            luajit \
-            clang \
-            "
-
-RDEPENDS_${PN} += "bash python3 python3-core python3-setuptools xz"
-
-SRC_URI = "gitsm://github.com/iovisor/bcc \
-           file://0001-python-CMakeLists.txt-Remove-check-for-host-etc-debi.patch \
-           file://0001-tools-opensnoop-snoop-do_sys_openat2-for-kernel-v5.6.patch \
-           file://0001-Replace-kprobe-function-blk_account_io_completion-to.patch \
-           file://0001-tools-trace.py-Fix-failing-to-exit.patch \
-           file://0001-CMakeLists.txt-override-the-PY_CMD_ESCAPED.patch \
-           "
-
-SRCREV = "e41f7a3be5c8114ef6a0990e50c2fbabea0e928e"
-
-S = "${WORKDIR}/git"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[manpages] = "-DENABLE_MAN=ON,-DENABLE_MAN=OFF,"
-
-EXTRA_OECMAKE = " \
-    -DENABLE_LLVM_SHARED=ON \
-    -DENABLE_CLANG_JIT=ON \
-    -DLLVM_PACKAGE_VERSION=${LLVMVERSION} \
-    -DPYTHON_CMD=${PYTHON} \
-    -DPYTHON_FLAGS=--install-lib=${PYTHON_SITEPACKAGES_DIR} \
-"
-
-do_install_append() {
-        sed -e 's@#!/usr/bin/python@#!/usr/bin/env python3@g' \
-            -i $(find ${D}${datadir}/${PN} -type f)
-}
-
-FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}"
-FILES_${PN}-doc += "${datadir}/${PN}/man"
-
-COMPATIBLE_HOST = "(x86_64.*|aarch64.*|powerpc64.*)-linux"
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.17.0.bb b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.17.0.bb
new file mode 100644
index 0000000..d6f70d3
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.17.0.bb
@@ -0,0 +1,46 @@
+SUMMARY = "BPF Compiler Collection (BCC)"
+HOMEPAGE = "https://github.com/iovisor/bcc"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e3fc50a88d0a364313df4b21ef20c29e"
+
+inherit cmake python3native manpages
+
+DEPENDS += "bison-native \
+            flex-native \
+            elfutils \
+            luajit \
+            clang \
+            "
+
+RDEPENDS_${PN} += "bash python3 python3-core python3-setuptools xz"
+
+SRC_URI = "gitsm://github.com/iovisor/bcc \
+           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 \
+           "
+
+SRCREV = "ad5b82a5196b222ed2cdc738d8444e8c9546a77f"
+
+S = "${WORKDIR}/git"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[manpages] = "-DENABLE_MAN=ON,-DENABLE_MAN=OFF,"
+
+EXTRA_OECMAKE = " \
+    -DENABLE_LLVM_SHARED=ON \
+    -DENABLE_CLANG_JIT=ON \
+    -DLLVM_PACKAGE_VERSION=${LLVMVERSION} \
+    -DPYTHON_CMD=${PYTHON} \
+    -DPYTHON_FLAGS=--install-lib=${PYTHON_SITEPACKAGES_DIR} \
+"
+
+do_install_append() {
+        sed -e 's@#!/usr/bin/python@#!/usr/bin/env python3@g' \
+            -i $(find ${D}${datadir}/${PN} -type f)
+}
+
+FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}"
+FILES_${PN}-doc += "${datadir}/${PN}/man"
+
+COMPATIBLE_HOST = "(x86_64.*|aarch64.*|powerpc64.*)-linux"
-- 
cgit v1.2.3-54-g00ecf