summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Kamensky <victor.kamensky7@gmail.com>2023-12-04 22:32:47 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-12-06 22:55:49 +0000
commit720ad02ae6b93c6d336254ca033b6eb5188c8be7 (patch)
tree148710541f37557663a3776090f299102b6c6095
parent2a20575e52ee796d319088572f87673b05b5828f (diff)
downloadpoky-720ad02ae6b93c6d336254ca033b6eb5188c8be7.tar.gz
systemtap: upgrade 4.9 -> 5.0
Similar to 4.9 release, in 5.0 release release-5.0 tag is off any branch, release-5.0a tag e72dc118e563c645d93a1a2d771e8d90e8fec1ae is on the master branch. Use this value for SRCREV and add catch up patch, 0001-prerelease-datestamp-fixes.patch, to bring source up to release-5.0 tag level. Remove 0001-prerelease-datestamp-fixes.patch in next upgrade. (From OE-Core rev: 2d0cb9b21ccee93027fd12a51b74d3821cd03d2e) Signed-off-by: Victor Kamensky <victor.kamensky7@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch23
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/0001-release-date-fix.patch37
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc6
3 files changed, 26 insertions, 40 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch b/meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch
new file mode 100644
index 0000000000..afdc10a3fe
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch
@@ -0,0 +1,23 @@
1From cfc2c1d53924face11e3fab78ded61c359778eb9 Mon Sep 17 00:00:00 2001
2From: "Frank Ch. Eigler" <fche@redhat.com>
3Date: Sat, 4 Nov 2023 12:19:59 -0400
4Subject: [PATCH] prerelease datestamp fixes
5
6Upstream-Status: Backport
7---
8 NEWS | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11diff --git a/NEWS b/NEWS
12index c7f31e8b7..f0f9056c4 100644
13--- a/NEWS
14+++ b/NEWS
15@@ -1,4 +1,4 @@
16-* What's new in version 5.0, 2023-11-03
17+* What's new in version 5.0, 2023-11-04
18
19 - Performance improvements in uprobe registration and module startup.
20
21--
222.31.1
23
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-release-date-fix.patch b/meta/recipes-kernel/systemtap/systemtap/0001-release-date-fix.patch
deleted file mode 100644
index 3dcb369ec3..0000000000
--- a/meta/recipes-kernel/systemtap/systemtap/0001-release-date-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
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 de3750ff04..bc2a9ff434 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -1,13 +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 = "418f0a45ca4473491385b5c7eef777607bbdb3b7" 3SRCREV = "e72dc118e563c645d93a1a2d771e8d90e8fec1ae"
4PV = "4.9" 4PV = "5.0"
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 file://0001-prerelease-datestamp-fixes.patch \
11 " 11 "
12 12
13COMPATIBLE_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'