diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/pahole')
3 files changed, 75 insertions, 2 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch b/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch new file mode 100644 index 000000000..54cd096e4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch @@ -0,0 +1,35 @@ +From 436163ab845c263312cf3d4717a43727cf5f0747 Mon Sep 17 00:00:00 2001 +From: Matteo Croce <mcroce@microsoft.com> +Date: Wed, 15 Sep 2021 17:54:01 +0200 +Subject: [PATCH] Use /usr/bin/env python3 instead of just /usr/bin/python3 + +Upstream-Status: inappropriate [OE specific] + +--- + ostra/ostra-cg | 2 +- + ostra/python/ostra.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ostra/ostra-cg b/ostra/ostra-cg +index 52c902e..8142e67 100755 +--- a/ostra/ostra-cg ++++ b/ostra/ostra-cg +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 ++#!/usr/bin/env python3 + # ostra-cg - generate callgraphs from encoded trace + # + # Arnaldo Carvalho de Melo <acme@redhat.com> +diff --git a/ostra/python/ostra.py b/ostra/python/ostra.py +index 86fe079..9bb5ad1 100755 +--- a/ostra/python/ostra.py ++++ b/ostra/python/ostra.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 ++#!/usr/bin/env python3 + # + # Copyright (C) 2005, 2006, 2007 Arnaldo Carvalho de Melo + # +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0003-CMakeList.txt-don-t-download-libbpf-source-when-syst.patch b/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0003-CMakeList.txt-don-t-download-libbpf-source-when-syst.patch new file mode 100644 index 000000000..3d491e2ef --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0003-CMakeList.txt-don-t-download-libbpf-source-when-syst.patch @@ -0,0 +1,34 @@ +From 3d20210d84f61ee2189927e2d9de9ce3e5a0a9c5 Mon Sep 17 00:00:00 2001 +From: Matteo Croce <mcroce@microsoft.com> +Date: Mon, 20 Sep 2021 18:44:52 +0200 +Subject: [PATCH] CMakeList.txt: Don't download libbpf source when system + library is used + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/devel/pahole/pahole.git/commit/?id=3d20210d84f61ee2189927e2d9de9ce3e5a0a9c5] + +The build system always download the libbpf submodule, regardless if +we're using the embedded or the system version. +Download the libbpf source only if we're using the embedded one. + +Signed-off-by: Matteo Croce <mcroce@microsoft.com> +Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8523bce..2ab66e4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,7 +65,7 @@ find_package(Python3 QUIET) + + # make sure git submodule(s) are checked out + find_package(Git QUIET) +-if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") ++if(LIBBPF_EMBEDDED AND GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") + # Update submodules as needed + option(GIT_SUBMODULE "Check submodules during build" ON) + if(GIT_SUBMODULE) +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb b/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb index db7d88cdf..66f776135 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb @@ -5,15 +5,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "elfutils zlib libbpf" +# Depends on MACHINE_ARCH libbpf +PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_HOST = "(x86_64|i.86|aarch64).*-linux" SRCREV = "f02af2553ea58ae1186226af0d0ec835a248358f" SRC_URI = "git://git.kernel.org/pub/scm/devel/pahole/pahole.git \ - file://0001-CMakeList.txt-make-python-optional.patch" + file://0001-CMakeList.txt-make-python-optional.patch \ + file://0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch \ + file://0003-CMakeList.txt-don-t-download-libbpf-source-when-syst.patch" S = "${WORKDIR}/git" -inherit cmake +inherit cmake pkgconfig PACKAGECONFIG[python3] = ",,python3-core,python3-core" |