| Message ID | 20250617052540.8256-1-victor.kamensky7@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] systemtap: upgrade 5.2 -> 5.3 | expand |
On Tue, 17 Jun 2025 at 07:26, Victor Kamensky via
lists.openembedded.org
<victor.kamensky7=gmail.com@lists.openembedded.org> wrote:
> @@ -7,7 +7,7 @@ SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=https;branch=master \
Please add a tag parameter here to enable verification that the commit
hash matches the version tag. There are several examples in oe-core.
Alex
Hi Alexander, On Mon, Jun 16, 2025 at 11:11 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > > On Tue, 17 Jun 2025 at 07:26, Victor Kamensky via > lists.openembedded.org > <victor.kamensky7=gmail.com@lists.openembedded.org> wrote: > > > @@ -7,7 +7,7 @@ SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=https;branch=master \ > > Please add a tag parameter here to enable verification that the commit > hash matches the version tag. There are several examples in oe-core. May I use "nobranch=1" as well? I.e "git://sourceware.org/git/systemtap.git;protocol=https;nobranch=1;tag=release-${PV}". Note in the SystemTap project I've run into situations when the release tag was not on any branch. I.e release-5.0 was not on any branch: [vkamensky@vkamensky-fc38 systemtap]$ git branch --contains release-5.3 master [vkamensky@vkamensky-fc38 systemtap]$ git branch --contains release-5.0 [vkamensky@vkamensky-fc38 systemtap]$ Because of that for 5.0 I had to do shenanigans: specify githash from master branch and explicitly add their patches to reach release-5.0 tag. Otherwise, if they repeat it again in future versions I will have to take 'tag' off because githash from main branch won't match it. Although I don't see 'nobranch=1' used in any places now. Thanks, Victor > Alex
On Tue, 17 Jun 2025 at 10:20, Victor Kamensky <victor.kamensky7@gmail.com> wrote: > Because of that for 5.0 I had to do shenanigans: specify githash from > master branch > and explicitly add their patches to reach release-5.0 tag. Otherwise, > if they repeat it again > in future versions I will have to take 'tag' off because githash from > main branch won't > match it. > > Although I don't see 'nobranch=1' used in any places now. I would add nobranch only when updating to a release that is indeed not on any branch. And remove it if a later release is again on a branch. It's best to explicitly specify the branch and have it checked: it's a kind of quality check to ensure SRCREV is not pointing to random 'dangling commits' or throwaway private development branches. Alex
diff --git a/meta/recipes-kernel/systemtap/systemtap-native_5.2.bb b/meta/recipes-kernel/systemtap/systemtap-native_5.3.bb similarity index 100% rename from meta/recipes-kernel/systemtap/systemtap-native_5.2.bb rename to meta/recipes-kernel/systemtap/systemtap-native_5.3.bb diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch b/meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch index 15a6f2a9a5..7d35f76b29 100644 --- a/meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch +++ b/meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch @@ -13,19 +13,16 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> stringtable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/stringtable.h b/stringtable.h -index 5fc42e7..6fd8a1e 100644 ---- a/stringtable.h -+++ b/stringtable.h -@@ -19,7 +19,7 @@ +Index: git/stringtable.h +=================================================================== +--- git.orig/stringtable.h ++++ git/stringtable.h +@@ -23,7 +23,7 @@ - #if defined(HAVE_BOOST_UTILITY_STRING_REF_HPP) + #if 0 && defined(HAVE_BOOST_UTILITY_STRING_REF_HPP) #include <boost/version.hpp> -#include <boost/utility/string_ref.hpp> //header with string_ref +#include "@RELATIVE_STAGING_INCDIR@/boost/utility/string_ref.hpp" //header with string_ref // XXX: experimental tunables #define INTERNED_STRING_FIND_MEMMEM 1 /* perf stat indicates a very slight benefit */ --- -2.7.4 - diff --git a/meta/recipes-kernel/systemtap/systemtap_5.2.bb b/meta/recipes-kernel/systemtap/systemtap_5.3.bb similarity index 100% rename from meta/recipes-kernel/systemtap/systemtap_5.2.bb rename to meta/recipes-kernel/systemtap/systemtap_5.3.bb diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index a6688f2604..ed806d2cdb 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -7,7 +7,7 @@ SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=https;branch=master \ file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ " -SRCREV = "3a92ffe673c1621309a0b60892114495b651c9de" +SRCREV = "c4fc655170b534478a6b131292b987630c7c0865" COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux' COMPATIBLE_HOST:libc-musl = 'null'
* fixed patch fuzz issue Signed-off-by: Victor Kamensky <victor.kamensky7@gmail.com> --- ...mtap-native_5.2.bb => systemtap-native_5.3.bb} | 0 ...-improve-reproducibility-for-c-compiling.patch | 15 ++++++--------- .../{systemtap_5.2.bb => systemtap_5.3.bb} | 0 meta/recipes-kernel/systemtap/systemtap_git.inc | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) rename meta/recipes-kernel/systemtap/{systemtap-native_5.2.bb => systemtap-native_5.3.bb} (100%) rename meta/recipes-kernel/systemtap/{systemtap_5.2.bb => systemtap_5.3.bb} (100%)