From bf866a99d920331bc5c08c3dccc86f71b2d1b3bb Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 9 Jun 2025 12:19:47 +0100 Subject: [PATCH] systemtap: put version in recipe filename A recipe that fetches from git but is otherwise a released version should not be using _git.bb recipe names. Put the version in the filename and drop the explicit PV. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../{systemtap-native_git.bb => systemtap-native_5.2.bb} | 3 +-- .../systemtap/{systemtap_git.bb => systemtap_5.2.bb} | 0 meta/recipes-kernel/systemtap/systemtap_git.inc | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) rename meta/recipes-kernel/systemtap/{systemtap-native_git.bb => systemtap-native_5.2.bb} (77%) rename meta/recipes-kernel/systemtap/{systemtap_git.bb => systemtap_5.2.bb} (100%) diff --git a/meta/recipes-kernel/systemtap/systemtap-native_git.bb b/meta/recipes-kernel/systemtap/systemtap-native_5.2.bb similarity index 77% rename from meta/recipes-kernel/systemtap/systemtap-native_git.bb rename to meta/recipes-kernel/systemtap/systemtap-native_5.2.bb index 2690b259c8b..8befa7a7eac 100644 --- a/meta/recipes-kernel/systemtap/systemtap-native_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap-native_5.2.bb @@ -1,5 +1,4 @@ - -require systemtap_git.bb +require systemtap_${PV}.bb inherit_defer native diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_5.2.bb similarity index 100% rename from meta/recipes-kernel/systemtap/systemtap_git.bb rename to meta/recipes-kernel/systemtap/systemtap_5.2.bb diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index bbb2105b5ac..a6688f26042 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -1,14 +1,14 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "3a92ffe673c1621309a0b60892114495b651c9de" -PV = "5.2" -SRC_URI = "git://sourceware.org/git/systemtap.git;branch=master;protocol=https \ +SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=https;branch=master \ file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ file://0001-Install-python-modules-to-correct-library-dir.patch \ file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ " +SRCREV = "3a92ffe673c1621309a0b60892114495b651c9de" + COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux' COMPATIBLE_HOST:libc-musl = 'null' -- 2.47.3