Message ID | 20220810072138.2440138-1-max.oss.09@gmail.com |
---|---|
State | New |
Headers | show |
Series | [oe,1/1] perf: depend on setuptools if building python scripting | expand |
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] > -=-=-=-=-=-=-=-=-=-=-=- >
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
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