* [oe][OE-core][Patch 1/1] perf: depend on setuptools if building python scripting
@ 2022-08-10 7:21 Max Krummenacher
2022-08-11 9:01 ` Alexandre Belloni
0 siblings, 1 reply; 3+ messages in thread
From: Max Krummenacher @ 2022-08-10 7:21 UTC (permalink / raw)
To: openembedded-core; +Cc: Max Krummenacher
From: Max Krummenacher <max.krummenacher@toradex.com>
Starting with kernel 5.19-rc7 perf changed from using distutils
to setuptools.
Add this to the dependencies to be prepared.
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/tools/perf?id=ee87a0841aa538ab7ad49cf5679ac5ea2682c909
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
meta/recipes-kernel/perf/perf.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 95e7eae9fe..4b15b11462 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -13,7 +13,7 @@ PR = "r9"
PACKAGECONFIG ??= "scripting tui libunwind"
PACKAGECONFIG[dwarf] = ",NO_DWARF=1"
-PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python3"
+PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python3 python3-setuptools-native"
# gui support was added with kernel 3.6.35
# since 3.10 libnewt was replaced by slang
# to cover a wide range of kernel we add both dependencies
--
2.35.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [oe][OE-core][Patch 1/1] perf: depend on setuptools if building python scripting
2022-08-10 7:21 [oe][OE-core][Patch 1/1] perf: depend on setuptools if building python scripting Max Krummenacher
@ 2022-08-11 9:01 ` Alexandre Belloni
2022-08-11 10:47 ` Richard Purdie
0 siblings, 1 reply; 3+ messages in thread
From: Alexandre Belloni @ 2022-08-11 9:01 UTC (permalink / raw)
To: Max Krummenacher; +Cc: openembedded-core, Max Krummenacher
Hello Max,
On 10/08/2022 09:21:38+0200, Max Krummenacher wrote:
> From: Max Krummenacher <max.krummenacher@toradex.com>
>
> Starting with kernel 5.19-rc7 perf changed from using distutils
> to setuptools.
> Add this to the dependencies to be prepared.
>
Unfortunately, this causes the following reproducibility issues:
https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20220810-ikgt3whb/packages/diff-html/
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/tools/perf?id=ee87a0841aa538ab7ad49cf5679ac5ea2682c909
>
> Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
> ---
> meta/recipes-kernel/perf/perf.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
> index 95e7eae9fe..4b15b11462 100644
> --- a/meta/recipes-kernel/perf/perf.bb
> +++ b/meta/recipes-kernel/perf/perf.bb
> @@ -13,7 +13,7 @@ PR = "r9"
>
> PACKAGECONFIG ??= "scripting tui libunwind"
> PACKAGECONFIG[dwarf] = ",NO_DWARF=1"
> -PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python3"
> +PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python3 python3-setuptools-native"
> # gui support was added with kernel 3.6.35
> # since 3.10 libnewt was replaced by slang
> # to cover a wide range of kernel we add both dependencies
> --
> 2.35.3
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#169185): https://lists.openembedded.org/g/openembedded-core/message/169185
> Mute This Topic: https://lists.openembedded.org/mt/92932047/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [oe][OE-core][Patch 1/1] perf: depend on setuptools if building python scripting
2022-08-11 9:01 ` Alexandre Belloni
@ 2022-08-11 10:47 ` Richard Purdie
0 siblings, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2022-08-11 10:47 UTC (permalink / raw)
To: alexandre.belloni, Max Krummenacher; +Cc: openembedded-core, Max Krummenacher
On Thu, 2022-08-11 at 11:01 +0200, Alexandre Belloni via
lists.openembedded.org wrote:
> Hello Max,
>
> On 10/08/2022 09:21:38+0200, Max Krummenacher wrote:
> > From: Max Krummenacher <max.krummenacher@toradex.com>
> >
> > Starting with kernel 5.19-rc7 perf changed from using distutils
> > to setuptools.
> > Add this to the dependencies to be prepared.
> >
>
> Unfortunately, this causes the following reproducibility issues:
> https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20220810-ikgt3whb/packages/diff-html/
>
>
> > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/tools/perf?id=ee87a0841aa538ab7ad49cf5679ac5ea2682c909
> >
> > Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
> > ---
> > meta/recipes-kernel/perf/perf.bb | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
> > index 95e7eae9fe..4b15b11462 100644
> > --- a/meta/recipes-kernel/perf/perf.bb
> > +++ b/meta/recipes-kernel/perf/perf.bb
> > @@ -13,7 +13,7 @@ PR = "r9"
> >
> > PACKAGECONFIG ??= "scripting tui libunwind"
> > PACKAGECONFIG[dwarf] = ",NO_DWARF=1"
> > -PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python3"
> > +PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python3 python3-setuptools-native"
> > # gui support was added with kernel 3.6.35
> > # since 3.10 libnewt was replaced by slang
> > # to cover a wide range of kernel we add both dependencies
> > --
> > 2.35.3
I think this needs something like:
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 4b15b114620..2fdb99361fa 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -203,7 +203,7 @@ do_configure:prepend () {
if [ -e "${S}/tools/perf/Makefile.perf" ]; then
sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \
${S}/tools/perf/Makefile.perf
- sed -i -e "s,prefix='\$(DESTDIR_SQ)/usr'$,prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \
+ sed -i -e "s,prefix='\$(DESTDIR_SQ)/usr'$,prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(PYTHON_SITEPACKAGES_DIR)' --root='\$(DESTDIR)',g" \
${S}/tools/perf/Makefile.perf
# backport https://github.com/torvalds/linux/commit/e4ffd066ff440a57097e9140fa9e16ceef905de8
sed -i -e 's,\($(Q)$(SHELL) .$(arch_errno_tbl).\) $(CC) $(arch_errno_hdr_dir),\1 $(firstword $(CC)) $(arch_errno_hdr_dir),g' \
to work with 5.19 but we also need to keep older versions working :/
Cheers,
Richard
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-08-11 10:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-10 7:21 [oe][OE-core][Patch 1/1] perf: depend on setuptools if building python scripting Max Krummenacher
2022-08-11 9:01 ` Alexandre Belloni
2022-08-11 10:47 ` Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).