From f3703b716ac018b5817588e3534ec58a0126de44 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Mon, 30 Sep 2024 14:33:13 +0800 Subject: pahole: upgrade 1.25 -> 1.27 ChangeLog: https://git.kernel.org/pub/scm/devel/pahole/pahole.git/tree/changes-v1.26?h=v1.27 https://git.kernel.org/pub/scm/devel/pahole/pahole.git/tree/changes-v1.27?h=v1.27 Add more architectures to COMPATIBLE_HOST, as libbpf is now allowed to be built on more architectures[1]. [1] https://git.openembedded.org/meta-openembedded/commit/?id=bb8049afe96db57707afc259743e288bec456117 Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- ...-env-python3-instead-of-just-usr-bin-pyth.patch | 34 +++++++++++++++++++++ ...-env-python3-instead-of-just-usr-bin-pyth.patch | 35 ---------------------- meta-oe/recipes-devtools/pahole/pahole_1.25.bb | 32 -------------------- meta-oe/recipes-devtools/pahole/pahole_1.27.bb | 33 ++++++++++++++++++++ 4 files changed, 67 insertions(+), 67 deletions(-) create mode 100644 meta-oe/recipes-devtools/pahole/files/0001-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch delete mode 100644 meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch delete mode 100644 meta-oe/recipes-devtools/pahole/pahole_1.25.bb create mode 100644 meta-oe/recipes-devtools/pahole/pahole_1.27.bb (limited to 'meta-oe/recipes-devtools') diff --git a/meta-oe/recipes-devtools/pahole/files/0001-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch b/meta-oe/recipes-devtools/pahole/files/0001-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch new file mode 100644 index 0000000000..7dc18d7aa2 --- /dev/null +++ b/meta-oe/recipes-devtools/pahole/files/0001-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch @@ -0,0 +1,34 @@ +From 436163ab845c263312cf3d4717a43727cf5f0747 Mon Sep 17 00:00:00 2001 +From: Matteo Croce +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 +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-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch b/meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch deleted file mode 100644 index 4f7dfd4cca..0000000000 --- a/meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 436163ab845c263312cf3d4717a43727cf5f0747 Mon Sep 17 00:00:00 2001 -From: Matteo Croce -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 -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-oe/recipes-devtools/pahole/pahole_1.25.bb b/meta-oe/recipes-devtools/pahole/pahole_1.25.bb deleted file mode 100644 index 1334c850e6..0000000000 --- a/meta-oe/recipes-devtools/pahole/pahole_1.25.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Shows and manipulates data structure layout" - -LICENSE = "GPL-2.0-only" -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 = "81558a5a996005df0d607dd33f74ec5b7bdb619d" -SRC_URI = "git://git.kernel.org/pub/scm/devel/pahole/pahole.git;branch=master \ - file://0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig - -PACKAGECONFIG[python3] = ",,python3-core,python3-core" - -EXTRA_OECMAKE = "-D__LIB=${@os.path.relpath(d.getVar('libdir'), d.getVar('prefix') + '/')} -DCMAKE_BUILD_TYPE=Release -DLIBBPF_EMBEDDED=OFF" - -FILES:${PN} = "${bindir}/pahole \ - ${libdir}/libdwarves.so* \ - ${libdir}/libdwarves_reorganize.so*" - -PACKAGES += "${PN}-extra" -FILES:${PN}-extra = "${datadir} ${bindir} ${libdir}/libdwarves_emit.so*" -RDEPENDS:${PN}-extra += "bash python3-core" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-devtools/pahole/pahole_1.27.bb b/meta-oe/recipes-devtools/pahole/pahole_1.27.bb new file mode 100644 index 0000000000..b899684eb2 --- /dev/null +++ b/meta-oe/recipes-devtools/pahole/pahole_1.27.bb @@ -0,0 +1,33 @@ +SUMMARY = "Shows and manipulates data structure layout" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "elfutils zlib libbpf" + +# Depends on MACHINE_ARCH libbpf +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_HOST:mips = "null" +COMPATIBLE_HOST:riscv32 = "null" + +SRCREV = "3e265dac5ec85b956c664464072196c37d2af4f3" +SRC_URI = "git://git.kernel.org/pub/scm/devel/pahole/pahole.git;branch=master \ + file://0001-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +PACKAGECONFIG[python3] = ",,python3-core,python3-core" + +EXTRA_OECMAKE = "-D__LIB=${@os.path.relpath(d.getVar('libdir'), d.getVar('prefix') + '/')} -DCMAKE_BUILD_TYPE=Release -DLIBBPF_EMBEDDED=OFF" + +FILES:${PN} = "${bindir}/pahole \ + ${libdir}/libdwarves.so* \ + ${libdir}/libdwarves_reorganize.so*" + +PACKAGES += "${PN}-extra" +FILES:${PN}-extra = "${datadir} ${bindir} ${libdir}/libdwarves_emit.so*" +RDEPENDS:${PN}-extra += "bash python3-core" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf