diff mbox series

systemtap: Add git revision to PV

Message ID 20241114124856.35716-1-mathieu.dubois-briand@bootlin.com
State New
Headers show
Series systemtap: Add git revision to PV | expand

Commit Message

Mathieu Dubois-Briand Nov. 14, 2024, 12:48 p.m. UTC 
From: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>

Systemtap has reproducibility issues, as it relies internally on git
describe. Make sure to have different PV when using different SRCREV, to
prevent possible issues.

Fixes [YOCTO #15288]

Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
---
 meta/recipes-kernel/systemtap/systemtap_git.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Alexander Kanavin Nov. 14, 2024, 12:59 p.m. UTC | #1 
On Thu, 14 Nov 2024 at 13:49, Mathieu Dubois-Briand via
lists.openembedded.org
<mathieu.dubois-briand=bootlin.com@lists.openembedded.org> wrote:
> -PV = "5.1"
> +PV = "5.1+git"

I'm not sure I understand the reproducible 'magic' this would trigger
in systemtap's usage of 'git describe', but if this does fix things,
you need to leave a comment in the recipe asking people not to remove
"+git". This is because "+git" suffix is typically used for something
else: an indication that we're taking a revision that's several
commits after the tagged version (e.g. containing important fixes).

Alex
Mathieu Dubois-Briand Nov. 14, 2024, 1:11 p.m. UTC | #2 
On Thu, Nov 14, 2024 at 01:59:29PM +0100, Alexander Kanavin wrote:
> On Thu, 14 Nov 2024 at 13:49, Mathieu Dubois-Briand via
> lists.openembedded.org
> <mathieu.dubois-briand=bootlin.com@lists.openembedded.org> wrote:
> > -PV = "5.1"
> > +PV = "5.1+git"
> 
> I'm not sure I understand the reproducible 'magic' this would trigger
> in systemtap's usage of 'git describe', but if this does fix things,
> you need to leave a comment in the recipe asking people not to remove
> "+git". This is because "+git" suffix is typically used for something
> else: an indication that we're taking a revision that's several
> commits after the tagged version (e.g. containing important fixes).
> 
> Alex

Yes, indeed having a comment here would be better, I will make a v2
adding it.

As for the reasoning leading to add +git in the revision, the bug entry
gives some context:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=15288#c10
diff mbox series

Patch

diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index 80945ad7f88e..3467e2cba697 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -1,7 +1,7 @@ 
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRCREV = "3a0c9c15163520dd0d9ab07177da62ce9cc2332f"
-PV = "5.1"
+PV = "5.1+git"
 
 SRC_URI = "git://sourceware.org/git/systemtap.git;branch=master;protocol=https \
            file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \