summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Kamensky <victor.kamensky7@gmail.com>2023-06-05 21:30:05 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-06-06 23:41:13 +0100
commit207aed036d3a3116e72240df95320b853977c6e7 (patch)
treedb4d94f576f4217f28e5afb93cf3ade3185d09f9
parent0498637354387cea2b305cebb2c102ef5de2848b (diff)
downloadpoky-207aed036d3a3116e72240df95320b853977c6e7.tar.gz
systemtap: upgrade 4.8 -> 4.9
SystemTap 4.9 release went out with a little hick up: release date was not set correctly and fix for it was added as ebb424eee5599fcc131901c0d82d0bfc0d2f57ab commit and tagged as 'release-4.9'. Unfortunately by that time 'master' branch already has moved on, and it turns out that now 'release-4.9' tag does not belong to any branch. On other hand OE SRC_URI does complain about git uri without branch. To deal with it we will use SRCREV set to 418f0a45ca4473491385b5c7eef777607bbdb3b7, commit one that precedes ebb424eee5599fcc131901c0d82d0bfc0d2f57ab, and add separate patch for ebb424eee5599fcc131901c0d82d0bfc0d2f57ab as 0001-release-date-fix.patch. Note for any future version move: please remove 0001-release-date-fix.patch (From OE-Core rev: 2a10dc2a80a42368b222a7a832dd342a9c2d9d0a) Signed-off-by: Victor Kamensky <victor.kamensky7@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/0001-release-date-fix.patch37
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc5
2 files changed, 40 insertions, 2 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-release-date-fix.patch b/meta/recipes-kernel/systemtap/systemtap/0001-release-date-fix.patch
new file mode 100644
index 0000000000..3dcb369ec3
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/0001-release-date-fix.patch
@@ -0,0 +1,37 @@
1From ebb424eee5599fcc131901c0d82d0bfc0d2f57ab Mon Sep 17 00:00:00 2001
2From: "Frank Ch. Eigler" <fche@redhat.com>
3Date: Fri, 28 Apr 2023 13:51:27 -0400
4Subject: [PATCH] release date fix
5
6Upstream-Status: Backport
7---
8 NEWS | 2 +-
9 systemtap.spec | 2 +-
10 2 files changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/NEWS b/NEWS
13index 695bc990c..46859e304 100644
14--- a/NEWS
15+++ b/NEWS
16@@ -1,4 +1,4 @@
17-* What's new in version 4.9, 2023-04-27
18+* What's new in version 4.9, 2023-04-28
19
20 - ISystemtap: the new interactive systemtap jupyter kernel. This provides
21 a simple GUI for writing/running Systemtap scripts in an easy, incremental
22diff --git a/systemtap.spec b/systemtap.spec
23index 59814f112..fd8023264 100644
24--- a/systemtap.spec
25+++ b/systemtap.spec
26@@ -1307,7 +1307,7 @@ exit 0
27
28 # PRERELEASE
29 %changelog
30-* Thu Apr 27 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-1
31+* Fri Apr 28 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-1
32 - Upstream release, see wiki page below for detailed notes.
33 https://sourceware.org/systemtap/wiki/SystemTapReleases
34
35--
362.40.1
37
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index afeb3ce2d2..de3750ff04 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -1,12 +1,13 @@
1LICENSE = "GPL-2.0-only" 1LICENSE = "GPL-2.0-only"
2LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 2LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
3SRCREV = "b176afb2e49119ef844d193d27b0752a6d84fe8f" 3SRCREV = "418f0a45ca4473491385b5c7eef777607bbdb3b7"
4PV = "4.8" 4PV = "4.9"
5 5
6SRC_URI = "git://sourceware.org/git/systemtap.git;branch=master;protocol=https \ 6SRC_URI = "git://sourceware.org/git/systemtap.git;branch=master;protocol=https \
7 file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ 7 file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \
8 file://0001-Install-python-modules-to-correct-library-dir.patch \ 8 file://0001-Install-python-modules-to-correct-library-dir.patch \
9 file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ 9 file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \
10 file://0001-release-date-fix.patch \
10 " 11 "
11 12
12COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux' 13COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux'