| Message ID | 20231205063249.3433-1-victor.kamensky7@gmail.com |
|---|---|
| State | Accepted, archived |
| Commit | 2d0cb9b21ccee93027fd12a51b74d3821cd03d2e |
| Headers | show |
| Series | [1/3] systemtap: upgrade 4.9 -> 5.0 | expand |
This seems to be causing:
../git/util.cxx:51:10: fatal error: elfutils/debuginfod.h: No such file or
directory
51 | #include <elfutils/debuginfod.h>
| ^~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make[2]: *** [Makefile:1389: stap-util.o] Error 1
on some systems.
Looks like with
https://sourceware.org/git/?p=systemtap.git;a=commit;h=2e67b053e3796ee7cf29a39f9698729b52078406
it now enables debuginfod ("AC_MSG_RESULT([yes])" _after_
the PKG_CHECK_MODULES now seems wrong).
log.do_configure:
checking whether to use debuginfod... checking for debuginfod... no
yes
checking for debuginfod_find_metadata in -ldebuginfod... no
build $ grep DEBUGINFO config.h
#define HAVE_LIBDEBUGINFOD 1
config.log (see the strange result yes):
configure:12213: checking whether to use debuginfod
configure:12228: checking for debuginfod
configure:12235: $PKG_CONFIG --exists --print-errors "libdebuginfod >=
0.179"
Package libdebuginfod was not found in the pkg-config search path.
Perhaps you should add the directory containing `libdebuginfod.pc'
to the PKG_CONFIG_PATH environment variable
No package 'libdebuginfod' found
configure:12238: $? = 1
configure:12252: $PKG_CONFIG --exists --print-errors "libdebuginfod >=
0.179"
Package libdebuginfod was not found in the pkg-config search path.
Perhaps you should add the directory containing `libdebuginfod.pc'
to the PKG_CONFIG_PATH environment variable
No package 'libdebuginfod' found
configure:12255: $? = 1
configure:12269: result: no
No package 'libdebuginfod' found
configure:12304: result: yes
configure:12315: checking for debuginfod_find_metadata in -ldebuginfod
configure:12344: ccache aarch64-webos-linux-gcc -mcpu=cortex-a72
-march=armv8-a+crc -mbranch-protection=standard -fstack-protector-strong
-O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security
-Werror=return-type
--sysroot=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot
-o conftest -O2 -pipe -g -feliminate-unused-debug-types -fcanon-prefix-map
-fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/git=/usr/src/debug/systemtap/5.0
-fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/git=/usr/src/debug/systemtap/5.0
-fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/build=/usr/src/debug/systemtap/5.0
-fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/build=/usr/src/debug/systemtap/5.0
-fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot=
-fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot=
-fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot-native=
-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fcanon-prefix-map
-fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/git=/usr/src/debug/systemtap/5.0
-fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/git=/usr/src/debug/systemtap/5.0
-fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/build=/usr/src/debug/systemtap/5.0
-fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/build=/usr/src/debug/systemtap/5.0
-fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot=
-fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot=
-fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot-native=
-Wl,-z,relro,-z,now conftest.c -ldebuginfod >&5
/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot-native/usr/bin/aarch64-webos-linux/../../libexec/aarch64-webos-linux/gcc/aarch64-webos-linux/13.2.0/ld:
cannot find -ldebuginfod: No such file or directory
collect2: error: ld returned 1 exit status
With debuginfod in DISTRO_FEATURES (which is included by default) and
*debuginfod PACKAGECONFIG enabled in elfutils (also by default based on
DISTRO_FEAUTRES) this builds OK.
Regards,
On Tue, Dec 5, 2023 at 7:33 AM Victor Kamensky <victor.kamensky7@gmail.com>
wrote:
> 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.
>
> Signed-off-by: Victor Kamensky <victor.kamensky7@gmail.com>
> ---
> .../0001-prerelease-datestamp-fixes.patch | 23 ++++++++++++
> .../systemtap/0001-release-date-fix.patch | 37 -------------------
> .../systemtap/systemtap_git.inc | 6 +--
> 3 files changed, 26 insertions(+), 40 deletions(-)
> create mode 100644
> meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch
> delete mode 100644
> meta/recipes-kernel/systemtap/systemtap/0001-release-date-fix.patch
>
> 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 @@
> +From cfc2c1d53924face11e3fab78ded61c359778eb9 Mon Sep 17 00:00:00 2001
> +From: "Frank Ch. Eigler" <fche@redhat.com>
> +Date: Sat, 4 Nov 2023 12:19:59 -0400
> +Subject: [PATCH] prerelease datestamp fixes
> +
> +Upstream-Status: Backport
> +---
> + NEWS | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/NEWS b/NEWS
> +index c7f31e8b7..f0f9056c4 100644
> +--- a/NEWS
> ++++ b/NEWS
> +@@ -1,4 +1,4 @@
> +-* What's new in version 5.0, 2023-11-03
> ++* What's new in version 5.0, 2023-11-04
> +
> + - Performance improvements in uprobe registration and module startup.
> +
> +--
> +2.31.1
> +
> 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 @@
> -From ebb424eee5599fcc131901c0d82d0bfc0d2f57ab Mon Sep 17 00:00:00 2001
> -From: "Frank Ch. Eigler" <fche@redhat.com>
> -Date: Fri, 28 Apr 2023 13:51:27 -0400
> -Subject: [PATCH] release date fix
> -
> -Upstream-Status: Backport
> ----
> - NEWS | 2 +-
> - systemtap.spec | 2 +-
> - 2 files changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/NEWS b/NEWS
> -index 695bc990c..46859e304 100644
> ---- a/NEWS
> -+++ b/NEWS
> -@@ -1,4 +1,4 @@
> --* What's new in version 4.9, 2023-04-27
> -+* What's new in version 4.9, 2023-04-28
> -
> - - ISystemtap: the new interactive systemtap jupyter kernel. This provides
> - a simple GUI for writing/running Systemtap scripts in an easy,
> incremental
> -diff --git a/systemtap.spec b/systemtap.spec
> -index 59814f112..fd8023264 100644
> ---- a/systemtap.spec
> -+++ b/systemtap.spec
> -@@ -1307,7 +1307,7 @@ exit 0
> -
> - # PRERELEASE
> - %changelog
> --* Thu Apr 27 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-1
> -+* Fri Apr 28 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-1
> - - Upstream release, see wiki page below for detailed notes.
> - https://sourceware.org/systemtap/wiki/SystemTapReleases
> -
> ---
> -2.40.1
> -
> 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 @@
> LICENSE = "GPL-2.0-only"
> LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> -SRCREV = "418f0a45ca4473491385b5c7eef777607bbdb3b7"
> -PV = "4.9"
> +SRCREV = "e72dc118e563c645d93a1a2d771e8d90e8fec1ae"
> +PV = "5.0"
>
> 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 \
>
> file://0001-Install-python-modules-to-correct-library-dir.patch \
>
> file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \
> - file://0001-release-date-fix.patch \
> + file://0001-prerelease-datestamp-fixes.patch \
> "
>
> COMPATIBLE_HOST =
> '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux'
> --
> 2.31.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#191795):
> https://lists.openembedded.org/g/openembedded-core/message/191795
> Mute This Topic: https://lists.openembedded.org/mt/102987514/3617156
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Hi Martin, Sorry about that. I am looking at it now. Do I understand it correctly to reproduce the issue: I need to remove debuginfod (as it is currently on by default) from DISTO_FEATURES and remove debuginfod from elfutils PACKAGECONFIG defaults? Thanks, Victor On Sun, Dec 10, 2023 at 3:16 AM Martin Jansa <martin.jansa@gmail.com> wrote: > > This seems to be causing: > ../git/util.cxx:51:10: fatal error: elfutils/debuginfod.h: No such file or directory > 51 | #include <elfutils/debuginfod.h> > | ^~~~~~~~~~~~~~~~~~~~~~~ > compilation terminated. > make[2]: *** [Makefile:1389: stap-util.o] Error 1 > > on some systems. > > Looks like with https://sourceware.org/git/?p=systemtap.git;a=commit;h=2e67b053e3796ee7cf29a39f9698729b52078406 it now enables debuginfod ("AC_MSG_RESULT([yes])" _after_ the PKG_CHECK_MODULES now seems wrong). > > log.do_configure: > checking whether to use debuginfod... checking for debuginfod... no > yes > checking for debuginfod_find_metadata in -ldebuginfod... no > > build $ grep DEBUGINFO config.h > #define HAVE_LIBDEBUGINFOD 1 > > config.log (see the strange result yes): > configure:12213: checking whether to use debuginfod > configure:12228: checking for debuginfod > configure:12235: $PKG_CONFIG --exists --print-errors "libdebuginfod >= 0.179" > Package libdebuginfod was not found in the pkg-config search path. > Perhaps you should add the directory containing `libdebuginfod.pc' > to the PKG_CONFIG_PATH environment variable > No package 'libdebuginfod' found > configure:12238: $? = 1 > configure:12252: $PKG_CONFIG --exists --print-errors "libdebuginfod >= 0.179" > Package libdebuginfod was not found in the pkg-config search path. > Perhaps you should add the directory containing `libdebuginfod.pc' > to the PKG_CONFIG_PATH environment variable > No package 'libdebuginfod' found > configure:12255: $? = 1 > configure:12269: result: no > No package 'libdebuginfod' found > configure:12304: result: yes > configure:12315: checking for debuginfod_find_metadata in -ldebuginfod > configure:12344: ccache aarch64-webos-linux-gcc -mcpu=cortex-a72 -march=armv8-a+crc -mbranch-protection=standard -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Werror=return-type --sysroot=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot -o conftest -O2 -pipe -g -feliminate-unused-debug-types -fcanon-prefix-map -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/git=/usr/src/debug/systemtap/5.0 -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/git=/usr/src/debug/systemtap/5.0 -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/build=/usr/src/debug/systemtap/5.0 -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/build=/usr/src/debug/systemtap/5.0 -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot= -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot= -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot-native= -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fcanon-prefix-map -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/git=/usr/src/debug/systemtap/5.0 -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/git=/usr/src/debug/systemtap/5.0 -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/build=/usr/src/debug/systemtap/5.0 -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/build=/usr/src/debug/systemtap/5.0 -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot= -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot= -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot-native= -Wl,-z,relro,-z,now conftest.c -ldebuginfod >&5 > /OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot-native/usr/bin/aarch64-webos-linux/../../libexec/aarch64-webos-linux/gcc/aarch64-webos-linux/13.2.0/ld: cannot find -ldebuginfod: No such file or directory > collect2: error: ld returned 1 exit status > > With debuginfod in DISTRO_FEATURES (which is included by default) and *debuginfod PACKAGECONFIG enabled in elfutils (also by default based on DISTRO_FEAUTRES) this builds OK. > > Regards, > > > On Tue, Dec 5, 2023 at 7:33 AM Victor Kamensky <victor.kamensky7@gmail.com> wrote: >> >> 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. >> >> Signed-off-by: Victor Kamensky <victor.kamensky7@gmail.com> >> --- >> .../0001-prerelease-datestamp-fixes.patch | 23 ++++++++++++ >> .../systemtap/0001-release-date-fix.patch | 37 ------------------- >> .../systemtap/systemtap_git.inc | 6 +-- >> 3 files changed, 26 insertions(+), 40 deletions(-) >> create mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch >> delete mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-release-date-fix.patch >> >> 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 @@ >> +From cfc2c1d53924face11e3fab78ded61c359778eb9 Mon Sep 17 00:00:00 2001 >> +From: "Frank Ch. Eigler" <fche@redhat.com> >> +Date: Sat, 4 Nov 2023 12:19:59 -0400 >> +Subject: [PATCH] prerelease datestamp fixes >> + >> +Upstream-Status: Backport >> +--- >> + NEWS | 2 +- >> + 1 file changed, 1 insertion(+), 1 deletion(-) >> + >> +diff --git a/NEWS b/NEWS >> +index c7f31e8b7..f0f9056c4 100644 >> +--- a/NEWS >> ++++ b/NEWS >> +@@ -1,4 +1,4 @@ >> +-* What's new in version 5.0, 2023-11-03 >> ++* What's new in version 5.0, 2023-11-04 >> + >> + - Performance improvements in uprobe registration and module startup. >> + >> +-- >> +2.31.1 >> + >> 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 @@ >> -From ebb424eee5599fcc131901c0d82d0bfc0d2f57ab Mon Sep 17 00:00:00 2001 >> -From: "Frank Ch. Eigler" <fche@redhat.com> >> -Date: Fri, 28 Apr 2023 13:51:27 -0400 >> -Subject: [PATCH] release date fix >> - >> -Upstream-Status: Backport >> ---- >> - NEWS | 2 +- >> - systemtap.spec | 2 +- >> - 2 files changed, 2 insertions(+), 2 deletions(-) >> - >> -diff --git a/NEWS b/NEWS >> -index 695bc990c..46859e304 100644 >> ---- a/NEWS >> -+++ b/NEWS >> -@@ -1,4 +1,4 @@ >> --* What's new in version 4.9, 2023-04-27 >> -+* What's new in version 4.9, 2023-04-28 >> - >> - - ISystemtap: the new interactive systemtap jupyter kernel. This provides >> - a simple GUI for writing/running Systemtap scripts in an easy, incremental >> -diff --git a/systemtap.spec b/systemtap.spec >> -index 59814f112..fd8023264 100644 >> ---- a/systemtap.spec >> -+++ b/systemtap.spec >> -@@ -1307,7 +1307,7 @@ exit 0 >> - >> - # PRERELEASE >> - %changelog >> --* Thu Apr 27 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-1 >> -+* Fri Apr 28 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-1 >> - - Upstream release, see wiki page below for detailed notes. >> - https://sourceware.org/systemtap/wiki/SystemTapReleases >> - >> --- >> -2.40.1 >> - >> 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 @@ >> LICENSE = "GPL-2.0-only" >> LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" >> -SRCREV = "418f0a45ca4473491385b5c7eef777607bbdb3b7" >> -PV = "4.9" >> +SRCREV = "e72dc118e563c645d93a1a2d771e8d90e8fec1ae" >> +PV = "5.0" >> >> 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 \ >> file://0001-Install-python-modules-to-correct-library-dir.patch \ >> file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ >> - file://0001-release-date-fix.patch \ >> + file://0001-prerelease-datestamp-fixes.patch \ >> " >> >> COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux' >> -- >> 2.31.1 >> >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#191795): https://lists.openembedded.org/g/openembedded-core/message/191795 >> Mute This Topic: https://lists.openembedded.org/mt/102987514/3617156 >> Group Owner: openembedded-core+owner@lists.openembedded.org >> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [martin.jansa@gmail.com] >> -=-=-=-=-=-=-=-=-=-=-=- >>
Hi Victor, no problem, at least it forced me to enable debuginfod in our builds as well (where it wasn't intentionally disabled). Just didn't get enabled when it was added to default DISTRO_FEATUREs as we define our own and it wasn't using BACKFILL mechanism to enable it in such setups. Removing debuginfod from DISTRO_FEATURES should be enough to reproduce the issue (as it will disable both *debuginfod PACKAGECONFIG options from elfutils as well). I haven't tried, but removing the PACKAGECONFIG just from elfutils will probably reproduce it as well (with possibly fewer recipes needing to rebuilt). There are 2 PACKAGECONFIGs for this, not sure which one is needed, but you can just disable both. Cheers, On Wed, Dec 13, 2023 at 10:27 PM Victor Kamensky <victor.kamensky7@gmail.com> wrote: > Hi Martin, > > Sorry about that. I am looking at it now. > > Do I understand it correctly to reproduce the issue: I need to remove > debuginfod (as it is currently on > by default) from DISTO_FEATURES and remove debuginfod from elfutils > PACKAGECONFIG defaults? > > Thanks, > Victor > > On Sun, Dec 10, 2023 at 3:16 AM Martin Jansa <martin.jansa@gmail.com> > wrote: > > > > This seems to be causing: > > ../git/util.cxx:51:10: fatal error: elfutils/debuginfod.h: No such file > or directory > > 51 | #include <elfutils/debuginfod.h> > > | ^~~~~~~~~~~~~~~~~~~~~~~ > > compilation terminated. > > make[2]: *** [Makefile:1389: stap-util.o] Error 1 > > > > on some systems. > > > > Looks like with > https://sourceware.org/git/?p=systemtap.git;a=commit;h=2e67b053e3796ee7cf29a39f9698729b52078406 > it now enables debuginfod ("AC_MSG_RESULT([yes])" _after_ the > PKG_CHECK_MODULES now seems wrong). > > > > log.do_configure: > > checking whether to use debuginfod... checking for debuginfod... no > > yes > > checking for debuginfod_find_metadata in -ldebuginfod... no > > > > build $ grep DEBUGINFO config.h > > #define HAVE_LIBDEBUGINFOD 1 > > > > config.log (see the strange result yes): > > configure:12213: checking whether to use debuginfod > > configure:12228: checking for debuginfod > > configure:12235: $PKG_CONFIG --exists --print-errors "libdebuginfod >= > 0.179" > > Package libdebuginfod was not found in the pkg-config search path. > > Perhaps you should add the directory containing `libdebuginfod.pc' > > to the PKG_CONFIG_PATH environment variable > > No package 'libdebuginfod' found > > configure:12238: $? = 1 > > configure:12252: $PKG_CONFIG --exists --print-errors "libdebuginfod >= > 0.179" > > Package libdebuginfod was not found in the pkg-config search path. > > Perhaps you should add the directory containing `libdebuginfod.pc' > > to the PKG_CONFIG_PATH environment variable > > No package 'libdebuginfod' found > > configure:12255: $? = 1 > > configure:12269: result: no > > No package 'libdebuginfod' found > > configure:12304: result: yes > > configure:12315: checking for debuginfod_find_metadata in -ldebuginfod > > configure:12344: ccache aarch64-webos-linux-gcc -mcpu=cortex-a72 > -march=armv8-a+crc -mbranch-protection=standard -fstack-protector-strong > -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security > -Werror=return-type > --sysroot=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot > -o conftest -O2 -pipe -g -feliminate-unused-debug-types > -fcanon-prefix-map > -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/git=/usr/src/debug/systemtap/5.0 > -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/git=/usr/src/debug/systemtap/5.0 > -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/build=/usr/src/debug/systemtap/5.0 > -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/build=/usr/src/debug/systemtap/5.0 > -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot= > -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot= > -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot-native= > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fcanon-prefix-map > -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/git=/usr/src/debug/systemtap/5.0 > -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/git=/usr/src/debug/systemtap/5.0 > -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/build=/usr/src/debug/systemtap/5.0 > -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/build=/usr/src/debug/systemtap/5.0 > -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot= > -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot= > -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot-native= > -Wl,-z,relro,-z,now conftest.c -ldebuginfod >&5 > > > /OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot-native/usr/bin/aarch64-webos-linux/../../libexec/aarch64-webos-linux/gcc/aarch64-webos-linux/13.2.0/ld: > cannot find -ldebuginfod: No such file or directory > > collect2: error: ld returned 1 exit status > > > > With debuginfod in DISTRO_FEATURES (which is included by default) and > *debuginfod PACKAGECONFIG enabled in elfutils (also by default based on > DISTRO_FEAUTRES) this builds OK. > > > > Regards, > > > > > > On Tue, Dec 5, 2023 at 7:33 AM Victor Kamensky < > victor.kamensky7@gmail.com> wrote: > >> > >> 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. > >> > >> Signed-off-by: Victor Kamensky <victor.kamensky7@gmail.com> > >> --- > >> .../0001-prerelease-datestamp-fixes.patch | 23 ++++++++++++ > >> .../systemtap/0001-release-date-fix.patch | 37 ------------------- > >> .../systemtap/systemtap_git.inc | 6 +-- > >> 3 files changed, 26 insertions(+), 40 deletions(-) > >> create mode 100644 > meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch > >> delete mode 100644 > meta/recipes-kernel/systemtap/systemtap/0001-release-date-fix.patch > >> > >> 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 @@ > >> +From cfc2c1d53924face11e3fab78ded61c359778eb9 Mon Sep 17 00:00:00 2001 > >> +From: "Frank Ch. Eigler" <fche@redhat.com> > >> +Date: Sat, 4 Nov 2023 12:19:59 -0400 > >> +Subject: [PATCH] prerelease datestamp fixes > >> + > >> +Upstream-Status: Backport > >> +--- > >> + NEWS | 2 +- > >> + 1 file changed, 1 insertion(+), 1 deletion(-) > >> + > >> +diff --git a/NEWS b/NEWS > >> +index c7f31e8b7..f0f9056c4 100644 > >> +--- a/NEWS > >> ++++ b/NEWS > >> +@@ -1,4 +1,4 @@ > >> +-* What's new in version 5.0, 2023-11-03 > >> ++* What's new in version 5.0, 2023-11-04 > >> + > >> + - Performance improvements in uprobe registration and module startup. > >> + > >> +-- > >> +2.31.1 > >> + > >> 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 @@ > >> -From ebb424eee5599fcc131901c0d82d0bfc0d2f57ab Mon Sep 17 00:00:00 2001 > >> -From: "Frank Ch. Eigler" <fche@redhat.com> > >> -Date: Fri, 28 Apr 2023 13:51:27 -0400 > >> -Subject: [PATCH] release date fix > >> - > >> -Upstream-Status: Backport > >> ---- > >> - NEWS | 2 +- > >> - systemtap.spec | 2 +- > >> - 2 files changed, 2 insertions(+), 2 deletions(-) > >> - > >> -diff --git a/NEWS b/NEWS > >> -index 695bc990c..46859e304 100644 > >> ---- a/NEWS > >> -+++ b/NEWS > >> -@@ -1,4 +1,4 @@ > >> --* What's new in version 4.9, 2023-04-27 > >> -+* What's new in version 4.9, 2023-04-28 > >> - > >> - - ISystemtap: the new interactive systemtap jupyter kernel. This > provides > >> - a simple GUI for writing/running Systemtap scripts in an easy, > incremental > >> -diff --git a/systemtap.spec b/systemtap.spec > >> -index 59814f112..fd8023264 100644 > >> ---- a/systemtap.spec > >> -+++ b/systemtap.spec > >> -@@ -1307,7 +1307,7 @@ exit 0 > >> - > >> - # PRERELEASE > >> - %changelog > >> --* Thu Apr 27 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-1 > >> -+* Fri Apr 28 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-1 > >> - - Upstream release, see wiki page below for detailed notes. > >> - https://sourceware.org/systemtap/wiki/SystemTapReleases > >> - > >> --- > >> -2.40.1 > >> - > >> 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 @@ > >> LICENSE = "GPL-2.0-only" > >> LIC_FILES_CHKSUM = > "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" > >> -SRCREV = "418f0a45ca4473491385b5c7eef777607bbdb3b7" > >> -PV = "4.9" > >> +SRCREV = "e72dc118e563c645d93a1a2d771e8d90e8fec1ae" > >> +PV = "5.0" > >> > >> 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 \ > >> > file://0001-Install-python-modules-to-correct-library-dir.patch \ > >> > file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ > >> - file://0001-release-date-fix.patch \ > >> + file://0001-prerelease-datestamp-fixes.patch \ > >> " > >> > >> COMPATIBLE_HOST = > '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux' > >> -- > >> 2.31.1 > >> > >> > >> -=-=-=-=-=-=-=-=-=-=-=- > >> Links: You receive all messages sent to this group. > >> View/Reply Online (#191795): > https://lists.openembedded.org/g/openembedded-core/message/191795 > >> Mute This Topic: https://lists.openembedded.org/mt/102987514/3617156 > >> Group Owner: openembedded-core+owner@lists.openembedded.org > >> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > martin.jansa@gmail.com] > >> -=-=-=-=-=-=-=-=-=-=-=- > >> >
PACKAGECONFIG:remove:pn-elfutils = "debuginfod" PACKAGECONFIG:remove:pn-elfutils = "libdebuginfod" PACKAGECONFIG:remove:pn-binutils = "debuginfod" in local.conf is the easiest way to reproduce it. The one for binutils isn't strictly needed (but target binutils will fail as well when debuginfod is disabled in elfutils and enabled in binutils). On Wed, Dec 13, 2023 at 11:45 PM Martin Jansa via lists.openembedded.org <martin.jansa=gmail.com@lists.openembedded.org> wrote: > Hi Victor, > > no problem, at least it forced me to enable debuginfod in our builds as > well (where it wasn't intentionally disabled). Just didn't get enabled when > it was added to default DISTRO_FEATUREs as we define our own and it wasn't > using BACKFILL mechanism to enable it in such setups. > > Removing debuginfod from DISTRO_FEATURES should be enough to reproduce the > issue (as it will disable both *debuginfod PACKAGECONFIG options from > elfutils as well). > > I haven't tried, but removing the PACKAGECONFIG just from elfutils will > probably reproduce it as well (with possibly fewer recipes needing to > rebuilt). There are 2 PACKAGECONFIGs for this, not sure which one is > needed, but you can just disable both. > > Cheers, > > On Wed, Dec 13, 2023 at 10:27 PM Victor Kamensky < > victor.kamensky7@gmail.com> wrote: > >> Hi Martin, >> >> Sorry about that. I am looking at it now. >> >> Do I understand it correctly to reproduce the issue: I need to remove >> debuginfod (as it is currently on >> by default) from DISTO_FEATURES and remove debuginfod from elfutils >> PACKAGECONFIG defaults? >> >> Thanks, >> Victor >> >> On Sun, Dec 10, 2023 at 3:16 AM Martin Jansa <martin.jansa@gmail.com> >> wrote: >> > >> > This seems to be causing: >> > ../git/util.cxx:51:10: fatal error: elfutils/debuginfod.h: No such file >> or directory >> > 51 | #include <elfutils/debuginfod.h> >> > | ^~~~~~~~~~~~~~~~~~~~~~~ >> > compilation terminated. >> > make[2]: *** [Makefile:1389: stap-util.o] Error 1 >> > >> > on some systems. >> > >> > Looks like with >> https://sourceware.org/git/?p=systemtap.git;a=commit;h=2e67b053e3796ee7cf29a39f9698729b52078406 >> it now enables debuginfod ("AC_MSG_RESULT([yes])" _after_ the >> PKG_CHECK_MODULES now seems wrong). >> > >> > log.do_configure: >> > checking whether to use debuginfod... checking for debuginfod... no >> > yes >> > checking for debuginfod_find_metadata in -ldebuginfod... no >> > >> > build $ grep DEBUGINFO config.h >> > #define HAVE_LIBDEBUGINFOD 1 >> > >> > config.log (see the strange result yes): >> > configure:12213: checking whether to use debuginfod >> > configure:12228: checking for debuginfod >> > configure:12235: $PKG_CONFIG --exists --print-errors "libdebuginfod >= >> 0.179" >> > Package libdebuginfod was not found in the pkg-config search path. >> > Perhaps you should add the directory containing `libdebuginfod.pc' >> > to the PKG_CONFIG_PATH environment variable >> > No package 'libdebuginfod' found >> > configure:12238: $? = 1 >> > configure:12252: $PKG_CONFIG --exists --print-errors "libdebuginfod >= >> 0.179" >> > Package libdebuginfod was not found in the pkg-config search path. >> > Perhaps you should add the directory containing `libdebuginfod.pc' >> > to the PKG_CONFIG_PATH environment variable >> > No package 'libdebuginfod' found >> > configure:12255: $? = 1 >> > configure:12269: result: no >> > No package 'libdebuginfod' found >> > configure:12304: result: yes >> > configure:12315: checking for debuginfod_find_metadata in -ldebuginfod >> > configure:12344: ccache aarch64-webos-linux-gcc -mcpu=cortex-a72 >> -march=armv8-a+crc -mbranch-protection=standard -fstack-protector-strong >> -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security >> -Werror=return-type >> --sysroot=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot >> -o conftest -O2 -pipe -g -feliminate-unused-debug-types >> -fcanon-prefix-map >> -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/git=/usr/src/debug/systemtap/5.0 >> -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/git=/usr/src/debug/systemtap/5.0 >> -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/build=/usr/src/debug/systemtap/5.0 >> -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/build=/usr/src/debug/systemtap/5.0 >> -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot= >> -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot= >> -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot-native= >> -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fcanon-prefix-map >> -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/git=/usr/src/debug/systemtap/5.0 >> -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/git=/usr/src/debug/systemtap/5.0 >> -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/build=/usr/src/debug/systemtap/5.0 >> -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/build=/usr/src/debug/systemtap/5.0 >> -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot= >> -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot= >> -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot-native= >> -Wl,-z,relro,-z,now conftest.c -ldebuginfod >&5 >> > >> /OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot-native/usr/bin/aarch64-webos-linux/../../libexec/aarch64-webos-linux/gcc/aarch64-webos-linux/13.2.0/ld: >> cannot find -ldebuginfod: No such file or directory >> > collect2: error: ld returned 1 exit status >> > >> > With debuginfod in DISTRO_FEATURES (which is included by default) and >> *debuginfod PACKAGECONFIG enabled in elfutils (also by default based on >> DISTRO_FEAUTRES) this builds OK. >> > >> > Regards, >> > >> > >> > On Tue, Dec 5, 2023 at 7:33 AM Victor Kamensky < >> victor.kamensky7@gmail.com> wrote: >> >> >> >> 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. >> >> >> >> Signed-off-by: Victor Kamensky <victor.kamensky7@gmail.com> >> >> --- >> >> .../0001-prerelease-datestamp-fixes.patch | 23 ++++++++++++ >> >> .../systemtap/0001-release-date-fix.patch | 37 ------------------- >> >> .../systemtap/systemtap_git.inc | 6 +-- >> >> 3 files changed, 26 insertions(+), 40 deletions(-) >> >> create mode 100644 >> meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch >> >> delete mode 100644 >> meta/recipes-kernel/systemtap/systemtap/0001-release-date-fix.patch >> >> >> >> 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 @@ >> >> +From cfc2c1d53924face11e3fab78ded61c359778eb9 Mon Sep 17 00:00:00 2001 >> >> +From: "Frank Ch. Eigler" <fche@redhat.com> >> >> +Date: Sat, 4 Nov 2023 12:19:59 -0400 >> >> +Subject: [PATCH] prerelease datestamp fixes >> >> + >> >> +Upstream-Status: Backport >> >> +--- >> >> + NEWS | 2 +- >> >> + 1 file changed, 1 insertion(+), 1 deletion(-) >> >> + >> >> +diff --git a/NEWS b/NEWS >> >> +index c7f31e8b7..f0f9056c4 100644 >> >> +--- a/NEWS >> >> ++++ b/NEWS >> >> +@@ -1,4 +1,4 @@ >> >> +-* What's new in version 5.0, 2023-11-03 >> >> ++* What's new in version 5.0, 2023-11-04 >> >> + >> >> + - Performance improvements in uprobe registration and module startup. >> >> + >> >> +-- >> >> +2.31.1 >> >> + >> >> 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 @@ >> >> -From ebb424eee5599fcc131901c0d82d0bfc0d2f57ab Mon Sep 17 00:00:00 2001 >> >> -From: "Frank Ch. Eigler" <fche@redhat.com> >> >> -Date: Fri, 28 Apr 2023 13:51:27 -0400 >> >> -Subject: [PATCH] release date fix >> >> - >> >> -Upstream-Status: Backport >> >> ---- >> >> - NEWS | 2 +- >> >> - systemtap.spec | 2 +- >> >> - 2 files changed, 2 insertions(+), 2 deletions(-) >> >> - >> >> -diff --git a/NEWS b/NEWS >> >> -index 695bc990c..46859e304 100644 >> >> ---- a/NEWS >> >> -+++ b/NEWS >> >> -@@ -1,4 +1,4 @@ >> >> --* What's new in version 4.9, 2023-04-27 >> >> -+* What's new in version 4.9, 2023-04-28 >> >> - >> >> - - ISystemtap: the new interactive systemtap jupyter kernel. This >> provides >> >> - a simple GUI for writing/running Systemtap scripts in an easy, >> incremental >> >> -diff --git a/systemtap.spec b/systemtap.spec >> >> -index 59814f112..fd8023264 100644 >> >> ---- a/systemtap.spec >> >> -+++ b/systemtap.spec >> >> -@@ -1307,7 +1307,7 @@ exit 0 >> >> - >> >> - # PRERELEASE >> >> - %changelog >> >> --* Thu Apr 27 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-1 >> >> -+* Fri Apr 28 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-1 >> >> - - Upstream release, see wiki page below for detailed notes. >> >> - https://sourceware.org/systemtap/wiki/SystemTapReleases >> >> - >> >> --- >> >> -2.40.1 >> >> - >> >> 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 @@ >> >> LICENSE = "GPL-2.0-only" >> >> LIC_FILES_CHKSUM = >> "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" >> >> -SRCREV = "418f0a45ca4473491385b5c7eef777607bbdb3b7" >> >> -PV = "4.9" >> >> +SRCREV = "e72dc118e563c645d93a1a2d771e8d90e8fec1ae" >> >> +PV = "5.0" >> >> >> >> 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 \ >> >> >> file://0001-Install-python-modules-to-correct-library-dir.patch \ >> >> >> file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ >> >> - file://0001-release-date-fix.patch \ >> >> + file://0001-prerelease-datestamp-fixes.patch \ >> >> " >> >> >> >> COMPATIBLE_HOST = >> '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux' >> >> -- >> >> 2.31.1 >> >> >> >> >> >> >> >> >> > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#192332): > https://lists.openembedded.org/g/openembedded-core/message/192332 > Mute This Topic: https://lists.openembedded.org/mt/102987514/3617156 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > martin.jansa@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
On Thu, Dec 14, 2023 at 6:27 AM Martin Jansa <martin.jansa@gmail.com> wrote: > > PACKAGECONFIG:remove:pn-elfutils = "debuginfod" > PACKAGECONFIG:remove:pn-elfutils = "libdebuginfod" > PACKAGECONFIG:remove:pn-binutils = "debuginfod" > > in local.conf is the easiest way to reproduce it. > > The one for binutils isn't strictly needed (but target binutils will fail as well when debuginfod is disabled in elfutils and enabled in binutils). Thanks, Martin. I was able to reproduce it with removing debuginfod from DISTRO_FEATURES_DEFAULT Submitted patches to systemtap mailing list: https://sourceware.org/pipermail/systemtap/2023q4/027914.html https://sourceware.org/pipermail/systemtap/2023q4/027915.html And to oe-core: https://lists.openembedded.org/g/openembedded-core/message/192600?p=%2C%2C%2C20%2C0%2C0%2C0%3A%3Acreated%2C0%2CVictor+Kamensky%2C20%2C2%2C0%2C103238308 https://lists.openembedded.org/g/openembedded-core/message/192601?p=%2C%2C%2C20%2C0%2C0%2C0%3A%3Acreated%2C0%2CVictor+Kamensky%2C20%2C2%2C0%2C103238309 Appreciate reporting the issue! Thanks, Victor > On Wed, Dec 13, 2023 at 11:45 PM Martin Jansa via lists.openembedded.org <martin.jansa=gmail.com@lists.openembedded.org> wrote: >> >> Hi Victor, >> >> no problem, at least it forced me to enable debuginfod in our builds as well (where it wasn't intentionally disabled). Just didn't get enabled when it was added to default DISTRO_FEATUREs as we define our own and it wasn't using BACKFILL mechanism to enable it in such setups. >> >> Removing debuginfod from DISTRO_FEATURES should be enough to reproduce the issue (as it will disable both *debuginfod PACKAGECONFIG options from elfutils as well). >> >> I haven't tried, but removing the PACKAGECONFIG just from elfutils will probably reproduce it as well (with possibly fewer recipes needing to rebuilt). There are 2 PACKAGECONFIGs for this, not sure which one is needed, but you can just disable both. >> >> Cheers, >> >> On Wed, Dec 13, 2023 at 10:27 PM Victor Kamensky <victor.kamensky7@gmail.com> wrote: >>> >>> Hi Martin, >>> >>> Sorry about that. I am looking at it now. >>> >>> Do I understand it correctly to reproduce the issue: I need to remove >>> debuginfod (as it is currently on >>> by default) from DISTO_FEATURES and remove debuginfod from elfutils >>> PACKAGECONFIG defaults? >>> >>> Thanks, >>> Victor >>> >>> On Sun, Dec 10, 2023 at 3:16 AM Martin Jansa <martin.jansa@gmail.com> wrote: >>> > >>> > This seems to be causing: >>> > ../git/util.cxx:51:10: fatal error: elfutils/debuginfod.h: No such file or directory >>> > 51 | #include <elfutils/debuginfod.h> >>> > | ^~~~~~~~~~~~~~~~~~~~~~~ >>> > compilation terminated. >>> > make[2]: *** [Makefile:1389: stap-util.o] Error 1 >>> > >>> > on some systems. >>> > >>> > Looks like with https://sourceware.org/git/?p=systemtap.git;a=commit;h=2e67b053e3796ee7cf29a39f9698729b52078406 it now enables debuginfod ("AC_MSG_RESULT([yes])" _after_ the PKG_CHECK_MODULES now seems wrong). >>> > >>> > log.do_configure: >>> > checking whether to use debuginfod... checking for debuginfod... no >>> > yes >>> > checking for debuginfod_find_metadata in -ldebuginfod... no >>> > >>> > build $ grep DEBUGINFO config.h >>> > #define HAVE_LIBDEBUGINFOD 1 >>> > >>> > config.log (see the strange result yes): >>> > configure:12213: checking whether to use debuginfod >>> > configure:12228: checking for debuginfod >>> > configure:12235: $PKG_CONFIG --exists --print-errors "libdebuginfod >= 0.179" >>> > Package libdebuginfod was not found in the pkg-config search path. >>> > Perhaps you should add the directory containing `libdebuginfod.pc' >>> > to the PKG_CONFIG_PATH environment variable >>> > No package 'libdebuginfod' found >>> > configure:12238: $? = 1 >>> > configure:12252: $PKG_CONFIG --exists --print-errors "libdebuginfod >= 0.179" >>> > Package libdebuginfod was not found in the pkg-config search path. >>> > Perhaps you should add the directory containing `libdebuginfod.pc' >>> > to the PKG_CONFIG_PATH environment variable >>> > No package 'libdebuginfod' found >>> > configure:12255: $? = 1 >>> > configure:12269: result: no >>> > No package 'libdebuginfod' found >>> > configure:12304: result: yes >>> > configure:12315: checking for debuginfod_find_metadata in -ldebuginfod >>> > configure:12344: ccache aarch64-webos-linux-gcc -mcpu=cortex-a72 -march=armv8-a+crc -mbranch-protection=standard -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Werror=return-type --sysroot=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot -o conftest -O2 -pipe -g -feliminate-unused-debug-types -fcanon-prefix-map -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/git=/usr/src/debug/systemtap/5.0 -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/git=/usr/src/debug/systemtap/5.0 -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/build=/usr/src/debug/systemtap/5.0 -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/build=/usr/src/debug/systemtap/5.0 -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot= -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot= -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot-native= -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fcanon-prefix-map -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/git=/usr/src/debug/systemtap/5.0 -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/git=/usr/src/debug/systemtap/5.0 -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/build=/usr/src/debug/systemtap/5.0 -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/build=/usr/src/debug/systemtap/5.0 -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot= -fmacro-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot= -fdebug-prefix-map=/OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot-native= -Wl,-z,relro,-z,now conftest.c -ldebuginfod >&5 >>> > /OE/lge/build/webos/scarthgap/BUILD/work/raspberrypi4_64-webos-linux/systemtap/5.0/recipe-sysroot-native/usr/bin/aarch64-webos-linux/../../libexec/aarch64-webos-linux/gcc/aarch64-webos-linux/13.2.0/ld: cannot find -ldebuginfod: No such file or directory >>> > collect2: error: ld returned 1 exit status >>> > >>> > With debuginfod in DISTRO_FEATURES (which is included by default) and *debuginfod PACKAGECONFIG enabled in elfutils (also by default based on DISTRO_FEAUTRES) this builds OK. >>> > >>> > Regards, >>> > >>> > >>> > On Tue, Dec 5, 2023 at 7:33 AM Victor Kamensky <victor.kamensky7@gmail.com> wrote: >>> >> >>> >> 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. >>> >> >>> >> Signed-off-by: Victor Kamensky <victor.kamensky7@gmail.com> >>> >> --- >>> >> .../0001-prerelease-datestamp-fixes.patch | 23 ++++++++++++ >>> >> .../systemtap/0001-release-date-fix.patch | 37 ------------------- >>> >> .../systemtap/systemtap_git.inc | 6 +-- >>> >> 3 files changed, 26 insertions(+), 40 deletions(-) >>> >> create mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch >>> >> delete mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-release-date-fix.patch >>> >> >>> >> 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 @@ >>> >> +From cfc2c1d53924face11e3fab78ded61c359778eb9 Mon Sep 17 00:00:00 2001 >>> >> +From: "Frank Ch. Eigler" <fche@redhat.com> >>> >> +Date: Sat, 4 Nov 2023 12:19:59 -0400 >>> >> +Subject: [PATCH] prerelease datestamp fixes >>> >> + >>> >> +Upstream-Status: Backport >>> >> +--- >>> >> + NEWS | 2 +- >>> >> + 1 file changed, 1 insertion(+), 1 deletion(-) >>> >> + >>> >> +diff --git a/NEWS b/NEWS >>> >> +index c7f31e8b7..f0f9056c4 100644 >>> >> +--- a/NEWS >>> >> ++++ b/NEWS >>> >> +@@ -1,4 +1,4 @@ >>> >> +-* What's new in version 5.0, 2023-11-03 >>> >> ++* What's new in version 5.0, 2023-11-04 >>> >> + >>> >> + - Performance improvements in uprobe registration and module startup. >>> >> + >>> >> +-- >>> >> +2.31.1 >>> >> + >>> >> 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 @@ >>> >> -From ebb424eee5599fcc131901c0d82d0bfc0d2f57ab Mon Sep 17 00:00:00 2001 >>> >> -From: "Frank Ch. Eigler" <fche@redhat.com> >>> >> -Date: Fri, 28 Apr 2023 13:51:27 -0400 >>> >> -Subject: [PATCH] release date fix >>> >> - >>> >> -Upstream-Status: Backport >>> >> ---- >>> >> - NEWS | 2 +- >>> >> - systemtap.spec | 2 +- >>> >> - 2 files changed, 2 insertions(+), 2 deletions(-) >>> >> - >>> >> -diff --git a/NEWS b/NEWS >>> >> -index 695bc990c..46859e304 100644 >>> >> ---- a/NEWS >>> >> -+++ b/NEWS >>> >> -@@ -1,4 +1,4 @@ >>> >> --* What's new in version 4.9, 2023-04-27 >>> >> -+* What's new in version 4.9, 2023-04-28 >>> >> - >>> >> - - ISystemtap: the new interactive systemtap jupyter kernel. This provides >>> >> - a simple GUI for writing/running Systemtap scripts in an easy, incremental >>> >> -diff --git a/systemtap.spec b/systemtap.spec >>> >> -index 59814f112..fd8023264 100644 >>> >> ---- a/systemtap.spec >>> >> -+++ b/systemtap.spec >>> >> -@@ -1307,7 +1307,7 @@ exit 0 >>> >> - >>> >> - # PRERELEASE >>> >> - %changelog >>> >> --* Thu Apr 27 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-1 >>> >> -+* Fri Apr 28 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-1 >>> >> - - Upstream release, see wiki page below for detailed notes. >>> >> - https://sourceware.org/systemtap/wiki/SystemTapReleases >>> >> - >>> >> --- >>> >> -2.40.1 >>> >> - >>> >> 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 @@ >>> >> LICENSE = "GPL-2.0-only" >>> >> LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" >>> >> -SRCREV = "418f0a45ca4473491385b5c7eef777607bbdb3b7" >>> >> -PV = "4.9" >>> >> +SRCREV = "e72dc118e563c645d93a1a2d771e8d90e8fec1ae" >>> >> +PV = "5.0" >>> >> >>> >> 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 \ >>> >> file://0001-Install-python-modules-to-correct-library-dir.patch \ >>> >> file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ >>> >> - file://0001-release-date-fix.patch \ >>> >> + file://0001-prerelease-datestamp-fixes.patch \ >>> >> " >>> >> >>> >> COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux' >>> >> -- >>> >> 2.31.1 >>> >> >>> >> >>> >> >>> >> >> >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#192332): https://lists.openembedded.org/g/openembedded-core/message/192332 >> Mute This Topic: https://lists.openembedded.org/mt/102987514/3617156 >> Group Owner: openembedded-core+owner@lists.openembedded.org >> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [martin.jansa@gmail.com] >> -=-=-=-=-=-=-=-=-=-=-=- >>
On Mon, Dec 18, 2023 at 7:16 AM Victor Kamensky <victor.kamensky7@gmail.com> wrote: > On Thu, Dec 14, 2023 at 6:27 AM Martin Jansa <martin.jansa@gmail.com> > wrote: > > > > PACKAGECONFIG:remove:pn-elfutils = "debuginfod" > > PACKAGECONFIG:remove:pn-elfutils = "libdebuginfod" > > PACKAGECONFIG:remove:pn-binutils = "debuginfod" > > > > in local.conf is the easiest way to reproduce it. > > > > The one for binutils isn't strictly needed (but target binutils will > fail as well when debuginfod is disabled in elfutils and enabled in > binutils). > > Thanks, Martin. I was able to reproduce it with removing debuginfod > from DISTRO_FEATURES_DEFAULT > > Submitted patches to systemtap mailing list: > https://sourceware.org/pipermail/systemtap/2023q4/027914.html > https://sourceware.org/pipermail/systemtap/2023q4/027915.html > > And to oe-core: > > https://lists.openembedded.org/g/openembedded-core/message/192600?p=%2C%2C%2C20%2C0%2C0%2C0%3A%3Acreated%2C0%2CVictor+Kamensky%2C20%2C2%2C0%2C103238308 > > https://lists.openembedded.org/g/openembedded-core/message/192601?p=%2C%2C%2C20%2C0%2C0%2C0%3A%3Acreated%2C0%2CVictor+Kamensky%2C20%2C2%2C0%2C103238309 > > Appreciate reporting the issue! > Thanks for the fixes! They LGTM.
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 @@ +From cfc2c1d53924face11e3fab78ded61c359778eb9 Mon Sep 17 00:00:00 2001 +From: "Frank Ch. Eigler" <fche@redhat.com> +Date: Sat, 4 Nov 2023 12:19:59 -0400 +Subject: [PATCH] prerelease datestamp fixes + +Upstream-Status: Backport +--- + NEWS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/NEWS b/NEWS +index c7f31e8b7..f0f9056c4 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,4 +1,4 @@ +-* What's new in version 5.0, 2023-11-03 ++* What's new in version 5.0, 2023-11-04 + + - Performance improvements in uprobe registration and module startup. + +-- +2.31.1 + 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 @@ -From ebb424eee5599fcc131901c0d82d0bfc0d2f57ab Mon Sep 17 00:00:00 2001 -From: "Frank Ch. Eigler" <fche@redhat.com> -Date: Fri, 28 Apr 2023 13:51:27 -0400 -Subject: [PATCH] release date fix - -Upstream-Status: Backport ---- - NEWS | 2 +- - systemtap.spec | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/NEWS b/NEWS -index 695bc990c..46859e304 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,4 +1,4 @@ --* What's new in version 4.9, 2023-04-27 -+* What's new in version 4.9, 2023-04-28 - - - ISystemtap: the new interactive systemtap jupyter kernel. This provides - a simple GUI for writing/running Systemtap scripts in an easy, incremental -diff --git a/systemtap.spec b/systemtap.spec -index 59814f112..fd8023264 100644 ---- a/systemtap.spec -+++ b/systemtap.spec -@@ -1307,7 +1307,7 @@ exit 0 - - # PRERELEASE - %changelog --* Thu Apr 27 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-1 -+* Fri Apr 28 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-1 - - Upstream release, see wiki page below for detailed notes. - https://sourceware.org/systemtap/wiki/SystemTapReleases - --- -2.40.1 - 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 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "418f0a45ca4473491385b5c7eef777607bbdb3b7" -PV = "4.9" +SRCREV = "e72dc118e563c645d93a1a2d771e8d90e8fec1ae" +PV = "5.0" 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 \ file://0001-Install-python-modules-to-correct-library-dir.patch \ file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ - file://0001-release-date-fix.patch \ + file://0001-prerelease-datestamp-fixes.patch \ " COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux'
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. Signed-off-by: Victor Kamensky <victor.kamensky7@gmail.com> --- .../0001-prerelease-datestamp-fixes.patch | 23 ++++++++++++ .../systemtap/0001-release-date-fix.patch | 37 ------------------- .../systemtap/systemtap_git.inc | 6 +-- 3 files changed, 26 insertions(+), 40 deletions(-) create mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch delete mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-release-date-fix.patch