Skip to contentSkip to conversation

kernel/kernel-yocto: 6.0 prep

PATCH In review [email protected] 4 participants 13 messages Oct 4, 2022 – Oct 11, 2022

lore
Share & tools
lore
#0 lore raw

cover kernel/kernel-yocto: 6.0 prep

From: Bruce Ashfield <[email protected]>

Richard,

This is the bump of linux-yocto-dev to 6.0, as part of the testing for core-image-kernel-dev, I ran into perf and lttng-modules issues.

The fixes are part of this series and are good for all kernels, and part of the dot updates to langdale if they miss.

Cheers,

Bruce

The following changes since commit bfb8626cc073b2b368ae7286fe6b0361398e4c7d:

build-appliance-image: Update to master head revision (2022-09-29 21:57:53 +0100)

are available in the Git repository at:

https://git.yoctoproject.org/poky-contrib zedd/kernel
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (3):
linux-yocto-dev: bump to v6.0+
perf: make scripting depend on setuptools3
lttng-modules: update to 2.13.7

 meta/recipes-kernel/linux/linux-yocto-dev.bb  |   4 +-
 .../lttng-modules/0001-fix-compaction.patch   |  68 ----------
 ...c-fix-tracepoint-mm_page_alloc_zone_.patch | 106 ---------------
 ...oduce-kfree_skb_reason-v5.15.58.v5.1.patch |  53 --------
 ...ags-parameter-from-aops-write_begin-.patch |  76 -----------
 ...Fix-type-of-cpu-in-trace-event-v5.19.patch | 124 ------------------
 .../0009-Rename-genhd-wrapper-to-blkdev.patch |  76 -----------
 ...ules_2.13.4.bb => lttng-modules_2.13.7.bb} |   8 +-
 meta/recipes-kernel/perf/perf.bb              |   2 +-
 9 files changed, 4 insertions(+), 513 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-compaction.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0009-Rename-genhd-wrapper-to-blkdev.patch
 rename meta/recipes-kernel/lttng/{lttng-modules_2.13.4.bb => lttng-modules_2.13.7.bb} (73%)
Signature · 1 line
2.19.1
#1 lore raw

PATCH 1/3 linux-yocto-dev: bump to v6.0+

From: Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto-dev.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/linux/linux-yocto-dev.bb +2 -2
index b1b57beac3..a79079e038 100644
@@ -16,7 +16,7 @@ inherit pkgconfig
 # provide this .inc to set specific revisions
 include recipes-kernel/linux/linux-yocto-dev-revisions.inc
 
-KBRANCH = "v5.19/standard/base"
+KBRANCH = "v6.0/standard/base"
 KMETA = "kernel-meta"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine \
@@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name
 SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}'
 SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}'
 
-LINUX_VERSION ?= "5.19+"
+LINUX_VERSION ?= "6.0"
 LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
Signature · 1 line
2.19.1
#2 lore raw

PATCH 2/3 perf: make scripting depend on setuptools3

In reply to [email protected]

From: Bruce Ashfield <[email protected]>

It looks like this should have been an error for a while, but it only started showing up in my 6.x linux-yocto-dev testing.

Without the inherit of setuptool3, we get a module missing error during configure and the build obviously fails.

Tested against 5.x and 6.x kernels.

---
 meta/recipes-kernel/perf/perf.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/perf/perf.bb +1 -1
index 31bc04635d..2591171eca 100644
@@ -48,7 +48,7 @@ PROVIDES = "virtual/perf"
 inherit linux-kernel-base kernel-arch manpages
 
 # needed for building the tools/perf Python bindings
-inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'python3targetconfig', '', d)}
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'python3targetconfig setuptools3', '', d)}
 inherit python3-dir
 export PYTHON_SITEPACKAGES_DIR
 
Signature · 1 line
2.19.1
#12 lore raw

PATCH 3/3 lttng-modules: update to 2.13.7

In reply to [email protected]

From: Bruce Ashfield <[email protected]>

Updating to the latest 2.13 -stable release of lttng-modules. This contains fixes needed to build against the 6.0+ kernel.

We also drop our backported patches as they are part of the release.

---
 .../lttng-modules/0001-fix-compaction.patch   |  68 ----------
 ...c-fix-tracepoint-mm_page_alloc_zone_.patch | 106 ---------------
 ...oduce-kfree_skb_reason-v5.15.58.v5.1.patch |  53 --------
 ...ags-parameter-from-aops-write_begin-.patch |  76 -----------
 ...Fix-type-of-cpu-in-trace-event-v5.19.patch | 124 ------------------
 .../0009-Rename-genhd-wrapper-to-blkdev.patch |  76 -----------
 ...ules_2.13.4.bb => lttng-modules_2.13.7.bb} |   8 +-
 7 files changed, 1 insertion(+), 510 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-compaction.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0009-Rename-genhd-wrapper-to-blkdev.patch
 rename meta/recipes-kernel/lttng/{lttng-modules_2.13.4.bb => lttng-modules_2.13.7.bb} (73%)
meta/recipes-kernel/lttng/lttng-modules/0001-fix-compaction.patch deleted +0 -68
deleted file mode 100644
index 21e27ffc5e..0000000000
@@ -1,68 +0,0 @@
-From 8e42c4821fb5f5cb816b6ddf73d9a13ba3298a63 Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <[email protected]>
-Date: Wed, 10 Aug 2022 11:07:14 -0400
-Subject: [PATCH] fix: tie compaction probe build to CONFIG_COMPACTION
-
-The definition of 'struct compact_control' in 'mm/internal.h' depends on
-CONFIG_COMPACTION being defined. Only build the compaction probe when
-this configuration option is enabled.
-
-Thanks to Bruce Ashfield <[email protected]> for reporting this
-issue.
-
-Upstream-Status: Backport [https://review.lttng.org/c/lttng-modules/+/8660]
-
-Change-Id: I81e77aa9c1bf10452c152d432fe5224df0db42c9
-Signed-off-by: Michael Jeanson <[email protected]>
----
- src/probes/Kbuild | 34 ++++++++++++++++++----------------
- 1 file changed, 18 insertions(+), 16 deletions(-)
-
-diff --git a/src/probes/Kbuild b/src/probes/Kbuild
-index 2908cf75..3e556b8e 100644
---- a/src/probes/Kbuild
-+++ b/src/probes/Kbuild
-@@ -167,22 +167,24 @@ ifneq ($(CONFIG_BTRFS_FS),)
-   endif # $(wildcard $(btrfs_dep))
- endif # CONFIG_BTRFS_FS
- 
--# A dependency on internal header 'mm/internal.h' was introduced in v5.18
--compaction_dep = $(srctree)/mm/internal.h
--compaction_dep_wildcard = $(wildcard $(compaction_dep))
--compaction_dep_check = $(shell \
--if [ \( $(VERSION) -ge 6 \
--   -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) -a \
--   -z "$(compaction_dep_wildcard)" ] ; then \
--  echo "warn" ; \
--else \
--  echo "ok" ; \
--fi ;)
--ifeq ($(compaction_dep_check),ok)
--  obj-$(CONFIG_LTTNG) += lttng-probe-compaction.o
--else
--  $(warning Files $(compaction_dep) not found. Probe "compaction" is disabled. Use full kernel source tree to enable it.)
--endif # $(wildcard $(compaction_dep))
-+ifneq ($(CONFIG_COMPACTION),)
-+  # A dependency on internal header 'mm/internal.h' was introduced in v5.18
-+  compaction_dep = $(srctree)/mm/internal.h
-+  compaction_dep_wildcard = $(wildcard $(compaction_dep))
-+  compaction_dep_check = $(shell \
-+  if [ \( $(VERSION) -ge 6 \
-+     -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) -a \
-+     -z "$(compaction_dep_wildcard)" ] ; then \
-+    echo "warn" ; \
-+  else \
-+    echo "ok" ; \
-+  fi ;)
-+  ifeq ($(compaction_dep_check),ok)
-+    obj-$(CONFIG_LTTNG) += lttng-probe-compaction.o
-+  else
-+    $(warning Files $(compaction_dep) not found. Probe "compaction" is disabled. Use full kernel source tree to enable it.)
-+  endif # $(wildcard $(compaction_dep))
-+endif # CONFIG_COMPACTION
- 
- ifneq ($(CONFIG_EXT4_FS),)
-   ext4_dep = $(srctree)/fs/ext4/*.h
--- 
-2.34.1
-
meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch deleted +0 -106

106 lines not on this page · raw message

meta/recipes-kernel/lttng/lttng-modules/0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch deleted +0 -53

53 lines not on this page · raw message

meta/recipes-kernel/lttng/lttng-modules/0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch deleted +0 -76

76 lines not on this page · raw message

meta/recipes-kernel/lttng/lttng-modules/0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch deleted +0 -124

124 lines not on this page · raw message

meta/recipes-kernel/lttng/lttng-modules/0009-Rename-genhd-wrapper-to-blkdev.patch deleted +0 -76

76 lines not on this page · raw message

meta/recipes-kernel/lttng/lttng-modules_2.13.7.bb renamed from meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb +1 -7
similarity index 73%
rename from meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb
rename to meta/recipes-kernel/lttng/lttng-modules_2.13.7.bb
index f60ab3b5f5..83b9b12e82 100644
@@ -10,18 +10,12 @@ inherit module
 include lttng-platforms.inc
 
 SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
-           file://0009-Rename-genhd-wrapper-to-blkdev.patch \
-           file://0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch \
-           file://0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch \
-           file://0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch \
-           file://0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch \
-           file://0001-fix-compaction.patch \
            "
 
 # Use :append here so that the patch is applied also when using devupstream
 SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch"
 
-SRC_URI[sha256sum] = "6159d00e4e1d59546eec8d4a67e1aa39c1084ceb5e5afeb666eab4b8a5b5a9ee"
+SRC_URI[sha256sum] = "5a99679df7903160cbde3918fee5af90ffafc90fc96ccdefaa57cf230492b234"
 
 export INSTALL_MOD_DIR="kernel/lttng-modules"
 
Signature · 1 line
2.19.1
#3 lore raw

Re: [OE-core] [PATCH 2/3] perf: make scripting depend on setuptools3

In reply to [email protected]

meta/recipes-kernel/perf/perf.bb PROVIDES = "virtual/perf" · line 51

Quoted 2 lines · Bruce Ashfield via lists.openembedded.org
meta/recipes-kernel/perf/perf.bb +1 -1
-inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'python3targetconfig', '', d)}
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'python3targetconfig setuptools3', '', d)}

For reasons, setuptools3-base does this:

RDEPENDS:${PN}:append:class-target = " ${PYTHON_PN}-core”

So buildhistory-diff says:

packages/qemuarm64-poky-linux/perf/perf: RDEPENDS: added "python3-core”

I’m guessing that isn’t what you meant.

Might be easier to :remove that RDEPENDS than faff around recreating the right dependencies.

Ross

#4 lore raw

Re: [OE-core] [PATCH 2/3] perf: make scripting depend on setuptools3

Quoted 7 lines · Ross Burton

meta/recipes-kernel/perf/perf.bb PROVIDES = "virtual/perf" · line 51

Quoted 2 lines · Bruce Ashfield via lists.openembedded.org
meta/recipes-kernel/perf/perf.bb +1 -1
-inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'python3targetconfig', '', d)}
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'python3targetconfig setuptools3', '', d)}

For reasons, setuptools3-base does this:

Quoted 8 lines

RDEPENDS:${PN}:append:class-target = " ${PYTHON_PN}-core”

So buildhistory-diff says:

packages/qemuarm64-poky-linux/perf/perf: RDEPENDS: added "python3-core”

I’m guessing that isn’t what you meant.

We do need the python support on the target when perf is installed. Isn't that what python-core provides ?

While it maybe wasn't a RDEPENDS before, it really should have been (if python-core does provide the runtime bits for target execution).

Quoted 1 line

Might be easier to :remove that RDEPENDS than faff around recreating the right dependencies.

I can definitely do that, but I just want to understand if we do .. or don't want python3-core appearing now.

Bruce

Quoted 2 lines

Ross

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
#5 lore raw

Re: [OE-core] [PATCH 2/3] perf: make scripting depend on setuptools3

Quoted 15 lines · Bruce Ashfield
Quoted 13 lines · Ross Burton

meta/recipes-kernel/perf/perf.bb PROVIDES = "virtual/perf" · line 51

Quoted 2 lines · Bruce Ashfield via lists.openembedded.org
meta/recipes-kernel/perf/perf.bb +1 -1
-inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'python3targetconfig', '', d)}
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'python3targetconfig setuptools3', '', d)}

For reasons, setuptools3-base does this:

RDEPENDS:${PN}:append:class-target = " ${PYTHON_PN}-core”

So buildhistory-diff says:

packages/qemuarm64-poky-linux/perf/perf: RDEPENDS: added "python3-core”

Quoted 8 lines
Quoted 2 lines

I’m guessing that isn’t what you meant.

We do need the python support on the target when perf is installed. Isn't that what python-core provides ?

While it maybe wasn't a RDEPENDS before, it really should have been (if python-core does provide the runtime bits for target execution).

Sure, but there’s a perf-python package that contains all of the python stuff, right? So the RDEPENDS should be there (and is already).

Ross

#6 lore raw

Re: [OE-core] [PATCH 2/3] perf: make scripting depend on setuptools3

Quoted 20 lines · Ross Burton
Quoted 18 lines · Bruce Ashfield
Quoted 15 lines · Ross Burton

meta/recipes-kernel/perf/perf.bb PROVIDES = "virtual/perf" · line 51

Quoted 2 lines · Bruce Ashfield via lists.openembedded.org
meta/recipes-kernel/perf/perf.bb +1 -1
-inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'python3targetconfig', '', d)}
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'python3targetconfig setuptools3', '', d)}

For reasons, setuptools3-base does this:

RDEPENDS:${PN}:append:class-target = " ${PYTHON_PN}-core”

So buildhistory-diff says:

packages/qemuarm64-poky-linux/perf/perf: RDEPENDS: added "python3-core”

I’m guessing that isn’t what you meant.

Quoted 7 lines
Quoted 5 lines

We do need the python support on the target when perf is installed. Isn't that what python-core provides ?

While it maybe wasn't a RDEPENDS before, it really should have been (if python-core does provide the runtime bits for target execution).

Sure, but there’s a perf-python package that contains all of the python stuff, right? So the RDEPENDS should be there (and is already).

Indeed, that's why it would have worked before.

I'm not particularly concerned if the extra RDEPENDS arrives with this, since if it is acceptable for other packages inheriting the setuptools (I thought it was build support only!), it really should be ok for perf as well. In particular since perf is debug/optional. Or am I missing something there ?

Bruce

Quoted 4 lines

Ross

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
#7 lore raw

Re: [OE-core] [PATCH 2/3] perf: make scripting depend on setuptools3

Quoted 5 lines · Bruce Ashfield

I'm not particularly concerned if the extra RDEPENDS arrives with this, since if it is acceptable for other packages inheriting the setuptools (I thought it was build support only!), it really should be ok for perf as well. In particular since perf is debug/optional. Or am I missing something there ?

With this change the base perf package will always runtime-depend on python3, even if perf-python isn’t installed. That sounds suboptimal.

Ross

#8 lore raw

Re: [OE-core] [PATCH 2/3] perf: make scripting depend on setuptools3

Quoted 10 lines · Ross Burton
Quoted 5 lines · Bruce Ashfield

I'm not particularly concerned if the extra RDEPENDS arrives with this, since if it is acceptable for other packages inheriting the setuptools (I thought it was build support only!), it really should be ok for perf as well. In particular since perf is debug/optional. Or am I missing something there ?

With this change the base perf package will always runtime-depend on python3, even if perf-python isn’t installed. That sounds suboptimal.

But is triggered on the 'scripting' packageconfig, which does mean we want the support, so it is at least somewhat conditional .. but yes, I agree that once we've built and packaged, it does make sense to keep the python dependencies in the dedicated package.

Let me re-work this and do the remove of the RDEPENDS and send a v2.

Bruce

Bruce

Quoted 1 line

Ross

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

#9 lore raw

RE: [OE-core] [PATCH 2/3] perf: make scripting depend on setuptools3

Quoted 23 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Bruce Ashfield
Sent: den 6 oktober 2022 16:02
To: Ross Burton <[email protected]>
Cc: Richard Purdie <[email protected]>; openembedded- [email protected]
Subject: Re: [OE-core] [PATCH 2/3] perf: make scripting depend on setuptools3

Quoted 11 lines · Ross Burton
Quoted 5 lines · Bruce Ashfield

I'm not particularly concerned if the extra RDEPENDS arrives with this, since if it is acceptable for other packages inheriting the setuptools (I thought it was build support only!), it really should be ok for perf as well. In particular since perf is debug/optional. Or am I missing something there ?

With this change the base perf package will always runtime-depend on python3, even if perf-python isn’t installed. That sounds suboptimal.

Quoted 10 lines

But is triggered on the 'scripting' packageconfig, which does mean we want the support, so it is at least somewhat conditional .. but yes, I agree that once we've built and packaged, it does make sense to keep the python dependencies in the dedicated package.

Let me re-work this and do the remove of the RDEPENDS and send a v2.

Bruce

Quoted 1 line

Ross

To me it sounds as what setuptools3-base.bbclass really should to is something like:

FOOBAR ??= "${PN}" RDEPENDS:${FOOBAR}:append:class-target = " ${PYTHON_PN}-core"
...
FILES:${FOOBAR} += "${libdir}/* ${libdir}/${PYTHON_DIR}/*"

so that the typical Python only recipes continue to just inherit setuptools3, but recipes that produce other packages than the Python package can do something like:

FOOBAR = "${PYTHON_PN}-${PN}"

Unfortunately this does not work as it results in a gazillion warnings like:

WARNING: .../meta-oe/recipes-support/libiio/libiio_git.bb: Variable key FILES:${PN}-${PYTHON_PN} (${PYTHON_SITEPACKAGES_DIR}) replaces original key FILES:libiio-python3 ( ${libdir}/* ${libdir}/${PYTHON_DIR}/*).
WARNING: .../meta-oe/recipes-support/libiio/libiio_git.bb: Variable key RDEPENDS:${PN}-${PYTHON_PN} (${PN} ${PYTHON_PN}-ctypes ${PYTHON_PN}-stringold ${PYTHON_PN}-core) replaces original key RDEPENDS:libiio-python3 ( ${PYTHON_PN}-core).

(I chose libiio as it is an example of another recipes that currently does RDEPENDS:${PN}:remove = "${PYTHON_PN}-core" to counteract what setuptools3-base.bbclass does).

:(

//Peter

#10 lore raw

Re: [OE-core] [PATCH 2/3] perf: make scripting depend on setuptools3

Quoted 52 lines · Peter Kjellerstedt
Quoted 24 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Bruce Ashfield
Sent: den 6 oktober 2022 16:02
To: Ross Burton <[email protected]>
Cc: Richard Purdie <[email protected]>; openembedded- [email protected]
Subject: Re: [OE-core] [PATCH 2/3] perf: make scripting depend on setuptools3

Quoted 11 lines · Ross Burton
Quoted 5 lines · Bruce Ashfield

I'm not particularly concerned if the extra RDEPENDS arrives with this, since if it is acceptable for other packages inheriting the setuptools (I thought it was build support only!), it really should be ok for perf as well. In particular since perf is debug/optional. Or am I missing something there ?

With this change the base perf package will always runtime-depend on python3, even if perf-python isn’t installed. That sounds suboptimal.

Quoted 10 lines

But is triggered on the 'scripting' packageconfig, which does mean we want the support, so it is at least somewhat conditional .. but yes, I agree that once we've built and packaged, it does make sense to keep the python dependencies in the dedicated package.

Let me re-work this and do the remove of the RDEPENDS and send a v2.

Bruce

Quoted 1 line

Ross

To me it sounds as what setuptools3-base.bbclass really should to is something like:

FOOBAR ??= "${PN}" RDEPENDS:${FOOBAR}:append:class-target = " ${PYTHON_PN}-core"
...
FILES:${FOOBAR} += "${libdir}/* ${libdir}/${PYTHON_DIR}/*"

so that the typical Python only recipes continue to just inherit setuptools3, but recipes that produce other packages than the Python package can do something like:

FOOBAR = "${PYTHON_PN}-${PN}"

Unfortunately this does not work as it results in a gazillion warnings like:

Quoted 7 lines

WARNING: .../meta-oe/recipes-support/libiio/libiio_git.bb: Variable key FILES:${PN}-${PYTHON_PN} (${PYTHON_SITEPACKAGES_DIR}) replaces original key FILES:libiio-python3 ( ${libdir}/* ${libdir}/${PYTHON_DIR}/*).
WARNING: .../meta-oe/recipes-support/libiio/libiio_git.bb: Variable key RDEPENDS:${PN}-${PYTHON_PN} (${PN} ${PYTHON_PN}-ctypes ${PYTHON_PN}-stringold ${PYTHON_PN}-core) replaces original key RDEPENDS:libiio-python3 ( ${PYTHON_PN}-core).

(I chose libiio as it is an example of another recipes that currently does RDEPENDS:${PN}:remove = "${PYTHON_PN}-core" to counteract what setuptools3-base.bbclass does).

Ran into this today too. I think you dont need all the bells and whistles of setuptools3 class. Adding

DEPENDS += "python3-setuptools-native"

should get the job done.

Quoted 13 lines

:(

//Peter

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171527): https://lists.openembedded.org/g/openembedded-core/message/171527
Mute This Topic: https://lists.openembedded.org/mt/94118767/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#11 lore raw

Re: [OE-core] [PATCH 2/3] perf: make scripting depend on setuptools3

Quoted 72 lines · Khem Raj
Quoted 12 lines · Peter Kjellerstedt
Quoted 12 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Bruce Ashfield
Sent: den 6 oktober 2022 16:02
To: Ross Burton <[email protected]>
Cc: Richard Purdie <[email protected]>; openembedded- [email protected]
Subject: Re: [OE-core] [PATCH 2/3] perf: make scripting depend on setuptools3

On Thu, Oct 6, 2022 at 9:43 AM Ross Burton <[email protected]>

Quoted 2 lines · wrote:
Quoted 2 lines
Quoted 2 lines

On 6 Oct 2022, at 14:29, Bruce Ashfield <[email protected]>

Quoted 3 lines · wrote:
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

I'm not particularly concerned if the extra RDEPENDS arrives with this, since if it is acceptable for other packages inheriting the setuptools (I thought it was build support only!), it really

should be

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

ok for perf as well. In particular since perf is debug/optional.

Or am

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 1 line

I missing something there ?

With this change the base perf package will always runtime-depend on python3, even if perf-python isn’t installed. That sounds

suboptimal.

Quoted 25 lines
Quoted 12 lines
Quoted 1 line

But is triggered on the 'scripting' packageconfig, which does mean we want the support, so it is at least somewhat conditional .. but yes, I agree that once we've built and packaged, it does make sense to keep the python dependencies in the dedicated package.

Let me re-work this and do the remove of the RDEPENDS and send a v2.

Bruce

Quoted 1 line

Ross

To me it sounds as what setuptools3-base.bbclass really should to is something like:

FOOBAR ??= "${PN}" RDEPENDS:${FOOBAR}:append:class-target = " ${PYTHON_PN}-core"
...
FILES:${FOOBAR} += "${libdir}/* ${libdir}/${PYTHON_DIR}/*"

so that the typical Python only recipes continue to just inherit setuptools3, but recipes that produce other packages than the Python package can do something like:

Quoted 6 lines

FOOBAR = "${PYTHON_PN}-${PN}"

Unfortunately this does not work as it results in a gazillion warnings like:

WARNING: .../meta-oe/recipes-support/libiio/libiio_git.bb: Variable key

FILES:${PN}-${PYTHON_PN} (${PYTHON_SITEPACKAGES_DIR}) replaces original key FILES:libiio-python3 ( ${libdir}/* ${libdir}/${PYTHON_DIR}/*).

Quoted 1 line

WARNING: .../meta-oe/recipes-support/libiio/libiio_git.bb: Variable key

RDEPENDS:${PN}-${PYTHON_PN} (${PN} ${PYTHON_PN}-ctypes ${PYTHON_PN}-stringold ${PYTHON_PN}-core) replaces original key RDEPENDS:libiio-python3 ( ${PYTHON_PN}-core).

Quoted 5 lines

(I chose libiio as it is an example of another recipes that currently does RDEPENDS:${PN}:remove = "${PYTHON_PN}-core" to counteract what setuptools3-base.bbclass does).

Quoted 7 lines

Ran into this today too. I think you dont need all the bells and whistles of setuptools3 class. Adding

DEPENDS += "python3-setuptools-native"

should get the job done.

Aha. I read this after your patch email.

Worth trying this, it may clear up the AB issue we are seeing!

Bruce

Quoted 17 lines
Quoted 9 lines

:(

//Peter

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#171527):

https://lists.openembedded.org/g/openembedded-core/message/171527

Quoted 3 lines

Mute This Topic: https://lists.openembedded.org/mt/94118767/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [

[email protected]]

Quoted 2 lines

-=-=-=-=-=-=-=-=-=-=-=-

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II