[OE-core] [PATCH 2/2] libcap-ng-python: upgrade 0.8.4 -> 0.8.5
Changelog:
https://people.redhat.com/sgrubb/libcap-ng/ChangeLog
- Remove python global exception handler since it's deprecated
- Make the utilities link against just built libraries
- Remove unused macro in cap-ng.h
Signed-off-by: Yi Zhao
---
.../{libcap-ng-python_0.8.4.bb => libcap-ng-python_0.8.5.bb} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta/recipes-support/libcap-ng/{libcap-ng-python_0.8.4.bb =>
libcap-ng-python_0.8.5.bb} (100%)
diff --git a/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.4.bb
b/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.5.bb
similarity index 100%
rename from meta/recipes-support/libcap-ng/libcap-ng-python_0.8.4.bb
rename to meta/recipes-support/libcap-ng/libcap-ng-python_0.8.5.bb
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199536):
https://lists.openembedded.org/g/openembedded-core/message/199536
Mute This Topic: https://lists.openembedded.org/mt/106169198/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/2] libcap-ng: upgrade 0.8.4 -> 0.8.5
Changelog:
https://people.redhat.com/sgrubb/libcap-ng/ChangeLog
- Remove python global exception handler since it's deprecated
- Make the utilities link against just built libraries
- Remove unused macro in cap-ng.h
Drop backport patch fix-issues-with-swig-4-2.patch.
Backport a patch to fix build for libcap-ng-python.
Signed-off-by: Yi Zhao
---
...hon-path-when-invoking-py-compile-54.patch | 34 +++
.../files/fix-issues-with-swig-4-2.patch | 32 -
meta/recipes-support/libcap-ng/libcap-ng.inc | 4 +--
...{libcap-ng_0.8.4.bb => libcap-ng_0.8.5.bb} | 0
4 files changed, 36 insertions(+), 34 deletions(-)
create mode 100644
meta/recipes-support/libcap-ng/files/0001-Fix-python-path-when-invoking-py-compile-54.patch
delete mode 100644
meta/recipes-support/libcap-ng/files/fix-issues-with-swig-4-2.patch
rename meta/recipes-support/libcap-ng/{libcap-ng_0.8.4.bb =>
libcap-ng_0.8.5.bb} (100%)
diff --git
a/meta/recipes-support/libcap-ng/files/0001-Fix-python-path-when-invoking-py-compile-54.patch
b/meta/recipes-support/libcap-ng/files/0001-Fix-python-path-when-invoking-py-compile-54.patch
new file mode 100644
index 00..a0452ad53d
--- /dev/null
+++
b/meta/recipes-support/libcap-ng/files/0001-Fix-python-path-when-invoking-py-compile-54.patch
@@ -0,0 +1,34 @@
+From 1fe7c1cfeea00ba4eb903fbb39b74361594d4835 Mon Sep 17 00:00:00 2001
+From: Jan Palus
+Date: Wed, 10 Apr 2024 21:30:51 +0200
+Subject: [PATCH] Fix python path when invoking py-compile (#54)
+
+48eebb2 replaced custom PYTHON3 variable with PYTHON by using standard
+AM_PATH_PYTHON macro. Makefile however still referred to old one.
+There's no need to set PYTHON explicitly anymore so drop it.
+
+Fixes #53
+
+Upstream-Status: Backport
+[https://github.com/stevegrubb/libcap-ng/commit/1fe7c1cfeea00ba4eb903fbb39b74361594d4835]
+
+Signed-off-by: Yi Zhao
+---
+ bindings/python3/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/bindings/python3/Makefile.am b/bindings/python3/Makefile.am
+index 70a1dd8..6072fc2 100644
+--- a/bindings/python3/Makefile.am
b/bindings/python3/Makefile.am
+@@ -27,7 +27,6 @@ AM_CPPFLAGS = -I. -I$(top_builddir) $(PYTHON3_INCLUDES)
+ LIBS = ${top_builddir}/src/libcap-ng.la
+ SWIG_FLAGS = -python
+ SWIG_INCLUDES = ${AM_CPPFLAGS}
+-PYTHON = $(PYTHON3)
+ pyexec_PYTHON = capng.py
+ pyexec_LTLIBRARIES = _capng.la
+ pyexec_SOLIBRARIES = _capng.so
+--
+2.25.1
+
diff --git
a/meta/recipes-support/libcap-ng/files/fix-issues-with-swig-4-2.patch
b/meta/recipes-support/libcap-ng/files/fix-issues-with-swig-4-2.patch
deleted file mode 100644
index fb424fe725..00
--- a/meta/recipes-support/libcap-ng/files/fix-issues-with-swig-4-2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 355eada2d20886287cffc16e304087dd6f66ae37 Mon Sep 17 00:00:00 2001
-From: Steve Grubb
-Date: Thu, 4 Jan 2024 15:06:29 -0500
-Subject: [PATCH] Remove python global exception handler since its deprecated
-
-Upstream-Status: Backport
[https://github.com/stevegrubb/libcap-ng/commit/30453b6553948cd05c438f9f509013e3bb84f25b]
-Signed-off-by: Anuj Mittal
- bindings/src/capng_swig.i | 7 ---
- 1 file changed, 7 deletions(-)
-
-diff --git a/bindings/src/capng_swig.i b/bindings/src/capng_swig.i
-index fcdaf18..fa85e13 100644
a/bindings/src/capng_swig.i
-+++ b/bindings/src/capng_swig.i
-@@ -30,13 +30,6 @@
-
- %varargs(16, signed capability = 0) capng_updatev;
-
--%except(python) {
-- $action
-- if (result < 0) {
--PyErr_SetFromErrno(PyExc_OSError);
--return NULL;
-- }
--}
- #endif
-
- %define __signed__
---
-2.43.2
-
diff --git a/meta/recipes-support/libcap-ng/libcap-ng.inc
b/meta/recipes-support/libcap-ng/libcap-ng.inc
index 845b7c2f0a..12b4002d11 100644
--- a/meta/recipes-support/libcap-ng/libcap-ng.inc
+++ b/meta/recipes-support/libcap-ng/libcap-ng.inc
@@ -8,10 +8,10 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
SRC_URI = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \
- file://fix-issues-with-swig-4-2.patch \
+ file://0001-Fix-python-path-when-invoking-py-compile-54.patch \
"
-SRC_URI[sha256sum] =
"68581d3b38e7553cb6f6ddf7813b1fc99e52856f21421f7b477ce5abd2605a8a"
+SRC_URI[sha256sum] =
"3ba5294d1cbdfa98afaacfbc00b6af9ed2b83e8a21817185dfd844cc8c7ac6ff"
EXTRA_OECONF:append:class-target = "
--with-capability_header=${STAGING_INCDIR}/linux/capability.h"
EXTRA_OECONF:append:class-nativesdk = "
--with-capability_header=${STAGING_INCDIR}/linux/capability.h"
diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.8.4.bb
b/meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb
similarity index 100%
rename from meta/recipes-support/libcap-ng/libcap-ng_0.8.4.bb
rename to meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply
Re: [OE-core] [PATCH] python3-requests: cleanup RDEPENDS
To continue fixing https://lists.openembedded.org/g/openembedded-core/message/199250 I'm now using a personal email instead my work email (I'm not being paid for this anyway :) ). I suspect the problem is I was sending the patch as an attachment. That should be fixed now and the patch content should be inline, at least it appears that way in my own email inbox. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199532): https://lists.openembedded.org/g/openembedded-core/message/199532 Mute This Topic: https://lists.openembedded.org/mt/106168861/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] python3-requests: cleanup RDEPENDS
Drop the following dependencies from RDEPENDS:
- python3-ndg-httpsclient
- python3-pyasn1
- python3-pyopenssl
Add a missing dependency into RDEPENDS:
- python3-certifi
Additional fix HOMEPAGE, the old link doesn't work
Signed-off-by: Guðni Már Gilbert
---
meta/recipes-devtools/python/python3-requests_2.31.0.bb | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/python/python3-requests_2.31.0.bb
b/meta/recipes-devtools/python/python3-requests_2.31.0.bb
index df48cd54c3..287b4f8eee 100644
--- a/meta/recipes-devtools/python/python3-requests_2.31.0.bb
+++ b/meta/recipes-devtools/python/python3-requests_2.31.0.bb
@@ -1,5 +1,5 @@
SUMMARY = "Python HTTP for Humans."
-HOMEPAGE = "http://python-requests.org;
+HOMEPAGE = "https://requests.readthedocs.io;
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
@@ -8,12 +8,10 @@ SRC_URI[sha256sum] =
"942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd
inherit pypi setuptools3
RDEPENDS:${PN} += " \
+python3-certifi \
python3-email \
python3-json \
-python3-ndg-httpsclient \
python3-netserver \
-python3-pyasn1 \
-python3-pyopenssl \
python3-pysocks \
python3-urllib3 \
python3-chardet \
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199531):
https://lists.openembedded.org/g/openembedded-core/message/199531
Mute This Topic: https://lists.openembedded.org/mt/106168861/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 3/5] ninja: build modified version with GNU Make jobserver support
Hi Randy, On Mon, 2024-04-08 at 17:39 -0400, Randy MacLeod wrote: > On 2024-04-03 3:08 p.m., Martin Hundebøll wrote: > > On Wed, 2024-04-03 at 17:58 +0200, Alexander Kanavin wrote: > > > We can't carry this mass of patches. It has to land upstream > > > first. > > > > > Understandable. > > > > > > Are you able/willing to drive the upstream pull request to > > > completion? > > > > > No, I don't think so. I'm not familiar with the ninja codebase, and > > the > > pull requests has been lingering for too long. > > > > Another option might be to propose adding the fifo feature to the > > kitware fork of ninja: > > https://github.com/Kitware/ninja > > > > They have forked ninja to get the jobserver feature in, but haven't > > taken the fifo part so far. > > > > The kitware fork is also used by buildroot: > > https://gitlab.com/buildroot.org/buildroot/-/blob/master/package/ninja/ninja.mk > > > I see that v2 has switched to kitware, which is fine in the short > run. > > I'm just back from vacation. I plan to test this patchset out. > > I can spend some time convincing upstream ninja that a solution is > needed for our use-case and > that perhaps the jobsever approach and the kitware fork is a good > starting point. > > Of course, I can't promise to "drive it to completion" but I'll > hound the upstream devs for months or even years! > > Thanks for re-submitting the patchset Martin! > I got hit by a strike of motivation and submitted a new attempt on jobserver support to ninja: https://github.com/ninja-build/ninja/pull/2450 First review from the ninja maintainer seems positive. I'll resubmit the my patchset to OE once the ninja PR is (hopefully) merged. // Martin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199530): https://lists.openembedded.org/g/openembedded-core/message/199530 Mute This Topic: https://lists.openembedded.org/mt/105304230/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v9 0/3] pkg-database and systemd-sysext image
Hoi Alexandre, is there a way to get more output out of the autobuilder? the logs only tell "that" the test failed, not "why" = which assertion was missed if i run the test locally with the differing variables set like this: #> SDKMACHINE=aarch64 MACHINE=qemuarm64 oe-selftest --verbose -r imagefeatures.ImageFeatures.test_image_gen_pkgdbfs_ipk it succeeds :-S ... ideas/thoughts? gruß Johannes From: Alexandre Belloni Sent: Friday, May 17, 2024 20:33 To: SCHNEIDER Johannes Cc: openembedded-core@lists.openembedded.org; richard.pur...@linuxfoundation.org; alex.kana...@gmail.com Subject: Re: [OE-core] [PATCH v9 0/3] pkg-database and systemd-sysext image This email is not from Hexagon’s Office 365 instance. Please be careful while clicking links, opening attachments, or replying to this email. Hello, deb and rpm seem successful but ipk still fails: https://autobuilder.yoctoproject.org/typhoon/#/builders/127/builds/3335/steps/14/logs/stdio On 16/05/2024 00:34:57+0200, Johannes Schneider via lists.openembedded.org wrote: > systemd-sysext allows to overlay another image (or multiple) ontop of > a "base-image" = the current rootfs, via the use of overlayfs; to add > tools and features meant for development purposes. > > To quote the documentation on systemd-sysext: > " ...addition in order to make debugging/development easier). System > extension images should not be misunderstood as a generic software > packaging framework, ..." > > To build a lean image, that only holds packages that are not already > part of the base-image, a snapshot of the package-database is taken > after the installation of the base-rootfs is done, and picked up again > when collecting the rootfs of such a extension image. > > with all this in place an example usage could look like this: > some-core-image.bb > inherit core-image > IMAGE_GEN_PKGDBFS = "1" > > extending-image.bb > inherit image-sysext > IMAGE_FSTYPES = "squashfs" > IMAGE_BASE_PKGDB = "some-core-image" > # the above pointing at a package-db similar to: > # > build/deploy/images/$MACHINE/some-core-image-$MACHINE-20240210172305-pkgdb.rootfs.tar.gz > > then on the device, running some-core-image, with the extension image placed > at FN: > $> ln -s "$FN" /run/extensions/$(basename $FN).raw > $> systemd-sysext list > $> SYSTEMD_LOG_LEVEL=debug systemd-sysext merge > > As long as the VERSION_ID of the extension image matches the os-release > in the base image, the above commands return sucessfully; > for details on the compativility check see the docs for systemd-sysext. > > = > > changes with v2: > rebase from 'kirkstone' onto 'master' > > changes with v3: > incorporate review suggestions for simplification > add task dependency handling > add oe-selftest for the pkgdb handling > add variable documentation and > some more comments, and examples in the commit-msg > > changes with v4: > rebase onto 'master' => no functional changes > fixed patchtest findings > > changes with v5: > rebase onto 'master' > add '.sysext' to the deployed symlink name > sidenote on the tests and autobuilder failure: run locally they > succeed, e.g.: > #> oe-selftest --verbose -r > imagefeatures.ImageFeatures.test_image_gen_pkgdbfs > > changes with v6: > tests: restructure to call 'bitbake' only once in the testcase itself > (in hopes of solving the autobuilder problem; local test runs succeed) > > changes with v7: > tests: undo the restructuring of done in v6, in favour of explicitly > forcing steps: > '-c rootfs -f'. since concurrency of the autobuilder, and reusing > artifacts/sstate-caching is probably the issue? > > changes with v8: > tests: fixed missing feature=PACKAGE_CLASSES during > 'test_image_gen_pkgdbfs' > which is now split into three, one for each of the three available > packagemanager: ipk, deb, rpm > > changes with v9: > tests: fix singular failure in 'oe-selftest-armhost' > which was due to the built image not containing a 'kernel-image...', > which the gen-pkgdb sanity > check expected, but 'packagegroup-core-boot' instead > > > -- Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com/ -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199529): https://lists.openembedded.org/g/openembedded-core/message/199529 Mute This Topic: https://lists.openembedded.org/mt/106124365/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] python3-cryptography: upgrade 42.0.5 -> 42.0.7
From: Tim Orling
Also upgrade python3-cryptography-vectors
Refresh python3-cryptography-crates.inc
42.0.7 - 2024-05-06
Restored Windows 7 compatibility for our pre-built wheels. Note that we
do not test on Windows 7 and wheels for our next release will not support
it. Microsoft no longer provides support for Windows 7 and users are
encouraged to upgrade.
42.0.6 - 2024-05-04
Fixed compilation when using LibreSSL 3.9.1.
https://cryptography.io/en/latest/changelog/#v42-0-7
https://cryptography.io/en/latest/changelog/#v42-0-6
https://github.com/pyca/cryptography/compare/42.0.5...42.0.7
Signed-off-by: Tim Orling
---
Tested with core-image-ptest-python3-cryptography on qemux86-64
.../python/python3-cryptography-crates.inc| 8
...s_42.0.5.bb => python3-cryptography-vectors_42.0.7.bb} | 2 +-
...1-pyproject.toml-remove-benchmark-disable-option.patch | 7 ++-
...ptography_42.0.5.bb => python3-cryptography_42.0.7.bb} | 2 +-
4 files changed, 8 insertions(+), 11 deletions(-)
rename meta/recipes-devtools/python/{python3-cryptography-vectors_42.0.5.bb =>
python3-cryptography-vectors_42.0.7.bb} (91%)
rename meta/recipes-devtools/python/{python3-cryptography_42.0.5.bb =>
python3-cryptography_42.0.7.bb} (95%)
diff --git a/meta/recipes-devtools/python/python3-cryptography-crates.inc
b/meta/recipes-devtools/python/python3-cryptography-crates.inc
index b26e22b70c3..dbeda05dc45 100644
--- a/meta/recipes-devtools/python/python3-cryptography-crates.inc
+++ b/meta/recipes-devtools/python/python3-cryptography-crates.inc
@@ -18,9 +18,9 @@ SRC_URI += " \
crate://crates.io/lock_api/0.4.11 \
crate://crates.io/memoffset/0.9.0 \
crate://crates.io/once_cell/1.19.0 \
-crate://crates.io/openssl/0.10.63 \
+crate://crates.io/openssl/0.10.64 \
crate://crates.io/openssl-macros/0.1.1 \
-crate://crates.io/openssl-sys/0.9.99 \
+crate://crates.io/openssl-sys/0.9.102 \
crate://crates.io/parking_lot/0.12.1 \
crate://crates.io/parking_lot_core/0.9.9 \
crate://crates.io/pem/3.0.3 \
@@ -68,9 +68,9 @@ SRC_URI[libc-0.2.152.sha256sum] =
"13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb0
SRC_URI[lock_api-0.4.11.sha256sum] =
"3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
SRC_URI[memoffset-0.9.0.sha256sum] =
"5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
SRC_URI[once_cell-1.19.0.sha256sum] =
"3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-SRC_URI[openssl-0.10.63.sha256sum] =
"15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8"
+SRC_URI[openssl-0.10.64.sha256sum] =
"95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
SRC_URI[openssl-macros-0.1.1.sha256sum] =
"a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-SRC_URI[openssl-sys-0.9.99.sha256sum] =
"22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae"
+SRC_URI[openssl-sys-0.9.102.sha256sum] =
"c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
SRC_URI[parking_lot-0.12.1.sha256sum] =
"3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
SRC_URI[parking_lot_core-0.9.9.sha256sum] =
"4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
SRC_URI[pem-3.0.3.sha256sum] =
"1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310"
diff --git
a/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.5.bb
b/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.7.bb
similarity index 91%
rename from meta/recipes-devtools/python/python3-cryptography-vectors_42.0.5.bb
rename to meta/recipes-devtools/python/python3-cryptography-vectors_42.0.7.bb
index ee522af08e6..9a025a530ce 100644
--- a/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.5.bb
+++ b/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.7.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \
# NOTE: Make sure to keep this recipe at the same version as
python3-cryptography
# Upgrade both recipes at the same time
-SRC_URI[sha256sum] =
"505cd5e3b0cb32da1526f07042b7fc38a4b6c356710cb73d2b5f76b037a38ed1"
+SRC_URI[sha256sum] =
"8294c632dbe2cb14c7b7e24219560e674bc2224dfc4bed577ab077dbb82bfa3c"
PYPI_PACKAGE = "cryptography_vectors"
diff --git
a/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch
b/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch
index f9c8d1393d2..ec4bfcc98bd 100644
---
a/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch
+++
b/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch
@@ -1,4 +1,4 @@
-From b7dd3ce1d75d1e6255e1aca82aa7f401d4246a75 Mon Sep 17 00:00:00 2001
+From 18d78736f5c39784d5151b08fdfdd21c61225686 Mon Sep 17 00:00:00 2001
From: Mingli Yu
Re: [OE-core] [PATCH v9 0/3] pkg-database and systemd-sysext image
Hello, deb and rpm seem successful but ipk still fails: https://autobuilder.yoctoproject.org/typhoon/#/builders/127/builds/3335/steps/14/logs/stdio On 16/05/2024 00:34:57+0200, Johannes Schneider via lists.openembedded.org wrote: > systemd-sysext allows to overlay another image (or multiple) ontop of > a "base-image" = the current rootfs, via the use of overlayfs; to add > tools and features meant for development purposes. > > To quote the documentation on systemd-sysext: > " ...addition in order to make debugging/development easier). System > extension images should not be misunderstood as a generic software > packaging framework, ..." > > To build a lean image, that only holds packages that are not already > part of the base-image, a snapshot of the package-database is taken > after the installation of the base-rootfs is done, and picked up again > when collecting the rootfs of such a extension image. > > with all this in place an example usage could look like this: > some-core-image.bb > inherit core-image > IMAGE_GEN_PKGDBFS = "1" > > extending-image.bb > inherit image-sysext > IMAGE_FSTYPES = "squashfs" > IMAGE_BASE_PKGDB = "some-core-image" > # the above pointing at a package-db similar to: > # > build/deploy/images/$MACHINE/some-core-image-$MACHINE-20240210172305-pkgdb.rootfs.tar.gz > > then on the device, running some-core-image, with the extension image placed > at FN: > $> ln -s "$FN" /run/extensions/$(basename $FN).raw > $> systemd-sysext list > $> SYSTEMD_LOG_LEVEL=debug systemd-sysext merge > > As long as the VERSION_ID of the extension image matches the os-release > in the base image, the above commands return sucessfully; > for details on the compativility check see the docs for systemd-sysext. > > = > > changes with v2: > rebase from 'kirkstone' onto 'master' > > changes with v3: > incorporate review suggestions for simplification > add task dependency handling > add oe-selftest for the pkgdb handling > add variable documentation and > some more comments, and examples in the commit-msg > > changes with v4: > rebase onto 'master' => no functional changes > fixed patchtest findings > > changes with v5: > rebase onto 'master' > add '.sysext' to the deployed symlink name > sidenote on the tests and autobuilder failure: run locally they > succeed, e.g.: > #> oe-selftest --verbose -r > imagefeatures.ImageFeatures.test_image_gen_pkgdbfs > > changes with v6: > tests: restructure to call 'bitbake' only once in the testcase itself > (in hopes of solving the autobuilder problem; local test runs succeed) > > changes with v7: > tests: undo the restructuring of done in v6, in favour of explicitly > forcing steps: > '-c rootfs -f'. since concurrency of the autobuilder, and reusing > artifacts/sstate-caching is probably the issue? > > changes with v8: > tests: fixed missing feature=PACKAGE_CLASSES during > 'test_image_gen_pkgdbfs' > which is now split into three, one for each of the three available > packagemanager: ipk, deb, rpm > > changes with v9: > tests: fix singular failure in 'oe-selftest-armhost' > which was due to the built image not containing a 'kernel-image...', > which the gen-pkgdb sanity > check expected, but 'packagegroup-core-boot' instead > > > -- Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199526): https://lists.openembedded.org/g/openembedded-core/message/199526 Mute This Topic: https://lists.openembedded.org/mt/106124365/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] binutils: stable 2.42 branch updates.
lgtm
On Fri, May 17, 2024 at 9:14 AM wrote:
>
> From: Sundeep KOKKONDA
>
> Below commits on binutils-2.42 stable branch are updated.
> 6224493e457 Re: PR26978, Inconsistency for strong foo@v1 and weak foo@@v1
> d125f967537 hppa: Implement PA 2.0 symbolic relocations for long displacements
> 884fb5373a1 x86/APX: Remove KEYLOCKER and SHA promotions from EVEX MAP4
> d816fda3cbd aarch64: Remove B16B16, SVE2p1 and SME2p1
> cb11047e34a Re: Move bfd_init to bfd.c
> 818bcf40efb print cached error messages using _bfd_error_handler
> 831be495ef1 aarch64: Fix the 2nd operand in gcsstr and gcssttr instructions.
>
> Signed-off-by: Sundeep KOKKONDA
> ---
> meta/recipes-devtools/binutils/binutils-2.42.inc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/binutils/binutils-2.42.inc
> b/meta/recipes-devtools/binutils/binutils-2.42.inc
> index 3b6f47d4ce..b4d273c9c3 100644
> --- a/meta/recipes-devtools/binutils/binutils-2.42.inc
> +++ b/meta/recipes-devtools/binutils/binutils-2.42.inc
> @@ -20,7 +20,7 @@ UPSTREAM_CHECK_GITTAGREGEX =
> "binutils-(?P\d+_(\d_?)*)"
>
> CVE_STATUS[CVE-2023-25584] = "cpe-incorrect: Applies only for version 2.40
> and earlier"
>
> -SRCREV ?= "553c7f61b74badf91df484450944675efd9cd485"
> +SRCREV ?= "73b22b4481e85635eb978585f405c4433bcc0174"
> BINUTILS_GIT_URI ?=
> "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=https"
> SRC_URI = "\
> ${BINUTILS_GIT_URI} \
> --
> 2.43.0
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199524):
https://lists.openembedded.org/g/openembedded-core/message/199524
Mute This Topic: https://lists.openembedded.org/mt/106156744/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] glibc: stable 2.39 branch updates.
Regression testing is done and below are the results: Before glibc update: - Recipe | Passed | Failed | Skipped | - glibc | 5041 | 123 | 156 | glibc-user | 4854 | 239 | 227 | - After glibc update: - Recipe | Passed | Failed | Skipped | - glibc | 5043 | 123 | 156 | glibc-user | 4863 | 232 | 227 | - ptest shows below tests as failed after glibc update: tst-robustpi7, tst-tsearch, tst-dynarray-fail-mem, tst-loading, mtrace-tst-loading -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199521): https://lists.openembedded.org/g/openembedded-core/message/199521 Mute This Topic: https://lists.openembedded.org/mt/106156801/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] binutils: stable 2.42 branch updates.
Regression testing is done and no regressions found. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199519): https://lists.openembedded.org/g/openembedded-core/message/199519 Mute This Topic: https://lists.openembedded.org/mt/106156744/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] glibc: stable 2.39 branch updates.
From: Sundeep KOKKONDA Below commits on glibc-2.39 stable branch are updated. c7c3f5bf80 LoongArch: Fix undefined `__memset_aligned` reference in ld.so linking. 32969a2b36 socket: Add new test for connect 2db79c96ba libsupport: Add xgetpeername ab4ef4421f x86_64: Fix missing wcsncat function definition without multiarch (x86-64-v4) 97bb89668d Force DT_RPATH for --enable-hardcoded-path-in-tests 71149c2a2e elf: Only process multiple tunable once (BZ 31686) f8e4623421 Add a test to check for duplicate definitions in the static library 8b005d7869 i686: Fix multiple definitions of __memmove_chk and __memset_chk 8323a83abd i586: Fix multiple definitions of __memcpy_chk and __mempcpy_chk 5141d4d83c Revert "i586: Fix multiple definitions of __memcpy_chk and __mempcpy_chk" c16871e662 Revert "i686: Fix multiple definitions of __memmove_chk and __memset_chk" fa616ea373 Revert "Add a test to check for duplicate definitions in the static library" ff110b2591 Add a test to check for duplicate definitions in the static library ad92c483a4 i686: Fix multiple definitions of __memmove_chk and __memset_chk 3148714ab6 i586: Fix multiple definitions of __memcpy_chk and __mempcpy_chk Signed-off-by: Sundeep KOKKONDA --- meta/recipes-core/glibc/glibc-version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index 1e4a323d64..20125e4339 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ SRCBRANCH ?= "release/2.39/master" PV = "2.39+git" -SRCREV_glibc ?= "273a835fe7c685cc54266bb8b502787bad5e9bae" +SRCREV_glibc ?= "c7c3f5bf80ae86b34501f473f1a9fc545c911b7f" SRCREV_localedef ?= "fab74f31b3811df543e24b6de47efdf45b538abc" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git;protocol=https" -- 2.43.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199516): https://lists.openembedded.org/g/openembedded-core/message/199516 Mute This Topic: https://lists.openembedded.org/mt/106156801/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] binutils: stable 2.42 branch updates.
From: Sundeep KOKKONDA
Below commits on binutils-2.42 stable branch are updated.
6224493e457 Re: PR26978, Inconsistency for strong foo@v1 and weak foo@@v1
d125f967537 hppa: Implement PA 2.0 symbolic relocations for long displacements
884fb5373a1 x86/APX: Remove KEYLOCKER and SHA promotions from EVEX MAP4
d816fda3cbd aarch64: Remove B16B16, SVE2p1 and SME2p1
cb11047e34a Re: Move bfd_init to bfd.c
818bcf40efb print cached error messages using _bfd_error_handler
831be495ef1 aarch64: Fix the 2nd operand in gcsstr and gcssttr instructions.
Signed-off-by: Sundeep KOKKONDA
---
meta/recipes-devtools/binutils/binutils-2.42.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/binutils/binutils-2.42.inc
b/meta/recipes-devtools/binutils/binutils-2.42.inc
index 3b6f47d4ce..b4d273c9c3 100644
--- a/meta/recipes-devtools/binutils/binutils-2.42.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.42.inc
@@ -20,7 +20,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P\d+_(\d_?)*)"
CVE_STATUS[CVE-2023-25584] = "cpe-incorrect: Applies only for version 2.40 and
earlier"
-SRCREV ?= "553c7f61b74badf91df484450944675efd9cd485"
+SRCREV ?= "73b22b4481e85635eb978585f405c4433bcc0174"
BINUTILS_GIT_URI ?=
"git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=https"
SRC_URI = "\
${BINUTILS_GIT_URI} \
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199515):
https://lists.openembedded.org/g/openembedded-core/message/199515
Mute This Topic: https://lists.openembedded.org/mt/106156744/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] oeqa/sdk/assimp: Upgrade and fix for gcc 14
To enable this test to work with gcc 14, pass the option to make
warnings non-fatal. Also upgrade to version 5.4.1 from 5.3.1.
Signed-off-by: Richard Purdie
---
meta/lib/oeqa/sdk/cases/assimp.py | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/lib/oeqa/sdk/cases/assimp.py
b/meta/lib/oeqa/sdk/cases/assimp.py
index e986838aea7..d990b1e97de 100644
--- a/meta/lib/oeqa/sdk/cases/assimp.py
+++ b/meta/lib/oeqa/sdk/cases/assimp.py
@@ -25,10 +25,10 @@ class BuildAssimp(OESDKTestCase):
def test_assimp(self):
with tempfile.TemporaryDirectory(prefix="assimp", dir=self.tc.sdk_dir)
as testdir:
-tarball = self.fetch(testdir, self.td["DL_DIR"],
"https://github.com/assimp/assimp/archive/v5.3.1.tar.gz;)
+tarball = self.fetch(testdir, self.td["DL_DIR"],
"https://github.com/assimp/assimp/archive/v5.4.1.tar.gz;)
dirs = {}
-dirs["source"] = os.path.join(testdir, "assimp-5.3.1")
+dirs["source"] = os.path.join(testdir, "assimp-5.4.1")
dirs["build"] = os.path.join(testdir, "build")
dirs["install"] = os.path.join(testdir, "install")
@@ -39,7 +39,7 @@ class BuildAssimp(OESDKTestCase):
self._run("sed -i '/# ifdef _FILE_OFFSET_BITS/I,+2 d'
{source}/contrib/zlib/gzguts.h".format(**dirs))
os.makedirs(dirs["build"])
-self._run("cd {build} && cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
-DASSIMP_BUILD_ZLIB=ON {source}".format(**dirs))
+self._run("cd {build} && cmake -DASSIMP_WARNINGS_AS_ERRORS=OFF
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DASSIMP_BUILD_ZLIB=ON
{source}".format(**dirs))
self._run("cmake --build {build} -- -j".format(**dirs))
self._run("cmake --build {build} --target install --
DESTDIR={install}".format(**dirs))
-self.check_elf(os.path.join(dirs["install"], "usr", "local",
"lib", "libassimp.so.5.3.0"))
+self.check_elf(os.path.join(dirs["install"], "usr", "local",
"lib", "libassimp.so.5.4.1"))
--
2.40.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199514):
https://lists.openembedded.org/g/openembedded-core/message/199514
Mute This Topic: https://lists.openembedded.org/mt/106154565/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] go.bbclass: support gitsm fetcher
Implement gitsm fetcher support along with the git one.
This makes go.bbclass properly handle source code with git submodules.
Signed-off-by: Dmitry Makhnin
---
meta/classes-recipe/go.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes-recipe/go.bbclass b/meta/classes-recipe/go.bbclass
index d32509aa6d..052fdd69ba 100644
--- a/meta/classes-recipe/go.bbclass
+++ b/meta/classes-recipe/go.bbclass
@@ -87,7 +87,7 @@ python go_do_unpack() {
fetcher = bb.fetch2.Fetch(src_uri, d)
for url in fetcher.urls:
-if fetcher.ud[url].type == 'git':
+if fetcher.ud[url].type == 'git' or fetcher.ud[url].type == 'gitsm':
if fetcher.ud[url].parm.get('destsuffix') is None:
s_dirname = os.path.basename(d.getVar('S'))
fetcher.ud[url].parm['destsuffix'] = os.path.join(s_dirname,
'src', d.getVar('GO_IMPORT')) + '/'
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199513):
https://lists.openembedded.org/g/openembedded-core/message/199513
Mute This Topic: https://lists.openembedded.org/mt/106152943/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v2] oeqa/selftest/devtool: add test for modifying recipes using go.bbclass
On Fri, May 17 2024, ol...@axis.com wrote:
> From: Ola x Nilsson
>
> go.bbclass uses a special do_unpack function that causes the git root
> to be different from S. Verify that it unpacks as expected.
>
> [ YOCTO #15483 ]
>
> Signed-off-by: Ola x Nilsson
> ---
>
> Changes since v1:
> Correct author
>
> meta/lib/oeqa/selftest/cases/devtool.py | 19 +++
> 1 file changed, 19 insertions(+)
>
> diff --git a/meta/lib/oeqa/selftest/cases/devtool.py
> b/meta/lib/oeqa/selftest/cases/devtool.py
> index 882225dde3..fc08906117 100644
> --- a/meta/lib/oeqa/selftest/cases/devtool.py
> +++ b/meta/lib/oeqa/selftest/cases/devtool.py
> @@ -753,6 +753,25 @@ class DevtoolModifyTests(DevtoolBase):
> result = runCmd('devtool status')
> self.assertNotIn('mdadm', result.output)
>
> +def test_devtool_modify_go(self):
> +import oe.path
> +from tempfile import TemporaryDirectory
> +with TemporaryDirectory(prefix='devtoolqa') as tempdir:
> +self.track_for_cleanup(self.workspacedir)
> +self.add_command_to_tearDown('bitbake -c clean go-helloworld')
> +self.add_command_to_tearDown('bitbake-layers remove-layer
> */workspace')
> +result = runCmd('devtool modify go-helloworld -x %s' % tempdir)
> +self.assertExists(
> +oe.path.join(tempdir, 'src', 'golang.org', 'x', 'example',
> 'go.mod'),
> + 'Extracted source could not be found'
> +)
> +self.assertExists(
> +oe.path.join(self.workspacedir, 'conf', 'layer.conf'),
> +'Workspace directory not created'
> +)
> +matches = glob.glob(oe.path.join(self.workspacedir, 'appends',
> 'go-helloworld_*.bbappend'))
> +self.assertTrue(matches, 'bbappend not created %s' %
> result.output)
> +
> def test_devtool_buildclean(self):
> def assertFile(path, *paths):
> f = os.path.join(path, *paths)
I realize that this test doesn't really solve the problem of "papering
over" the problem in devtool modify, but I hope it at least protects
against some breakage.
/Ola
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199512):
https://lists.openembedded.org/g/openembedded-core/message/199512
Mute This Topic: https://lists.openembedded.org/mt/106150373/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2] oeqa/selftest/devtool: add test for modifying recipes using go.bbclass
From: Ola x Nilsson
go.bbclass uses a special do_unpack function that causes the git root
to be different from S. Verify that it unpacks as expected.
[ YOCTO #15483 ]
Signed-off-by: Ola x Nilsson
---
Changes since v1:
Correct author
meta/lib/oeqa/selftest/cases/devtool.py | 19 +++
1 file changed, 19 insertions(+)
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py
b/meta/lib/oeqa/selftest/cases/devtool.py
index 882225dde3..fc08906117 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -753,6 +753,25 @@ class DevtoolModifyTests(DevtoolBase):
result = runCmd('devtool status')
self.assertNotIn('mdadm', result.output)
+def test_devtool_modify_go(self):
+import oe.path
+from tempfile import TemporaryDirectory
+with TemporaryDirectory(prefix='devtoolqa') as tempdir:
+self.track_for_cleanup(self.workspacedir)
+self.add_command_to_tearDown('bitbake -c clean go-helloworld')
+self.add_command_to_tearDown('bitbake-layers remove-layer
*/workspace')
+result = runCmd('devtool modify go-helloworld -x %s' % tempdir)
+self.assertExists(
+oe.path.join(tempdir, 'src', 'golang.org', 'x', 'example',
'go.mod'),
+ 'Extracted source could not be found'
+)
+self.assertExists(
+oe.path.join(self.workspacedir, 'conf', 'layer.conf'),
+'Workspace directory not created'
+)
+matches = glob.glob(oe.path.join(self.workspacedir, 'appends',
'go-helloworld_*.bbappend'))
+self.assertTrue(matches, 'bbappend not created %s' % result.output)
+
def test_devtool_buildclean(self):
def assertFile(path, *paths):
f = os.path.join(path, *paths)
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199511):
https://lists.openembedded.org/g/openembedded-core/message/199511
Mute This Topic: https://lists.openembedded.org/mt/106150373/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][PATCH] maintainers.inc: maintainer for opensbi
From: Thomas Perrot Signed-off-by: Thomas Perrot --- meta/conf/distro/include/maintainers.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 014cf32e4091..d98cb0f194bc 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -556,7 +556,7 @@ RECIPE_MAINTAINER:pn-npth = "Alexander Kanavin " RECIPE_MAINTAINER:pn-nss-myhostname = "Anuj Mittal " RECIPE_MAINTAINER:pn-numactl = "Richard Purdie " RECIPE_MAINTAINER:pn-ofono = "Ross Burton " -RECIPE_MAINTAINER:pn-opensbi = "Unassigned " +RECIPE_MAINTAINER:pn-opensbi = "Thomas Perrot " RECIPE_MAINTAINER:pn-openssh = "Unassigned " RECIPE_MAINTAINER:pn-openssl = "Alexander Kanavin " RECIPE_MAINTAINER:pn-opkg = "Alex Stewart " -- 2.45.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199509): https://lists.openembedded.org/g/openembedded-core/message/199509 Mute This Topic: https://lists.openembedded.org/mt/106150269/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][PATCH 1/1] libarchive: upgrade 3.7.3 -> 3.7.4
From: Yogita Urade
Changelog:
=
rar: Fix OOB in rar e8 filter
zip: Fix out of boundary access
7zip: Limit amount of properties
bsdtar: Fix error handling around strtol() usages
passphrase: Improve newline handling on Windows
passphrase: Never allow empty passwords
rar: Fix "File CRC Error" when extracting specific rar4 archives
xar: Avoid infinite link loop
zip: Update AppleDouble support for directories
zstd: Implement core detection
Signed-off-by: Yogita Urade
---
.../libarchive/{libarchive_3.7.3.bb => libarchive_3.7.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-extended/libarchive/{libarchive_3.7.3.bb =>
libarchive_3.7.4.bb} (96%)
diff --git a/meta/recipes-extended/libarchive/libarchive_3.7.3.bb
b/meta/recipes-extended/libarchive/libarchive_3.7.4.bb
similarity index 96%
rename from meta/recipes-extended/libarchive/libarchive_3.7.3.bb
rename to meta/recipes-extended/libarchive/libarchive_3.7.4.bb
index bea91b6e97..da85764116 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.7.3.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.7.4.bb
@@ -33,7 +33,7 @@ SRC_URI =
"http://libarchive.org/downloads/libarchive-${PV}.tar.gz;
SRC_URI += "file://configurehack.patch"
UPSTREAM_CHECK_URI = "http://libarchive.org/;
-SRC_URI[sha256sum] =
"f27a97bc22ceb996e72502df47dc19f99f9a0f09181ae909f09f3c9eb17b67e2"
+SRC_URI[sha256sum] =
"7875d49596286055b52439ed42f044bd8ad426aa4cc5aabd96bfe7abb971d5e8"
CVE_STATUS[CVE-2023-30571] = "upstream-wontfix: upstream has documented that
reported function is not thread-safe"
--
2.40.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199508):
https://lists.openembedded.org/g/openembedded-core/message/199508
Mute This Topic: https://lists.openembedded.org/mt/106150187/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] selftest/cases/runtime_test: Exclude centos-9 from virgl tests
Similarly to centos 8, centos 9 doesn't support the render device we need
for this test.
Signed-off-by: Richard Purdie
---
meta/lib/oeqa/selftest/cases/runtime_test.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py
b/meta/lib/oeqa/selftest/cases/runtime_test.py
index 12000aac16e..13aa5f16c9b 100644
--- a/meta/lib/oeqa/selftest/cases/runtime_test.py
+++ b/meta/lib/oeqa/selftest/cases/runtime_test.py
@@ -273,7 +273,7 @@ TEST_RUNQEMUPARAMS += " slirp"
import subprocess, os
distro = oe.lsb.distro_identifier()
-if distro and (distro in ['debian-9', 'debian-10', 'centos-7',
'centos-8', 'ubuntu-16.04', 'ubuntu-18.04'] or
+if distro and (distro in ['debian-9', 'debian-10', 'centos-7',
'centos-8', 'centos-9', 'ubuntu-16.04', 'ubuntu-18.04'] or
distro.startswith('almalinux') or distro.startswith('rocky')):
self.skipTest('virgl headless cannot be tested with %s' %(distro))
--
2.40.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199505):
https://lists.openembedded.org/g/openembedded-core/message/199505
Mute This Topic: https://lists.openembedded.org/mt/106149367/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] oeqa/selftest/devtool: add test for modifying recipes using go.bbclass
From: Julien Stephan
go.bbclass uses a special do_unpack function that causes the git root
to be different from S. Verify that it unpacks as expected.
[ YOCTO #15483 ]
Signed-off-by: Ola x Nilsson
---
meta/lib/oeqa/selftest/cases/devtool.py | 19 +++
1 file changed, 19 insertions(+)
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py
b/meta/lib/oeqa/selftest/cases/devtool.py
index 882225dde3..fc08906117 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -753,6 +753,25 @@ class DevtoolModifyTests(DevtoolBase):
result = runCmd('devtool status')
self.assertNotIn('mdadm', result.output)
+def test_devtool_modify_go(self):
+import oe.path
+from tempfile import TemporaryDirectory
+with TemporaryDirectory(prefix='devtoolqa') as tempdir:
+self.track_for_cleanup(self.workspacedir)
+self.add_command_to_tearDown('bitbake -c clean go-helloworld')
+self.add_command_to_tearDown('bitbake-layers remove-layer
*/workspace')
+result = runCmd('devtool modify go-helloworld -x %s' % tempdir)
+self.assertExists(
+oe.path.join(tempdir, 'src', 'golang.org', 'x', 'example',
'go.mod'),
+ 'Extracted source could not be found'
+)
+self.assertExists(
+oe.path.join(self.workspacedir, 'conf', 'layer.conf'),
+'Workspace directory not created'
+)
+matches = glob.glob(oe.path.join(self.workspacedir, 'appends',
'go-helloworld_*.bbappend'))
+self.assertTrue(matches, 'bbappend not created %s' % result.output)
+
def test_devtool_buildclean(self):
def assertFile(path, *paths):
f = os.path.join(path, *paths)
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199504):
https://lists.openembedded.org/g/openembedded-core/message/199504
Mute This Topic: https://lists.openembedded.org/mt/106149273/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 2/3] libsdl2: upgrade 2.30.2 -> 2.30.3
Changelog:
https://github.com/libsdl-org/SDL/releases/tag/release-2.30.3
This is a stable bugfix release, with the following changes:
- Fixed Win+V handling (pasting from clipboard history) on Windows
- Fixed Caps Lock and Backspace key mapping for the Colemak keyboard layout on
Windows
- Fixed mouse warp on XWayland
- Reduced startup time when scanning for game controllers on Linux
- Fixed building with C89 compilers
- Fixed building with the GDK SDK on Windows
Signed-off-by: Yi Zhao
---
.../libsdl2/{libsdl2_2.30.2.bb => libsdl2_2.30.3.bb}| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/libsdl2/{libsdl2_2.30.2.bb => libsdl2_2.30.3.bb}
(97%)
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.30.2.bb
b/meta/recipes-graphics/libsdl2/libsdl2_2.30.3.bb
similarity index 97%
rename from meta/recipes-graphics/libsdl2/libsdl2_2.30.2.bb
rename to meta/recipes-graphics/libsdl2/libsdl2_2.30.3.bb
index f9dacb288c..68cc2790e5 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.30.2.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.30.3.bb
@@ -25,7 +25,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz;
S = "${WORKDIR}/SDL2-${PV}"
-SRC_URI[sha256sum] =
"891d66ac8cae51361d3229e3336ebec1c407a8a2a063b61df14f5fdf3ab5ac31"
+SRC_URI[sha256sum] =
"820440072f8f5b50188c1dae104f2ad25984de268785be40c41a099a510f0aec"
inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199501):
https://lists.openembedded.org/g/openembedded-core/message/199501
Mute This Topic: https://lists.openembedded.org/mt/106146618/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 3/3] gnu-efi: upgrade 3.0.17 -> 3.0.18
* Drop backport patches.
* Refresh patches.
Signed-off-by: Yi Zhao
---
...-parallel-make-failure-for-archives.patch} | 12 ---
...0001-riscv64-adjust-type-definitions.patch | 34 ---
.../0001-riscv64-ignore-unknown-relocs.patch | 32 -
...002-Do-not-treat-warnings-as-errors.patch} | 21 +---
.../gnu-efi-3.0.9-fix-clang-build.patch | 24 -
.../{gnu-efi_3.0.17.bb => gnu-efi_3.0.18.bb} | 9 ++---
6 files changed, 27 insertions(+), 105 deletions(-)
rename meta/recipes-bsp/gnu-efi/gnu-efi/{parallel-make-archives.patch =>
0001-Fix-parallel-make-failure-for-archives.patch} (85%)
delete mode 100644
meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-adjust-type-definitions.patch
delete mode 100644
meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-ignore-unknown-relocs.patch
rename meta/recipes-bsp/gnu-efi/gnu-efi/{no-werror.patch =>
0002-Do-not-treat-warnings-as-errors.patch} (57%)
delete mode 100644
meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-3.0.9-fix-clang-build.patch
rename meta/recipes-bsp/gnu-efi/{gnu-efi_3.0.17.bb => gnu-efi_3.0.18.bb} (88%)
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Fix-parallel-make-failure-for-archives.patch
similarity index 85%
rename from meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
rename to
meta/recipes-bsp/gnu-efi/gnu-efi/0001-Fix-parallel-make-failure-for-archives.patch
index 63d9b6fc31..3c11baca0c 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
+++
b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Fix-parallel-make-failure-for-archives.patch
@@ -1,4 +1,4 @@
-From f56ddb00a656af2e84f839738fad19909ac65047 Mon Sep 17 00:00:00 2001
+From 70e30774debb9ab5d53a29c183f86fc569661b7c Mon Sep 17 00:00:00 2001
From: Saul Wold
Date: Sun, 9 Mar 2014 15:22:15 +0200
Subject: [PATCH] Fix parallel make failure for archives
@@ -19,16 +19,15 @@ Signed-off-by: Darren Hart
Signed-off-by: California Sullivan
[Rebased for 3.0.8]
Signed-off-by: Yi Zhao
-
---
lib/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/Makefile b/lib/Makefile
-index 1fc6a47..54b0ca7 100644
+index ec1f9e3..79a794d 100644
--- a/lib/Makefile
+++ b/lib/Makefile
-@@ -77,7 +77,7 @@ libsubdirs:
+@@ -75,7 +75,7 @@ libsubdirs:
$(OBJS): libsubdirs
libefi.a: $(OBJS)
@@ -36,4 +35,7 @@ index 1fc6a47..54b0ca7 100644
+ $(AR) $(ARFLAGS) $@ $(OBJS)
clean:
- rm -f libefi.a *~ $(OBJS) */*.o
+ @rm -vf libefi.a *~ $(OBJS) */*.o
+--
+2.25.1
+
diff --git
a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-adjust-type-definitions.patch
b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-adjust-type-definitions.patch
deleted file mode 100644
index 3475606264..00
---
a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-adjust-type-definitions.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 1de509497826faa0ad84b82f5e2c3d21ee613459 Mon Sep 17 00:00:00 2001
-From: Moody Liu
-Date: Sat, 13 May 2023 17:39:16 +0100
-Subject: [PATCH] riscv64: adjust type definitions
-
-CHAR8 needs to be defined while BOOLEAN should be removed
-here to prevent typedef conflicts
-
-Upstream-Status: Backport
[https://sourceforge.net/p/gnu-efi/code/ci/1de509497826faa0ad84b82f5e2c3d21ee613459/]
-Signed-off-by: Moody Liu
- inc/riscv64/efibind.h | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/inc/riscv64/efibind.h b/inc/riscv64/efibind.h
-index 4fdf81d..d8b4f39 100644
a/inc/riscv64/efibind.h
-+++ b/inc/riscv64/efibind.h
-@@ -32,11 +32,9 @@ typedef uint16_tUINT16;
- typedef int16_t INT16;
- typedef uint8_t UINT8;
- typedef int8_t INT8;
-+typedef charCHAR8;
- typedef wchar_t CHAR16;
- #define WCHAR CHAR16
--#ifndef BOOLEAN
--typedef uint8_t BOOLEAN;
--#endif
- #undef VOID
- typedef voidVOID;
- typedef int64_t INTN;
---
-2.41.0
-
diff --git
a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-ignore-unknown-relocs.patch
b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-ignore-unknown-relocs.patch
deleted file mode 100644
index 5b3c152c5e..00
--- a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-ignore-unknown-relocs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 708f66acfec9a86f237726d45095cbd380fd83ca Mon Sep 17 00:00:00 2001
-From: Callum Farmer
-Date: Wed, 21 Jun 2023 11:32:28 +0100
-Subject: [PATCH] riscv64: ignore unknown relocs
-
-Sometimes ld emits relocs such as R_RISCV_64 for unwind symbols
-these don't need to be handled yet so just can be skipped otherwise
-the binary will never load
-
-Upstream-Status: Backport
[https://sourceforge.net/p/gnu-efi/code/ci/708f66acfec9a86f237726d45095cbd380fd83ca/]
-Signed-off-by: Callum Farmer
- gnuefi/reloc_riscv64.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git
[OE-core] [PATCH 1/3] dropbear: upgrade 2024.84 -> 2024.85
Changelog:
https://matt.ucc.asn.au/dropbear/CHANGES
This release fixes build regressions in 2024.84:
- Fix build failure when SHA1 is disabled
- Fix build failure when DROPBEAR_CLI_PUBKEY_AUTH disabled
- Update debian/ directory with changed paths
Signed-off-by: Yi Zhao
---
.../0001-urandom-xauth-changes-to-options.h.patch | 8
.../dropbear/0005-dropbear-enable-pam.patch | 13 +
.../dropbear/0006-dropbear-configuration-file.patch | 11 ---
.../dropbear/dropbear-disable-weak-ciphers.patch| 9 +++--
.../{dropbear_2024.84.bb => dropbear_2024.85.bb}| 2 +-
5 files changed, 17 insertions(+), 26 deletions(-)
rename meta/recipes-core/dropbear/{dropbear_2024.84.bb => dropbear_2024.85.bb}
(98%)
diff --git
a/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch
b/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch
index c74f09e484..9c1dd3f606 100644
---
a/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch
+++
b/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch
@@ -1,4 +1,7 @@
-Subject: [PATCH 1/6] urandom-xauth-changes-to-options.h
+From cdc6a4a57a86d8116a92a5d905993e65cf723556 Mon Sep 17 00:00:00 2001
+From: Richard Purdie
+Date: Wed, 31 Aug 2005 10:45:47 +
+Subject: [PATCH] urandom-xauth-changes-to-options.h
Upstream-Status: Inappropriate [configuration]
---
@@ -18,6 +21,3 @@ index 6e970bb..ccc8b47 100644
/* If you want to enable running an sftp server (such as the one included with
---
-2.34.1
-
diff --git a/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch
b/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch
index fe667ddc25..6743f506e9 100644
--- a/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch
+++ b/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch
@@ -1,7 +1,7 @@
-From b8cece92ba19aa77ac013ea161bfe4c7147747c9 Mon Sep 17 00:00:00 2001
+From 253ca01f0fc50dbaeb2ff8bcece0c34256eba94f Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen
Date: Wed, 2 Dec 2015 11:36:02 +0200
-Subject: Enable pam
+Subject: [PATCH] Enable pam
We need modify file default_options.h besides enabling pam in
configure if we want dropbear to support pam.
@@ -15,10 +15,10 @@ Signed-off-by: Jussi Kukkonen
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/default_options.h b/src/default_options.h
-index 0e3d027..349338c 100644
+index ccc8b47..12768d1 100644
--- a/src/default_options.h
+++ b/src/default_options.h
-@@ -210,7 +210,7 @@ group1 in Dropbear server too */
+@@ -228,7 +228,7 @@ group1 in Dropbear server too */
/* Authentication Types - at least one required.
RFC Draft requires pubkey auth, and recommends password */
@@ -27,7 +27,7 @@ index 0e3d027..349338c 100644
/* Note: PAM auth is quite simple and only works for PAM modules which just do
* a simple "Login: " "Password: " (you can edit the strings in
svr-authpam.c).
-@@ -218,7 +218,7 @@ group1 in Dropbear server too */
+@@ -236,7 +236,7 @@ group1 in Dropbear server too */
* but there's an interface via a PAM module. It won't work for more complex
* PAM challenge/response.
* You can't enable both PASSWORD and PAM. */
@@ -36,6 +36,3 @@ index 0e3d027..349338c 100644
/* ~/.ssh/authorized_keys authentication.
* You must define DROPBEAR_SVR_PUBKEY_AUTH in order to use plugins. */
---
-2.25.1
-
diff --git
a/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch
b/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch
index f54f634a4e..44861088cc 100644
--- a/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch
+++ b/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch
@@ -1,4 +1,4 @@
-From e3a5db1b6d3f6382a15b2266458c26c645a10f18 Mon Sep 17 00:00:00 2001
+From 16b147f97f0938cddb55ec1c90bc919c13f26fc0 Mon Sep 17 00:00:00 2001
From: Mingli Yu
Date: Thu, 6 Sep 2018 15:54:00 +0800
Subject: [PATCH] dropbear configuration file
@@ -15,11 +15,11 @@ Signed-off-by: Mingli Yu
src/svr-authpam.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/srec/svr-authpam.c b/src/svr-authpam.c
-index d201bc9..165ec5c 100644
+diff --git a/src/svr-authpam.c b/src/svr-authpam.c
+index ec14632..026102f 100644
--- a/src/svr-authpam.c
+++ b/src/svr-authpam.c
-@@ -223,7 +223,7 @@ void svr_auth_pam(int valid_user) {
+@@ -224,7 +224,7 @@ void svr_auth_pam(int valid_user) {
}
/* Init pam */
@@ -28,6 +28,3 @@ index d201bc9..165ec5c 100644
dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s",
rc, pam_strerror(pamHandlep, rc));
goto cleanup;
---
-2.7.4
-
diff --git
a/meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch
Re: [OE-core][PATCH v2] glibc: correct license
On Thu, May 16, 2024 at 10:05 PM Khem Raj wrote: > > On Wed, May 15, 2024 at 10:29 PM Martin Jansa via > lists.openembedded.org > wrote: > > > > Hi Peter, > > > > what about BSD-4-Clause-UC, BSD-3-Clause, ISC licenses included in glibc. > > > > I've suggested to add them long time ago in: > > https://lists.openembedded.org/g/openembedded-core/topic/91285771#msg166005 > > which resulted in: > > https://sourceware.org/bugzilla/show_bug.cgi?id=28007 > > https://sourceware.org/pipermail/libc-alpha/2022-May/139167.html > > but the discussion upstream stopped shortly after and the oe-core > > change was never merged because of that. Maybe it's time to re-check > > and ping upstream again after 2 years. > > Perhaps yes. > > On a tangent here, but I also think we should use > https://github.com/nexB/scancode-toolkit > to extract the license information from source code itself to update > the LICENSE field > in the recipes. Yeah, we've added it 10+ years ago, because Blackduck or something was complaining about missing license identifiers in: https://github.com/openwebos/meta-webos/commit/8eb313e4303defbe495cf7f91974799046975fca then I've dropped this 2 years ago in: https://github.com/webosose/meta-webosose/commit/95d7c2798d6f0a7a227db9631775eff7a2928596 after failed attempt to upstream this to oe-core and upstream glibc reaction. The LICENSE information in the recipe isn't complete and as Peter wanted to fix "or later" part I though he might be interested in other licenses as well. There weren't many changes in: https://sourceware.org/git/?p=glibc.git;a=history;f=LICENSES;h=530893b1dc9ea00755603c68fb36bd4fc38a7be8;hb=HEAD but the last commit looks interesting. Cheers, -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199498): https://lists.openembedded.org/g/openembedded-core/message/199498 Mute This Topic: https://lists.openembedded.org/mt/105935723/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core][PATCH v2] glibc: correct license
On Wed, May 15, 2024 at 10:29 PM Martin Jansa via lists.openembedded.org wrote: > > Hi Peter, > > what about BSD-4-Clause-UC, BSD-3-Clause, ISC licenses included in glibc. > > I've suggested to add them long time ago in: > https://lists.openembedded.org/g/openembedded-core/topic/91285771#msg166005 > which resulted in: > https://sourceware.org/bugzilla/show_bug.cgi?id=28007 > https://sourceware.org/pipermail/libc-alpha/2022-May/139167.html > but the discussion upstream stopped shortly after and the oe-core > change was never merged because of that. Maybe it's time to re-check > and ping upstream again after 2 years. Perhaps yes. On a tangent here, but I also think we should use https://github.com/nexB/scancode-toolkit to extract the license information from source code itself to update the LICENSE field in the recipes. > > Cheers, > > On Mon, May 6, 2024 at 9:46 AM Peter Marko via lists.openembedded.org > wrote: > > > > From: Peter Marko > > > > The license per [1] is LGPL-2.1-or-later and > > [2] converted last LGPL-2.1-only references. > > > > License-Update: corrected from LGPL-2.1-only to LGPL-2.1-or-later based on > > [1] and [2] > > > > [1] https://www.gnu.org/software/libc/ > > [2] > > https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=273a835fe7c685cc54266bb8b502787bad5e9bae > > > > Signed-off-by: Peter Marko > > --- > > meta/recipes-core/glibc/glibc-common.inc | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta/recipes-core/glibc/glibc-common.inc > > b/meta/recipes-core/glibc/glibc-common.inc > > index b9516e77f0..91a3f5bcd5 100644 > > --- a/meta/recipes-core/glibc/glibc-common.inc > > +++ b/meta/recipes-core/glibc/glibc-common.inc > > @@ -2,7 +2,7 @@ SUMMARY = "GLIBC (GNU C Library)" > > DESCRIPTION = "The GNU C Library is used as the system C library in most > > systems with the Linux kernel." > > HOMEPAGE = "http://www.gnu.org/software/libc/libc.html; > > SECTION = "libs" > > -LICENSE = "GPL-2.0-only & LGPL-2.1-only" > > +LICENSE = "GPL-2.0-only & LGPL-2.1-or-later" > > > > LIC_FILES_CHKSUM ?= "file://LICENSES;md5=f77e878d320e99e94ae9a4aea7f491d1 \ > >file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ > > -- > > 2.30.2 > > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199497): https://lists.openembedded.org/g/openembedded-core/message/199497 Mute This Topic: https://lists.openembedded.org/mt/105935723/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core][PATCH v2] glibc: correct license
Hi Martin, license handling is a very complicated topic, especially for historical projects like glibc with ton of files with diverse origin. License scanning programs will find 15+ different licenses here and some of them may not be even available in yocto license list. I submitted this particular commit because I was responsible for an update with commit which was asking for it. The discussion you linked about adding SPDX identifiers is something which would really help. It would enable license discovery without need of big data software and allow to accurately set the LICENSE field also by SW developers. Peter -Original Message- From: Martin Jansa Sent: Thursday, May 16, 2024 7:30 To: Marko, Peter (ADV D EU SK BFS1) Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core][PATCH v2] glibc: correct license > Hi Peter, > > what about BSD-4-Clause-UC, BSD-3-Clause, ISC licenses included in glibc. > > I've suggested to add them long time ago in: > https://lists.openembedded.org/g/openembedded-core/topic/91285771#msg166005 > which resulted in: > https://sourceware.org/bugzilla/show_bug.cgi?id=28007 > https://sourceware.org/pipermail/libc-alpha/2022-May/139167.html > but the discussion upstream stopped shortly after and the oe-core change was > never merged because of that. Maybe it's time to re-check and ping upstream > again after 2 years. > > Cheers, > > On Mon, May 6, 2024 at 9:46 AM Peter Marko via lists.openembedded.org > wrote: > ... -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199496): https://lists.openembedded.org/g/openembedded-core/message/199496 Mute This Topic: https://lists.openembedded.org/mt/105935723/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 10/13] iptables: remove unneeded 0002-iptables-xshared.h-add-missing-sys.types.h-include.patch
On Thu, May 16, 2024 at 4:27 AM Alexander Kanavin via
lists.openembedded.org
wrote:
>
> From: Alexander Kanavin
>
> Somewhere on the way it ceased to be necessary.
Thats due it being applied upstream [1] so mentioning that is perhaps
going to qualify this a bit more.
[1]
https://git.netfilter.org/iptables/commit/iptables/xshared.h?id=f319389525b066b7dc6d389c88f16a0df3b8f189
>
> Signed-off-by: Alexander Kanavin
> ---
> ...ed.h-add-missing-sys.types.h-include.patch | 31 ---
> .../iptables/iptables_1.8.10.bb | 1 -
> 2 files changed, 32 deletions(-)
> delete mode 100644
> meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch
>
> diff --git
> a/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch
>
> b/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch
> deleted file mode 100644
> index a190c7e8ae2..000
> ---
> a/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -From 465e3ef77f1763d225adc76220e43ee9bd73b178 Mon Sep 17 00:00:00 2001
> -From: Alexander Kanavin
> -Date: Tue, 17 May 2022 10:56:59 +0200
> -Subject: [PATCH] iptables/xshared.h: add missing sys.types.h include
> -
> -This resolves the build error under musl:
> -
> -| ../../../../../../../workspace/sources/iptables/iptables/xshared.h:83:56:
> error: unknown type name 'u_int16_t'; did you mean 'uint16_t'?
> -|83 | set_option(unsigned int *options, unsigned int option, u_int16_t
> *invflg,
> -| |^
> -| |uint16_t
> -
> -Upstream-Status: Submitted [via email to p...@nwl.cc]
> -Signed-off-by: Alexander Kanavin
> -
>
> - iptables/xshared.h | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/iptables/xshared.h b/iptables/xshared.h
> -index a200e0d..f543dbf 100644
> a/iptables/xshared.h
> -+++ b/iptables/xshared.h
> -@@ -6,6 +6,7 @@
> - #include
> - #include
> - #include
> -+#include
> - #include
> - #include
> - #include
> diff --git a/meta/recipes-extended/iptables/iptables_1.8.10.bb
> b/meta/recipes-extended/iptables/iptables_1.8.10.bb
> index 5a878977425..cbd727b75df 100644
> --- a/meta/recipes-extended/iptables/iptables_1.8.10.bb
> +++ b/meta/recipes-extended/iptables/iptables_1.8.10.bb
> @@ -14,7 +14,6 @@ SRC_URI =
> "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.xz \
> file://ip6tables.service \
> file://ip6tables.rules \
>
> file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \
> -
> file://0002-iptables-xshared.h-add-missing-sys.types.h-include.patch \
>
> file://0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch \
> "
> SRC_URI[sha256sum] =
> "5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c"
> --
> 2.39.2
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199495):
https://lists.openembedded.org/g/openembedded-core/message/199495
Mute This Topic: https://lists.openembedded.org/mt/106132526/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v4] ipk/rootfs: run sanity test of multilib in parallel
> -Original Message-
> From: openembedded-core@lists.openembedded.org
> On Behalf Of Seungkyun Kim
> Sent: den 16 maj 2024 02:12
> To: openembedded-core@lists.openembedded.org
> Cc: seungkyun.kim
> Subject: [OE-core] [PATCH v4] ipk/rootfs: run sanity test of multilib in
> parallel
>
> From: "seungkyun.kim"
>
> For multilib type packages, there is an additional temporary
> installation before the actual installation. It makes almost doubles
> the do_rootfs time if having many multilib type packages.
> To avoid this overhead, run sanity test in parallel.
> Installing package groups through opkg takes much more time than
> copying directory.
>
> - Changes in V2:
> Fix FileNotFoundError exception when copying rootfs
> - Changes in V3:
> Removed unnecessary test call
> - Changes in V4:
> Fix invalid argument when create Process
> Keep the temporary rootfs directory after sanity check
The above list of changes related to the review process should be moved to
after the --- line below as they should not be part of the actual commit
message.
>
> Signed-off-by: seungkyun.kim
> ---
> meta/lib/oe/package_manager/ipk/rootfs.py | 34 +--
> 1 file changed, 32 insertions(+), 2 deletions(-)
>
> diff --git a/meta/lib/oe/package_manager/ipk/rootfs.py
> b/meta/lib/oe/package_manager/ipk/rootfs.py
> index ba93eb62ea..a3842a6264 100644
> --- a/meta/lib/oe/package_manager/ipk/rootfs.py
> +++ b/meta/lib/oe/package_manager/ipk/rootfs.py
> @@ -6,7 +6,9 @@
>
> import re
> import filecmp
> +import multiprocessing
> import shutil
> +import stat
> from oe.rootfs import Rootfs
> from oe.manifest import Manifest
> from oe.utils import execute_pre_post_process
> @@ -197,11 +199,34 @@ class PkgRootfs(DpkgOpkgRootfs):
> files[key] = item
>
> def _multilib_test_install(self, pkgs):
> +def _copy_rootfs(src, dst):
> +if os.path.islink(src):
> +linkto = os.readlink(src)
> +if os.path.isabs(linkto):
> +linkto =
> os.path.normpath(os.path.join(os.path.dirname(dst),
> + os.path.relpath(linkto, src)))
> +os.symlink(linkto, dst)
> +elif os.path.isfile(src):
> +shutil.copy2(src, dst)
> +elif stat.S_ISFIFO(os.stat(src).st_mode):
> +os.mkfifo(dst)
> +else:
> +bb.warn("Skip unsupported file type: %s" % src)
> +
> ml_temp = self.d.getVar("MULTILIB_TEMP_ROOTFS")
> +rootfs_temp = os.path.join(ml_temp, "rootfs")
> bb.utils.mkdirhier(ml_temp)
> +bb.utils.remove(rootfs_temp, True)
>
> -dirs = [self.image_rootfs]
> +if os.path.exists(self.image_rootfs):
> +shutil.copytree(self.image_rootfs, rootfs_temp,
> copy_function=_copy_rootfs)
> +else:
> +bb.utils.mkdirhier(rootfs_temp)
> +dirs = [rootfs_temp]
> +return
> multiprocessing.Process(target=self._multilib_test_pkg_install,
> + args=(pkgs, ml_temp, dirs,))
>
> +def _multilib_test_pkg_install(self, pkgs, ml_temp, dirs):
> for variant in self.d.getVar("MULTILIB_VARIANTS").split():
> ml_target_rootfs = os.path.join(ml_temp, variant)
>
> @@ -300,15 +325,20 @@ class PkgRootfs(DpkgOpkgRootfs):
>
> for pkg_type in self.install_order:
> if pkg_type in pkgs_to_install:
> +sanity_test = None
> # For multilib, we perform a sanity test before final install
> # If sanity test fails, it will automatically do a bb.fatal()
> # and the installation will stop
> if pkg_type == Manifest.PKG_TYPE_MULTILIB:
> -self._multilib_test_install(pkgs_to_install[pkg_type])
> +sanity_test=
> self._multilib_test_install(pkgs_to_install[pkg_type])
Add a space before the equal sign.
> +sanity_test.start()
>
> self.pm.install(pkgs_to_install[pkg_type],
> [False, True][pkg_type ==
> Manifest.PKG_TYPE_ATTEMPT_ONLY])
>
> +if sanity_test is not None:
> +sanity_test.join()
> +
> if self.progress_reporter:
> self.progress_reporter.next_stage()
>
> --
> 2.34.1
//Peter
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199485):
https://lists.openembedded.org/g/openembedded-core/message/199485
Mute This Topic: https://lists.openembedded.org/mt/106125799/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 13/13] elfutils: remove unneeded 0006-Fix-build-on-aarch64-musl.patch
From: Alexander Kanavin
Verified on qemuarm64/musl (as the patch says).
Signed-off-by: Alexander Kanavin
---
.../elfutils/elfutils_0.191.bb| 1 -
.../0006-Fix-build-on-aarch64-musl.patch | 58 ---
2 files changed, 59 deletions(-)
delete mode 100644
meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.191.bb
b/meta/recipes-devtools/elfutils/elfutils_0.191.bb
index c4d872430be..76bd2b3a99c 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.191.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.191.bb
@@ -15,7 +15,6 @@ SRC_URI =
"https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
file://0001-dso-link-change.patch \
file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \
file://0003-fixheadercheck.patch \
- file://0006-Fix-build-on-aarch64-musl.patch \
file://0001-libasm-may-link-with-libbz2-if-found.patch \
file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \
file://0001-skip-the-test-when-gcc-not-deployed.patch \
diff --git
a/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
b/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
deleted file mode 100644
index 149e0e6a7b9..000
--- a/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 4409f128c81a9d76b9360b002a1d76043c77b53e Mon Sep 17 00:00:00 2001
-From: Hongxu Jia
-Date: Tue, 15 Aug 2017 17:27:30 +0800
-Subject: [PATCH] Fix build on aarch64/musl
-
-Errors
-
-invalid operands to binary & (have 'long double' and 'unsigned int')
-
-error: redefinition
- of 'struct iovec'
- struct iovec { void *iov_base; size_t iov_len; };
-^
-Upstream-Status: Pending
-Signed-off-by: Khem Raj
-
-Rebase to 0.170
-Signed-off-by: Hongxu Jia
- backends/aarch64_initreg.c | 4 ++--
- backends/arm_initreg.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/backends/aarch64_initreg.c b/backends/aarch64_initreg.c
-index daf6f37..6445276 100644
a/backends/aarch64_initreg.c
-+++ b/backends/aarch64_initreg.c
-@@ -33,7 +33,7 @@
- #include "system.h"
- #include
- #if defined(__aarch64__) && defined(__linux__)
--# include
-+# include
- # include
- # include
- /* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */
-@@ -82,7 +82,7 @@ aarch64_set_initial_registers_tid (pid_t tid __attribute__
((unused)),
-
- Dwarf_Word dwarf_fregs[32];
- for (int r = 0; r < 32; r++)
--dwarf_fregs[r] = fregs.vregs[r] & 0x;
-+dwarf_fregs[r] = (unsigned int)fregs.vregs[r] & 0x;
-
- if (! setfunc (64, 32, dwarf_fregs, arg))
- return false;
-diff --git a/backends/arm_initreg.c b/backends/arm_initreg.c
-index efcabaf..062bb9e 100644
a/backends/arm_initreg.c
-+++ b/backends/arm_initreg.c
-@@ -38,7 +38,7 @@
- #endif
-
- #ifdef __aarch64__
--# include
-+# include
- # include
- # include
- /* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199480):
https://lists.openembedded.org/g/openembedded-core/message/199480
Mute This Topic: https://lists.openembedded.org/mt/106132529/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 11/13] iptables: correctly enable libnetfilter_conntrack support
From: Alexander Kanavin
This is done via configure option, and makes
0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch
unnecessary, as both libnetfilter_conntrack and libnfnetlink
are enabled in lockstep.
Signed-off-by: Alexander Kanavin
---
...y-check-conntrack-when-libnfnetlink-.patch | 49 ---
.../iptables/iptables_1.8.10.bb | 3 +-
2 files changed, 1 insertion(+), 51 deletions(-)
delete mode 100644
meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch
diff --git
a/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch
b/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch
deleted file mode 100644
index 5a022ebc8c3..000
---
a/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 6832501bbb90a3dab977a4625d0391804c0e795c Mon Sep 17 00:00:00 2001
-From: "Maxin B. John"
-Date: Tue, 21 Feb 2017 11:49:07 +0200
-Subject: [PATCH] configure.ac:
- only-check-conntrack-when-libnfnetlink-enabled.patch
-
-Package libnetfilter-conntrack depends on package libnfnetlink. iptables
-checks package libnetfilter-conntrack whatever its package config
-libnfnetlink is enabled or not. When libnfnetlink is disabled but
-package libnetfilter-conntrack exists, it fails randomly with:
-
-In file included from
-.../iptables/1.4.21-r0/iptables-1.4.21/extensions/libxt_connlabel.c:8:0:
-
-.../tmp/sysroots/qemumips/usr/include/libnetfilter_conntrack/libnetfilter_conntrack.h:14:42:
-fatal error: libnfnetlink/linux_nfnetlink.h: No such file or directory
-
-compilation terminated.
-GNUmakefile:96: recipe for target 'libxt_connlabel.oo' failed
-Only check libnetfilter-conntrack when libnfnetlink is enabled to fix it.
-
-Upstream-Status: Pending
-
-Signed-off-by: Kai Kang
-Signed-off-by: Maxin B. John
-
- configure.ac | 6 --
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d607772..25a8e75 100644
a/configure.ac
-+++ b/configure.ac
-@@ -159,10 +159,12 @@ if test "$nftables" != 1; then
- fi
-
- if test "x$enable_connlabel" = "xyes"; then
-- PKG_CHECK_MODULES([libnetfilter_conntrack],
-+nfconntrack=0
-+AS_IF([test "x$enable_libnfnetlink" = "xyes"], [
-+PKG_CHECK_MODULES([libnetfilter_conntrack],
- [libnetfilter_conntrack >= 1.0.6],
- [nfconntrack=1], [nfconntrack=0])
--
-+])
- if test "$nfconntrack" -ne 1; then
- blacklist_modules="$blacklist_modules connlabel";
- echo "WARNING: libnetfilter_conntrack not found, connlabel
match will not be built";
diff --git a/meta/recipes-extended/iptables/iptables_1.8.10.bb
b/meta/recipes-extended/iptables/iptables_1.8.10.bb
index cbd727b75df..a9c88582cda 100644
--- a/meta/recipes-extended/iptables/iptables_1.8.10.bb
+++ b/meta/recipes-extended/iptables/iptables_1.8.10.bb
@@ -14,7 +14,6 @@ SRC_URI =
"http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.xz \
file://ip6tables.service \
file://ip6tables.rules \
file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \
-
file://0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch \
"
SRC_URI[sha256sum] =
"5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c"
@@ -33,7 +32,7 @@ PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES',
'ipv6', d)}"
PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
# libnfnetlink recipe is in meta-networking layer
-PACKAGECONFIG[libnfnetlink] =
"--enable-libnfnetlink,--disable-libnfnetlink,libnfnetlink
libnetfilter-conntrack"
+PACKAGECONFIG[libnfnetlink] = "--enable-libnfnetlink
--enable-connlabel,--disable-libnfnetlink --disable-connlabel,libnfnetlink
libnetfilter-conntrack"
# libnftnl recipe is in meta-networking layer(previously known as libnftables)
PACKAGECONFIG[libnftnl] = "--enable-nftables,--disable-nftables,libnftnl"
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199478):
https://lists.openembedded.org/g/openembedded-core/message/199478
Mute This Topic: https://lists.openembedded.org/mt/106132527/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 04/13] vorbis: mark patch as Inactive-Upstream
From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- .../libvorbis/libvorbis/0001-configure-Check-for-clang.patch| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/libvorbis/libvorbis/0001-configure-Check-for-clang.patch b/meta/recipes-multimedia/libvorbis/libvorbis/0001-configure-Check-for-clang.patch index b06029b98b7..d4fac605b66 100644 --- a/meta/recipes-multimedia/libvorbis/libvorbis/0001-configure-Check-for-clang.patch +++ b/meta/recipes-multimedia/libvorbis/libvorbis/0001-configure-Check-for-clang.patch @@ -5,9 +5,9 @@ Subject: [PATCH] configure: Check for clang Disable gcc specific options if using clang +Upstream-Status: Inactive-Upstream [https://gitlab.xiph.org/xiph/vorbis,https://github.com/xiph/vorbis] Signed-off-by: Khem Raj --- -Upstream-Status: Pending configure.ac | 19 +-- 1 file changed, 17 insertions(+), 2 deletions(-) -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199471): https://lists.openembedded.org/g/openembedded-core/message/199471 Mute This Topic: https://lists.openembedded.org/mt/106132518/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 12/13] x264: update to latest revision on official git
From: Alexander Kanavin
The mirror was out of date; meanwhile x264 remains in active development.
Drop unsuitable x32 patch and declare x264 incompatible with the target
(by every sign it's an extinct target; if not so please work with upstream
to develop a solution there).
Replace don-t-default-to-cortex-a9-with-neon.patch with a configure
option passing in target compiler options so that configure can make
correct decisions and we don't have to patch it.
Signed-off-by: Alexander Kanavin
---
.../x264/Fix-X32-build-by-disabling-asm.patch | 51 ---
...don-t-default-to-cortex-a9-with-neon.patch | 33
meta/recipes-multimedia/x264/x264_git.bb | 9 ++--
3 files changed, 5 insertions(+), 88 deletions(-)
delete mode 100644
meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch
delete mode 100644
meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
diff --git
a/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch
b/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch
deleted file mode 100644
index cb771fb0bf8..000
--- a/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 7bc25f4d1aaa5186d2eff3e2326c7245fcd7e7f3 Mon Sep 17 00:00:00 2001
-From: Christopher Larson
-Date: Tue, 13 Dec 2016 14:22:32 -0700
-Subject: [PATCH] Fix X32 build by disabling asm
-
-This applies gentoo's x32 patch, adjusted slightly, which disables asm support
-for x32 as well as correcting -m.
-
-Debian has a different patch which does the same, and there's a superior yet
-out of date patch series on the x264 list which keeps asm support enabled, but
-doesn't successfully build at this time, and my assembly is very rusty.
-
-Upstream-Status: Pending
-Signed-off-by: Christopher Larson
-
- configure | 14 --
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 51b128d..6ea9469 100755
a/configure
-+++ b/configure
-@@ -754,7 +754,13 @@ case $host_cpu in
- AS_EXT=".asm"
- ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/"
- stack_alignment=16
--[ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64
$LDFLAGS"
-+if [ $compiler = GNU ]; then
-+if cpp_check "" "" "__ILP32__" ; then
-+CFLAGS="-mx32 $CFLAGS" && LDFLAGS="-mx32 $LDFLAGS"
-+else
-+CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
-+fi
-+fi
- if [ "$SYS" = MACOSX ]; then
- ASFLAGS="$ASFLAGS -f macho64 -DPREFIX"
- if cc_check '' "-arch x86_64"; then
-@@ -773,7 +779,11 @@ case $host_cpu in
- RCFLAGS="--target=pe-x86-64 $RCFLAGS"
- fi
- else
--ASFLAGS="$ASFLAGS -f elf64"
-+if cpp_check "" "" "__ILP32__" ; then
-+asm=no
-+else
-+ASFLAGS="$ASFLAGS -f elf64"
-+fi
- fi
- ;;
- powerpc*)
diff --git
a/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
b/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
deleted file mode 100644
index 065e3b35b7c..000
---
a/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From a72bf499a0674fc75eedf15008b424e28f67e4bd Mon Sep 17 00:00:00 2001
-From: Andrei Gherzan
-Date: Fri, 2 Feb 2018 15:10:08 +0200
-Subject: [PATCH] dont default to cortex-a9 with neon
-
--march flag is not in CFLAGS so this will always default to
- -mcpu=cortex-a8 -mfpu=neon.
-
-Upstream-Status: Pending
-
-Signed-off-by: Andrei Gherzan
-Signed-off-by: Maxin B. John
- configure | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/configure b/configure
-index 0e3ef23..955b993 100755
a/configure
-+++ b/configure
-@@ -911,9 +911,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ]
; then
- fi
-
- if [ $asm = auto -a $ARCH = ARM ] ; then
--# set flags so neon is built by default
--[ $compiler == CL ] || echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' ||
CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon"
--
- cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM
- if [ $compiler = CL ] && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7'
; then
- define HAVE_ARMV6
---
-2.4.0
-
diff --git a/meta/recipes-multimedia/x264/x264_git.bb
b/meta/recipes-multimedia/x264/x264_git.bb
index e7d9e75e8de..fae88d24d13 100644
--- a/meta/recipes-multimedia/x264/x264_git.bb
+++ b/meta/recipes-multimedia/x264/x264_git.bb
@@ -8,13 +8,11 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "nasm-native"
-SRC_URI = "git://github.com/mirror/x264;branch=stable;protocol=https \
- file://don-t-default-to-cortex-a9-with-neon.patch \
-
[OE-core] [PATCH 03/13] kexec-tools: submit 0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch upstream
From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- .../0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch b/meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch index e874a8b4f16..489b1092850 100644 --- a/meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch +++ b/meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch @@ -8,7 +8,7 @@ is used by MMU, the "SECTION_SIZE" is defined with (1 << 21), but 'add_buffer_phys_virt()' hardcode this to (1 << 20). -Upstream-Status: Pending +Upstream-Status: Submitted [via email to ho...@kernel.org,http://lists.infradead.org/pipermail/kexec/2024-April/029903.html] Suggested-By:fredrik.markst...@gmail.com Signed-off-by: Haiqing Bai -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199470): https://lists.openembedded.org/g/openembedded-core/message/199470 Mute This Topic: https://lists.openembedded.org/mt/106132517/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 10/13] iptables: remove unneeded 0002-iptables-xshared.h-add-missing-sys.types.h-include.patch
From: Alexander Kanavin
Somewhere on the way it ceased to be necessary.
Signed-off-by: Alexander Kanavin
---
...ed.h-add-missing-sys.types.h-include.patch | 31 ---
.../iptables/iptables_1.8.10.bb | 1 -
2 files changed, 32 deletions(-)
delete mode 100644
meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch
diff --git
a/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch
b/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch
deleted file mode 100644
index a190c7e8ae2..000
---
a/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 465e3ef77f1763d225adc76220e43ee9bd73b178 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin
-Date: Tue, 17 May 2022 10:56:59 +0200
-Subject: [PATCH] iptables/xshared.h: add missing sys.types.h include
-
-This resolves the build error under musl:
-
-| ../../../../../../../workspace/sources/iptables/iptables/xshared.h:83:56:
error: unknown type name 'u_int16_t'; did you mean 'uint16_t'?
-|83 | set_option(unsigned int *options, unsigned int option, u_int16_t
*invflg,
-| |^
-| |uint16_t
-
-Upstream-Status: Submitted [via email to p...@nwl.cc]
-Signed-off-by: Alexander Kanavin
-
- iptables/xshared.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/iptables/xshared.h b/iptables/xshared.h
-index a200e0d..f543dbf 100644
a/iptables/xshared.h
-+++ b/iptables/xshared.h
-@@ -6,6 +6,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
- #include
diff --git a/meta/recipes-extended/iptables/iptables_1.8.10.bb
b/meta/recipes-extended/iptables/iptables_1.8.10.bb
index 5a878977425..cbd727b75df 100644
--- a/meta/recipes-extended/iptables/iptables_1.8.10.bb
+++ b/meta/recipes-extended/iptables/iptables_1.8.10.bb
@@ -14,7 +14,6 @@ SRC_URI =
"http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.xz \
file://ip6tables.service \
file://ip6tables.rules \
file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \
-
file://0002-iptables-xshared.h-add-missing-sys.types.h-include.patch \
file://0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch \
"
SRC_URI[sha256sum] =
"5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c"
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199477):
https://lists.openembedded.org/g/openembedded-core/message/199477
Mute This Topic: https://lists.openembedded.org/mt/106132526/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 09/13] iptables: submit 0001-configure-Add-option-to-enable-disable-libnfnetlink.patch upstream
From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- ...ption-to-enable-disable-libnfnetlink.patch | 44 +++ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch index 8824bf2af7e..0fe22615119 100644 --- a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch +++ b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch @@ -1,22 +1,24 @@ -From 0096c854d5015918ed154dccb3ad472fd06c1010 Mon Sep 17 00:00:00 2001 +From 653db8b938166db7833135f615b90c38a3f27a30 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" -Date: Tue, 21 Feb 2017 11:16:31 +0200 +Date: Thu, 25 Apr 2024 10:51:02 +0200 Subject: [PATCH] configure: Add option to enable/disable libnfnetlink -This changes the configure behaviour from autodetecting -for libnfnetlink to having an option to disable it explicitly - -Upstream-Status: Pending +Default behavior (autodetecting) does not change, but specifying +either option would explicitly disable or enable libnfnetlink support, +and if the library is not found in the latter case, ./configure will error +out. +Upstream-Status: Backport [https://git.netfilter.org/iptables/commit/?id=653db8b938166db7833135f615b90c38a3f27a30] Signed-off-by: Khem Raj Signed-off-by: Maxin B. John - +Signed-off-by: Alexander Kanavin +Signed-off-by: Phil Sutter --- - configure.ac | 10 +++--- - 1 file changed, 7 insertions(+), 3 deletions(-) + configure.ac | 13 +++-- + 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index d99fa3b..d607772 100644 +index d99fa3b9..2293702b 100644 --- a/configure.ac +++ b/configure.ac @@ -63,6 +63,9 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH], @@ -25,21 +27,27 @@ index d99fa3b..d607772 100644 [enable_nftables="$enableval"], [enable_nftables="yes"]) +AC_ARG_ENABLE([libnfnetlink], +AS_HELP_STRING([--disable-libnfnetlink], [Do not use netfilter netlink library]), -+[enable_libnfnetlink="$enableval"], [enable_libnfnetlink="yes"]) ++[enable_libnfnetlink="$enableval"], [enable_libnfnetlink="auto"]) AC_ARG_ENABLE([connlabel], AS_HELP_STRING([--disable-connlabel], [Do not build libnetfilter_conntrack]), -@@ -113,9 +116,10 @@ AM_CONDITIONAL([ENABLE_SYNCONF], [test "$enable_nfsynproxy" = "yes"]) +@@ -113,8 +116,14 @@ AM_CONDITIONAL([ENABLE_SYNCONF], [test "$enable_nfsynproxy" = "yes"]) AM_CONDITIONAL([ENABLE_NFTABLES], [test "$enable_nftables" = "yes"]) AM_CONDITIONAL([ENABLE_CONNLABEL], [test "$enable_connlabel" = "yes"]) -PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], - [nfnetlink=1], [nfnetlink=0]) --AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1]) -+AS_IF([test "x$enable_libnfnetlink" = "xyes"], [ -+PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0]) -+]) -+AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "x$enable_libnfnetlink" = "xyes"]) ++# If specified explicitly on the command line, error out when library was not found ++# Otherwise, disable and continue ++AS_IF([test "x$enable_libnfnetlink" = "xyes"], ++ [PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], ++ [nfnetlink=1])], ++ [test "x$enable_libnfnetlink" = "xauto"], ++ [PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], ++ [nfnetlink=1], [nfnetlink=0])]) + AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1]) if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then - PKG_CHECK_MODULES([libpcap], [libpcap], [], [ +-- +2.39.2 + -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199476): https://lists.openembedded.org/g/openembedded-core/message/199476 Mute This Topic: https://lists.openembedded.org/mt/106132524/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 06/13] grub: remove unneeded 0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch
From: Alexander Kanavin
Verified on qemux86 and qemux86-64 with grub and grub-efi.
Signed-off-by: Alexander Kanavin
---
...ath-sse-as-well-when-SSE-is-disabled.patch | 44 ---
meta/recipes-bsp/grub/grub2.inc | 1 -
2 files changed, 45 deletions(-)
delete mode 100644
meta/recipes-bsp/grub/files/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch
diff --git
a/meta/recipes-bsp/grub/files/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch
b/meta/recipes-bsp/grub/files/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch
deleted file mode 100644
index 05a4697a734..000
---
a/meta/recipes-bsp/grub/files/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 006799e9c4babe8a8340a24501b253e759614a2d Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Wed, 13 Jan 2016 19:17:31 +
-Subject: [PATCH] Disable -mfpmath=sse as well when SSE is disabled
-
-Fixes
-
-configure:20574: i586-poky-linux-gcc -m32-march=core2 -msse3
--mtune=generic -mfpmath=sse
---sysroot=/usr/local/dev/yocto/grubtest2/build/tmp/sysroots/emenlow -o
-conftest -O2 -pipe -g -feliminate-unused-debug-types -Wall -W -Wshadow
--Wpointer-arith -Wmissing-prototypes -Wundef -Wstrict-prototypes -g
--falign-jumps=1 -falign-loops=1 -falign-functions=1 -mno-mmx -mno-sse
--mno-sse2 -mno-3dnow -fno-dwarf2-cfi-asm -m32 -fno-stack-protector
--mno-stack-arg-probe -Werror -nostdlib -Wl,--defsym,___main=0x8100
--Wall -W -I$(top_srcdir)/include -I$(top_builddir)/include
--DGRUB_MACHINE_PCBIOS=1 -DGRUB_MACHINE=I386_PC -Wl,-O1
--Wl,--hash-style=gnu -Wl,--as-needed conftest.c >&5
-conftest.c:1:0: error: SSE instruction set disabled, using 387
-arithmetics [-Werror]
-cc1: all warnings being treated as errors
-
-Signed-off-by: Nitin A Kamble
-Signed-off-by: Khem Raj
-
-Upstream-Status: Pending
-
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index cd667a2..8263876 100644
a/configure.ac
-+++ b/configure.ac
-@@ -846,7 +846,7 @@ fi
- if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test
"x$platform" != xemu; then
- # Some toolchains enable these features by default, but they need
- # registers that aren't set up properly in GRUB.
-- TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-sse3
-mno-3dnow"
-+ TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-sse3
-mno-3dnow -mfpmath=387"
- fi
-
- if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ); then
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc
index bb9aacb478a..e2a2a842773 100644
--- a/meta/recipes-bsp/grub/grub2.inc
+++ b/meta/recipes-bsp/grub/grub2.inc
@@ -14,7 +14,6 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
CVE_PRODUCT = "grub2"
SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \
- file://0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch \
file://autogen.sh-exclude-pc.patch \
file://grub-module-explicitly-keeps-symbole-.module_license.patch \
file://0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch \
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199473):
https://lists.openembedded.org/g/openembedded-core/message/199473
Mute This Topic: https://lists.openembedded.org/mt/106132520/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 08/13] perl: submit the rest of determinism.patch upstream
From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/perl/files/determinism.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/perl/files/determinism.patch b/meta/recipes-devtools/perl/files/determinism.patch index aa85ccef100..f2b5524 100644 --- a/meta/recipes-devtools/perl/files/determinism.patch +++ b/meta/recipes-devtools/perl/files/determinism.patch @@ -8,9 +8,9 @@ b) Sort the order of the module lists from configure_mods.sh since otherwise the result isn't the same leading to makefile differences. Reported upstream: https://github.com/arsv/perl-cross/issues/88 -c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst +c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst there for good measure) - This needs to go to upstream perl (not done) + Submitted to upstream perl: https://github.com/dankogai/p5-encode/pull/179 d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash and "" with dash @@ -18,7 +18,7 @@ d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with RP 2020/2/7 -Upstream-Status: Pending [75% submitted] +Upstream-Status: Submitted [see links above] Signed-off-by: Richard Purdie -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199475): https://lists.openembedded.org/g/openembedded-core/message/199475 Mute This Topic: https://lists.openembedded.org/mt/106132522/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 07/13] gdb: remove unneeded 0006-resolve-restrict-keyword-conflict.patch
From: Alexander Kanavin
Somewhere on the way the issue solved itself.
Signed-off-by: Alexander Kanavin
---
meta/recipes-devtools/gdb/gdb.inc | 1 -
...06-resolve-restrict-keyword-conflict.patch | 45 ---
2 files changed, 46 deletions(-)
delete mode 100644
meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch
diff --git a/meta/recipes-devtools/gdb/gdb.inc
b/meta/recipes-devtools/gdb/gdb.inc
index 81ac441462a..c2fbcb2ac6b 100644
--- a/meta/recipes-devtools/gdb/gdb.inc
+++ b/meta/recipes-devtools/gdb/gdb.inc
@@ -10,7 +10,6 @@ SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \
file://0003-Dont-disable-libreadline.a-when-using-disable-static.patch \
file://0004-use-asm-sgidefs.h.patch \
file://0005-Change-order-of-CFLAGS.patch \
- file://0006-resolve-restrict-keyword-conflict.patch \
file://0007-Fix-invalid-sigprocmask-call.patch \
file://0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \
"
diff --git
a/meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch
b/meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch
deleted file mode 100644
index 45388c5ac5a..000
--- a/meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 477f1b2049c7f940b8e8fda4ac396cfe322b269f Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Tue, 10 May 2016 08:47:05 -0700
-Subject: [PATCH] resolve restrict keyword conflict
-
-GCC detects that we call 'restrict' as param name in function
-signatures and complains since both params are called 'restrict'
-therefore we use __restrict to denote the C99 keywork
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj
- gnulib/import/sys_time.in.h | 8
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h
-index 87db1a88745..e6b98c7e467 100644
a/gnulib/import/sys_time.in.h
-+++ b/gnulib/import/sys_time.in.h
-@@ -93,20 +93,20 @@ struct timeval
- # define gettimeofday rpl_gettimeofday
- # endif
- _GL_FUNCDECL_RPL (gettimeofday, int,
-- (struct timeval *restrict, void *restrict)
-+ (struct timeval *__restrict, void *__restrict)
- _GL_ARG_NONNULL ((1)));
- _GL_CXXALIAS_RPL (gettimeofday, int,
-- (struct timeval *restrict, void *restrict));
-+ (struct timeval *__restrict, void *__restrict));
- # else
- # if !@HAVE_GETTIMEOFDAY@
- _GL_FUNCDECL_SYS (gettimeofday, int,
-- (struct timeval *restrict, void *restrict)
-+ (struct timeval *__restrict, void *__restrict)
- _GL_ARG_NONNULL ((1)));
- # endif
- /* Need to cast, because on glibc systems, by default, the second argument is
- struct timezone *. */
- _GL_CXXALIAS_SYS_CAST (gettimeofday, int,
-- (struct timeval *restrict, void *restrict));
-+ (struct timeval *__restrict, void *__restrict));
- # endif
- _GL_CXXALIASWARN (gettimeofday);
- # if defined __cplusplus && defined GNULIB_NAMESPACE
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199474):
https://lists.openembedded.org/g/openembedded-core/message/199474
Mute This Topic: https://lists.openembedded.org/mt/106132521/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 05/13] grub: mark grub-module-explicitly-keeps-symbole-.module_license.patch as a workaround
From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- .../grub-module-explicitly-keeps-symbole-.module_license.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch b/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch index d9012d1dd63..7c8770ce8bd 100644 --- a/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch +++ b/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch @@ -37,7 +37,7 @@ SYMBOL TABLE: ld .modname .modname -- -Upstream-Status: Pending +Upstream-Status: Inappropriate [workaround that needs investigation into @TARGET_STRIP@ behaviour in oe-core vs toolchain used by upstream] Signed-off-by: Hongxu Jia -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199472): https://lists.openembedded.org/g/openembedded-core/message/199472 Mute This Topic: https://lists.openembedded.org/mt/106132519/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 01/13] mesa: remove obsolete 0001-meson.build-check-for-all-linux-host_os-combinations.patch
From: Alexander Kanavin
The patch was submitted upstream
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28895
but further investigation revealed that the problem had been solved properly
in meson.class:
https://git.yoctoproject.org/poky/commit/?id=6bf674374d568b2419a4c6eef00d893028878881
Signed-off-by: Alexander Kanavin
---
...k-for-all-linux-host_os-combinations.patch | 42 ---
meta/recipes-graphics/mesa/mesa.inc | 1 -
2 files changed, 43 deletions(-)
delete mode 100644
meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
diff --git
a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
deleted file mode 100644
index 7be7d81eeb7..000
---
a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e8ec6b1cc5e401ba719095722d8b317d755ae613 Mon Sep 17 00:00:00 2001
-From: Alistair Francis
-Date: Thu, 14 Nov 2019 13:04:49 -0800
-Subject: [PATCH] meson.build: check for all linux host_os combinations
-
-Make sure that we are also looking for our host_os combinations like
-linux-musl etc. when assuming support for DRM/KMS.
-
-Also delete a duplicate line.
-
-Upstream-Status: Pending
-
-Signed-off-by: Anuj Mittal
-Signed-off-by: Fabio Berton
-Signed-off-by: Otavio Salvador
-Signed-off-by: Alistair Francis
- meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 133fd9a..817861e 100644
a/meson.build
-+++ b/meson.build
-@@ -128,7 +128,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
- # Only build shared_glapi if at least one OpenGL API is enabled
- with_shared_glapi = with_shared_glapi and with_any_opengl
-
--system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd',
'dragonfly', 'linux', 'sunos', 'android',
'managarm'].contains(host_machine.system())
-+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd',
'dragonfly', 'linux', 'sunos', 'android',
'managarm'].contains(host_machine.system()) or
host_machine.system().startswith('linux')
-
- gallium_drivers = get_option('gallium-drivers')
- if gallium_drivers.contains('auto')
-@@ -997,7 +997,7 @@ if cc.has_function('fmemopen')
- endif
-
- # TODO: this is very incomplete
--if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android',
'managarm'].contains(host_machine.system())
-+if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android',
'managarm'].contains(host_machine.system()) or
host_machine.system().startswith('linux')
- pre_args += '-D_GNU_SOURCE'
- elif host_machine.system() == 'sunos'
- pre_args += '-D__EXTENSIONS__'
diff --git a/meta/recipes-graphics/mesa/mesa.inc
b/meta/recipes-graphics/mesa/mesa.inc
index 77e9c80fcb6..a8f3397e04a 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -15,7 +15,6 @@ LIC_FILES_CHKSUM =
"file://docs/license.rst;md5=63779ec98d78d823a9dc533a0735ef10
PE = "2"
SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
-
file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
file://0001-drisw-fix-build-without-dri3.patch \
file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199468):
https://lists.openembedded.org/g/openembedded-core/message/199468
Mute This Topic: https://lists.openembedded.org/mt/106132515/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 02/13] glib-2.0: remove obsolete 0001-Set-host_machine-correctly-when-building-with-mingw3.patch
From: Alexander Kanavin
This as well has been solved via
https://git.yoctoproject.org/poky/commit/?id=f6a35934540e910794b8729ecc278189a39b710f
Signed-off-by: Alexander Kanavin
---
...-correctly-when-building-with-mingw3.patch | 80 ---
meta/recipes-core/glib-2.0/glib.inc | 1 -
2 files changed, 81 deletions(-)
delete mode 100644
meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
diff --git
a/meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
b/meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
deleted file mode 100644
index a2f9dd9672f..000
---
a/meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 01810df82fae752428d3756c85edb2eb7bbf3c15 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin
-Date: Wed, 13 Feb 2019 15:32:05 +0100
-Subject: [PATCH] Set host_machine correctly when building with mingw32
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin
- gio/tests/meson.build | 8
- glib/tests/meson.build | 2 +-
- meson.build| 3 +++
- 3 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/gio/tests/meson.build b/gio/tests/meson.build
-index 232ecca..563298b 100644
a/gio/tests/meson.build
-+++ b/gio/tests/meson.build
-@@ -29,7 +29,7 @@ endif
-
- test_cpp_args = test_c_args
-
--if host_machine.system() == 'windows'
-+if host_system == 'windows'
- common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library
('secur32')]
- endif
-
-@@ -244,7 +244,7 @@ if have_dbus_daemon
- endif
-
- # Test programs buildable on UNIX only
--if host_machine.system() != 'windows'
-+if host_system != 'windows'
- gio_tests += {
- 'file' : {
- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/3148
-@@ -593,7 +593,7 @@ if host_machine.system() != 'windows'
- endif # unix
-
- # Test programs buildable on Windows only
--if host_machine.system() == 'windows'
-+if host_system == 'windows'
- gio_tests += {'win32-streams' : {}}
- endif
-
-@@ -663,7 +663,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
- }
- endif
-
--if host_machine.system() != 'windows'
-+if host_system != 'windows'
- test_extra_programs += {
- 'gdbus-example-unix-fd-client' : {
- 'install' : false,
-diff --git a/glib/tests/meson.build b/glib/tests/meson.build
-index f6efc59..83eb5a5 100644
a/glib/tests/meson.build
-+++ b/glib/tests/meson.build
-@@ -226,7 +226,7 @@ if glib_conf.has('HAVE_EVENTFD')
- }
- endif
-
--if host_machine.system() == 'windows'
-+if host_system == 'windows'
- if winsock2.found()
- glib_tests += {
- 'gpoll' : {
-diff --git a/meson.build b/meson.build
-index 7534542..2560686 100644
a/meson.build
-+++ b/meson.build
-@@ -54,6 +54,9 @@ else
- endif
-
- host_system = host_machine.system()
-+if host_system == 'mingw32'
-+ host_system = 'windows'
-+endif
-
- if host_system == 'darwin'
- ios_test_code = '''#include
diff --git a/meta/recipes-core/glib-2.0/glib.inc
b/meta/recipes-core/glib-2.0/glib.inc
index 1a97a0d02a6..2de50dd9af3 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -222,7 +222,6 @@ SRC_URI =
"${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
-
file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \
file://0001-Do-not-write-bindir-into-pkg-config-files.patch \
file://0001-meson-Run-atomics-test-on-clang-as-well.patch \
file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199469):
https://lists.openembedded.org/g/openembedded-core/message/199469
Mute This Topic: https://lists.openembedded.org/mt/106132516/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 4/4] rust: build the default set of tools
From: Alexander Kanavin
Setting it explicitly replaces rust's default choice which is rustdoc
(needed for example in selftests and otherwise expected to be present
in typical rust installations):
https://github.com/rust-lang/rust/blob/master/config.example.toml#L320
This addresses some of the rust selftest failures but not all. Help
is appreciate to restore the selftest.
Unfortunately, this also breaks rust reproducibility (or rather exposes
that it was never properly fixed, as explained here:
https://lists.openembedded.org/g/openembedded-core/message/199288
)
Signed-off-by: Alexander Kanavin
---
meta/lib/oeqa/selftest/cases/reproducible.py | 2 ++
meta/recipes-devtools/rust/rust_1.75.0.bb| 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py
b/meta/lib/oeqa/selftest/cases/reproducible.py
index 80e830136f7..97a9c3da908 100644
--- a/meta/lib/oeqa/selftest/cases/reproducible.py
+++ b/meta/lib/oeqa/selftest/cases/reproducible.py
@@ -16,6 +16,8 @@ import os
import datetime
exclude_packages = [
+ 'rust-rustdoc',
+ 'rust-dbg'
]
def is_excluded(package):
diff --git a/meta/recipes-devtools/rust/rust_1.75.0.bb
b/meta/recipes-devtools/rust/rust_1.75.0.bb
index e82a7395e44..b041a5f8e4c 100644
--- a/meta/recipes-devtools/rust/rust_1.75.0.bb
+++ b/meta/recipes-devtools/rust/rust_1.75.0.bb
@@ -149,7 +149,6 @@ python do_configure() {
config.add_section("build")
config.set("build", "submodules", e(False))
config.set("build", "docs", e(False))
-config.set("build", "tools", ["rust-demangler",])
rustc = d.getVar('RUSTC_BOOTSTRAP')
config.set("build", "rustc", e(rustc))
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199467):
https://lists.openembedded.org/g/openembedded-core/message/199467
Mute This Topic: https://lists.openembedded.org/mt/106132436/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 2/4] rust: add reproducibility patch to eliminate host leakage
From: Alexander Kanavin
[YOCTO #15185]
Signed-off-by: Alexander Kanavin
---
...te-host-information-into-compilation.patch | 51 +++
meta/recipes-devtools/rust/rust-source.inc| 1 +
2 files changed, 52 insertions(+)
create mode 100644
meta/recipes-devtools/rust/files/0001-cargo-do-not-write-host-information-into-compilation.patch
diff --git
a/meta/recipes-devtools/rust/files/0001-cargo-do-not-write-host-information-into-compilation.patch
b/meta/recipes-devtools/rust/files/0001-cargo-do-not-write-host-information-into-compilation.patch
new file mode 100644
index 000..a6ee8676058
--- /dev/null
+++
b/meta/recipes-devtools/rust/files/0001-cargo-do-not-write-host-information-into-compilation.patch
@@ -0,0 +1,51 @@
+From 065d7c263091118437465d714d8a29dbb6296921 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Mon, 13 May 2024 14:57:54 +0200
+Subject: [PATCH] cargo: do not write host information into compilation unit
+ hashes
+
+This breaks reproducibility in cross-builds where the cross-target
+can be the same, but build hosts are different, as seen with
+"rustc --version -v":
+...
+host: x86_64-unknown-linux-gnu
+
+vs.
+
+host: aarch64-unknown-linux-gnu
+
+This can possibly be improved by only hashing host info if the build
+is a native one (e.g. there's no --target option passed to cargo
+invocation) but I'm not sure how.
+
+Upstream-Status: Inappropriate [reported at
https://github.com/rust-lang/cargo/issues/13922]
+Signed-off-by: Alexander Kanavin
+---
+ .../src/cargo/core/compiler/context/compilation_files.rs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git
a/src/tools/cargo/src/cargo/core/compiler/context/compilation_files.rs
b/src/tools/cargo/src/cargo/core/compiler/context/compilation_files.rs
+index d83dbf10c..b2ad8d9f3 100644
+--- a/src/tools/cargo/src/cargo/core/compiler/context/compilation_files.rs
b/src/tools/cargo/src/cargo/core/compiler/context/compilation_files.rs
+@@ -652,7 +652,7 @@ fn hash_rustc_version(bcx: <'_, '_>, hasher:
StableHasher) {
+ if vers.pre.is_empty() || bcx.config.cli_unstable().separate_nightlies {
+ // For stable, keep the artifacts separate. This helps if someone is
+ // testing multiple versions, to avoid recompiles.
+-bcx.rustc().verbose_version.hash(hasher);
++//bcx.rustc().verbose_version.hash(hasher);
+ return;
+ }
+ // On "nightly"/"beta"/"dev"/etc, keep each "channel" separate. Don't hash
+@@ -665,7 +665,7 @@ fn hash_rustc_version(bcx: <'_, '_>, hasher:
StableHasher) {
+ // Keep "host" since some people switch hosts to implicitly change
+ // targets, (like gnu vs musl or gnu vs msvc). In the future, we may want
+ // to consider hashing `unit.kind.short_name()` instead.
+-bcx.rustc().host.hash(hasher);
++//bcx.rustc().host.hash(hasher);
+ // None of the other lines are important. Currently they are:
+ // binary: rustc <-- or "rustdoc"
+ // commit-hash: 38114ff16e7856f98b2b4be7ab4cd29b38bed59a
+--
+2.39.2
+
diff --git a/meta/recipes-devtools/rust/rust-source.inc
b/meta/recipes-devtools/rust/rust-source.inc
index c83c8ec3a39..20ef5e82bc4 100644
--- a/meta/recipes-devtools/rust/rust-source.inc
+++ b/meta/recipes-devtools/rust/rust-source.inc
@@ -12,6 +12,7 @@ SRC_URI +=
"https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
file://target-build-value.patch;patchdir=${RUSTSRC} \
file://0001-Handle-vendored-sources-when-remapping-paths.patch;patchdir=${RUSTSRC}
\
file://repro-issue-fix-with-v175.patch;patchdir=${RUSTSRC} \
+
file://0001-cargo-do-not-write-host-information-into-compilation.patch;patchdir=${RUSTSRC}
\
"
SRC_URI[rust.sha256sum] =
"4526f786d673e4859ff2afa0bab2ba13c918b796519a25c1acce06dba9542340"
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199466):
https://lists.openembedded.org/g/openembedded-core/message/199466
Mute This Topic: https://lists.openembedded.org/mt/106132435/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/4] rust: correctly link rust-snapshot into build/stage0
From: Alexander Kanavin
This does not seem to be used in regular builds, but is beneficial
in rust selftest, where it allows dropping a custom patch
that is unsuitable for upstream (and was rejected by them).
Also remove an obsolete comment that seems related to the code
but describes something that was resolved long time ago.
I have confirmed that the rust selftest continues to pass with just
this one commit on top of master (as the following changes do break
the selftest).
Signed-off-by: Alexander Kanavin
---
.../rust/files/cargo-path.patch | 37 ---
meta/recipes-devtools/rust/rust-source.inc| 1 -
meta/recipes-devtools/rust/rust_1.75.0.bb | 6 +--
3 files changed, 2 insertions(+), 42 deletions(-)
delete mode 100644 meta/recipes-devtools/rust/files/cargo-path.patch
diff --git a/meta/recipes-devtools/rust/files/cargo-path.patch
b/meta/recipes-devtools/rust/files/cargo-path.patch
deleted file mode 100644
index 9a50c402201..000
--- a/meta/recipes-devtools/rust/files/cargo-path.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Fix the cargo binary path error and ensure that it is fetched
-during rustc bootstrap in rust oe-selftest.
-
-==
-ERROR: test_cargoflags (bootstrap_test.BuildBootstrap)
---
-Traceback (most recent call last):
- File
"/home/build-st/tmp/work/cortexa57-poky-linux/rust/1.74.1/rustc-1.74.1-src/src/bootstrap/bootstrap_test.py",
line 157, in test_cargoflags
-args, _ = self.build_args(env={"CARGOFLAGS": "--timings"})
- File
"/home/build-st/tmp/work/cortexa57-poky-linux/rust/1.74.1/rustc-1.74.1-src/src/bootstrap/bootstrap_test.py",
line 154, in build_args
-return build.build_bootstrap_cmd(env), env
- File
"/home/build-st/tmp/work/cortexa57-poky-linux/rust/1.74.1/rustc-1.74.1-src/src/bootstrap/bootstrap.py",
line 960, in build_bootstrap_cmd
-raise Exception("no cargo executable found at `{}`".format(
-Exception: no cargo executable found at
`/home/build-st/tmp/work/cortexa57-poky-linux/rust/1.74.1/rustc-1.74.1-src/build/x86_64-unknown-linux-gnu/stage0/bin/cargo`
-
-Upstream-Status: Submitted [https://github.com/rust-lang/rust/pull/120125]
-
-Signed-off-by: Yash Shinde
-diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
a/src/bootstrap/bootstrap.py
-+++ b/src/bootstrap/bootstrap.py
-@@ -954,9 +954,11 @@
- if "RUSTFLAGS_BOOTSTRAP" in env:
- env["RUSTFLAGS"] += " " + env["RUSTFLAGS_BOOTSTRAP"]
-
--env["PATH"] = os.path.join(self.bin_root(), "bin") + \
--os.pathsep + env["PATH"]
--if not os.path.isfile(self.cargo()):
-+cargo_bin_path = os.path.join(self.bin_root(), "bin", "cargo")
-+if not os.path.isfile(cargo_bin_path):
-+cargo_bin_path = os.getenv("RUST_TARGET_PATH") +
"rust-snapshot/bin/cargo"
-+env["PATH"] = os.path.dirname(cargo_bin_path) + os.pathsep +
env["PATH"]
-+else:
- raise Exception("no cargo executable found at `{}`".format(
- self.cargo()))
- args = [self.cargo(), "build", "--manifest-path",
diff --git a/meta/recipes-devtools/rust/rust-source.inc
b/meta/recipes-devtools/rust/rust-source.inc
index b14221b6cb8..c83c8ec3a39 100644
--- a/meta/recipes-devtools/rust/rust-source.inc
+++ b/meta/recipes-devtools/rust/rust-source.inc
@@ -7,7 +7,6 @@ SRC_URI +=
"https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
file://rv32-missing-syscalls.patch;patchdir=${RUSTSRC} \
file://rv32-rustix-libc-backend.patch;patchdir=${RUSTSRC} \
file://rv32-cargo-rustix-0.38.19-fix.patch;patchdir=${RUSTSRC} \
-file://cargo-path.patch;patchdir=${RUSTSRC} \
file://custom-target-cfg.patch;patchdir=${RUSTSRC} \
file://rustc-bootstrap.patch;patchdir=${RUSTSRC} \
file://target-build-value.patch;patchdir=${RUSTSRC} \
diff --git a/meta/recipes-devtools/rust/rust_1.75.0.bb
b/meta/recipes-devtools/rust/rust_1.75.0.bb
index 76e1fe2d84a..8ef838ee90c 100644
--- a/meta/recipes-devtools/rust/rust_1.75.0.bb
+++ b/meta/recipes-devtools/rust/rust_1.75.0.bb
@@ -35,8 +35,6 @@ RUST_ALTERNATE_EXE_PATH_NATIVE =
"${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-co
# own vendoring.
CARGO_DISABLE_BITBAKE_VENDORING = "1"
-# We can't use RUST_BUILD_SYS here because that may be "musl" if
-# TCLIBC="musl". Snapshots are always -unknown-linux-gnu
setup_cargo_environment () {
# The first step is to build bootstrap and some early stage tools,
# these are build for the same target as the snapshot, e.g.
@@ -54,8 +52,8 @@ do_rust_setup_snapshot () {
# Some versions of rust (e.g. 1.18.0) tries to find cargo in
stage0/bin/cargo
# and fail without it there.
-mkdir -p ${RUSTSRC}/build/${BUILD_SYS}
-ln -sf ${WORKDIR}/rust-snapshot/
[OE-core] [PATCH 3/4] rust: use rust-snapshot binaries only in rust-native
From: Alexander Kanavin
Otherwise, use rust-native and cargo-native binaries as that allows
our native tweaks in them to be used for target/nativesdk rust -
same as for everything else written in rust.
In particular, this allows building target rust with
cargo-native that includes important reproducibility tweaks.
Unfortunately, this also breaks rust selftest, and that
is partially addressed by the following commit.
[YOCTO #15185]
Signed-off-by: Alexander Kanavin
---
meta/recipes-devtools/rust/rust_1.75.0.bb | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/rust/rust_1.75.0.bb
b/meta/recipes-devtools/rust/rust_1.75.0.bb
index 8ef838ee90c..e82a7395e44 100644
--- a/meta/recipes-devtools/rust/rust_1.75.0.bb
+++ b/meta/recipes-devtools/rust/rust_1.75.0.bb
@@ -11,6 +11,11 @@ DEPENDS += "file-native python3-native"
DEPENDS:append:class-native = " rust-llvm-native"
DEPENDS:append:class-nativesdk = " nativesdk-rust-llvm"
+# native rust uses cargo/rustc from binary snapshots to bootstrap
+# but everything else should use our native builds
+DEPENDS:append:class-target = " cargo-native rust-native"
+DEPENDS:append:class-nativesdk = " cargo-native rust-native"
+
DEPENDS += "rust-llvm (=${PV})"
RDEPENDS:${PN}:append:class-target = " gcc g++ binutils"
@@ -68,6 +73,11 @@ addtask do_test_compile after do_configure
do_rust_gen_targets
do_rust_setup_snapshot[dirs] += "${WORKDIR}/rust-snapshot"
do_rust_setup_snapshot[vardepsexclude] += "UNINATIVE_LOADER"
+RUSTC_BOOTSTRAP = "${STAGING_BINDIR_NATIVE}/rustc"
+CARGO_BOOTSTRAP = "${STAGING_BINDIR_NATIVE}/cargo"
+RUSTC_BOOTSTRAP:class-native = "${WORKDIR}/rust-snapshot/bin/rustc"
+CARGO_BOOTSTRAP:class-native = "${WORKDIR}/rust-snapshot/bin/cargo"
+
python do_configure() {
import json
import configparser
@@ -141,10 +151,10 @@ python do_configure() {
config.set("build", "docs", e(False))
config.set("build", "tools", ["rust-demangler",])
-rustc = d.expand("${WORKDIR}/rust-snapshot/bin/rustc")
+rustc = d.getVar('RUSTC_BOOTSTRAP')
config.set("build", "rustc", e(rustc))
-cargo = d.expand("${WORKDIR}/rust-snapshot/bin/cargo")
+cargo = d.getVar('CARGO_BOOTSTRAP')
config.set("build", "cargo", e(cargo))
config.set("build", "vendor", e(True))
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199465):
https://lists.openembedded.org/g/openembedded-core/message/199465
Mute This Topic: https://lists.openembedded.org/mt/106132434/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 3/3] fribidi: upgrade 1.0.13 -> 1.0.14
* Updated Unicode tables to version 15.1
Signed-off-by: Ross Burton
---
.../fribidi/{fribidi_1.0.13.bb => fribidi_1.0.14.bb}| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/fribidi/{fribidi_1.0.13.bb => fribidi_1.0.14.bb}
(89%)
diff --git a/meta/recipes-support/fribidi/fribidi_1.0.13.bb
b/meta/recipes-support/fribidi/fribidi_1.0.14.bb
similarity index 89%
rename from meta/recipes-support/fribidi/fribidi_1.0.13.bb
rename to meta/recipes-support/fribidi/fribidi_1.0.14.bb
index 5d0476a3752..51752096de1 100644
--- a/meta/recipes-support/fribidi/fribidi_1.0.13.bb
+++ b/meta/recipes-support/fribidi/fribidi_1.0.14.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.xz \
"
-SRC_URI[sha256sum] =
"7fa16c80c81bd622f7b198d31356da139cc318a63fc7761217af4130903f54a2"
+SRC_URI[sha256sum] =
"76ae204a7027652ac3981b9fa5817c083ba23114340284c58e756b259cd2259a"
inherit meson lib_package pkgconfig github-releases
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199463):
https://lists.openembedded.org/g/openembedded-core/message/199463
Mute This Topic: https://lists.openembedded.org/mt/106132270/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/3] python3-hatchling: upgrade 1.24.1 -> 1.24.2
* Add .venv to the list of directories that cannot be traversed
* Output from the core Application utility now writes to stderr
Signed-off-by: Ross Burton
---
...{python3-hatchling_1.24.1.bb => python3-hatchling_1.24.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/python/{python3-hatchling_1.24.1.bb =>
python3-hatchling_1.24.2.bb} (85%)
diff --git a/meta/recipes-devtools/python/python3-hatchling_1.24.1.bb
b/meta/recipes-devtools/python/python3-hatchling_1.24.2.bb
similarity index 85%
rename from meta/recipes-devtools/python/python3-hatchling_1.24.1.bb
rename to meta/recipes-devtools/python/python3-hatchling_1.24.2.bb
index fc8d9532813..0ad545f448b 100644
--- a/meta/recipes-devtools/python/python3-hatchling_1.24.1.bb
+++ b/meta/recipes-devtools/python/python3-hatchling_1.24.2.bb
@@ -8,7 +8,7 @@ inherit pypi python_hatchling
DEPENDS += "python3-pluggy-native python3-pathspec-native
python3-packaging-native python3-editables-native
python3-trove-classifiers-native"
DEPENDS:remove:class-native = "python3-hatchling-native"
-SRC_URI[sha256sum] =
"51f861891e98c4044eb455163a737e5d2328d7aa74890b182db2d80fee22a497"
+SRC_URI[sha256sum] =
"41ddc27cdb25db9ef7b68bef075f829c84cb349aa1bff8240797d012510547b0"
do_compile:prepend() {
export PYTHONPATH=src
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199461):
https://lists.openembedded.org/g/openembedded-core/message/199461
Mute This Topic: https://lists.openembedded.org/mt/106132268/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 2/3] gdk-pixbuf: upgrade 2.42.11 -> 2.42.12
- Fix a build failure (Christian Heusel)
- Fix occasional build failures (Benjamin Gilbert)
- ani: Reject files with multiple INA or IART chunks (Benjamin Gilbert)
- ani: Reject files with multiple anih chunks (Benjamin Gilbert, CVE-2022-48622)
- ani: validate chunk size (Benjamin Gilbert)
- Translation updates
Signed-off-by: Ross Burton
---
...n.build-allow-a-subset-of-tests-in-cross-compile.patch | 8
.../gdk-pixbuf/gdk-pixbuf/fatal-loader.patch | 2 +-
.../{gdk-pixbuf_2.42.11.bb => gdk-pixbuf_2.42.12.bb} | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.42.11.bb =>
gdk-pixbuf_2.42.12.bb} (98%)
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch
index 3d685db7742..24edda81021 100644
---
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch
+++
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch
@@ -1,4 +1,4 @@
-From 4bfb696fd125f044e3df9f6983c4ad518d9552c7 Mon Sep 17 00:00:00 2001
+From 325a4cde99a00b84116ab7111d27e6973f3c5026 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin
Date: Thu, 26 Jan 2023 20:29:46 +0100
Subject: [PATCH] meson.build: allow (a subset of) tests in cross compile
@@ -19,7 +19,7 @@ Signed-off-by: Alexander Kanavin
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/meson.build b/meson.build
-index 78f3683..e0feaee 100644
+index 3eb3fcc..dc7e790 100644
--- a/meson.build
+++ b/meson.build
@@ -390,10 +390,10 @@ subdir('gdk-pixbuf')
@@ -37,7 +37,7 @@ index 78f3683..e0feaee 100644
endif
diff --git a/tests/meson.build b/tests/meson.build
-index 78d0ad9..0c9e64e 100644
+index 3781066..911b5fb 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -4,7 +4,7 @@
@@ -49,7 +49,7 @@ index 78d0ad9..0c9e64e 100644
# Resources; we cannot use gnome.compile_resources() here, because we need
to
# override the environment in order to use the utilities we just built
instead
# of the system ones
-@@ -172,9 +172,11 @@ endif
+@@ -164,9 +164,11 @@ endif
test_deps = gdk_pixbuf_deps + [ gdkpixbuf_dep, ]
test_args = [ '-k' ]
test_env = environment()
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
index 80c93e2166f..3b4bf628614 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
@@ -1,4 +1,4 @@
-From 9b4f5738f8ac30f393b6163dcc84757976683d9b Mon Sep 17 00:00:00 2001
+From f78ab4edaee5f62663a9a4bcfa56e5c524da4474 Mon Sep 17 00:00:00 2001
From: Ross Burton
Date: Tue, 1 Apr 2014 17:23:36 +0100
Subject: [PATCH] gdk-pixbuf: add an option so that loader errors are fatal
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.11.bb
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb
similarity index 98%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.11.bb
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb
index ef0f23f8f7e..9f825a68efb 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.11.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb
@@ -22,7 +22,7 @@ SRC_URI =
"${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
file://0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch \
"
-SRC_URI[sha256sum] =
"49dcb402388708647e8c321d56b6fb30f21e51e515d0c5a942268d23052a2f00"
+SRC_URI[sha256sum] =
"b9505b3445b9a7e48ced34760c3bcb73e966df3ac94c95a148cb669ab748e3c7"
inherit meson pkgconfig gettext pixbufcache ptest-gnome
upstream-version-is-even gobject-introspection gi-docgen lib_package
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199462):
https://lists.openembedded.org/g/openembedded-core/message/199462
Mute This Topic: https://lists.openembedded.org/mt/106132269/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/4] harfbuzz: upgrade 8.4.0 -> 8.5.0
Signed-off-by: Anuj Mittal
---
.../harfbuzz/{harfbuzz_8.4.0.bb => harfbuzz_8.5.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/harfbuzz/{harfbuzz_8.4.0.bb => harfbuzz_8.5.0.bb}
(95%)
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_8.4.0.bb
b/meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb
similarity index 95%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_8.4.0.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb
index fc6951d9edb..97efc56c646 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_8.4.0.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=b98429b8e8e3c2a67cfef01e99e4893d \
"
SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] =
"af4ea73e25ab748c8c063b78c2f88e48833db9b2ac369e29bd115702e789755e"
+SRC_URI[sha256sum] =
"77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27"
DEPENDS += "glib-2.0-native"
--
2.45.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199454):
https://lists.openembedded.org/g/openembedded-core/message/199454
Mute This Topic: https://lists.openembedded.org/mt/106132071/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 4/4] glib-networking: upgrade 2.78.1 -> 2.80.0
Signed-off-by: Anuj Mittal
---
meta/recipes-core/glib-networking/glib-networking/eagain.patch | 2 +-
.../{glib-networking_2.78.1.bb => glib-networking_2.80.0.bb}| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/glib-networking/{glib-networking_2.78.1.bb =>
glib-networking_2.80.0.bb} (95%)
diff --git a/meta/recipes-core/glib-networking/glib-networking/eagain.patch
b/meta/recipes-core/glib-networking/glib-networking/eagain.patch
index 6c2e3c634b7..88ac15e7d7c 100644
--- a/meta/recipes-core/glib-networking/glib-networking/eagain.patch
+++ b/meta/recipes-core/glib-networking/glib-networking/eagain.patch
@@ -1,4 +1,4 @@
-From 5604707bed4b4a4bc4658c7158a18c1774775775 Mon Sep 17 00:00:00 2001
+From 1bd273b207044a77fba6a6a57a743a1768b2676b Mon Sep 17 00:00:00 2001
From: Richard Purdie
Date: Sat, 6 May 2023 12:18:50 +0100
Subject: [PATCH] In autobuilder testing we regularly see glib-networking ptest
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.78.1.bb
b/meta/recipes-core/glib-networking/glib-networking_2.80.0.bb
similarity index 95%
rename from meta/recipes-core/glib-networking/glib-networking_2.78.1.bb
rename to meta/recipes-core/glib-networking/glib-networking_2.80.0.bb
index 5060d9fd7a1..c8a13555486 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.78.1.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.80.0.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=4fbd65380cdd255951079008b364516c \
SECTION = "libs"
DEPENDS = "glib-2.0-native glib-2.0"
-SRC_URI[archive.sha256sum] =
"e48f2ddbb049832cbb09230529c5e45daca9f0df0eda325f832f7379859bf09f"
+SRC_URI[archive.sha256sum] =
"d8f4f1aab213179ae3351617b59dab5de6bcc9e785021eee178998ebd4bb3acf"
# Upstream note that for the openssl backend, half the tests where this
backend don't return
# the expected error code or don't work as expected so default to gnutls
--
2.45.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199457):
https://lists.openembedded.org/g/openembedded-core/message/199457
Mute This Topic: https://lists.openembedded.org/mt/106132074/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 3/4] glib-2.0: upgrade 2.80.0 -> 2.80.2
Signed-off-by: Anuj Mittal
---
...Do-not-write-bindir-into-pkg-config-files.patch | 2 +-
.../0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 2 +-
...stall-gio-querymodules-as-libexec_PROGRAM.patch | 2 +-
...warning-about-deprecated-paths-in-schemas.patch | 2 +-
...chine-correctly-when-building-with-mingw3.patch | 14 +++---
...esources.c-comment-out-a-build-host-only-.patch | 2 +-
...y-introspection-correctly-install-.gir-fi.patch | 2 +-
...1-meson-Run-atomics-test-on-clang-as-well.patch | 4 ++--
...-do-not-enable-pidfd-features-on-native-g.patch | 4 ++--
...t-hardcode-python-path-into-various-tools.patch | 2 +-
.../glib-2.0/files/relocate-modules.patch | 2 +-
.../recipes-core/glib-2.0/files/skip-timeout.patch | 2 +-
...nitial_2.80.0.bb => glib-2.0-initial_2.80.2.bb} | 0
.../{glib-2.0_2.80.0.bb => glib-2.0_2.80.2.bb} | 1 +
meta/recipes-core/glib-2.0/glib.inc| 2 +-
15 files changed, 22 insertions(+), 21 deletions(-)
rename meta/recipes-core/glib-2.0/{glib-2.0-initial_2.80.0.bb =>
glib-2.0-initial_2.80.2.bb} (100%)
rename meta/recipes-core/glib-2.0/{glib-2.0_2.80.0.bb => glib-2.0_2.80.2.bb}
(94%)
diff --git
a/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch
b/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch
index f6eba04fd4c..10568b7c9fe 100644
---
a/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch
+++
b/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch
@@ -1,4 +1,4 @@
-From 0561dcbf0918631d8106c3f6c2d8e92a5ec4b887 Mon Sep 17 00:00:00 2001
+From 10b08af6c7dcb03f954da29b6c4f9636b8796f30 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin
Date: Fri, 15 Feb 2019 11:17:27 +0100
Subject: [PATCH] Do not prefix executables with $bindir in pkg-config files
diff --git
a/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
b/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
index 129bc7f8aee..b9c9706fc46 100644
---
a/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
+++
b/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
@@ -1,4 +1,4 @@
-From ccb25e8c0bab54eac8ba0e9d7083ce81461ab72a Mon Sep 17 00:00:00 2001
+From 55c49c51d8db5af15132653003d2b65a5215eebf Mon Sep 17 00:00:00 2001
From: Khem Raj
Date: Sat, 15 Mar 2014 22:42:29 -0700
Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
diff --git
a/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
b/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
index 3e12f8abbeb..bc539fe3e88 100644
---
a/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
+++
b/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
@@ -1,4 +1,4 @@
-From caab40411d8520dae77a4b7933ebaffbb00559fe Mon Sep 17 00:00:00 2001
+From 5cf3ec787cb7e60585237327390e2ca89f4c Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen
Date: Tue, 22 Mar 2016 15:14:58 +0200
Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM
diff --git
a/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
b/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
index 9b0b83afa44..5e543339d8c 100644
---
a/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
+++
b/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
@@ -1,4 +1,4 @@
-From 65c036b1ede453e89893076f4ece21c946505096 Mon Sep 17 00:00:00 2001
+From 3db055ce8029372096be534c5cfc385f068bab17 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin
Date: Fri, 12 Jun 2015 17:08:46 +0300
Subject: [PATCH] Remove the warning about deprecated paths in schemas
diff --git
a/meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
b/meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
index a2f9dd9672f..7ac03aa6ac7 100644
---
a/meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
+++
b/meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
@@ -1,4 +1,4 @@
-From 01810df82fae752428d3756c85edb2eb7bbf3c15 Mon Sep 17 00:00:00 2001
+From 3f85d7dfb25666aef43dd6d58b4151e523f83693 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin
Date: Wed, 13 Feb 2019 15:32:05 +0100
Subject: [PATCH] Set host_machine correctly when building with mingw32
@@ -12,7 +12,7 @@ Signed-off-by: Alexander Kanavin
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
-index 232ecca..563298b 100644
+index 3bfb333..60e3d3d 100644
---
[OE-core] [PATCH 2/4] stress-ng: upgrade 0.17.07 -> 0.17.08
Signed-off-by: Anuj Mittal
---
.../stress-ng/{stress-ng_0.17.07.bb => stress-ng_0.17.08.bb}| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-extended/stress-ng/{stress-ng_0.17.07.bb =>
stress-ng_0.17.08.bb} (94%)
diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.17.07.bb
b/meta/recipes-extended/stress-ng/stress-ng_0.17.08.bb
similarity index 94%
rename from meta/recipes-extended/stress-ng/stress-ng_0.17.07.bb
rename to meta/recipes-extended/stress-ng/stress-ng_0.17.08.bb
index fb88e06a7f5..fffe6a1823b 100644
--- a/meta/recipes-extended/stress-ng/stress-ng_0.17.07.bb
+++ b/meta/recipes-extended/stress-ng/stress-ng_0.17.08.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI =
"git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \
"
-SRCREV = "519151f460738cd62b69b84f8096cd218131e0a2"
+SRCREV = "b7c7a5877501679a3b0a67d877e6274a801d1e4e"
S = "${WORKDIR}/git"
DEPENDS = "coreutils-native libbsd"
--
2.45.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199455):
https://lists.openembedded.org/g/openembedded-core/message/199455
Mute This Topic: https://lists.openembedded.org/mt/106132072/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 05/10] base: Switch UNPACKDIR to a subdir of WORKDIR
On Wed, 2024-05-15 at 17:42 +, Peter Kjellerstedt wrote:
>
> > diff --git a/meta/classes-global/base.bbclass b/meta/classes-
> > global/base.bbclass
> > index 066f3848f7c..cdce0538273 100644
> > --- a/meta/classes-global/base.bbclass
> > +++ b/meta/classes-global/base.bbclass
> > @@ -153,20 +153,35 @@ python base_do_fetch() {
> > }
> >
> > addtask unpack after do_fetch
> > -do_unpack[dirs] = "${UNPACKDIR}"
> > -
> > -do_unpack[cleandirs] = "${@d.getVar('S') if
> > os.path.normpath(d.getVar('S')) !=
> > os.path.normpath(d.getVar('WORKDIR')) else os.path.join('${S}',
> > 'patches')}"
> > +do_unpack[cleandirs] = "${UNPACKDIR}"
> >
> > python base_do_unpack() {
> > + import shutil
> > +
> > src_uri = (d.getVar('SRC_URI') or "").split()
> > if not src_uri:
> > return
> >
> > + sourcedir = d.getVar('S')
> > + basedir = None
> > + workdir = d.getVar('WORKDIR')
> > + unpackdir = d.getVar('UNPACKDIR')
> > + if sourcedir.startswith(workdir) and not
> > sourcedir.startswith(unpackdir):
> > + basedir = sourcedir.replace(workdir,
> > '').strip("/").split('/')[0]
> > + bb.utils.remove(sourcedir, True)
>
> This remove() seems wrong and should not be needed. There are two
> cases here:
>
> 1) either ${S} == ${WORKDIR}, in which case the above will remove
> ${WORKDIR}, which is sure to lead to problems, or
> 2) ${S} == ${WORKDIR}/foo[/...], in which case the removal of
> workdir + '/' + basedir below will also remove ${S} as
> basedir == "foo".
>
>
I did look into that remove() further and tried to make the removal
unconditional. The challenge is that if S = UNPACKDIR, it will rmdir
the directory and the code assumes UNPACKDIR to be created from the
cleandirs. We don't want an empty S created though for the S !=
UNPACKDIR case.
Making it conditional on sourcedir != unpackdir which was the original
condition for that code block but that does still cause QA warnings for
linux-yocto. I'm now convinced linux-yocto needs more work so I'm
tempted to disable that QA check there for now, letting us improve
base.bbclass.
Cheers,
Richard, running out of patience with hours long test cycles
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199453):
https://lists.openembedded.org/g/openembedded-core/message/199453
Mute This Topic: https://lists.openembedded.org/mt/106112374/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][PATCH] go: upgrade 1.22.2 -> 1.22.3
Upgrade to latest 1.22.x release [1]:
$ git --no-pager log --oneline go1.22.2..go1.22.3
adbfb672ba (tag: go1.22.3) [release-branch.go1.22] go1.22.3
fa0292d252 [release-branch.go1.22] cmd/go: disallow -lto_library in LDFLAGS
947e43e371 [release-branch.go1.22] Revert "cmd/compile: don't combine loads in
generated equality functions"
9d2e28501c [release-branch.go1.22] cmd/compile: don't combine loads in
generated equality functions
93d8777d24 [release-branch.go1.22] net: check SkipAdditional error result
3f4af1ff0e [release-branch.go1.22] runtime: use bootstrapRand to initialize
hashkey
a7ff78d585 [release-branch.go1.22] cmd/compile: bail PGO method lookup on
interface types
12c1177045 [release-branch.go1.22] cmd/internal/obj/ppc64: fix incorrect int to
int64 conversion when checking MOVD opcodes
d6c972ad41 [release-branch.go1.22] net/http: update bundled
golang.org/x/net/http2
a65a2bbd8e [release-branch.go1.22] all: tidy dependency versioning after release
[1] https://github.com/golang/go/compare/go1.22.2...go1.22.3
Signed-off-by: Jose Quaresma
---
meta/recipes-devtools/go/{go-1.22.2.inc => go-1.22.3.inc} | 2 +-
...o-binary-native_1.22.2.bb => go-binary-native_1.22.3.bb} | 6 +++---
...cross-canadian_1.22.2.bb => go-cross-canadian_1.22.3.bb} | 0
.../go/{go-cross_1.22.2.bb => go-cross_1.22.3.bb} | 0
.../go/{go-crosssdk_1.22.2.bb => go-crosssdk_1.22.3.bb} | 0
.../go/{go-native_1.22.2.bb => go-native_1.22.3.bb} | 0
.../go/{go-runtime_1.22.2.bb => go-runtime_1.22.3.bb} | 0
meta/recipes-devtools/go/{go_1.22.2.bb => go_1.22.3.bb} | 0
8 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/go/{go-1.22.2.inc => go-1.22.3.inc} (89%)
rename meta/recipes-devtools/go/{go-binary-native_1.22.2.bb =>
go-binary-native_1.22.3.bb} (78%)
rename meta/recipes-devtools/go/{go-cross-canadian_1.22.2.bb =>
go-cross-canadian_1.22.3.bb} (100%)
rename meta/recipes-devtools/go/{go-cross_1.22.2.bb => go-cross_1.22.3.bb}
(100%)
rename meta/recipes-devtools/go/{go-crosssdk_1.22.2.bb =>
go-crosssdk_1.22.3.bb} (100%)
rename meta/recipes-devtools/go/{go-native_1.22.2.bb => go-native_1.22.3.bb}
(100%)
rename meta/recipes-devtools/go/{go-runtime_1.22.2.bb => go-runtime_1.22.3.bb}
(100%)
rename meta/recipes-devtools/go/{go_1.22.2.bb => go_1.22.3.bb} (100%)
diff --git a/meta/recipes-devtools/go/go-1.22.2.inc
b/meta/recipes-devtools/go/go-1.22.3.inc
similarity index 89%
rename from meta/recipes-devtools/go/go-1.22.2.inc
rename to meta/recipes-devtools/go/go-1.22.3.inc
index b399207311..34703bc1fa 100644
--- a/meta/recipes-devtools/go/go-1.22.2.inc
+++ b/meta/recipes-devtools/go/go-1.22.3.inc
@@ -15,4 +15,4 @@ SRC_URI += "\
file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \
file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \
"
-SRC_URI[main.sha256sum] =
"374ea82b289ec738e968267cac59c7d5ff180f9492250254784b2044e90df5a9"
+SRC_URI[main.sha256sum] =
"80648ef34f903193d72a59c0dff019f5f98ae0c9aa13ade0b0ecbff991a76f68"
diff --git a/meta/recipes-devtools/go/go-binary-native_1.22.2.bb
b/meta/recipes-devtools/go/go-binary-native_1.22.3.bb
similarity index 78%
rename from meta/recipes-devtools/go/go-binary-native_1.22.2.bb
rename to meta/recipes-devtools/go/go-binary-native_1.22.3.bb
index 0f00509f03..b67d97608d 100644
--- a/meta/recipes-devtools/go/go-binary-native_1.22.2.bb
+++ b/meta/recipes-devtools/go/go-binary-native_1.22.3.bb
@@ -9,9 +9,9 @@ PROVIDES = "go-native"
# Checksums available at https://go.dev/dl/
SRC_URI =
"https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE};
-SRC_URI[go_linux_amd64.sha256sum] =
"5901c52b7a78002aeff14a21f93e0f064f74ce1360fce51c6ee68cd471216a17"
-SRC_URI[go_linux_arm64.sha256sum] =
"36e720b2d564980c162a48c7e97da2e407dfcc4239e1e58d98082dfa2486a0c1"
-SRC_URI[go_linux_ppc64le.sha256sum] =
"251a8886c5113be6490bdbb955ddee98763b49c9b1bf4c8364c02d3b482dab00"
+SRC_URI[go_linux_amd64.sha256sum] =
"8920ea521bad8f6b7bc377b4824982e011c19af27df88a815e3586ea895f1b36"
+SRC_URI[go_linux_arm64.sha256sum] =
"6c33e52a5b26e7aa021b94475587fce80043a727a54ceb0eee2f9fc160646434"
+SRC_URI[go_linux_ppc64le.sha256sum] =
"04b7b05283de30dd2da20bf3114b2e22cc727938aed3148babaf35cc951051ac"
UPSTREAM_CHECK_URI = "https://golang.org/dl/;
UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux"
diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.22.2.bb
b/meta/recipes-devtools/go/go-cross-canadian_1.22.3.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-cross-canadian_1.22.2.bb
rename to meta/recipes-devtools/go/go-cross-canadian_1.22.3.bb
diff --git a/meta/recipes-devtools/go/go-cross_1.22.2.bb
b/meta/recipes-devtools/go/go-cross_1.22.3.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-cross_1.22.2.bb
rename to meta/recipes-devtools/go/go-cross_1.22.3.bb
diff --git a/meta/recipes-devtools/go/go-crosssdk_1.22.2.bb
Re: [OE-core] [PATCH v4] ipk/rootfs: run sanity test of multilib in parallel
The code adds significant complexity, and the patch is difficult to
understand. The commit message should explain what the temporary
installation does, and why is needed. What does 'sanity test' do, and
how is it parallelized? Is it a part of that 'temporary installation'?
How is 'Installing package groups through opkg takes much more time
than copying directory.' relevant to all of that?
Also, if it does improve performance, can you please provide some
numbers for that, based on poky?
Alex
On Thu, 16 May 2024 at 02:12, Seungkyun Kim via lists.openembedded.org
wrote:
>
> From: "seungkyun.kim"
>
> For multilib type packages, there is an additional temporary
> installation before the actual installation. It makes almost doubles
> the do_rootfs time if having many multilib type packages.
> To avoid this overhead, run sanity test in parallel.
> Installing package groups through opkg takes much more time than
> copying directory.
>
> - Changes in V2:
> Fix FileNotFoundError exception when copying rootfs
> - Changes in V3:
> Removed unnecessary test call
> - Changes in V4:
> Fix invalid argument when create Process
> Keep the temporary rootfs directory after sanity check
>
> Signed-off-by: seungkyun.kim
> ---
> meta/lib/oe/package_manager/ipk/rootfs.py | 34 +--
> 1 file changed, 32 insertions(+), 2 deletions(-)
>
> diff --git a/meta/lib/oe/package_manager/ipk/rootfs.py
> b/meta/lib/oe/package_manager/ipk/rootfs.py
> index ba93eb62ea..a3842a6264 100644
> --- a/meta/lib/oe/package_manager/ipk/rootfs.py
> +++ b/meta/lib/oe/package_manager/ipk/rootfs.py
> @@ -6,7 +6,9 @@
>
> import re
> import filecmp
> +import multiprocessing
> import shutil
> +import stat
> from oe.rootfs import Rootfs
> from oe.manifest import Manifest
> from oe.utils import execute_pre_post_process
> @@ -197,11 +199,34 @@ class PkgRootfs(DpkgOpkgRootfs):
> files[key] = item
>
> def _multilib_test_install(self, pkgs):
> +def _copy_rootfs(src, dst):
> +if os.path.islink(src):
> +linkto = os.readlink(src)
> +if os.path.isabs(linkto):
> +linkto =
> os.path.normpath(os.path.join(os.path.dirname(dst),
> +
> os.path.relpath(linkto, src)))
> +os.symlink(linkto, dst)
> +elif os.path.isfile(src):
> +shutil.copy2(src, dst)
> +elif stat.S_ISFIFO(os.stat(src).st_mode):
> +os.mkfifo(dst)
> +else:
> +bb.warn("Skip unsupported file type: %s" % src)
> +
> ml_temp = self.d.getVar("MULTILIB_TEMP_ROOTFS")
> +rootfs_temp = os.path.join(ml_temp, "rootfs")
> bb.utils.mkdirhier(ml_temp)
> +bb.utils.remove(rootfs_temp, True)
>
> -dirs = [self.image_rootfs]
> +if os.path.exists(self.image_rootfs):
> +shutil.copytree(self.image_rootfs, rootfs_temp,
> copy_function=_copy_rootfs)
> +else:
> +bb.utils.mkdirhier(rootfs_temp)
> +dirs = [rootfs_temp]
> +return
> multiprocessing.Process(target=self._multilib_test_pkg_install,
> + args=(pkgs, ml_temp, dirs,))
>
> +def _multilib_test_pkg_install(self, pkgs, ml_temp, dirs):
> for variant in self.d.getVar("MULTILIB_VARIANTS").split():
> ml_target_rootfs = os.path.join(ml_temp, variant)
>
> @@ -300,15 +325,20 @@ class PkgRootfs(DpkgOpkgRootfs):
>
> for pkg_type in self.install_order:
> if pkg_type in pkgs_to_install:
> +sanity_test = None
> # For multilib, we perform a sanity test before final install
> # If sanity test fails, it will automatically do a bb.fatal()
> # and the installation will stop
> if pkg_type == Manifest.PKG_TYPE_MULTILIB:
> -self._multilib_test_install(pkgs_to_install[pkg_type])
> +sanity_test=
> self._multilib_test_install(pkgs_to_install[pkg_type])
> +sanity_test.start()
>
> self.pm.install(pkgs_to_install[pkg_type],
> [False, True][pkg_type ==
> Manifest.PKG_TYPE_ATTEMPT_ONLY])
>
> +if sanity_test is not None:
> +sanity_test.join()
> +
> if self.progress_reporter:
> self.progress_reporter.next_stage()
>
> --
> 2.34.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199446):
https://lists.openembedded.org/g/openembedded-core/message/199446
Mute This Topic: https://lists.openembedded.org/mt/106125799/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] git: set --with-gitconfig=/etc/gitconfig for -native builds
Polite ping.
On 23/04/2024 11.57, Rasmus Villemoes via lists.openembedded.org wrote:
> From: Rasmus Villemoes
>
> Commit 6c2ae2346db0 (kern-tools: depend on git-replacement-native)
> broke our kernel builds. For saving space and time, we have a DL_DIR
> shared between multiple users/buildbots, not all of which run with the
> same uid (and with appropriate sticky bits set so that files
> downloaded by one user become owned by a common group and are readable
> by others). This works fine also for git sources because the docker
> images we use all have a /etc/gitconfig with
>
> [safe]
> directory = *
>
> But with the mentioned commit, the host's git is no longer used for
> do_unpack (nor for do_fetch if re-building and sysroot has already
> been populated by a previous build), causing spurious "fatal: detected
> dubious ownership..." failures.
>
> Currently, the path where the git-native binary searches for system
> gitconfig is the sysroot from it was built, which obviously doesn't
> contain a /etc/gitconfig. As for the nativesdk variant, respect the
> host's /etc/gitconfig if present.
>
> Signed-off-by: Rasmus Villemoes
> ---
> meta/recipes-devtools/git/git_2.44.0.bb | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta/recipes-devtools/git/git_2.44.0.bb
> b/meta/recipes-devtools/git/git_2.44.0.bb
> index 90e555eba7..78b00dd19f 100644
> --- a/meta/recipes-devtools/git/git_2.44.0.bb
> +++ b/meta/recipes-devtools/git/git_2.44.0.bb
> @@ -40,6 +40,7 @@ EXTRA_OECONF =
> "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \
> --without-iconv \
> "
> EXTRA_OECONF:append:class-nativesdk = " --with-gitconfig=/etc/gitconfig "
> +EXTRA_OECONF:append:class-native = " --with-gitconfig=/etc/gitconfig "
>
> # Needs brokensep as this doesn't use automake
> inherit autotools-brokensep perlnative bash-completion manpages
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199445):
https://lists.openembedded.org/g/openembedded-core/message/199445
Mute This Topic: https://lists.openembedded.org/mt/105686820/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 05/10] base: Switch UNPACKDIR to a subdir of WORKDIR
On Thu, 2024-05-16 at 09:18 +0200, Martin Hundebøll wrote:
> On Wed, 2024-05-15 at 12:56 +0100, Richard Purdie wrote:
> > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> > index b2c500d8739..75c850760f6 100644
> > --- a/meta/conf/bitbake.conf
> > +++ b/meta/conf/bitbake.conf
> > @@ -405,7 +405,7 @@ STAMP =
> > "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}"
> > STAMPCLEAN = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/*-*"
> > BASE_WORKDIR ?= "${TMPDIR}/work"
> > WORKDIR = "${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}"
> > -UNPACKDIR ??= "${WORKDIR}"
> > +UNPACKDIR ??= "${WORKDIR}/sources-unpack"
> > T = "${WORKDIR}/temp"
> > D = "${WORKDIR}/image"
> > S = "${WORKDIR}/${BP}"
>
> Why not use
>
> UNPACKDIR ??= "${WORKDIR}/sources"
>
> like it's done in the individual recipes?
I think it is helpful for users to be able to tell the difference
between a recipe where S is a subdirectory of this and when there is no
subdirectory. I therefore left them visually different.
> And shouldn't we do
>
> S = ?? "${UNPACKDIR}/${BP}"
>
> also?
See my other emails. I'm torn on changing this. I've been hoping we
could avoid extra directory levels, the extra pain of changing S
everywhere and there is also some benefit to keeping extra unpacked
files clearly separate from the other sources. We may end up doing it,
I don't know.
Cheers,
Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199444):
https://lists.openembedded.org/g/openembedded-core/message/199444
Mute This Topic: https://lists.openembedded.org/mt/106112374/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 3/3] package_manager: Share more common DEB / IPK code
Avoid code duplication by making `extract` a shared method (and
retrieving the package manager specific input via an abstract method).
Additionally, follow Python conventions and prefix class internal
methods with "_" to indicate that they shouldn't be called externally.
Signed-off-by: Philip Lorenz
---
meta/lib/oe/package_manager/common_deb_ipk.py | 16
meta/lib/oe/package_manager/deb/__init__.py | 19 ++-
meta/lib/oe/package_manager/ipk/__init__.py | 15 +--
3 files changed, 15 insertions(+), 35 deletions(-)
diff --git a/meta/lib/oe/package_manager/common_deb_ipk.py
b/meta/lib/oe/package_manager/common_deb_ipk.py
index c91a4b45650..6a1e28ee6f9 100644
--- a/meta/lib/oe/package_manager/common_deb_ipk.py
+++ b/meta/lib/oe/package_manager/common_deb_ipk.py
@@ -20,9 +20,15 @@ class OpkgDpkgPM(PackageManager):
"""
super(OpkgDpkgPM, self).__init__(d, target_rootfs)
-def package_info(self, pkg, cmd):
+def package_info(self, pkg):
"""
Returns a dictionary with the package info.
+"""
+raise NotImplementedError
+
+def _common_package_info(self, cmd):
+"""
+ "Returns a dictionary with the package info.
This method extracts the common parts for Opkg and Dpkg
"""
@@ -36,14 +42,16 @@ class OpkgDpkgPM(PackageManager):
return opkg_query(proc.stdout)
-def extract(self, pkg, pkg_info):
+def extract(self, pkg):
"""
Returns the path to a tmpdir where resides the contents of a package.
Deleting the tmpdir is responsability of the caller.
-
-This method extracts the common parts for Opkg and Dpkg
"""
+pkg_info = self.package_info(pkg)
+if not pkg_info:
+bb.fatal("Unable to get information for package '%s' while "
+ "trying to extract the package." % pkg)
ar_cmd = bb.utils.which(os.getenv("PATH"), "ar")
tar_cmd = bb.utils.which(os.getenv("PATH"), "tar")
diff --git a/meta/lib/oe/package_manager/deb/__init__.py
b/meta/lib/oe/package_manager/deb/__init__.py
index a96e56b2ada..e09e81e4901 100644
--- a/meta/lib/oe/package_manager/deb/__init__.py
+++ b/meta/lib/oe/package_manager/deb/__init__.py
@@ -7,7 +7,7 @@
import re
import subprocess
from oe.package_manager import *
-from oe.package_manager import OpkgDpkgPM
+from oe.package_manager.common_deb_ipk import OpkgDpkgPM
class DpkgIndexer(Indexer):
def _create_configs(self):
@@ -431,7 +431,7 @@ class DpkgPM(OpkgDpkgPM):
Returns a dictionary with the package info.
"""
cmd = "%s show %s" % (self.apt_cache_cmd, pkg)
-pkg_info = super(DpkgPM, self).package_info(pkg, cmd)
+pkg_info = self._common_package_info(cmd)
pkg_arch = pkg_info[pkg]["pkgarch"]
pkg_filename = pkg_info[pkg]["filename"]
@@ -439,18 +439,3 @@ class DpkgPM(OpkgDpkgPM):
os.path.join(self.deploy_dir, pkg_arch, pkg_filename)
return pkg_info
-
-def extract(self, pkg):
-"""
-Returns the path to a tmpdir where resides the contents of a package.
-
-Deleting the tmpdir is responsability of the caller.
-"""
-pkg_info = self.package_info(pkg)
-if not pkg_info:
-bb.fatal("Unable to get information for package '%s' while "
- "trying to extract the package." % pkg)
-
-tmp_dir = super(DpkgPM, self).extract(pkg, pkg_info)
-
-return tmp_dir
diff --git a/meta/lib/oe/package_manager/ipk/__init__.py
b/meta/lib/oe/package_manager/ipk/__init__.py
index 23536294b0b..3d998e52ff1 100644
--- a/meta/lib/oe/package_manager/ipk/__init__.py
+++ b/meta/lib/oe/package_manager/ipk/__init__.py
@@ -416,7 +416,7 @@ class OpkgPM(OpkgDpkgPM):
Returns a dictionary with the package info.
"""
cmd = "%s %s info %s" % (self.opkg_cmd, self.opkg_args, pkg)
-pkg_info = super(OpkgPM, self).package_info(pkg, cmd)
+pkg_info = self._common_package_info(cmd)
pkg_arch = pkg_info[pkg]["arch"]
pkg_filename = pkg_info[pkg]["filename"]
@@ -424,16 +424,3 @@ class OpkgPM(OpkgDpkgPM):
os.path.join(self.deploy_dir, pkg_arch, pkg_filename)
return pkg_info
-
-def extract(self, pkg):
-"""
-Returns the path to a tmpdir where resides the contents of a package.
-
-Deleting the tmpdir is responsability of the caller.
-"""
-pkg_info = self.package_info(pkg)
-if not pkg_info:
-bb.fatal("Unable to get information for package '%s' while "
- "trying to extract the package." % pkg)
-
-return super(OpkgPM, self).extract(pkg, pkg_info)
--
2.44.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199443):
https://lists.openembedded.org/g/openembedded-core/message/199443
Mute This
[OE-core] [PATCH 1/3] ipk: Fix clean up of extracted IPK payload
It turns out that the IPK payload tarball was actually cleaned up in the
concrete package manager implementation (most likely because at some
point Debian and IPK packages used different compression algorithms).
Globbing removes this ambiguity so move the removal of the payload into
the common extract method.
Signed-off-by: Philip Lorenz
---
meta/lib/oe/package_manager/ipk/__init__.py | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/lib/oe/package_manager/ipk/__init__.py
b/meta/lib/oe/package_manager/ipk/__init__.py
index 0f0038d00d9..47e72cc7a65 100644
--- a/meta/lib/oe/package_manager/ipk/__init__.py
+++ b/meta/lib/oe/package_manager/ipk/__init__.py
@@ -159,6 +159,7 @@ class OpkgDpkgPM(PackageManager):
bb.note("Extracted %s to %s" % (pkg_path, tmp_dir))
bb.utils.remove(os.path.join(tmp_dir, "debian-binary"))
bb.utils.remove(os.path.join(tmp_dir, "control.tar.gz"))
+bb.utils.remove(os.path.join(tmp_dir, data_tar))
os.chdir(current_dir)
return tmp_dir
@@ -511,7 +512,4 @@ class OpkgPM(OpkgDpkgPM):
bb.fatal("Unable to get information for package '%s' while "
"trying to extract the package." % pkg)
-tmp_dir = super(OpkgPM, self).extract(pkg, pkg_info)
-bb.utils.remove(os.path.join(tmp_dir, "data.tar.zst"))
-
-return tmp_dir
+return super(OpkgPM, self).extract(pkg, pkg_info)
--
2.44.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199442):
https://lists.openembedded.org/g/openembedded-core/message/199442
Mute This Topic: https://lists.openembedded.org/mt/106130330/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 2/3] package_manager: Move OpkgDpkgPM into common module
The OpkgDpkgPM class was introduced to share common functionality
between the Opkg and Debian package manager implementations. However,
for unknown reasons , the refactoring done in
5bc67f55028407de78ac09f97f9a47b165ae8760 duplicated the common class
into the deb and ipk modules. Undo this part of the change by moving the
common base class into a newly created module.
The two variants did not diverge a lot (next to the payload name
generalization, the Debian variant missed
17e2eaed036e1da8e7cb42cb3de51b9523ba54ec) and as such no regressions
should be expected.
Signed-off-by: Philip Lorenz
---
meta/lib/oe/package_manager/common_deb_ipk.py | 89 +++
meta/lib/oe/package_manager/deb/__init__.py | 68 +-
meta/lib/oe/package_manager/ipk/__init__.py | 78 +---
3 files changed, 91 insertions(+), 144 deletions(-)
create mode 100644 meta/lib/oe/package_manager/common_deb_ipk.py
diff --git a/meta/lib/oe/package_manager/common_deb_ipk.py
b/meta/lib/oe/package_manager/common_deb_ipk.py
new file mode 100644
index 000..c91a4b45650
--- /dev/null
+++ b/meta/lib/oe/package_manager/common_deb_ipk.py
@@ -0,0 +1,89 @@
+#
+# Copyright OpenEmbedded Contributors
+#
+# SPDX-License-Identifier: GPL-2.0-only
+#
+
+import glob
+import os
+import subprocess
+import tempfile
+
+import bb
+
+from oe.package_manager import opkg_query, PackageManager
+
+class OpkgDpkgPM(PackageManager):
+def __init__(self, d, target_rootfs):
+"""
+This is an abstract class. Do not instantiate this directly.
+"""
+super(OpkgDpkgPM, self).__init__(d, target_rootfs)
+
+def package_info(self, pkg, cmd):
+"""
+Returns a dictionary with the package info.
+
+This method extracts the common parts for Opkg and Dpkg
+"""
+
+proc = subprocess.run(cmd, capture_output=True, encoding="utf-8",
shell=True)
+if proc.returncode:
+bb.fatal("Unable to list available packages. Command '%s' "
+ "returned %d:\n%s" % (cmd, proc.returncode, proc.stderr))
+elif proc.stderr:
+bb.note("Command '%s' returned stderr: %s" % (cmd, proc.stderr))
+
+return opkg_query(proc.stdout)
+
+def extract(self, pkg, pkg_info):
+"""
+Returns the path to a tmpdir where resides the contents of a package.
+
+Deleting the tmpdir is responsability of the caller.
+
+This method extracts the common parts for Opkg and Dpkg
+"""
+
+ar_cmd = bb.utils.which(os.getenv("PATH"), "ar")
+tar_cmd = bb.utils.which(os.getenv("PATH"), "tar")
+pkg_path = pkg_info[pkg]["filepath"]
+
+if not os.path.isfile(pkg_path):
+bb.fatal("Unable to extract package for '%s'."
+ "File %s doesn't exists" % (pkg, pkg_path))
+
+tmp_dir = tempfile.mkdtemp()
+current_dir = os.getcwd()
+os.chdir(tmp_dir)
+
+try:
+cmd = [ar_cmd, 'x', pkg_path]
+output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+data_tar = glob.glob("data.tar.*")
+if len(data_tar) != 1:
+bb.fatal("Unable to extract %s package. Failed to identify "
+ "data tarball (found tarballs '%s').",
+ pkg_path, data_tar)
+data_tar = data_tar[0]
+cmd = [tar_cmd, 'xf', data_tar]
+output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+except subprocess.CalledProcessError as e:
+bb.utils.remove(tmp_dir, recurse=True)
+bb.fatal("Unable to extract %s package. Command '%s' "
+ "returned %d:\n%s" % (pkg_path, ' '.join(cmd),
e.returncode, e.output.decode("utf-8")))
+except OSError as e:
+bb.utils.remove(tmp_dir, recurse=True)
+bb.fatal("Unable to extract %s package. Command '%s' "
+ "returned %d:\n%s at %s" % (pkg_path, ' '.join(cmd),
e.errno, e.strerror, e.filename))
+
+bb.note("Extracted %s to %s" % (pkg_path, tmp_dir))
+bb.utils.remove(os.path.join(tmp_dir, "debian-binary"))
+bb.utils.remove(os.path.join(tmp_dir, "control.tar.gz"))
+bb.utils.remove(os.path.join(tmp_dir, data_tar))
+os.chdir(current_dir)
+
+return tmp_dir
+
+def _handle_intercept_failure(self, registered_pkgs):
+self.mark_packages("unpacked", registered_pkgs.split())
diff --git a/meta/lib/oe/package_manager/deb/__init__.py
b/meta/lib/oe/package_manager/deb/__init__.py
index 0c23c884c12..a96e56b2ada 100644
--- a/meta/lib/oe/package_manager/deb/__init__.py
+++ b/meta/lib/oe/package_manager/deb/__init__.py
@@ -7,6 +7,7 @@
import re
import subprocess
from oe.package_manager import *
+from oe.package_manager import OpkgDpkgPM
class DpkgIndexer(Indexer):
def _create_configs(self):
@@ -111,72 +112,6 @@ class PMPkgsList(PkgsList):
return
[OE-core] [PATCH 0/3] package_manager: Clean up shared deb / ipk helpers
This patch series fixes one issue which I missed in "lib/package_manager/ipk: Do not hardcode payload compression algorithm" (2ad05635a6da403b4fadcc126fe7734067c12c73). Default configurations using zstd are not affected but I'd still like to make sure that things are cleaned up. Additionally, this series cleans up some deb / ipk related code by moving their common base class to a shared location. This originally used to be the case, but as part of a larger refactoring, the class was duplicated into the individual packages. If there was some kind of rationale for doing this (I couldn't think of one and couldn't figure this out based on the commit history), please let me know. As part of this clean up, the `extract` method is moved into the common base class to ensure that future adaptations apply to both specializations. Philip Lorenz (3): ipk: Fix clean up of extracted IPK payload package_manager: Move OpkgDpkgPM into common module package_manager: Share more common DEB / IPK code meta/lib/oe/package_manager/common_deb_ipk.py | 97 +++ meta/lib/oe/package_manager/deb/__init__.py | 85 +--- meta/lib/oe/package_manager/ipk/__init__.py | 95 +- 3 files changed, 101 insertions(+), 176 deletions(-) create mode 100644 meta/lib/oe/package_manager/common_deb_ipk.py -- 2.44.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199440): https://lists.openembedded.org/g/openembedded-core/message/199440 Mute This Topic: https://lists.openembedded.org/mt/106130311/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 05/10] base: Switch UNPACKDIR to a subdir of WORKDIR
On Wed, 2024-05-15 at 12:56 +0100, Richard Purdie wrote:
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index b2c500d8739..75c850760f6 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -405,7 +405,7 @@ STAMP =
> "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}"
> STAMPCLEAN = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/*-*"
> BASE_WORKDIR ?= "${TMPDIR}/work"
> WORKDIR = "${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}"
> -UNPACKDIR ??= "${WORKDIR}"
> +UNPACKDIR ??= "${WORKDIR}/sources-unpack"
> T = "${WORKDIR}/temp"
> D = "${WORKDIR}/image"
> S = "${WORKDIR}/${BP}"
Why not use
UNPACKDIR ??= "${WORKDIR}/sources"
like it's done in the individual recipes?
And shouldn't we do
S = ?? "${UNPACKDIR}/${BP}"
also?
// Martin
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199439):
https://lists.openembedded.org/g/openembedded-core/message/199439
Mute This Topic: https://lists.openembedded.org/mt/106112374/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] libusb1: Set CVE_PRODUCT
From: Ricardo Simoes
This commit sets the CVE_PRODUCT variable to "libusb" to match the
product name used in the NIST CPE database [1].
[1]: https://nvd.nist.gov/products/cpe/search
Signed-off-by: Ricardo Simoes
Signed-off-by: Mark Jonas
---
meta/recipes-support/libusb/libusb1_1.0.27.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-support/libusb/libusb1_1.0.27.bb
b/meta/recipes-support/libusb/libusb1_1.0.27.bb
index f2431d75c8..5bf854f95d 100644
--- a/meta/recipes-support/libusb/libusb1_1.0.27.bb
+++ b/meta/recipes-support/libusb/libusb1_1.0.27.bb
@@ -8,6 +8,8 @@ SECTION = "libs"
LICENSE = "LGPL-2.1-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+CVE_PRODUCT = "libusb"
+
BBCLASSEXTEND = "native nativesdk"
SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libusb-${PV}.tar.bz2 \
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199438):
https://lists.openembedded.org/g/openembedded-core/message/199438
Mute This Topic: https://lists.openembedded.org/mt/106129930/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core][PATCH v2] glibc: correct license
Hi Peter, what about BSD-4-Clause-UC, BSD-3-Clause, ISC licenses included in glibc. I've suggested to add them long time ago in: https://lists.openembedded.org/g/openembedded-core/topic/91285771#msg166005 which resulted in: https://sourceware.org/bugzilla/show_bug.cgi?id=28007 https://sourceware.org/pipermail/libc-alpha/2022-May/139167.html but the discussion upstream stopped shortly after and the oe-core change was never merged because of that. Maybe it's time to re-check and ping upstream again after 2 years. Cheers, On Mon, May 6, 2024 at 9:46 AM Peter Marko via lists.openembedded.org wrote: > > From: Peter Marko > > The license per [1] is LGPL-2.1-or-later and > [2] converted last LGPL-2.1-only references. > > License-Update: corrected from LGPL-2.1-only to LGPL-2.1-or-later based on > [1] and [2] > > [1] https://www.gnu.org/software/libc/ > [2] > https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=273a835fe7c685cc54266bb8b502787bad5e9bae > > Signed-off-by: Peter Marko > --- > meta/recipes-core/glibc/glibc-common.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-core/glibc/glibc-common.inc > b/meta/recipes-core/glibc/glibc-common.inc > index b9516e77f0..91a3f5bcd5 100644 > --- a/meta/recipes-core/glibc/glibc-common.inc > +++ b/meta/recipes-core/glibc/glibc-common.inc > @@ -2,7 +2,7 @@ SUMMARY = "GLIBC (GNU C Library)" > DESCRIPTION = "The GNU C Library is used as the system C library in most > systems with the Linux kernel." > HOMEPAGE = "http://www.gnu.org/software/libc/libc.html; > SECTION = "libs" > -LICENSE = "GPL-2.0-only & LGPL-2.1-only" > +LICENSE = "GPL-2.0-only & LGPL-2.1-or-later" > > LIC_FILES_CHKSUM ?= "file://LICENSES;md5=f77e878d320e99e94ae9a4aea7f491d1 \ >file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ > -- > 2.30.2 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199437): https://lists.openembedded.org/g/openembedded-core/message/199437 Mute This Topic: https://lists.openembedded.org/mt/105935723/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] kexec-tools: Fix build with GCC-14 on musl
Signed-off-by: Khem Raj
---
...linux-setup.c-Use-POSIX-basename-API.patch | 54 +++
.../kexec/kexec-tools_2.0.28.bb | 1 +
2 files changed, 55 insertions(+)
create mode 100644
meta/recipes-kernel/kexec/kexec-tools/0001-x86-linux-setup.c-Use-POSIX-basename-API.patch
diff --git
a/meta/recipes-kernel/kexec/kexec-tools/0001-x86-linux-setup.c-Use-POSIX-basename-API.patch
b/meta/recipes-kernel/kexec/kexec-tools/0001-x86-linux-setup.c-Use-POSIX-basename-API.patch
new file mode 100644
index 000..e223f45998c
--- /dev/null
+++
b/meta/recipes-kernel/kexec/kexec-tools/0001-x86-linux-setup.c-Use-POSIX-basename-API.patch
@@ -0,0 +1,54 @@
+From 32c8ffa7ace6f1b7e63f9ddffab00b00c36a7b57 Mon Sep 17 00:00:00 2001
+From: Khem Raj
+Date: Wed, 15 May 2024 21:18:08 -0700
+Subject: [PATCH] x86-linux-setup.c: Use POSIX basename API
+
+Musl C library only supports POSIX basename function. while glibc has
+both GNU extention as well as POSIX basename implemented. Switch to
+using posix version, so it can work across musl and glibc
+
+basename prototype has been removed from string.h from latest musl [1]
+compilers e.g. clang-18/GCC-14 flags the absense of prototype as error.
+therefore include libgen.h for providing it.
+
+[1]
https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
+
+Upstream-Status: Submitted
[https://lists.infradead.org/pipermail/kexec/2024-May/030034.html]
+Signed-off-by: Khem Raj
+---
+ kexec/arch/i386/x86-linux-setup.c | 9 ++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/kexec/arch/i386/x86-linux-setup.c
b/kexec/arch/i386/x86-linux-setup.c
+index 9a281dc..73251b9 100644
+--- a/kexec/arch/i386/x86-linux-setup.c
b/kexec/arch/i386/x86-linux-setup.c
+@@ -14,6 +14,7 @@
+ *
+ */
+ #define _GNU_SOURCE
++#include
+ #include
+ #include
+ #include
+@@ -329,12 +330,14 @@ static int add_edd_entry(struct x86_linux_param_header
*real_mode,
+ memset(edd_info, 0, sizeof(struct edd_info));
+
+ /* extract the device number */
+- if (sscanf(basename(sysfs_name), "int13_dev%hhx", ) != 1) {
++ char* sysfs_name_copy = strdup(sysfs_name);
++ if (sscanf(basename(sysfs_name_copy), "int13_dev%hhx", ) != 1) {
+ fprintf(stderr, "Invalid format of int13_dev dir "
+- "entry: %s\n", basename(sysfs_name));
++ "entry: %s\n", basename(sysfs_name_copy));
++ free(sysfs_name_copy);
+ return -1;
+ }
+-
++ free(sysfs_name_copy);
+ /* if there's a MBR signature, then add it */
+ if (file_scanf(sysfs_name, "mbr_signature", "0x%x", _sig) == 1) {
+ real_mode->edd_mbr_sig_buffer[*current_mbr] = mbr_sig;
+--
+2.45.1
+
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb
b/meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb
index c39fff834d0..b60c51df4a1 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb
@@ -18,6 +18,7 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz
file://0005-Disable-PIE-during-link.patch \
file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \
file://Fix-building-on-x86_64-with-binutils-2.41.patch \
+ file://0001-x86-linux-setup.c-Use-POSIX-basename-API.patch \
"
SRC_URI[sha256sum] =
"f33d2660b3e38d25a127e87097978e0f7a9a73ab5151a29eb80974d169ff6a29"
--
2.45.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199436):
https://lists.openembedded.org/g/openembedded-core/message/199436
Mute This Topic: https://lists.openembedded.org/mt/106129045/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v4] ipk/rootfs: run sanity test of multilib in parallel
From: "seungkyun.kim"
For multilib type packages, there is an additional temporary
installation before the actual installation. It makes almost doubles
the do_rootfs time if having many multilib type packages.
To avoid this overhead, run sanity test in parallel.
Installing package groups through opkg takes much more time than
copying directory.
- Changes in V2:
Fix FileNotFoundError exception when copying rootfs
- Changes in V3:
Removed unnecessary test call
- Changes in V4:
Fix invalid argument when create Process
Keep the temporary rootfs directory after sanity check
Signed-off-by: seungkyun.kim
---
meta/lib/oe/package_manager/ipk/rootfs.py | 34 +--
1 file changed, 32 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oe/package_manager/ipk/rootfs.py
b/meta/lib/oe/package_manager/ipk/rootfs.py
index ba93eb62ea..a3842a6264 100644
--- a/meta/lib/oe/package_manager/ipk/rootfs.py
+++ b/meta/lib/oe/package_manager/ipk/rootfs.py
@@ -6,7 +6,9 @@
import re
import filecmp
+import multiprocessing
import shutil
+import stat
from oe.rootfs import Rootfs
from oe.manifest import Manifest
from oe.utils import execute_pre_post_process
@@ -197,11 +199,34 @@ class PkgRootfs(DpkgOpkgRootfs):
files[key] = item
def _multilib_test_install(self, pkgs):
+def _copy_rootfs(src, dst):
+if os.path.islink(src):
+linkto = os.readlink(src)
+if os.path.isabs(linkto):
+linkto =
os.path.normpath(os.path.join(os.path.dirname(dst),
+
os.path.relpath(linkto, src)))
+os.symlink(linkto, dst)
+elif os.path.isfile(src):
+shutil.copy2(src, dst)
+elif stat.S_ISFIFO(os.stat(src).st_mode):
+os.mkfifo(dst)
+else:
+bb.warn("Skip unsupported file type: %s" % src)
+
ml_temp = self.d.getVar("MULTILIB_TEMP_ROOTFS")
+rootfs_temp = os.path.join(ml_temp, "rootfs")
bb.utils.mkdirhier(ml_temp)
+bb.utils.remove(rootfs_temp, True)
-dirs = [self.image_rootfs]
+if os.path.exists(self.image_rootfs):
+shutil.copytree(self.image_rootfs, rootfs_temp,
copy_function=_copy_rootfs)
+else:
+bb.utils.mkdirhier(rootfs_temp)
+dirs = [rootfs_temp]
+return multiprocessing.Process(target=self._multilib_test_pkg_install,
+ args=(pkgs, ml_temp, dirs,))
+def _multilib_test_pkg_install(self, pkgs, ml_temp, dirs):
for variant in self.d.getVar("MULTILIB_VARIANTS").split():
ml_target_rootfs = os.path.join(ml_temp, variant)
@@ -300,15 +325,20 @@ class PkgRootfs(DpkgOpkgRootfs):
for pkg_type in self.install_order:
if pkg_type in pkgs_to_install:
+sanity_test = None
# For multilib, we perform a sanity test before final install
# If sanity test fails, it will automatically do a bb.fatal()
# and the installation will stop
if pkg_type == Manifest.PKG_TYPE_MULTILIB:
-self._multilib_test_install(pkgs_to_install[pkg_type])
+sanity_test=
self._multilib_test_install(pkgs_to_install[pkg_type])
+sanity_test.start()
self.pm.install(pkgs_to_install[pkg_type],
[False, True][pkg_type ==
Manifest.PKG_TYPE_ATTEMPT_ONLY])
+if sanity_test is not None:
+sanity_test.join()
+
if self.progress_reporter:
self.progress_reporter.next_stage()
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199435):
https://lists.openembedded.org/g/openembedded-core/message/199435
Mute This Topic: https://lists.openembedded.org/mt/106125799/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v8 0/3] pkg-database and systemd-sysext image
Hoi Alexandre,
and thanks again for patiently pointing out the autobuilder problems :-)
"only" the test_image_gen_pkgdbfs_{ipk,deb,rpm} fail, the
test_image_use_pkgdbfs succeeds
picking apart the yocto-autobuilder-helper/config.json showed the difference:
basically all oe-selftest-* use
"MACHINE" : "qemux86-64"
**but** oe-selftest-armhost sets:
"MACHINE": "qemuarm64"
the test_image_gen_pkgdbfs_ checks to sanity check the packagamanager state
looked for a "kernel-image" package in the listing... but for quemuarm64
"packagegroup-core-boot" replaces that
v9 of the patchstack adapts that particular assert(s) to look for either the
kernel-image or core-boot depending on the set MACHINE
gruß
Johannes
From: Alexandre Belloni
Sent: Wednesday, May 15, 2024 21:09
To: SCHNEIDER Johannes
Cc: openembedded-core@lists.openembedded.org;
richard.pur...@linuxfoundation.org; alex.kana...@gmail.com
Subject: Re: [OE-core] [PATCH v8 0/3] pkg-database and systemd-sysext image
This email is not from Hexagon’s Office 365 instance. Please be careful while
clicking links, opening attachments, or replying to this email.
Hello,
It seems that this reliably fails oe-selftest-armhost. I didn't really
pay attention until now beause we had other issues but in this build,
those are the only failing tests:
https://autobuilder.yoctoproject.org/typhoon/#/builders/127/builds/3322/steps/15/logs/stdio
On 12/05/2024 08:31:56+0200, Johannes Schneider via lists.openembedded.org
wrote:
> systemd-sysext allows to overlay another image (or multiple) ontop of
> a "base-image" = the current rootfs, via the use of overlayfs; to add
> tools and features meant for development purposes.
>
> To quote the documentation on systemd-sysext:
> " ...addition in order to make debugging/development easier). System
> extension images should not be misunderstood as a generic software
> packaging framework, ..."
>
> To build a lean image, that only holds packages that are not already
> part of the base-image, a snapshot of the package-database is taken
> after the installation of the base-rootfs is done, and picked up again
> when collecting the rootfs of such a extension image.
>
> with all this in place an example usage could look like this:
> some-core-image.bb
> inherit core-image
> IMAGE_GEN_PKGDBFS = "1"
>
> extending-image.bb
> inherit image-sysext
> IMAGE_FSTYPES = "squashfs"
> IMAGE_BASE_PKGDB = "some-core-image"
> # the above pointing at a package-db similar to:
> #
> build/deploy/images/$MACHINE/some-core-image-$MACHINE-20240210172305-pkgdb.rootfs.tar.gz
>
> then on the device, running some-core-image, with the extension image placed
> at FN:
> $> ln -s "$FN" /run/extensions/$(basename $FN).raw
> $> systemd-sysext list
> $> SYSTEMD_LOG_LEVEL=debug systemd-sysext merge
>
> As long as the VERSION_ID of the extension image matches the os-release
> in the base image, the above commands return sucessfully;
> for details on the compativility check see the docs for systemd-sysext.
>
> =
>
> changes with v2:
> rebase from 'kirkstone' onto 'master'
>
> changes with v3:
> incorporate review suggestions for simplification
> add task dependency handling
> add oe-selftest for the pkgdb handling
> add variable documentation and
> some more comments, and examples in the commit-msg
>
> changes with v4:
> rebase onto 'master' => no functional changes
> fixed patchtest findings
>
> changes with v5:
> rebase onto 'master'
> add '.sysext' to the deployed symlink name
> sidenote on the tests and autobuilder failure: run locally they
> succeed, e.g.:
> #> oe-selftest --verbose -r
> imagefeatures.ImageFeatures.test_image_gen_pkgdbfs
>
> changes with v6:
> tests: restructure to call 'bitbake' only once in the testcase itself
> (in hopes of solving the autobuilder problem; local test runs succeed)
>
> changes with v7:
> tests: undo the restructuring of done in v6, in favour of explicitly
> forcing steps:
> '-c rootfs -f'. since concurrency of the autobuilder, and reusing
> artifacts/sstate-caching is probably the issue?
>
> changes with v8:
> tests: fixed missing feature=PACKAGE_CLASSES during
> 'test_image_gen_pkgdbfs'
> which is now split into three, one for each of the three available
> packagemanager: ipk, deb, rpm
>
>
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com/
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199434):
https://lists.openembedded.org/g/openembedded-core/message/199434
Mute This Topic: https://lists.openembedded.org/mt/106051545/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v9 3/3] classes: add a systemd-sysext image class
systemd-sysext can load a raw-image containing usr/ and opt/ folders
to mount them as RO overlay over the rootfs, to "extend" the systems.
This class provides the necessary changes/additions to the enclosed
file-system so that systemd-sysext accepts the extension for "merge"
into the rootfs.
With such an created image, placed into the correct folder (see [1]),
`systemd-sysext list` should be able to list the "extension" and
`systemd-sysext merge` should enable the overlay. On both commands a
preceding "SYSTEMD_LOG_LEVEL=debug" can aide in figuring out what is
amiss.
The strict name checking systemd-sysext does against the name of
extension-release.NAME file, is disabled, as there is only one such in
the resulting image. This is done to allow a user to freely rename the
resulting image file.
Note that for e.g. squashfs, the kernel needs CONFIG_SQUASHFS_XATTR=y
Link:
https://www.freedesktop.org/software/systemd/man/latest/systemd-sysext.html
Link:
https://0pointer.net/blog/testing-my-system-code-in-usr-without-modifying-usr.html
Signed-off-by: Johannes Schneider
---
meta/classes-recipe/image-sysext.bbclass | 43
1 file changed, 43 insertions(+)
create mode 100644 meta/classes-recipe/image-sysext.bbclass
diff --git a/meta/classes-recipe/image-sysext.bbclass
b/meta/classes-recipe/image-sysext.bbclass
new file mode 100644
index 00..bc3e4d52b5
--- /dev/null
+++ b/meta/classes-recipe/image-sysext.bbclass
@@ -0,0 +1,43 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright Leica Geosystems AG
+#
+
+# systemd-sysext [1] has a simple mechanism for version compatibility:
+# the extension to be loaded has to contain a
+# /usr/lib/extension-release.d/extension-release.NAME
+# with "NAME" *exactly* matching the filename of the extensions
+# raw-device filename/
+#
+# from the extension-release file the "ID" and "VERSION_ID" fields are
+# matched against the etc/os-release and the extension is only "merged"
+# if no mismatches between NAME, ID, and VERSION_ID.
+#
+# Link:
https://www.freedesktop.org/software/systemd/man/latest/systemd-sysext.html
+
+inherit image
+
+IMAGE_NAME_SUFFIX = ".sysext"
+EXTENSION_NAME = "${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${IMAGE_FSTYPES}"
+IMAGE_LINK_NAME:append = ".sysext"
+
+DEPENDS += " os-release"
+
+sysext_image_mangle_rootfs() {
+R=${IMAGE_ROOTFS}
+
+# pull a copy of the rootfs version information, which systemd-sysext
matches against
+cp -av ${RECIPE_SYSROOT}/${nonarch_libdir}/os-release
${WORKDIR}/extension-release.base
+
+echo 'EXTENSION_RELOAD_MANAGER=1' >> ${WORKDIR}/extension-release.base
+
+install -d $R${nonarch_libdir}/extension-release.d
+install -m 0644 ${WORKDIR}/extension-release.base \
+
$R${nonarch_libdir}/extension-release.d/extension-release.${EXTENSION_NAME}
+
+# disable systemd-sysext's strict name checking, so that the image file
can be renamed, while still being 'merge'-able
+setfattr -n user.extension-release.strict -v false \
+
$R${nonarch_libdir}/extension-release.d/extension-release.${EXTENSION_NAME}
+}
+
+ROOTFS_POSTPROCESS_COMMAND += " sysext_image_mangle_rootfs; "
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199433):
https://lists.openembedded.org/g/openembedded-core/message/199433
Mute This Topic: https://lists.openembedded.org/mt/106124370/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v9 2/3] image.bbclass/rootfs: set and unpack package-database
set the package-database of a "lower image" to unpack and build upon
when installing packages for the current image. This way a lean image
will be created, which only holds the packages that are not already
present in the lower image.
An image build such could then be used with overlayfs or systemd-
sysext to extend the "lower image" on demand; for development purposes
on a device running the "lower image" in RO mode for example.
A configuration could look as follows:
some-core-image.bb
inherit image
IMAGE_GEN_PKGDBFS = "1"
extending-image.bb
inherit image
IMAGE_BASE_PKGDB = "some-core-image"
Signed-off-by: Johannes Schneider
---
meta/classes-recipe/image.bbclass | 23 ++--
meta/conf/documentation.conf | 3 +-
meta/lib/oe/package_manager/deb/rootfs.py | 2 +
meta/lib/oe/package_manager/ipk/rootfs.py | 6 ++-
meta/lib/oe/package_manager/rpm/rootfs.py | 7 ++-
meta/lib/oe/rootfs.py | 18 +++
meta/lib/oeqa/selftest/cases/imagefeatures.py | 52 ++-
7 files changed, 102 insertions(+), 9 deletions(-)
diff --git a/meta/classes-recipe/image.bbclass
b/meta/classes-recipe/image.bbclass
index 3ccaaa17b8..c573c37cd8 100644
--- a/meta/classes-recipe/image.bbclass
+++ b/meta/classes-recipe/image.bbclass
@@ -42,8 +42,16 @@ IMAGE_FEATURES ?= ""
IMAGE_FEATURES[type] = "list"
IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs
read-only-rootfs-delayed-postinsts stateless-rootfs empty-root-password
allow-empty-password allow-root-login serial-autologin-root
post-install-logging overlayfs-etc"
-# Generate snapshot of the package database?
+# Image layering:
+# a "base image" would create a snapshot of the package-database after the
+# installation of all packages into the rootfs is done. The next/other image
+# "layered on-top" of the former would then import that database and install
+# further packages; without reinstalling packages/dependencies that are already
+# installed in the layer below.
+# Set to '1' in a "base image" recipe, to preserve a snapshot of the package
database.
IMAGE_GEN_PKGDBFS ?= "0"
+# "PN" of a "base image", upon which the current image is to be built upon.
+IMAGE_BASE_PKGDB ?= ""
# Generate companion debugfs?
IMAGE_GEN_DEBUGFS ?= "0"
@@ -118,6 +126,15 @@ do_rootfs[depends] += " \
"
do_rootfs[recrdeptask] += "do_packagedata"
+python () {
+# make sure that the 'base image' has been queued in before this
+# image wants to unpack and build upon the formers pgkdb
+base_image = d.getVar('IMAGE_BASE_PKGDB')
+pn = d.getVar('PN')
+if base_image and base_image != pn:
+d.appendVarFlag("do_rootfs", 'depends', ' '+ base_image +
':do_image_complete')
+}
+
def rootfs_command_variables(d):
return
['ROOTFS_POSTPROCESS_COMMAND','ROOTFS_PREPROCESS_COMMAND','ROOTFS_POSTINSTALL_COMMAND','ROOTFS_POSTUNINSTALL_COMMAND','OPKG_PREPROCESS_COMMANDS','OPKG_POSTPROCESS_COMMANDS','IMAGE_POSTPROCESS_COMMAND',
'IMAGE_PREPROCESS_COMMAND','RPM_PREPROCESS_COMMANDS','RPM_POSTPROCESS_COMMANDS','DEB_PREPROCESS_COMMANDS','DEB_POSTPROCESS_COMMANDS']
@@ -134,8 +151,8 @@ def rootfs_variables(d):
'IMAGE_ROOTFS_MAXSIZE','IMAGE_NAME','IMAGE_LINK_NAME','IMAGE_MANIFEST','DEPLOY_DIR_IMAGE','IMAGE_FSTYPES','IMAGE_INSTALL_COMPLEMENTARY','IMAGE_LINGUAS',
'IMAGE_LINGUAS_COMPLEMENTARY', 'IMAGE_LOCALES_ARCHIVE',
'MULTILIBRE_ALLOW_REP','MULTILIB_TEMP_ROOTFS','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS',
'PACKAGE_ARCHS','PACKAGE_CLASSES','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','USE_DEVFS',
- 'CONVERSIONTYPES', 'IMAGE_GEN_PKGDBFS', 'IMAGE_GEN_DEBUGFS',
'ROOTFS_RO_UNNEEDED', 'IMGDEPLOYDIR', 'PACKAGE_EXCLUDE_COMPLEMENTARY',
'REPRODUCIBLE_TIMESTAMP_ROOTFS',
- 'IMAGE_INSTALL_DEBUGFS']
+ 'CONVERSIONTYPES', 'IMAGE_GEN_PKGDBFS', 'IMAGE_BASE_PKGDB',
'IMAGE_GEN_DEBUGFS', 'ROOTFS_RO_UNNEEDED', 'IMGDEPLOYDIR',
'PACKAGE_EXCLUDE_COMPLEMENTARY',
+ 'REPRODUCIBLE_TIMESTAMP_ROOTFS', 'IMAGE_INSTALL_DEBUGFS']
variables.extend(rootfs_command_variables(d))
variables.extend(variable_depends(d))
return " ".join(variables)
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 36aebb59ab..9f493cfe96 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -208,6 +208,7 @@ ICECC_PATH[doc] = "The location of the icecc binary."
ICECC_CLASS_DISABLE[doc] = "Identifies user classes that you do not want the
Icecream distributed compile support to consider."
ICECC_RECIPE_DISABLE[doc] = "Identifies user recipes that you do not want the
Icecream distributed compile support to consider."
ICECC_RECIPE_ENABLE[doc] = "Identifies user recipes that use
[OE-core] [PATCH v9 1/3] image.bbclass/rootfs: archive and deploy package database
archive the package database after the rootfs has been put together as
*rootfs-pkdbfs.tar.gz, and put it into the deploy folder.
This creates a snapshot of the package mangers state at the point in
time when all dependencies have been resolved and installed; which
could be used by "extension images" to built upon.
Signed-off-by: Johannes Schneider
---
meta/classes-recipe/image.bbclass | 44 -
meta/classes-recipe/image_types.bbclass | 1 +
meta/conf/documentation.conf | 1 +
meta/lib/oe/package_manager/deb/rootfs.py | 1 +
meta/lib/oe/package_manager/ipk/rootfs.py | 1 +
meta/lib/oe/package_manager/rpm/rootfs.py | 1 +
meta/lib/oe/rootfs.py | 20 +++
meta/lib/oeqa/selftest/cases/imagefeatures.py | 159 ++
8 files changed, 227 insertions(+), 1 deletion(-)
diff --git a/meta/classes-recipe/image.bbclass
b/meta/classes-recipe/image.bbclass
index 28be6c6362..3ccaaa17b8 100644
--- a/meta/classes-recipe/image.bbclass
+++ b/meta/classes-recipe/image.bbclass
@@ -42,6 +42,9 @@ IMAGE_FEATURES ?= ""
IMAGE_FEATURES[type] = "list"
IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs
read-only-rootfs-delayed-postinsts stateless-rootfs empty-root-password
allow-empty-password allow-root-login serial-autologin-root
post-install-logging overlayfs-etc"
+# Generate snapshot of the package database?
+IMAGE_GEN_PKGDBFS ?= "0"
+
# Generate companion debugfs?
IMAGE_GEN_DEBUGFS ?= "0"
@@ -131,7 +134,8 @@ def rootfs_variables(d):
'IMAGE_ROOTFS_MAXSIZE','IMAGE_NAME','IMAGE_LINK_NAME','IMAGE_MANIFEST','DEPLOY_DIR_IMAGE','IMAGE_FSTYPES','IMAGE_INSTALL_COMPLEMENTARY','IMAGE_LINGUAS',
'IMAGE_LINGUAS_COMPLEMENTARY', 'IMAGE_LOCALES_ARCHIVE',
'MULTILIBRE_ALLOW_REP','MULTILIB_TEMP_ROOTFS','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS',
'PACKAGE_ARCHS','PACKAGE_CLASSES','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','USE_DEVFS',
- 'CONVERSIONTYPES', 'IMAGE_GEN_DEBUGFS', 'ROOTFS_RO_UNNEEDED',
'IMGDEPLOYDIR', 'PACKAGE_EXCLUDE_COMPLEMENTARY',
'REPRODUCIBLE_TIMESTAMP_ROOTFS', 'IMAGE_INSTALL_DEBUGFS']
+ 'CONVERSIONTYPES', 'IMAGE_GEN_PKGDBFS', 'IMAGE_GEN_DEBUGFS',
'ROOTFS_RO_UNNEEDED', 'IMGDEPLOYDIR', 'PACKAGE_EXCLUDE_COMPLEMENTARY',
'REPRODUCIBLE_TIMESTAMP_ROOTFS',
+ 'IMAGE_INSTALL_DEBUGFS']
variables.extend(rootfs_command_variables(d))
variables.extend(variable_depends(d))
return " ".join(variables)
@@ -337,6 +341,17 @@ python do_image_qa_setscene () {
}
addtask do_image_qa_setscene
+def setup_pkgdbfs_variables(d):
+d.appendVar('IMAGE_ROOTFS', '-pkgdb')
+if d.getVar('IMAGE_LINK_NAME'):
+d.appendVar('IMAGE_LINK_NAME', '-pkgdb')
+d.appendVar('IMAGE_NAME','-pkgdb')
+d.setVar('IMAGE_FSTYPES', 'tar.gz')
+
+python setup_pkgdbfs () {
+setup_pkgdbfs_variables(d)
+}
+
def setup_debugfs_variables(d):
d.appendVar('IMAGE_ROOTFS', '-dbg')
if d.getVar('IMAGE_LINK_NAME'):
@@ -381,6 +396,11 @@ python () {
alltypes = d.getVar('IMAGE_FSTYPES').split()
typedeps = {}
+if d.getVar('IMAGE_GEN_PKGDBFS') == "1":
+pkgdbfs_fstypes = ['tar.gz']
+for t in pkgdbfs_fstypes:
+alltypes.append("pkgdbfs_" + t)
+
if d.getVar('IMAGE_GEN_DEBUGFS') == "1":
debugfs_fstypes = d.getVar('IMAGE_FSTYPES_DEBUGFS').split()
for t in debugfs_fstypes:
@@ -393,6 +413,10 @@ python () {
basetypes[baset]= []
if t not in basetypes[baset]:
basetypes[baset].append(t)
+pkgdb = ""
+if t.startswith("pkgdbfs_"):
+t = t[8:]
+pkgdb = "pkgdbfs_"
debug = ""
if t.startswith("debugfs_"):
t = t[8:]
@@ -401,6 +425,13 @@ python () {
vardeps.add('IMAGE_TYPEDEP:' + t)
if baset not in typedeps:
typedeps[baset] = set()
+deps = [pkgdb + dep for dep in deps]
+for dep in deps:
+if dep not in alltypes:
+alltypes.append(dep)
+_add_type(dep)
+basedep = _image_base_type(dep)
+typedeps[baset].add(basedep)
deps = [debug + dep for dep in deps]
for dep in deps:
if dep not in alltypes:
@@ -419,6 +450,7 @@ python () {
maskedtypes = (d.getVar('IMAGE_TYPES_MASKED') or "").split()
maskedtypes = [dbg + t for t in maskedtypes for dbg in ("", "debugfs_")]
+maskedtypes = [pkgdb + t for t in maskedtypes for pkgdb in ("",
"pkgdbfs_")]
for t in basetypes:
vardeps = set()
@@ -430,6 +462,11 @@ python () {
continue
localdata = bb.data.createCopy(d)
+pkgdb = ""
+if t.startswith("pkgdbfs_"):
+
[OE-core] [PATCH v9 0/3] pkg-database and systemd-sysext image
systemd-sysext allows to overlay another image (or multiple) ontop of a "base-image" = the current rootfs, via the use of overlayfs; to add tools and features meant for development purposes. To quote the documentation on systemd-sysext: " ...addition in order to make debugging/development easier). System extension images should not be misunderstood as a generic software packaging framework, ..." To build a lean image, that only holds packages that are not already part of the base-image, a snapshot of the package-database is taken after the installation of the base-rootfs is done, and picked up again when collecting the rootfs of such a extension image. with all this in place an example usage could look like this: some-core-image.bb inherit core-image IMAGE_GEN_PKGDBFS = "1" extending-image.bb inherit image-sysext IMAGE_FSTYPES = "squashfs" IMAGE_BASE_PKGDB = "some-core-image" # the above pointing at a package-db similar to: # build/deploy/images/$MACHINE/some-core-image-$MACHINE-20240210172305-pkgdb.rootfs.tar.gz then on the device, running some-core-image, with the extension image placed at FN: $> ln -s "$FN" /run/extensions/$(basename $FN).raw $> systemd-sysext list $> SYSTEMD_LOG_LEVEL=debug systemd-sysext merge As long as the VERSION_ID of the extension image matches the os-release in the base image, the above commands return sucessfully; for details on the compativility check see the docs for systemd-sysext. = changes with v2: rebase from 'kirkstone' onto 'master' changes with v3: incorporate review suggestions for simplification add task dependency handling add oe-selftest for the pkgdb handling add variable documentation and some more comments, and examples in the commit-msg changes with v4: rebase onto 'master' => no functional changes fixed patchtest findings changes with v5: rebase onto 'master' add '.sysext' to the deployed symlink name sidenote on the tests and autobuilder failure: run locally they succeed, e.g.: #> oe-selftest --verbose -r imagefeatures.ImageFeatures.test_image_gen_pkgdbfs changes with v6: tests: restructure to call 'bitbake' only once in the testcase itself (in hopes of solving the autobuilder problem; local test runs succeed) changes with v7: tests: undo the restructuring of done in v6, in favour of explicitly forcing steps: '-c rootfs -f'. since concurrency of the autobuilder, and reusing artifacts/sstate-caching is probably the issue? changes with v8: tests: fixed missing feature=PACKAGE_CLASSES during 'test_image_gen_pkgdbfs' which is now split into three, one for each of the three available packagemanager: ipk, deb, rpm changes with v9: tests: fix singular failure in 'oe-selftest-armhost' which was due to the built image not containing a 'kernel-image...', which the gen-pkgdb sanity check expected, but 'packagegroup-core-boot' instead -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199430): https://lists.openembedded.org/g/openembedded-core/message/199430 Mute This Topic: https://lists.openembedded.org/mt/106124365/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v8 0/3] pkg-database and systemd-sysext image
Hello, It seems that this reliably fails oe-selftest-armhost. I didn't really pay attention until now beause we had other issues but in this build, those are the only failing tests: https://autobuilder.yoctoproject.org/typhoon/#/builders/127/builds/3322/steps/15/logs/stdio On 12/05/2024 08:31:56+0200, Johannes Schneider via lists.openembedded.org wrote: > systemd-sysext allows to overlay another image (or multiple) ontop of > a "base-image" = the current rootfs, via the use of overlayfs; to add > tools and features meant for development purposes. > > To quote the documentation on systemd-sysext: > " ...addition in order to make debugging/development easier). System > extension images should not be misunderstood as a generic software > packaging framework, ..." > > To build a lean image, that only holds packages that are not already > part of the base-image, a snapshot of the package-database is taken > after the installation of the base-rootfs is done, and picked up again > when collecting the rootfs of such a extension image. > > with all this in place an example usage could look like this: > some-core-image.bb > inherit core-image > IMAGE_GEN_PKGDBFS = "1" > > extending-image.bb > inherit image-sysext > IMAGE_FSTYPES = "squashfs" > IMAGE_BASE_PKGDB = "some-core-image" > # the above pointing at a package-db similar to: > # > build/deploy/images/$MACHINE/some-core-image-$MACHINE-20240210172305-pkgdb.rootfs.tar.gz > > then on the device, running some-core-image, with the extension image placed > at FN: > $> ln -s "$FN" /run/extensions/$(basename $FN).raw > $> systemd-sysext list > $> SYSTEMD_LOG_LEVEL=debug systemd-sysext merge > > As long as the VERSION_ID of the extension image matches the os-release > in the base image, the above commands return sucessfully; > for details on the compativility check see the docs for systemd-sysext. > > = > > changes with v2: > rebase from 'kirkstone' onto 'master' > > changes with v3: > incorporate review suggestions for simplification > add task dependency handling > add oe-selftest for the pkgdb handling > add variable documentation and > some more comments, and examples in the commit-msg > > changes with v4: > rebase onto 'master' => no functional changes > fixed patchtest findings > > changes with v5: > rebase onto 'master' > add '.sysext' to the deployed symlink name > sidenote on the tests and autobuilder failure: run locally they > succeed, e.g.: > #> oe-selftest --verbose -r > imagefeatures.ImageFeatures.test_image_gen_pkgdbfs > > changes with v6: > tests: restructure to call 'bitbake' only once in the testcase itself > (in hopes of solving the autobuilder problem; local test runs succeed) > > changes with v7: > tests: undo the restructuring of done in v6, in favour of explicitly > forcing steps: > '-c rootfs -f'. since concurrency of the autobuilder, and reusing > artifacts/sstate-caching is probably the issue? > > changes with v8: > tests: fixed missing feature=PACKAGE_CLASSES during > 'test_image_gen_pkgdbfs' > which is now split into three, one for each of the three available > packagemanager: ipk, deb, rpm > > > -- Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199429): https://lists.openembedded.org/g/openembedded-core/message/199429 Mute This Topic: https://lists.openembedded.org/mt/106051545/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] devtool: modify: Catch git submodule error for go code
On Wed, 2024-05-15 at 17:55 +, Peter Kjellerstedt via
lists.openembedded.org wrote:
> Steve, please cherry-pick this to Scarthgap.
>
> //Peter
>
> > -Original Message-
> > From: openembedded-core@lists.openembedded.org
> > On Behalf Of Ola x Nilsson
> > Sent: den 14 maj 2024 11:56
> > To: openembedded-core@lists.openembedded.org
> > Cc: Ola x Nilsson
> > Subject: [OE-core] [PATCH] devtool: modify: Catch git submodule error for
> > go code
> >
> > From: Anton Almqvist
> >
> > One of the git submodule commands failed for source extracted for
> > recipes using go.bbclass. The root cause is probably the path set up
> > by go_do_unpack which makes S and gitroot not match.
> >
> > This patch does not fix the root problem, but at least it is no worse
> > than before the git submodule support.
> >
> > The extracted source will still have two .git folders, one in S
> > created by devtool and one in the go path which will contain the tru
> > git history.
> >
> > [ YOCTO #15483 ]
> >
> > Signed-off-by: Anton Almqvist
> > Signed-off-by: Ola x Nilsson
> > ---
> > scripts/lib/devtool/standard.py | 5 -
> > 1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/scripts/lib/devtool/standard.py
> > b/scripts/lib/devtool/standard.py
> > index bd009f44b1..05161942b7 100644
> > --- a/scripts/lib/devtool/standard.py
> > +++ b/scripts/lib/devtool/standard.py
> > @@ -904,7 +904,10 @@ def modify(args, config, basepath, workspace):
> > (stdout, _) = bb.process.run('git rev-list --reverse
> > %s..HEAD' % initial_revs["."], cwd=srctree)
> > commits["."] = stdout.split()
> > check_commits = True
> > - (stdout, _) = bb.process.run('git submodule --quiet
> > foreach --recursive \'echo `git rev-parse devtool-base` $PWD\'',
> > cwd=srctree)
> > + try:
> > + (stdout, _) = bb.process.run('git submodule --quiet
> > foreach --recursive \'echo `git rev-parse devtool-base` $PWD\'',
> > cwd=srctree)
> > + except bb.process.ExecutionError:
> > + stdout = ""
> > for line in stdout.splitlines():
> > (rev, submodule_path) = line.split()
> > submodule = os.path.relpath(submodule_path, srctree)
FWIW I was in two minds whether to merge this. Making things silently
ignore failures is bad and by merging it I've removed any leverage I
had on trying to get this fixed properly. There is also no test case.
I only merged it as I can't face yet another discussion/argument about
why we should try and do things properly. Nobody else appears to want
to do this kind of review or push for that kind of quality and I'm
growing weary of trying :(
Cheers,
Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199425):
https://lists.openembedded.org/g/openembedded-core/message/199425
Mute This Topic: https://lists.openembedded.org/mt/106091660/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 05/10] base: Switch UNPACKDIR to a subdir of WORKDIR
On Wed, 2024-05-15 at 17:42 +, Peter Kjellerstedt wrote:
> > -Original Message-
> > From: openembedded-core@lists.openembedded.org
> > On Behalf Of Richard Purdie
> > Sent: den 15 maj 2024 13:56
> > To: openembedded-core@lists.openembedded.org
> > Subject: [OE-core] [PATCH 05/10] base: Switch UNPACKDIR to a subdir of
> > WORKDIR
> >
> > Change do_unpack to unpack files to a subdirectory of WORKDIR instead of
> > WORKDIR
> > itself. There are several good reasons for this but it is mainly about
> > being able
> > to isolate the output of the unpack task and tell the files apart from
> > other things
> > which are created in workdir (logs, sysroots, temp dirs and more).
> >
> > This means that when the do_unpack task reruns, we can clean UNPACKDIR and
> > know
> > we have a standard point to start builds from.
> >
> > It also makes code in tools like devtool and recipetool easier.
> >
> > To reduce the impact to users, if a subdirectory under UNPACKDIR matches
> > the first subdirectory under WORKDIR of S, that directory is moved into
> > position
> > inside WORKDIR. This preserves the behaviour of S = "${WORKDIR}/git",
> > S = "${WORKDIR}/${BPN}" and other commonly used source directory setups.
> >
> > The directory is moved since sadly many autotools based projects can't cope
> > with
> > symlinks in their paths.
>
> Would it be an option to create a symbolic link by default, and instead
> let the autotools bbclass replace it with a moved directory? If it is
> in fact only autotools based projects that have this problem.
Maybe. I've reached the point with this where I really didn't want to
try and explore that particular set of problems and I'd rather things
were consistent.
I'm not going to rule out trying to clean up and improve this somehow
in the future but for now, it works, it solves the original major
problem (cleanup of obsolete sources) and we have most of the major
pieces like devtool working. It also doesn't look as different to users
as moving S would from a documentation perspective.
I'm a bit torn on what the end result for S should look like. I'm happy
enough with the changes so far and I think the best thing to do is
merge these, then consider if we do want to go further or not.
> > Signed-off-by: Richard Purdie
> > ---
> > meta/classes-global/base.bbclass | 21 ++---
> > meta/conf/bitbake.conf | 2 +-
> > 2 files changed, 19 insertions(+), 4 deletions(-)
> >
> > diff --git a/meta/classes-global/base.bbclass b/meta/classes-
> > global/base.bbclass
> > index 066f3848f7c..cdce0538273 100644
> > --- a/meta/classes-global/base.bbclass
> > +++ b/meta/classes-global/base.bbclass
> > @@ -153,20 +153,35 @@ python base_do_fetch() {
> > }
> >
> > addtask unpack after do_fetch
> > -do_unpack[dirs] = "${UNPACKDIR}"
> > -
> > -do_unpack[cleandirs] = "${@d.getVar('S') if
> > os.path.normpath(d.getVar('S')) != os.path.normpath(d.getVar('WORKDIR'))
> > else os.path.join('${S}', 'patches')}"
> > +do_unpack[cleandirs] = "${UNPACKDIR}"
> >
> > python base_do_unpack() {
> > + import shutil
> > +
> > src_uri = (d.getVar('SRC_URI') or "").split()
> > if not src_uri:
> > return
> >
> > + sourcedir = d.getVar('S')
> > + basedir = None
> > + workdir = d.getVar('WORKDIR')
> > + unpackdir = d.getVar('UNPACKDIR')
> > + if sourcedir.startswith(workdir) and not
> > sourcedir.startswith(unpackdir):
> > + basedir = sourcedir.replace(workdir, '').strip("/").split('/')[0]
> > + bb.utils.remove(sourcedir, True)
>
> This remove() seems wrong and should not be needed. There are two
> cases here:
>
> 1) either ${S} == ${WORKDIR}, in which case the above will remove
> ${WORKDIR}, which is sure to lead to problems, or
Which is why S = WORKDIR has to become a hard error. We have to drop
support for it.
> 2) ${S} == ${WORKDIR}/foo[/...], in which case the removal of
> workdir + '/' + basedir below will also remove ${S} as
> basedir == "foo".
You're right. This code did go through several iterations as I found
all the weird corner cases this needs to support. Ultimately, I suspect
it should probably unconditionally remove ${S}. I'd need yet another
test run to try and identify if that causes any new weird issues
though.
>
> > + if basedir:
> > + bb.utils.remove(workdir + '/' + basedir, True)
> > +
> > try:
> >
Re: [OE-core] [PATCH] devtool: modify: Catch git submodule error for go code
Steve, please cherry-pick this to Scarthgap.
//Peter
> -Original Message-
> From: openembedded-core@lists.openembedded.org
> On Behalf Of Ola x Nilsson
> Sent: den 14 maj 2024 11:56
> To: openembedded-core@lists.openembedded.org
> Cc: Ola x Nilsson
> Subject: [OE-core] [PATCH] devtool: modify: Catch git submodule error for go
> code
>
> From: Anton Almqvist
>
> One of the git submodule commands failed for source extracted for
> recipes using go.bbclass. The root cause is probably the path set up
> by go_do_unpack which makes S and gitroot not match.
>
> This patch does not fix the root problem, but at least it is no worse
> than before the git submodule support.
>
> The extracted source will still have two .git folders, one in S
> created by devtool and one in the go path which will contain the tru
> git history.
>
> [ YOCTO #15483 ]
>
> Signed-off-by: Anton Almqvist
> Signed-off-by: Ola x Nilsson
> ---
> scripts/lib/devtool/standard.py | 5 -
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
> index bd009f44b1..05161942b7 100644
> --- a/scripts/lib/devtool/standard.py
> +++ b/scripts/lib/devtool/standard.py
> @@ -904,7 +904,10 @@ def modify(args, config, basepath, workspace):
> (stdout, _) = bb.process.run('git rev-list --reverse
> %s..HEAD' % initial_revs["."], cwd=srctree)
> commits["."] = stdout.split()
> check_commits = True
> -(stdout, _) = bb.process.run('git submodule --quiet foreach
> --recursive \'echo `git rev-parse devtool-base` $PWD\'', cwd=srctree)
> +try:
> +(stdout, _) = bb.process.run('git submodule --quiet
> foreach --recursive \'echo `git rev-parse devtool-base` $PWD\'', cwd=srctree)
> +except bb.process.ExecutionError:
> +stdout = ""
> for line in stdout.splitlines():
> (rev, submodule_path) = line.split()
> submodule = os.path.relpath(submodule_path, srctree)
> --
> 2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199423):
https://lists.openembedded.org/g/openembedded-core/message/199423
Mute This Topic: https://lists.openembedded.org/mt/106091660/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 05/10] base: Switch UNPACKDIR to a subdir of WORKDIR
> -Original Message-
> From: openembedded-core@lists.openembedded.org
> On Behalf Of Richard Purdie
> Sent: den 15 maj 2024 13:56
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH 05/10] base: Switch UNPACKDIR to a subdir of WORKDIR
>
> Change do_unpack to unpack files to a subdirectory of WORKDIR instead of
> WORKDIR
> itself. There are several good reasons for this but it is mainly about being
> able
> to isolate the output of the unpack task and tell the files apart from other
> things
> which are created in workdir (logs, sysroots, temp dirs and more).
>
> This means that when the do_unpack task reruns, we can clean UNPACKDIR and
> know
> we have a standard point to start builds from.
>
> It also makes code in tools like devtool and recipetool easier.
>
> To reduce the impact to users, if a subdirectory under UNPACKDIR matches
> the first subdirectory under WORKDIR of S, that directory is moved into
> position
> inside WORKDIR. This preserves the behaviour of S = "${WORKDIR}/git",
> S = "${WORKDIR}/${BPN}" and other commonly used source directory setups.
>
> The directory is moved since sadly many autotools based projects can't cope
> with
> symlinks in their paths.
Would it be an option to create a symbolic link by default, and instead
let the autotools bbclass replace it with a moved directory? If it is
in fact only autotools based projects that have this problem.
>
> Signed-off-by: Richard Purdie
> ---
> meta/classes-global/base.bbclass | 21 ++---
> meta/conf/bitbake.conf | 2 +-
> 2 files changed, 19 insertions(+), 4 deletions(-)
>
> diff --git a/meta/classes-global/base.bbclass b/meta/classes-
> global/base.bbclass
> index 066f3848f7c..cdce0538273 100644
> --- a/meta/classes-global/base.bbclass
> +++ b/meta/classes-global/base.bbclass
> @@ -153,20 +153,35 @@ python base_do_fetch() {
> }
>
> addtask unpack after do_fetch
> -do_unpack[dirs] = "${UNPACKDIR}"
> -
> -do_unpack[cleandirs] = "${@d.getVar('S') if os.path.normpath(d.getVar('S'))
> != os.path.normpath(d.getVar('WORKDIR')) else os.path.join('${S}',
> 'patches')}"
> +do_unpack[cleandirs] = "${UNPACKDIR}"
>
> python base_do_unpack() {
> +import shutil
> +
> src_uri = (d.getVar('SRC_URI') or "").split()
> if not src_uri:
> return
>
> +sourcedir = d.getVar('S')
> +basedir = None
> +workdir = d.getVar('WORKDIR')
> +unpackdir = d.getVar('UNPACKDIR')
> +if sourcedir.startswith(workdir) and not sourcedir.startswith(unpackdir):
> +basedir = sourcedir.replace(workdir, '').strip("/").split('/')[0]
> +bb.utils.remove(sourcedir, True)
This remove() seems wrong and should not be needed. There are two
cases here:
1) either ${S} == ${WORKDIR}, in which case the above will remove
${WORKDIR}, which is sure to lead to problems, or
2) ${S} == ${WORKDIR}/foo[/...], in which case the removal of
workdir + '/' + basedir below will also remove ${S} as
basedir == "foo".
> +if basedir:
> +bb.utils.remove(workdir + '/' + basedir, True)
> +
> try:
> fetcher = bb.fetch2.Fetch(src_uri, d)
> fetcher.unpack(d.getVar('UNPACKDIR'))
> except bb.fetch2.BBFetchException as e:
> bb.fatal("Bitbake Fetcher Error: " + repr(e))
> +
> +if basedir and os.path.exists(unpackdir + '/' + basedir):
> +# Compatibility magic to ensure ${WORKDIR}/git and ${WORKDIR}/${BP}
> +# as often used in S work as expected.
> +shutil.move(unpackdir + '/' + basedir, workdir + '/' + basedir)
> }
>
> SSTATETASKS += "do_deploy_source_date_epoch"
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index b2c500d8739..75c850760f6 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -405,7 +405,7 @@ STAMP =
> "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}"
> STAMPCLEAN = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/*-*"
> BASE_WORKDIR ?= "${TMPDIR}/work"
> WORKDIR = "${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}"
> -UNPACKDIR ??= "${WORKDIR}"
> +UNPACKDIR ??= "${WORKDIR}/sources-unpack"
"sources-unpack" does not exactly fall off the tongue.
Would "unpack" or "unpacked" be alternatives?
> T = "${WORKDIR}/temp"
> D = "${WORKDIR}/image"
> S = "${WORKDIR}/${BP}"
> --
> 2.40.1
//Peter
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199422):
https://lists.openembedded.org/g/openembedded-core/message/199422
Mute This Topic: https://lists.openembedded.org/mt/106112374/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v2 1/5] oe-build-perf-report: Add apache echarts to make report interactive
On 15 May 2024, at 16:56, Richard Purdie via lists.openembedded.org wrote: > The other question we'd wondered about is whether we can show the > commit hash as well as the commit number? > > The tricky part is that ideally we'd be able to copy/paste the hash or > even make it a clickable link to the poky repository > (e.g.https://git.yoctoproject.org/poky/commit/?id=6582436a1d1af7775a6bb651aff47a9db773e32b > ) but I'm not sure how possible that is? > > The use case here is where for example there are the step changes in > things like disk usage, or the kernel build time, we'd like to know > which changes happened around that time. The commit number is good, and > you can resolve it with a command like: > > git rev-list --reverse HEAD | nl -n ln | grep ^69808 > > but a direct link to the revision would be ideal if possible. A better way - if you already have access to the results.json for a particular run then metadata.json contains all the SHAs that were used. Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199294): https://lists.openembedded.org/g/openembedded-core/message/199294 Mute This Topic: https://lists.openembedded.org/mt/105889451/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v2 1/5] oe-build-perf-report: Add apache echarts to make report interactive
On Fri, 2024-05-03 at 16:43 +0200, Ninette Adhikari wrote: > From: Ninette Adhikari <13760198+ninetteadhik...@users.noreply.github.com> > > - Add Apache echarts (https://echarts.apache.org/en/index.html) library to > create build performance charts. > - Restructure data to time and value array format so that it can be used by > echarts. > - This commit also converts test duration to minutes to map against the > values axis. > - Zoom is added to the line charts. > --- > .../build_perf/html/measurement_chart.html | 116 +++--- > scripts/lib/build_perf/html/report.html | 6 +- > 2 files changed, 72 insertions(+), 50 deletions(-) Thanks, I was able to test these: https://autobuilder.yocto.io/pub/non-release/20240514-17/testresults/buildperf-alma8/perf-alma8_master-next_20240514121350_a8f48d1cb1.html https://autobuilder.yocto.io/pub/non-release/20240514-16/testresults/buildperf-debian11/perf-debian11_master-next_20240514051235_a8f48d1cb1.html and they are definitely a huge improvement on what we had. I've merged them since I think at this point they're definitely better, thanks for making the tweaks others asked about. As Ross mentioned, the preview doesn't always quite match the chart itself. The other question we'd wondered about is whether we can show the commit hash as well as the commit number? The tricky part is that ideally we'd be able to copy/paste the hash or even make it a clickable link to the poky repository (e.g.https://git.yoctoproject.org/poky/commit/?id=6582436a1d1af7775a6bb651aff47a9db773e32b ) but I'm not sure how possible that is? The use case here is where for example there are the step changes in things like disk usage, or the kernel build time, we'd like to know which changes happened around that time. The commit number is good, and you can resolve it with a command like: git rev-list --reverse HEAD | nl -n ln | grep ^69808 but a direct link to the revision would be ideal if possible. Regardless, this looks very very much improved on where it was, thanks! Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199293): https://lists.openembedded.org/g/openembedded-core/message/199293 Mute This Topic: https://lists.openembedded.org/mt/105889451/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] lib/oe/reproducible: Update for WORKDIR -> UNPACKDIR
We need to search UNPACKDIR instead of WORKDIR for git repos for
SOURCE_DATE_EPOCH.
Drop the exclusions list as these would no longer exist under UNPACKDIR.
Signed-off-by: Richard Purdie
---
meta/lib/oe/reproducible.py | 15 ++-
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/meta/lib/oe/reproducible.py b/meta/lib/oe/reproducible.py
index a9f717159e3..e57c83b92b8 100644
--- a/meta/lib/oe/reproducible.py
+++ b/meta/lib/oe/reproducible.py
@@ -75,10 +75,10 @@ def get_source_date_epoch_from_known_files(d, sourcedir):
return source_date_epoch
def find_git_folder(d, sourcedir):
-# First guess: WORKDIR/git
+# First guess: UNPACKDIR/git
# This is the default git fetcher unpack path
-workdir = d.getVar('WORKDIR')
-gitpath = os.path.join(workdir, "git/.git")
+unpackdir = d.getVar('UNPACKDIR')
+gitpath = os.path.join(unpackdir, "git/.git")
if os.path.isdir(gitpath):
return gitpath
@@ -88,15 +88,12 @@ def find_git_folder(d, sourcedir):
return gitpath
# Perhaps there was a subpath or destsuffix specified.
-# Go looking in the WORKDIR
-exclude = set(["build", "image", "license-destdir", "patches", "pseudo",
- "recipe-sysroot", "recipe-sysroot-native",
"sysroot-destdir", "temp"])
-for root, dirs, files in os.walk(workdir, topdown=True):
-dirs[:] = [d for d in dirs if d not in exclude]
+# Go looking in the UNPACKDIR
+for root, dirs, files in os.walk(unpackdir, topdown=True):
if '.git' in dirs:
return os.path.join(root, ".git")
-bb.warn("Failed to find a git repository in WORKDIR: %s" % workdir)
+bb.warn("Failed to find a git repository in UNPACKDIR: %s" % unpackdir)
return None
def get_source_date_epoch_from_git(d, sourcedir):
--
2.40.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199292):
https://lists.openembedded.org/g/openembedded-core/message/199292
Mute This Topic: https://lists.openembedded.org/mt/106116358/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] systemd: fix build against 6.9 libc-headers
From: Bruce Ashfield
When building against the 6.9 linux-libc-headrs the following build
issue was hit:
| Program check-filesystems.sh found: YES
(build/tmp/work/cortexa57-poky-linux/systemd/255.4/git/src/basic/check-filesystems.sh)
|
| ../git/src/basic/meson.build:238:8: ERROR: Problem encountered: Unknown
filesystems defined in kernel headers:
|
| Filesystem found in kernel header but not in filesystems-gperf.gperf:
PID_FS_MAGIC
Upstream already has this fixed, so we backport the commit.
Signed-off-by: Bruce Ashfield
---
Richard,
I only lightly tested this against the older headers, but it shoudln't
be an issue.
Bruce
.../0001-basic-add-PIDFS-magic-31709.patch| 53 +++
meta/recipes-core/systemd/systemd_255.4.bb| 1 +
2 files changed, 54 insertions(+)
create mode 100644
meta/recipes-core/systemd/systemd/0001-basic-add-PIDFS-magic-31709.patch
diff --git
a/meta/recipes-core/systemd/systemd/0001-basic-add-PIDFS-magic-31709.patch
b/meta/recipes-core/systemd/systemd/0001-basic-add-PIDFS-magic-31709.patch
new file mode 100644
index 00..dd4be5ed2a
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0001-basic-add-PIDFS-magic-31709.patch
@@ -0,0 +1,53 @@
+From ed01b92e1c92871bbd92711f280e2b2d15753f0e Mon Sep 17 00:00:00 2001
+From: cpackham-atlnz <85916201+cpackham-at...@users.noreply.github.com>
+Date: Tue, 12 Mar 2024 00:55:36 +1300
+Subject: [PATCH] basic: add PIDFS magic (#31709)
+
+Kernel commit cb12fd8e0dabb9a1c8aef55a6a41e2c255fcdf4b added pidfs.
+Update filesystems-gperf.gperf and missing_magic.h accordingly.
+
+This fixes the following error building against a bleeding edge kernel.
+```
+../src/basic/meson.build:234:8: ERROR: Problem encountered: Unknown
filesystems defined in kernel headers:
+
+Filesystem found in kernel header but not in filesystems-gperf.gperf:
PID_FS_MAGIC
+```
+
+Upstream-Status: Backport [commit ed01b92e1c92871bbd92711f280e2b2d15753f0e]
+
+---
+ src/basic/filesystems-gperf.gperf | 1 +
+ src/basic/missing_magic.h | 5 +
+ 2 files changed, 6 insertions(+)
+
+diff --git a/src/basic/filesystems-gperf.gperf
b/src/basic/filesystems-gperf.gperf
+index e8c5357f91..1cd66b5a5f 100644
+--- a/src/basic/filesystems-gperf.gperf
b/src/basic/filesystems-gperf.gperf
+@@ -91,6 +91,7 @@ ocfs2, {OCFS2_SUPER_MAGIC}
+ openpromfs, {OPENPROM_SUPER_MAGIC}
+ orangefs,{ORANGEFS_DEVREQ_MAGIC}
+ overlay, {OVERLAYFS_SUPER_MAGIC}
++pidfs, {PID_FS_MAGIC}
+ pipefs, {PIPEFS_MAGIC}
+ ppc-cmm, {PPC_CMM_MAGIC}
+ proc,{PROC_SUPER_MAGIC}
+diff --git a/src/basic/missing_magic.h b/src/basic/missing_magic.h
+index 27a33adecb..82d71c8ad1 100644
+--- a/src/basic/missing_magic.h
b/src/basic/missing_magic.h
+@@ -128,6 +128,11 @@
+ #define DEVMEM_MAGIC 0x454d444d
+ #endif
+
++/* cb12fd8e0dabb9a1c8aef55a6a41e2c255fcdf4b (6.8) */
++#ifndef PID_FS_MAGIC
++#define PID_FS_MAGIC 0x50494446
++#endif
++
+ /* Not in mainline but included in Ubuntu */
+ #ifndef SHIFTFS_MAGIC
+ #define SHIFTFS_MAGIC 0x6a656a62
+--
+2.39.2
+
diff --git a/meta/recipes-core/systemd/systemd_255.4.bb
b/meta/recipes-core/systemd/systemd_255.4.bb
index 62842d43c8..08af221a93 100644
--- a/meta/recipes-core/systemd/systemd_255.4.bb
+++ b/meta/recipes-core/systemd/systemd_255.4.bb
@@ -28,6 +28,7 @@ SRC_URI += " \
file://systemd-pager.sh \
file://0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
file://0008-implment-systemd-sysv-install-for-OE.patch \
+ file://0001-basic-add-PIDFS-magic-31709.patch \
"
# patches needed by musl
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199291):
https://lists.openembedded.org/g/openembedded-core/message/199291
Mute This Topic: https://lists.openembedded.org/mt/106115218/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v3] ipk/rootfs: run sanity test of multilib in parallel
From: "seungkyun.kim"
For multilib type packages, there is an additional temporary
installation before the actual installation. It makes almost doubles
the do_rootfs time if having many multilib type packages.
To avoid this overhead, run sanity test in parallel.
Installing package groups through opkg takes much more time than
copying directory.
- Changes in V2:
Fix FileNotFoundError exception when copying rootfs
- Changes in V3:
Removed unnecessary test call
Signed-off-by: seungkyun.kim
---
meta/lib/oe/package_manager/ipk/rootfs.py | 36 +--
1 file changed, 34 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oe/package_manager/ipk/rootfs.py
b/meta/lib/oe/package_manager/ipk/rootfs.py
index ba93eb62ea..fa34dc56a2 100644
--- a/meta/lib/oe/package_manager/ipk/rootfs.py
+++ b/meta/lib/oe/package_manager/ipk/rootfs.py
@@ -6,7 +6,9 @@
import re
import filecmp
+import multiprocessing
import shutil
+import stat
from oe.rootfs import Rootfs
from oe.manifest import Manifest
from oe.utils import execute_pre_post_process
@@ -197,11 +199,34 @@ class PkgRootfs(DpkgOpkgRootfs):
files[key] = item
def _multilib_test_install(self, pkgs):
+def _copy_rootfs(src, dst):
+if os.path.islink(src):
+linkto = os.readlink(src)
+if os.path.isabs(linkto):
+linkto =
os.path.normpath(os.path.join(os.path.dirname(dst),
+
os.path.relpath(linkto, src)))
+os.symlink(linkto, dst)
+elif os.path.isfile(src):
+shutil.copy2(src, dst)
+elif stat.S_ISFIFO(os.stat(src).st_mode):
+os.mkfifo(dst)
+else:
+bb.warn("Skip unsupported file type: %s" % src)
+
ml_temp = self.d.getVar("MULTILIB_TEMP_ROOTFS")
+rootfs_temp = os.path.join(ml_temp, "rootfs")
bb.utils.mkdirhier(ml_temp)
+bb.utils.remove(rootfs_temp, True)
-dirs = [self.image_rootfs]
+if os.path.exists(self.image_rootfs):
+shutil.copytree(self.image_rootfs, rootfs_temp,
copy_function=_copy_rootfs)
+else:
+bb.utils.mkdirhier(rootfs_temp)
+dirs = [rootfs_temp]
+return multiprocessing.Process(target=self._multilib_test_pkg_install,
+ args=(pkgs, ml_temp, dirs, False))
+def _multilib_test_pkg_install(self, pkgs, ml_temp, dirs):
for variant in self.d.getVar("MULTILIB_VARIANTS").split():
ml_target_rootfs = os.path.join(ml_temp, variant)
@@ -218,6 +243,8 @@ class PkgRootfs(DpkgOpkgRootfs):
dirs.append(ml_target_rootfs)
self._multilib_sanity_test(dirs)
+rootfs_temp = os.path.join(ml_temp, "rootfs")
+bb.utils.remove(rootfs_temp)
'''
While ipk incremental image generation is enabled, it will remove the
@@ -300,15 +327,20 @@ class PkgRootfs(DpkgOpkgRootfs):
for pkg_type in self.install_order:
if pkg_type in pkgs_to_install:
+sanity_test = None
# For multilib, we perform a sanity test before final install
# If sanity test fails, it will automatically do a bb.fatal()
# and the installation will stop
if pkg_type == Manifest.PKG_TYPE_MULTILIB:
-self._multilib_test_install(pkgs_to_install[pkg_type])
+sanity_test=
self._multilib_test_install(pkgs_to_install[pkg_type])
+sanity_test.start()
self.pm.install(pkgs_to_install[pkg_type],
[False, True][pkg_type ==
Manifest.PKG_TYPE_ATTEMPT_ONLY])
+if sanity_test is not None:
+sanity_test.join()
+
if self.progress_reporter:
self.progress_reporter.next_stage()
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199290):
https://lists.openembedded.org/g/openembedded-core/message/199290
Mute This Topic: https://lists.openembedded.org/mt/106114385/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2] ipk/rootfs: run sanity test of multilib in parallel
From: "seungkyun.kim"
For multilib type packages, there is an additional temporary
installation before the actual installation. It makes almost doubles
the do_rootfs time if having many multilib type packages.
To avoid this overhead, run sanity test in parallel.
Installing package groups through opkg takes much more time than
copying directory.
- Changes in V2:
Fix FileNotFoundError exception when copying rootfs
Signed-off-by: seungkyun.kim
---
meta/lib/oe/package_manager/ipk/rootfs.py | 38 +--
1 file changed, 36 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oe/package_manager/ipk/rootfs.py
b/meta/lib/oe/package_manager/ipk/rootfs.py
index ba93eb62ea..530de740d1 100644
--- a/meta/lib/oe/package_manager/ipk/rootfs.py
+++ b/meta/lib/oe/package_manager/ipk/rootfs.py
@@ -6,7 +6,9 @@
import re
import filecmp
+import multiprocessing
import shutil
+import stat
from oe.rootfs import Rootfs
from oe.manifest import Manifest
from oe.utils import execute_pre_post_process
@@ -197,11 +199,34 @@ class PkgRootfs(DpkgOpkgRootfs):
files[key] = item
def _multilib_test_install(self, pkgs):
+def _copy_rootfs(src, dst):
+if os.path.islink(src):
+linkto = os.readlink(src)
+if os.path.isabs(linkto):
+linkto =
os.path.normpath(os.path.join(os.path.dirname(dst),
+
os.path.relpath(linkto, src)))
+os.symlink(linkto, dst)
+elif os.path.isfile(src):
+shutil.copy2(src, dst)
+elif stat.S_ISFIFO(os.stat(src).st_mode):
+os.mkfifo(dst)
+else:
+bb.warn("Skip unsupported file type: %s" % src)
+
ml_temp = self.d.getVar("MULTILIB_TEMP_ROOTFS")
+rootfs_temp = os.path.join(ml_temp, "rootfs")
bb.utils.mkdirhier(ml_temp)
+bb.utils.remove(rootfs_temp, True)
-dirs = [self.image_rootfs]
+if os.path.exists(self.image_rootfs):
+shutil.copytree(self.image_rootfs, rootfs_temp,
copy_function=_copy_rootfs)
+else:
+bb.utils.mkdirhier(rootfs_temp)
+dirs = [rootfs_temp]
+return multiprocessing.Process(target=self._multilib_test_pkg_install,
+ args=(pkgs, ml_temp, dirs, False))
+def _multilib_test_pkg_install(self, pkgs, ml_temp, dirs):
for variant in self.d.getVar("MULTILIB_VARIANTS").split():
ml_target_rootfs = os.path.join(ml_temp, variant)
@@ -218,6 +243,8 @@ class PkgRootfs(DpkgOpkgRootfs):
dirs.append(ml_target_rootfs)
self._multilib_sanity_test(dirs)
+rootfs_temp = os.path.join(ml_temp, "rootfs")
+bb.utils.remove(rootfs_temp)
'''
While ipk incremental image generation is enabled, it will remove the
@@ -300,15 +327,22 @@ class PkgRootfs(DpkgOpkgRootfs):
for pkg_type in self.install_order:
if pkg_type in pkgs_to_install:
+sanity_test = None
# For multilib, we perform a sanity test before final install
# If sanity test fails, it will automatically do a bb.fatal()
# and the installation will stop
if pkg_type == Manifest.PKG_TYPE_MULTILIB:
-self._multilib_test_install(pkgs_to_install[pkg_type])
+sanity_test=
self._multilib_test_install(pkgs_to_install[pkg_type])
+sanity_test.start()
self.pm.install(pkgs_to_install[pkg_type],
[False, True][pkg_type ==
Manifest.PKG_TYPE_ATTEMPT_ONLY])
+self._multilib_test_install(pkgs_to_install[pkg_type])
+
+if sanity_test is not None:
+sanity_test.join()
+
if self.progress_reporter:
self.progress_reporter.next_stage()
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199289):
https://lists.openembedded.org/g/openembedded-core/message/199289
Mute This Topic: https://lists.openembedded.org/mt/106113296/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 10/10] build-appliance-image: Remove warning about S not existing
Disable the qe checks the cause a warning about S not existing as this
recipe is special case where that doens't matter.
Signed-off-by: Richard Purdie
---
meta/recipes-core/images/build-appliance-image_15.0.0.bb | 5 +
1 file changed, 5 insertions(+)
diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb
b/meta/recipes-core/images/build-appliance-image_15.0.0.bb
index dbb257eda1b..e406968df2e 100644
--- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb
+++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb
@@ -129,6 +129,11 @@ python () {
d.delVarFlag("do_unpack", "noexec")
}
+# ${S} doesn't exist for us
+do_qa_unpack() {
+return
+}
+
create_bundle_files () {
cd ${WORKDIR}
mkdir -p Yocto_Build_Appliance
--
2.40.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199286):
https://lists.openembedded.org/g/openembedded-core/message/199286
Mute This Topic: https://lists.openembedded.org/mt/106112380/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 09/10] recipes: Ensure S is set to a valid directory
Several recipes have S pointing at a directory that does not exist.
Set S in these cases to somethig valid making the metadata and
recipe behaviour more consistent.
Tweak one of the QA test diff offsets to match the changed recipe.
Signed-off-by: Richard Purdie
---
.../recipes-test/recipeutils/recipeutils-test_1.2.bb | 3 +++
meta-selftest/recipes-test/testrpm/testrpm_0.0.1.bb | 3 +++
meta/lib/oeqa/selftest/cases/recipeutils.py | 4 ++--
.../ssh-pregen-hostkeys/ssh-pregen-hostkeys_1.0.bb| 3 +++
meta/recipes-extended/watchdog/watchdog-config.bb | 3 +++
meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb | 3 +++
meta/recipes-support/user-creation/xuser-account_0.1.bb | 3 +++
7 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb
b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb
index c64c4693964..8b314d396ee 100644
--- a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb
+++ b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb
@@ -6,6 +6,9 @@ LICENSE = "HPND"
LIC_FILES_CHKSUM =
"file://${UNPACKDIR}/somefile;md5=d41d8cd98f00b204e9800998ecf8427e"
DEPENDS += "zlib"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
BBCLASSEXTEND = "native nativesdk"
SRC_URI += "file://somefile"
diff --git a/meta-selftest/recipes-test/testrpm/testrpm_0.0.1.bb
b/meta-selftest/recipes-test/testrpm/testrpm_0.0.1.bb
index 5e8761ab554..db674d0efc2 100644
--- a/meta-selftest/recipes-test/testrpm/testrpm_0.0.1.bb
+++ b/meta-selftest/recipes-test/testrpm/testrpm_0.0.1.bb
@@ -6,6 +6,9 @@ LICENSE = "MIT"
SRC_URI = "file://testfile.txt"
INHIBIT_DEFAULT_DEPS = "1"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
do_compile(){
echo "testdata" > ${B}/"file with [brackets].txt"
echo "testdata" > ${B}/"file with (parentheses).txt"
diff --git a/meta/lib/oeqa/selftest/cases/recipeutils.py
b/meta/lib/oeqa/selftest/cases/recipeutils.py
index 2cb4445f81b..99497371724 100644
--- a/meta/lib/oeqa/selftest/cases/recipeutils.py
+++ b/meta/lib/oeqa/selftest/cases/recipeutils.py
@@ -72,7 +72,7 @@ class RecipeUtilsTests(OESelftestTestCase):
expected_patch = """
--- a/recipes-test/recipeutils/recipeutils-test_1.2.bb
+++ b/recipes-test/recipeutils/recipeutils-test_1.2.bb
-@@ -8,6 +8,4 @@
+@@ -11,6 +11,4 @@
BBCLASSEXTEND = "native nativesdk"
@@ -97,7 +97,7 @@ class RecipeUtilsTests(OESelftestTestCase):
expected_patch = """
--- a/recipes-test/recipeutils/recipeutils-test_1.2.bb
+++ b/recipes-test/recipeutils/recipeutils-test_1.2.bb
-@@ -8,6 +8,3 @@
+@@ -11,6 +11,3 @@
BBCLASSEXTEND = "native nativesdk"
diff --git
a/meta/recipes-connectivity/ssh-pregen-hostkeys/ssh-pregen-hostkeys_1.0.bb
b/meta/recipes-connectivity/ssh-pregen-hostkeys/ssh-pregen-hostkeys_1.0.bb
index 4a62ddacd5f..db5a0eb8ce5 100644
--- a/meta/recipes-connectivity/ssh-pregen-hostkeys/ssh-pregen-hostkeys_1.0.bb
+++ b/meta/recipes-connectivity/ssh-pregen-hostkeys/ssh-pregen-hostkeys_1.0.bb
@@ -6,6 +6,9 @@ SRC_URI = "file://dropbear_rsa_host_key \
LICENSE = "MIT"
LIC_FILES_CHKSUM =
"file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
INHIBIT_DEFAULT_DEPS = "1"
COMPATIBLE_MACHINE = "^qemu.*$"
diff --git a/meta/recipes-extended/watchdog/watchdog-config.bb
b/meta/recipes-extended/watchdog/watchdog-config.bb
index e826a7d4a66..17151ced5ec 100644
--- a/meta/recipes-extended/watchdog/watchdog-config.bb
+++ b/meta/recipes-extended/watchdog/watchdog-config.bb
@@ -13,6 +13,9 @@ SRC_URI = " \
file://watchdog.conf \
"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
# The default value is 60 seconds when null.
WATCHDOG_TIMEOUT ??= ""
diff --git a/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb
b/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb
index 332525f5c92..a766b00bef0 100644
--- a/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb
+++ b/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb
@@ -7,6 +7,9 @@ SRC_URI = "file://dt-doc-validate \
file://dt-mk-schema \
file://dt-validate"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
do_install() {
install -d ${D}${bindir}/
install -m 755 ${UNPACKDIR}/dt-doc-validate ${D}${bindir}/
diff --git a/meta/recipes-support/user-creation/xuser-account_0.1.bb
b/meta/recipes-support/user-creation/xuser-account_0.1.bb
index 2bd3699e74b..80a429c6d33 100644
--- a/meta/recipes-support/user-creation/xuser-account_0.1.bb
+++ b/meta/recipes-support/user-creation/xuser-account_0.1.bb
@@ -6,6 +6,9 @@ SRC_URI = "file://system-xuser.conf"
inherit allarch useradd
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
do_configure() {
:
}
--
2.40.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199285):
[OE-core] [PATCH 07/10] insane: Warn about S == WORKDIR
Where a recipe uses WORKDIR as S, add a warning since we're going
to stop supporting this soon.
Signed-off-by: Richard Purdie
---
meta/classes-global/insane.bbclass | 5 +
1 file changed, 5 insertions(+)
diff --git a/meta/classes-global/insane.bbclass
b/meta/classes-global/insane.bbclass
index 03ac06b102f..7af29ded458 100644
--- a/meta/classes-global/insane.bbclass
+++ b/meta/classes-global/insane.bbclass
@@ -1602,6 +1602,11 @@ python () {
if prog.search(pn):
oe.qa.handle_error("uppercase-pn", 'PN: %s is upper case, this can
result in unexpected behavior.' % pn, d)
+sourcedir = d.getVar("S")
+workdir = d.getVar("WORKDIR")
+if sourcedir == workdir:
+bb.warn("Using S = ${WORKDIR} is no longer supported")
+
# Some people mistakenly use DEPENDS:${PN} instead of DEPENDS and wonder
# why it doesn't work.
if (d.getVar(d.expand('DEPENDS:${PN}'))):
--
2.40.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199284):
https://lists.openembedded.org/g/openembedded-core/message/199284
Mute This Topic: https://lists.openembedded.org/mt/106112378/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 08/10] systemd-conf: Convert to use a dedicated UNPACKDIR
Avoid:
WARNING: systemd-conf-1_1.0-r0 do_unpack: systemd-conf: the directory
${WORKDIR}/${BP}
(tmp/work/genericarm64-poky-linux/systemd-conf/1.0/systemd-conf-1.0) pointed to
by
the S variable doesn't exist - please set S within the recipe to point to where
the
source has been unpacked to
by using a dedicated unpack directory for sources.
Signed-off-by: Richard Purdie
---
meta/recipes-core/systemd/systemd-conf_1.0.bb | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd-conf_1.0.bb
b/meta/recipes-core/systemd/systemd-conf_1.0.bb
index 752ad7c2b7e..b8bea0c25be 100644
--- a/meta/recipes-core/systemd/systemd-conf_1.0.bb
+++ b/meta/recipes-core/systemd/systemd-conf_1.0.bb
@@ -21,19 +21,22 @@ SRC_URI = "\
file://wired.network \
"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
do_install() {
- install -D -m0644 ${UNPACKDIR}/journald.conf
${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf
- install -D -m0644 ${UNPACKDIR}/logind.conf
${D}${systemd_unitdir}/logind.conf.d/00-${PN}.conf
- install -D -m0644 ${UNPACKDIR}/system.conf
${D}${systemd_unitdir}/system.conf.d/00-${PN}.conf
+ install -D -m0644 ${S}/journald.conf
${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf
+ install -D -m0644 ${S}/logind.conf
${D}${systemd_unitdir}/logind.conf.d/00-${PN}.conf
+ install -D -m0644 ${S}/system.conf
${D}${systemd_unitdir}/system.conf.d/00-${PN}.conf
if ${@bb.utils.contains('PACKAGECONFIG', 'dhcp-ethernet', 'true',
'false', d)}; then
- install -D -m0644 ${UNPACKDIR}/wired.network
${D}${systemd_unitdir}/network/80-wired.network
+ install -D -m0644 ${S}/wired.network
${D}${systemd_unitdir}/network/80-wired.network
fi
}
# Based on change from YP bug 8141, OE commit
5196d7bacaef1076c361adaa2867be31759c1b52
do_install:append:qemuall() {
- install -D -m0644 ${UNPACKDIR}/system.conf-qemuall
${D}${systemd_unitdir}/system.conf.d/01-${PN}.conf
+ install -D -m0644 ${S}/system.conf-qemuall
${D}${systemd_unitdir}/system.conf.d/01-${PN}.conf
}
PACKAGE_ARCH = "${MACHINE_ARCH}"
--
2.40.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199283):
https://lists.openembedded.org/g/openembedded-core/message/199283
Mute This Topic: https://lists.openembedded.org/mt/106112377/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 06/10] recipetool/devtool: Update to work correctly with UNPACKDIR
Tweak recipetool and devtool to correclty use UNPACKDIR. This allows some
simplification of the code. This patch makes things basically work but there
are likely deeper improvements that can be made now that WORKDIR != UNPACKDIR.
Signed-off-by: Richard Purdie
---
scripts/lib/devtool/upgrade.py | 2 +-
scripts/lib/recipetool/create.py | 2 +-
scripts/lib/scriptutils.py | 15 ++-
3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index fa5b8ef3c77..a8130ed23f5 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -32,7 +32,7 @@ def _run(cmd, cwd=''):
def _get_srctree(tmpdir):
srctree = tmpdir
-dirs = scriptutils.filter_src_subdirs(tmpdir)
+dirs = os.listdir(tmpdir)
if len(dirs) == 1:
srctree = os.path.join(tmpdir, dirs[0])
else:
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 8e9ff38db6c..066366e34f6 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -528,7 +528,7 @@ def create_recipe(args):
if ftmpdir and args.keep_temp:
logger.info('Fetch temp directory is %s' % ftmpdir)
-dirlist = scriptutils.filter_src_subdirs(srctree)
+dirlist = os.listdir(srctree)
logger.debug('Directory listing (excluding filtered out):\n %s' % '\n
'.join(dirlist))
if len(dirlist) == 1:
singleitem = os.path.join(srctree, dirlist[0])
diff --git a/scripts/lib/scriptutils.py b/scripts/lib/scriptutils.py
index f23e53cba93..81f0b01fa53 100644
--- a/scripts/lib/scriptutils.py
+++ b/scripts/lib/scriptutils.py
@@ -179,6 +179,8 @@ def fetch_url(tinfoil, srcuri, srcrev, destdir, logger,
preserve_tmp=False, mirr
f.write('SRCREV = "%s"\n' % srcrev)
f.write('PV = "0.0+"\n')
f.write('WORKDIR = "%s"\n' % tmpworkdir)
+f.write('UNPACKDIR = "%s"\n' % destdir)
+
# Set S out of the way so it doesn't get created under the
workdir
f.write('S = "%s"\n' % os.path.join(tmpdir, 'emptysrc'))
if not mirrors:
@@ -232,10 +234,6 @@ def fetch_url(tinfoil, srcuri, srcrev, destdir, logger,
preserve_tmp=False, mirr
if e.errno != errno.ENOTEMPTY:
raise
-bb.utils.mkdirhier(destdir)
-for fn in os.listdir(tmpworkdir):
-shutil.move(os.path.join(tmpworkdir, fn), destdir)
-
finally:
if not preserve_tmp:
shutil.rmtree(tmpdir)
@@ -271,12 +269,3 @@ def is_src_url(param):
return True
return False
-def filter_src_subdirs(pth):
-"""
-Filter out subdirectories of initial unpacked source trees that we do not
care about.
-Used by devtool and recipetool.
-"""
-dirlist = os.listdir(pth)
-filterout = ['git.indirectionsymlink', 'source-date-epoch',
'sstate-install-recipe_qa']
-dirlist = [x for x in dirlist if x not in filterout]
-return dirlist
--
2.40.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199282):
https://lists.openembedded.org/g/openembedded-core/message/199282
Mute This Topic: https://lists.openembedded.org/mt/106112376/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 04/10] devtool: Drop oe-local-files and simplify
The only real reason for oe-local-files was to support S = WORKDIR. With
changes to
drop support for that, it makes sense to simplify devtool and to try and make
both
the code and the processes/workflows simpler.
This patch drops support for S = WORKDIR, removes oe-local-files and then
updates
the test cases to match this new situation.
At the code level, we assume we can always now track code changes using git and
that things committed into git are handled as patches (as before) but delta
against
HEAD is saved as specific file level changes to the recipe.
One test is disabled as it is no longer approproate. It is being keped until we
can
make WORKDIR != UNPACKDIR at which point it should be revisited.
Signed-off-by: Richard Purdie
---
.../devtool/devtool-test-localonly.bb | 3 +
meta/classes-recipe/kernel-yocto.bbclass | 2 -
meta/classes/devtool-source.bbclass | 74 +--
meta/lib/oeqa/selftest/cases/devtool.py | 38 ++--
scripts/lib/devtool/standard.py | 194 ++
5 files changed, 89 insertions(+), 222 deletions(-)
diff --git a/meta-selftest/recipes-test/devtool/devtool-test-localonly.bb
b/meta-selftest/recipes-test/devtool/devtool-test-localonly.bb
index e767619879a..446c51f09b5 100644
--- a/meta-selftest/recipes-test/devtool/devtool-test-localonly.bb
+++ b/meta-selftest/recipes-test/devtool/devtool-test-localonly.bb
@@ -6,5 +6,8 @@ SRC_URI = "file://file1 \
SRC_URI:append:class-native = " file://file3"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
EXCLUDE_FROM_WORLD = "1"
BBCLASSEXTEND = "native"
diff --git a/meta/classes-recipe/kernel-yocto.bbclass
b/meta/classes-recipe/kernel-yocto.bbclass
index c4ed3f1ca2e..e8ff7311c32 100644
--- a/meta/classes-recipe/kernel-yocto.bbclass
+++ b/meta/classes-recipe/kernel-yocto.bbclass
@@ -234,8 +234,6 @@ do_kernel_metadata() {
for f in ${feat_dirs}; do
if [ -d "${UNPACKDIR}/$f/kernel-meta" ]; then
includes="$includes -I${UNPACKDIR}/$f/kernel-meta"
- elif [ -d "${UNPACKDIR}/../oe-local-files/$f" ]; then
- includes="$includes -I${UNPACKDIR}/../oe-local-files/$f"
elif [ -d "${UNPACKDIR}/$f" ]; then
includes="$includes -I${UNPACKDIR}/$f"
fi
diff --git a/meta/classes/devtool-source.bbclass
b/meta/classes/devtool-source.bbclass
index 4158c20c7e8..3e24800dcb0 100644
--- a/meta/classes/devtool-source.bbclass
+++ b/meta/classes/devtool-source.bbclass
@@ -26,8 +26,6 @@
DEVTOOL_TEMPDIR ?= ""
-DEVTOOL_PATCH_SRCDIR = "${DEVTOOL_TEMPDIR}/patchworkdir"
-
python() {
tempdir = d.getVar('DEVTOOL_TEMPDIR')
@@ -60,7 +58,6 @@ python() {
else:
unpacktask = 'do_unpack'
d.appendVarFlag(unpacktask, 'postfuncs', ' devtool_post_unpack')
-d.prependVarFlag('do_patch', 'prefuncs', ' devtool_pre_patch')
d.appendVarFlag('do_patch', 'postfuncs', ' devtool_post_patch')
# NOTE: in order for the patch stuff to be fully functional,
@@ -79,67 +76,23 @@ python devtool_post_unpack() {
tempdir = d.getVar('DEVTOOL_TEMPDIR')
workdir = d.getVar('WORKDIR')
+unpackdir = d.getVar('UNPACKDIR')
srcsubdir = d.getVar('S')
-def _move_file(src, dst):
-"""Move a file. Creates all the directory components of destination
path."""
-dst_d = os.path.dirname(dst)
-if dst_d:
-bb.utils.mkdirhier(dst_d)
-shutil.move(src, dst)
-
-def _ls_tree(directory):
-"""Recursive listing of files in a directory"""
-ret = []
-for root, dirs, files in os.walk(directory):
-ret.extend([os.path.relpath(os.path.join(root, fname), directory)
for
-fname in files])
-return ret
-
-is_kernel_yocto = bb.data.inherits_class('kernel-yocto', d)
-# Move local source files into separate subdir
-recipe_patches = [os.path.basename(patch) for patch in
-oe.recipeutils.get_recipe_patches(d)]
+# Add locally copied files to gitignore as we add back to the metadata
directly
local_files = oe.recipeutils.get_recipe_local_files(d)
-
-if is_kernel_yocto:
-for key in [f for f in local_files if f.endswith('scc')]:
-with open(local_files[key], 'r') as sccfile:
-for l in sccfile:
-line = l.split()
-if line and line[0] in ('kconf', 'patch'):
-cfg = os.path.join(os.path.dirname(local_files[key]),
line[-1])
-if cfg not in local_files.values():
-local_files[line[-1]] = cfg
-shutil.copy2(cfg, workdir)
-
-# Ignore local files with subdir={BP}
srcabspath = os.path.abspath(srcsubdir)
local_files = [fname for fname in local_files if
-os.path.exists(os.path.join(workdir, fname)) and
-
[OE-core] [PATCH 05/10] base: Switch UNPACKDIR to a subdir of WORKDIR
Change do_unpack to unpack files to a subdirectory of WORKDIR instead of WORKDIR
itself. There are several good reasons for this but it is mainly about being
able
to isolate the output of the unpack task and tell the files apart from other
things
which are created in workdir (logs, sysroots, temp dirs and more).
This means that when the do_unpack task reruns, we can clean UNPACKDIR and know
we have a standard point to start builds from.
It also makes code in tools like devtool and recipetool easier.
To reduce the impact to users, if a subdirectory under UNPACKDIR matches
the first subdirectory under WORKDIR of S, that directory is moved into position
inside WORKDIR. This preserves the behaviour of S = "${WORKDIR}/git",
S = "${WORKDIR}/${BPN}" and other commonly used source directory setups.
The directory is moved since sadly many autotools based projects can't cope with
symlinks in their paths.
Signed-off-by: Richard Purdie
---
meta/classes-global/base.bbclass | 21 ++---
meta/conf/bitbake.conf | 2 +-
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass
index 066f3848f7c..cdce0538273 100644
--- a/meta/classes-global/base.bbclass
+++ b/meta/classes-global/base.bbclass
@@ -153,20 +153,35 @@ python base_do_fetch() {
}
addtask unpack after do_fetch
-do_unpack[dirs] = "${UNPACKDIR}"
-
-do_unpack[cleandirs] = "${@d.getVar('S') if os.path.normpath(d.getVar('S')) !=
os.path.normpath(d.getVar('WORKDIR')) else os.path.join('${S}', 'patches')}"
+do_unpack[cleandirs] = "${UNPACKDIR}"
python base_do_unpack() {
+import shutil
+
src_uri = (d.getVar('SRC_URI') or "").split()
if not src_uri:
return
+sourcedir = d.getVar('S')
+basedir = None
+workdir = d.getVar('WORKDIR')
+unpackdir = d.getVar('UNPACKDIR')
+if sourcedir.startswith(workdir) and not sourcedir.startswith(unpackdir):
+basedir = sourcedir.replace(workdir, '').strip("/").split('/')[0]
+bb.utils.remove(sourcedir, True)
+if basedir:
+bb.utils.remove(workdir + '/' + basedir, True)
+
try:
fetcher = bb.fetch2.Fetch(src_uri, d)
fetcher.unpack(d.getVar('UNPACKDIR'))
except bb.fetch2.BBFetchException as e:
bb.fatal("Bitbake Fetcher Error: " + repr(e))
+
+if basedir and os.path.exists(unpackdir + '/' + basedir):
+# Compatibility magic to ensure ${WORKDIR}/git and ${WORKDIR}/${BP}
+# as often used in S work as expected.
+shutil.move(unpackdir + '/' + basedir, workdir + '/' + basedir)
}
SSTATETASKS += "do_deploy_source_date_epoch"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b2c500d8739..75c850760f6 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -405,7 +405,7 @@ STAMP = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}"
STAMPCLEAN = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/*-*"
BASE_WORKDIR ?= "${TMPDIR}/work"
WORKDIR = "${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}"
-UNPACKDIR ??= "${WORKDIR}"
+UNPACKDIR ??= "${WORKDIR}/sources-unpack"
T = "${WORKDIR}/temp"
D = "${WORKDIR}/image"
S = "${WORKDIR}/${BP}"
--
2.40.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199281):
https://lists.openembedded.org/g/openembedded-core/message/199281
Mute This Topic: https://lists.openembedded.org/mt/106112374/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 01/10] recipes: Start WORKDIR -> UNPACKDIR transition
Replace references of WORKDIR with UNPACKDIR where it makes sense to do
so in preparation for changing the default value of UNPACKDIR.
Signed-off-by: Richard Purdie
---
.../recipeutils/recipeutils-test_1.2.bb | 2 +-
meta/classes-recipe/cargo_common.bbclass | 4 ++--
meta/classes-recipe/kernel-yocto.bbclass | 10
meta/classes-recipe/ptest-perl.bbclass| 2 +-
meta/lib/oe/recipeutils.py| 2 +-
meta/lib/oeqa/selftest/cases/devtool.py | 6 ++---
meta/lib/oeqa/selftest/cases/layerappend.py | 2 +-
meta/lib/oeqa/selftest/cases/recipetool.py| 20
meta/recipes-bsp/grub/grub-efi_2.12.bb| 2 +-
meta/recipes-bsp/u-boot/u-boot.inc| 4 ++--
.../openssh/openssh_9.7p1.bb | 16 ++---
.../gettext/gettext-minimal-native_0.22.5.bb | 2 +-
.../glibc/glibc-testsuite_2.39.bb | 4 ++--
.../images/build-appliance-image_15.0.0.bb| 12 +-
meta/recipes-core/musl/libc-test_git.bb | 2 +-
meta/recipes-core/psplash/psplash_git.bb | 6 ++---
meta/recipes-devtools/apt/apt_2.6.1.bb| 2 +-
.../cdrtools/cdrtools-native_3.01.bb | 2 +-
meta/recipes-devtools/lua/lua_5.4.6.bb| 2 +-
.../perl-cross/perlcross_1.5.2.bb | 2 +-
meta/recipes-devtools/perl/perl_5.38.2.bb | 2 +-
.../python/python3-cryptography_42.0.5.bb | 2 +-
.../python/python3-hypothesis_6.100.1.bb | 4 ++--
.../python/python3-pyyaml_6.0.1.bb| 2 +-
meta/recipes-devtools/quilt/quilt.inc | 2 +-
meta/recipes-devtools/rust/cargo_1.75.0.bb| 2 +-
meta/recipes-devtools/rust/rust_1.75.0.bb | 2 +-
.../valgrind/valgrind_3.23.0.bb | 6 ++---
meta/recipes-extended/bash/bash.inc | 2 +-
meta/recipes-extended/bzip2/bzip2_1.0.8.bb| 24 +--
meta/recipes-extended/cpio/cpio_2.15.bb | 2 +-
.../net-tools/net-tools_2.10.bb | 4 ++--
meta/recipes-rt/rt-tests/rt-tests_git.bb | 2 +-
meta/recipes-support/curl/curl_8.7.1.bb | 2 +-
meta/recipes-support/libpcre/libpcre_8.45.bb | 2 +-
meta/recipes-support/lzop/lzop_1.04.bb| 2 +-
meta/recipes-support/numactl/numactl_git.bb | 2 +-
37 files changed, 84 insertions(+), 84 deletions(-)
diff --git a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb
b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb
index ad9f475d151..c64c4693964 100644
--- a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb
+++ b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb
@@ -3,7 +3,7 @@ SUMMARY = "Test recipe for recipeutils.patch_recipe()"
require recipeutils-test.inc
LICENSE = "HPND"
-LIC_FILES_CHKSUM =
"file://${WORKDIR}/somefile;md5=d41d8cd98f00b204e9800998ecf8427e"
+LIC_FILES_CHKSUM =
"file://${UNPACKDIR}/somefile;md5=d41d8cd98f00b204e9800998ecf8427e"
DEPENDS += "zlib"
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/classes-recipe/cargo_common.bbclass
b/meta/classes-recipe/cargo_common.bbclass
index 0fb443edbdd..78440c810b3 100644
--- a/meta/classes-recipe/cargo_common.bbclass
+++ b/meta/classes-recipe/cargo_common.bbclass
@@ -18,7 +18,7 @@
inherit rust-common
# Where we download our registry and dependencies to
-export CARGO_HOME = "${WORKDIR}/cargo_home"
+export CARGO_HOME = "${UNPACKDIR}/cargo_home"
# The pkg-config-rs library used by cargo build scripts disables itself when
# cross compiling unless this is defined. We set up pkg-config appropriately
@@ -138,7 +138,7 @@ python cargo_common_do_patch_paths() {
return
patches = dict()
-workdir = d.getVar('WORKDIR')
+workdir = d.getVar('UNPACKDIR')
fetcher = bb.fetch2.Fetch(src_uri, d)
for url in fetcher.urls:
ud = fetcher.ud[url]
diff --git a/meta/classes-recipe/kernel-yocto.bbclass
b/meta/classes-recipe/kernel-yocto.bbclass
index 6468e8aa903..c4ed3f1ca2e 100644
--- a/meta/classes-recipe/kernel-yocto.bbclass
+++ b/meta/classes-recipe/kernel-yocto.bbclass
@@ -379,19 +379,19 @@ do_kernel_checkout() {
set +e
source_dir=`echo ${S} | sed 's%/$%%'`
- source_workdir="${WORKDIR}/git"
- if [ -d "${WORKDIR}/git/" ]; then
+ source_workdir="${UNPACKDIR}/git"
+ if [ -d "${UNPACKDIR}/git/" ]; then
# case: git repository
# if S is WORKDIR/git, then we shouldn't be moving or deleting
the tree.
if [ "${source_dir}" != "${source_workdir}" ]; then
if [ -d "${source_workdir}/.git" ]; then
# regular git repository with .git
rm -rf ${S}
- mv ${WORKDIR}/git ${S}
+ mv ${UNPACKDIR}/git ${S}
else
# create source for bare cloned git repository
git clone
[OE-core] [PATCH 02/10] recipes: Switch away from S = WORKDIR
Where recipes use S = ${WORKDIR}, change them to set UNPACKDIR to
a subdir of WORKDIR and make S point at this instead.
I've chosen not to force S into any standard UNPACKDIR we may pick in
future just so the S = UNPACKDIR case is clearly visible by the
directory naming under WORKDIR as that should aid usability.
Signed-off-by: Richard Purdie
---
meta-selftest/recipes-test/cpp/cpp-example.inc | 3 ++-
.../recipes-test/selftest-chown/selftest-chown.bb| 3 ++-
.../recipes-test/selftest-hardlink/selftest-hardlink.bb | 3 ++-
.../recipes-test/selftest-hello/selftest-hello_1.0.bb| 5 +++--
.../recipes-test/selftest-users/acreategroup.bb | 3 ++-
.../recipes-test/selftest-users/bcreategroup.bb | 3 ++-
.../recipes-test/selftest-users/ccreategroup.bb | 3 ++-
.../recipes-test/selftest-users/creategroup1.bb | 3 ++-
.../recipes-test/selftest-users/creategroup2.bb | 3 ++-
.../recipes-test/selftest-users/dcreategroup.bb | 3 ++-
.../recipes-test/selftest-users/useraddbadtask.bb| 3 ++-
meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb | 3 ++-
meta-skeleton/recipes-skeleton/service/service_0.1.bb| 9 +
meta/recipes-bsp/alsa-state/alsa-state.bb| 3 ++-
meta/recipes-bsp/formfactor/formfactor_0.0.bb| 4 +++-
meta/recipes-bsp/grub/grub-bootconf_1.00.bb | 3 ++-
meta/recipes-bsp/keymaps/keymaps_1.0.bb | 3 ++-
meta/recipes-bsp/usbinit/usbinit.bb | 4 +++-
meta/recipes-connectivity/connman/connman-conf.bb| 3 ++-
meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb | 3 ++-
meta/recipes-core/base-files/base-files_3.0.14.bb| 3 ++-
meta/recipes-core/busybox/busybox-inittab_1.36.1.bb | 3 ++-
meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb | 3 ++-
meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb| 4 ++--
.../initrdscripts/initramfs-framework_1.0.bb | 3 ++-
.../initrdscripts/initramfs-live-boot-tiny_1.0.bb| 4 ++--
.../initrdscripts/initramfs-live-boot_1.0.bb | 4 ++--
.../initramfs-live-install-efi-testfs_1.0.bb | 3 ++-
.../initrdscripts/initramfs-live-install-efi_1.0.bb | 4 ++--
.../initrdscripts/initramfs-live-install-testfs_1.0.bb | 3 ++-
.../initrdscripts/initramfs-live-install_1.0.bb | 4 ++--
.../initrdscripts/initramfs-module-install-efi_1.0.bb| 3 ++-
.../initrdscripts/initramfs-module-install_1.0.bb| 3 ++-
.../initrdscripts/initramfs-module-setup-live_1.0.bb | 3 ++-
meta/recipes-core/initscripts/initscripts_1.0.bb | 3 ++-
meta/recipes-core/musl/bsd-headers.bb| 3 ++-
meta/recipes-core/musl/libssp-nonshared.bb | 3 ++-
meta/recipes-core/musl/musl-legacy-error.bb | 3 ++-
meta/recipes-core/systemd/systemd-bootconf_1.00.bb | 3 ++-
meta/recipes-core/systemd/systemd-compat-units.bb| 3 ++-
meta/recipes-core/systemd/systemd-serialgetty.bb | 3 ++-
meta/recipes-core/systemd/systemd-systemctl-native.bb| 3 ++-
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | 3 ++-
meta/recipes-core/udev/udev-extraconf_1.1.bb | 3 ++-
meta/recipes-core/volatile-binds/volatile-binds.bb | 5 ++---
meta/recipes-devtools/devel-config/distcc-config.bb | 3 ++-
meta/recipes-devtools/devel-config/nfs-export-root.bb| 4 ++--
.../recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb | 3 ++-
.../icecc-create-env/icecc-create-env_0.1.bb | 3 ++-
meta/recipes-devtools/makedevs/makedevs_1.0.1.bb | 3 ++-
meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb | 3 ++-
meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb | 3 ++-
meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb | 3 ++-
meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb | 3 ++-
meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb | 3 ++-
meta/recipes-devtools/rust/rust-cross-canadian.inc | 3 ++-
meta/recipes-extended/shadow/shadow-securetty_4.6.bb | 3 ++-
meta/recipes-extended/shadow/shadow-sysroot_4.6.bb | 3 ++-
.../texinfo-dummy-native/texinfo-dummy-native.bb | 3 ++-
meta/recipes-graphics/builder/builder_0.1.bb | 3 ++-
.../matchbox-session/matchbox-session_0.1.bb | 4 +++-
.../mini-x-session/mini-x-session_0.1.bb | 4 +++-
meta/recipes-graphics/pong-clock/pong-clock_1.0.bb | 3 ++-
meta/recipes-graphics/wayland/weston-init.bb | 3 ++-
.../recipes-graphics/x11-common/xserver-nodm-init_3.0.bb | 3 ++-
.../xinput-calibrator/pointercal-xinput_0.0.bb | 4 +++-
.../xorg-xserver/xserver-xf86-config_0.1.bb | 3 ++-
meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb | 3 ++-
meta/recipes-kernel/linux/linux-dummy.bb | 4 +++-
.../make-mod-scripts/make-mod-scripts_1.0.bb | 3 ++-
[OE-core] [PATCH 03/10] at: Tweak UNPACKDIR reference
${UNPACKDIR}/${BP} is ${S} so use the correct variable.
Signed-off-by: Richard Purdie
---
meta/recipes-extended/at/at_3.2.5.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-extended/at/at_3.2.5.bb
b/meta/recipes-extended/at/at_3.2.5.bb
index 0162548d337..112d1c4adcb 100644
--- a/meta/recipes-extended/at/at_3.2.5.bb
+++ b/meta/recipes-extended/at/at_3.2.5.bb
@@ -70,7 +70,7 @@ do_install () {
sed -i -e 's,@SBINDIR@,${sbindir},g'
${D}${systemd_system_unitdir}/atd.service
if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
- install -D -m 0644 ${UNPACKDIR}/${BP}/pam.conf
${D}${sysconfdir}/pam.d/atd
+ install -D -m 0644 ${S}/pam.conf ${D}${sysconfdir}/pam.d/atd
fi
rm -f ${D}${datadir}/at/batch-job
}
--
2.40.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199279):
https://lists.openembedded.org/g/openembedded-core/message/199279
Mute This Topic: https://lists.openembedded.org/mt/106112372/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] buildhistory: Fix do_package race issues
On Wed, 15 May 2024 at 11:36, pmi183 via lists.openembedded.org wrote: > - why is it unable to find anything in packages-split/, if it executes after > populate_packages which places things there? > > As far as i could understand, there is some concurrency issue between > package.bbclass and buildhistory.bbclass. Taking in consideration that > `buildhistory_list_pkg_files` is triggered by checking if `BB_CURRENTTASK` is > `package` and at the same time `PACKAGESPLITFUNCS` is triggered on > `do_package`, this leads to the issue with missing files since buildhistory > bbclass might be looking into something that wasnt yet created. In my > findings, `buildhistory_list_pkg_files` should be called in the end of > `do_package` execution where `packages-split` directory is created and > populated. > > Is there any clear reason why we cant move `buildhistory_list_pkg_files` to > `packagedata` task since its the next task to be executed? The reason is that the issue is not fully understood, and this move might be working around the real issue. The logs I saw indicate that package_split completes before buildhistory_list_pkg_files starts. This needs to be looked into further. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199275): https://lists.openembedded.org/g/openembedded-core/message/199275 Mute This Topic: https://lists.openembedded.org/mt/87258776/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] buildhistory: Fix do_package race issues
Hi Alex,
I did some investigation on this topic,
- why is it not a hard error?
That is because find command in `buildhistory_list_pkg_files` is tested inside
the loop for, hiding this issue and for loop is always returning 0 even if
`find` fails.
>
> .
> buildhistory_list_pkg_files() {
> # Create individual files-in-package for each recipe's package
> pkgdirlist=$(find ${PKGDEST}/* -maxdepth 0 -type d)
>
> for pkgdir in pkgdirlist; do
> .
>
- why is it unable to find anything in packages-split/, if it executes after
populate_packages which places things there?
As far as i could understand, there is some concurrency issue between
package.bbclass and buildhistory.bbclass. Taking in consideration that
`buildhistory_list_pkg_files` is triggered by checking if `BB_CURRENTTASK` is
`package` and at the same time `PACKAGESPLITFUNCS` is triggered on
`do_package`, this leads to the issue with missing files since buildhistory
bbclass might be looking into something that wasnt yet created. In my findings,
`buildhistory_list_pkg_files` should be called in the end of `do_package`
execution where `packages-split` directory is created and populated.
Is there any clear reason why we cant move `buildhistory_list_pkg_files` to
`packagedata` task since its the next task to be executed?
Any suggestion or any idea how can i, from buildhistory.bbclass, determine if
`PACKAGESPLITFUNCS` was already executed?
Thank you
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199272):
https://lists.openembedded.org/g/openembedded-core/message/199272
Mute This Topic: https://lists.openembedded.org/mt/87258776/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] gstreamer1.0-plugins-bad: rename onevpl-intel-gpu -> vpl-gpu-rt
Upstream has been renamed to vpl-gpu-rt. Signed-off-by: Naveen Saini --- .../gstreamer/gstreamer1.0-plugins-bad_1.22.11.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.11.bb index 523ee7a5ae..49a3a79b2d 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.11.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.11.bb @@ -60,7 +60,7 @@ PACKAGECONFIG[libde265]= "-Dlibde265=enabled,-Dlibde265=disabled,libde26 PACKAGECONFIG[libssh2] = "-Dcurl-ssh2=enabled,-Dcurl-ssh2=disabled,libssh2" PACKAGECONFIG[lcms2] = "-Dcolormanagement=enabled,-Dcolormanagement=disabled,lcms" PACKAGECONFIG[modplug] = "-Dmodplug=enabled,-Dmodplug=disabled,libmodplug" -PACKAGECONFIG[msdk]= "-Dmsdk=enabled -Dmfx_api=oneVPL,-Dmsdk=disabled,onevpl-intel-gpu" +PACKAGECONFIG[msdk]= "-Dmsdk=enabled -Dmfx_api=oneVPL,-Dmsdk=disabled,vpl-gpu-rt" PACKAGECONFIG[neon]= "-Dneon=enabled,-Dneon=disabled,neon" PACKAGECONFIG[openal] = "-Dopenal=enabled,-Dopenal=disabled,openal-soft" PACKAGECONFIG[opencv] = "-Dopencv=enabled,-Dopencv=disabled,opencv" -- 2.37.3 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199271): https://lists.openembedded.org/g/openembedded-core/message/199271 Mute This Topic: https://lists.openembedded.org/mt/106109503/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] ipk/rootfs: run sanity test of multilib in parallel
Hello,
This reliably fails on the autobuilders:
https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/9008/steps/20/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/9012/steps/20/logs/stdio
On 13/05/2024 13:37:52+, Seungkyun Kim wrote:
> From: "seungkyun.kim"
>
> For multilib type packages, there is an additional temporary
> installation before the actual installation. It makes almost doubles
> the do_rootfs time if having many multilib type packages.
> To avoid this overhead, run sanity test in parallel.
> Installing package groups through opkg takes much more time than
> copying directory.
>
> Signed-off-by: seungkyun.kim
> ---
> meta/lib/oe/package_manager/ipk/rootfs.py | 18 --
> 1 file changed, 16 insertions(+), 2 deletions(-)
>
> diff --git a/meta/lib/oe/package_manager/ipk/rootfs.py
> b/meta/lib/oe/package_manager/ipk/rootfs.py
> index ba93eb62ea..db1cc1650e 100644
> --- a/meta/lib/oe/package_manager/ipk/rootfs.py
> +++ b/meta/lib/oe/package_manager/ipk/rootfs.py
> @@ -6,6 +6,7 @@
>
> import re
> import filecmp
> +import multiprocessing
> import shutil
> from oe.rootfs import Rootfs
> from oe.manifest import Manifest
> @@ -198,10 +199,16 @@ class PkgRootfs(DpkgOpkgRootfs):
>
> def _multilib_test_install(self, pkgs):
> ml_temp = self.d.getVar("MULTILIB_TEMP_ROOTFS")
> +rootfs_temp = os.path.join(ml_temp, "rootfs")
> bb.utils.mkdirhier(ml_temp)
>
> -dirs = [self.image_rootfs]
> +bb.utils.remove(rootfs_temp, True)
> +shutil.copytree(self.image_rootfs, rootfs_temp)
> +dirs = [rootfs_temp]
> +return
> multiprocessing.Process(target=self._multilib_test_pkg_install, \
> + args=(pkgs, ml_temp, dirs, False))
>
> +def _multilib_test_pkg_install(self, pkgs, ml_temp, dirs):
> for variant in self.d.getVar("MULTILIB_VARIANTS").split():
> ml_target_rootfs = os.path.join(ml_temp, variant)
>
> @@ -218,6 +225,8 @@ class PkgRootfs(DpkgOpkgRootfs):
> dirs.append(ml_target_rootfs)
>
> self._multilib_sanity_test(dirs)
> +rootfs_temp = os.path.join(ml_temp, "rootfs")
> +bb.utils.remove(rootfs_temp)
>
> '''
> While ipk incremental image generation is enabled, it will remove the
> @@ -300,15 +309,20 @@ class PkgRootfs(DpkgOpkgRootfs):
>
> for pkg_type in self.install_order:
> if pkg_type in pkgs_to_install:
> +sanity_test = None
> # For multilib, we perform a sanity test before final install
> # If sanity test fails, it will automatically do a bb.fatal()
> # and the installation will stop
> if pkg_type == Manifest.PKG_TYPE_MULTILIB:
> -self._multilib_test_install(pkgs_to_install[pkg_type])
> +sanity_test=
> self._multilib_test_install(pkgs_to_install[pkg_type])
> +sanity_test.start()
>
> self.pm.install(pkgs_to_install[pkg_type],
> [False, True][pkg_type ==
> Manifest.PKG_TYPE_ATTEMPT_ONLY])
>
> +if sanity_test is not None:
> +sanity_test.join()
> +
> if self.progress_reporter:
> self.progress_reporter.next_stage()
>
> --
> 2.43.0
>
>
>
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199268):
https://lists.openembedded.org/g/openembedded-core/message/199268
Mute This Topic: https://lists.openembedded.org/mt/106072581/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2 2/3] selftest/classes: add localpkgfeed class
This class can be used to construct a subset of a deployed package feed
for use in tests which iterate the deploy directory, and as such a huge
feed of 30K+ packages can result in very slow tests.
Signed-off-by: Ross Burton
---
meta-selftest/classes/localpkgfeed.bbclass | 27 ++
1 file changed, 27 insertions(+)
create mode 100644 meta-selftest/classes/localpkgfeed.bbclass
diff --git a/meta-selftest/classes/localpkgfeed.bbclass
b/meta-selftest/classes/localpkgfeed.bbclass
new file mode 100644
index 000..b796375e55c
--- /dev/null
+++ b/meta-selftest/classes/localpkgfeed.bbclass
@@ -0,0 +1,27 @@
+# Create a subset of the package feed that just contain the
+# packages depended on by this recipe.
+
+LOCALPKGFEED_DIR = "${WORKDIR}/localpkgfeed"
+
+addtask localpkgfeed after do_build
+do_localpkgfeed[cleandirs] = "${LOCALPKGFEED_DIR}"
+do_localpkgfeed[nostamp] = "1"
+
+def get_packaging_class(d):
+package_class = d.getVar("PACKAGE_CLASSES").split()[0]
+return package_class.replace("package_", "")
+
+python () {
+packaging = get_packaging_class(d)
+d.setVarFlag("do_localpkgfeed", "rdeptask", "do_package_write_" +
packaging)
+}
+
+python do_localpkgfeed() {
+import oe.package_manager
+
+packaging = get_packaging_class(d)
+deploydir = d.getVar("DEPLOY_DIR_" + packaging.upper())
+task = "package_write_" + packaging
+
+oe.package_manager.create_packages_dir(d, d.getVar("LOCALPKGFEED_DIR"),
deploydir, task, True, True)
+}
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199266):
https://lists.openembedded.org/g/openembedded-core/message/199266
Mute This Topic: https://lists.openembedded.org/mt/106097812/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2 1/3] lib/oe/package-manager: allow including self in create_packages_dir
This function is typically used to construct a limited feed for image
creation, but there are other cases when you might want a limited feed
and include the current recipe's packages in it.
To ensure that existing behaviour is preserved, add a boolean to control
this behaviour and default it to False.
Signed-off-by: Ross Burton
---
meta/lib/oe/package_manager/__init__.py | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oe/package_manager/__init__.py
b/meta/lib/oe/package_manager/__init__.py
index 6774cdb794d..d3b23178949 100644
--- a/meta/lib/oe/package_manager/__init__.py
+++ b/meta/lib/oe/package_manager/__init__.py
@@ -449,7 +449,7 @@ class PackageManager(object, metaclass=ABCMeta):
return res
return _append(uris, base_paths)
-def create_packages_dir(d, subrepo_dir, deploydir, taskname,
filterbydependencies):
+def create_packages_dir(d, subrepo_dir, deploydir, taskname,
filterbydependencies, include_self=False):
"""
Go through our do_package_write_X dependencies and hardlink the packages
we depend
upon into the repo directory. This prevents us seeing other packages that
may
@@ -486,14 +486,17 @@ def create_packages_dir(d, subrepo_dir, deploydir,
taskname, filterbydependencie
bb.fatal("Couldn't find ourself in BB_TASKDEPDATA?")
pkgdeps = set()
start = [start]
-seen = set(start)
+if include_self:
+seen = set()
+else:
+seen = set(start)
# Support direct dependencies (do_rootfs -> do_package_write_X)
# or indirect dependencies within PN (do_populate_sdk_ext -> do_rootfs ->
do_package_write_X)
while start:
next = []
for dep2 in start:
for dep in taskdepdata[dep2][3]:
-if taskdepdata[dep][0] != pn:
+if include_self or taskdepdata[dep][0] != pn:
if "do_" + taskname in dep:
pkgdeps.add(dep)
elif dep not in seen:
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199265):
https://lists.openembedded.org/g/openembedded-core/message/199265
Mute This Topic: https://lists.openembedded.org/mt/106097811/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2 3/3] oeqa/selftest/debuginfod: use localpkgfeed to speed server startup
Sometimes the debuginfod selftest fails due to a timeout, because it
spends too long scanning a huge deploy directory that due to what tests
were ran previously can contain 30K packages.
The test only needs a subset of the feed, so use the new localpkgfeed
class to construct a minimal feed before running the test.
[ YOCTO #14937 ]
Signed-off-by: Ross Burton
---
meta/lib/oeqa/selftest/cases/debuginfod.py | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/debuginfod.py
b/meta/lib/oeqa/selftest/cases/debuginfod.py
index 505b4be8373..46c0cd87bbc 100644
--- a/meta/lib/oeqa/selftest/cases/debuginfod.py
+++ b/meta/lib/oeqa/selftest/cases/debuginfod.py
@@ -62,7 +62,7 @@ class Debuginfod(OESelftestTestCase):
raise TimeoutError("Cannot connect debuginfod, still %d scan jobs
running" % latest)
-def start_debuginfod(self):
+def start_debuginfod(self, feed_dir):
# We assume that the caller has already bitbake'd
elfutils-native:do_addto_recipe_sysroot
# Save some useful paths for later
@@ -82,7 +82,7 @@ class Debuginfod(OESelftestTestCase):
# Disable rescanning, this is a one-shot test
"--rescan-time=0",
"--groom-time=0",
-get_bb_var("DEPLOY_DIR"),
+feed_dir,
]
format = get_bb_var("PACKAGE_CLASSES").split()[0]
@@ -114,11 +114,12 @@ class Debuginfod(OESelftestTestCase):
self.write_config("""
TMPDIR = "${TOPDIR}/tmp-debuginfod"
DISTRO_FEATURES:append = " debuginfod"
+INHERIT += "localpkgfeed"
""")
-bitbake("elfutils-native:do_addto_recipe_sysroot xz xz:do_package")
+bitbake("elfutils-native:do_addto_recipe_sysroot xz xz:do_package
xz:do_localpkgfeed")
try:
-self.start_debuginfod()
+self.start_debuginfod(get_bb_var("LOCALPKGFEED_DIR", "xz"))
env = os.environ.copy()
env["DEBUGINFOD_URLS"] = "http://localhost:%d/; % self.port
@@ -141,12 +142,13 @@ DISTRO_FEATURES:append = " debuginfod"
self.write_config("""
TMPDIR = "${TOPDIR}/tmp-debuginfod"
DISTRO_FEATURES:append = " debuginfod"
+INHERIT += "localpkgfeed"
CORE_IMAGE_EXTRA_INSTALL += "elfutils xz"
""")
-bitbake("core-image-minimal elfutils-native:do_addto_recipe_sysroot")
+bitbake("core-image-minimal elfutils-native:do_addto_recipe_sysroot
xz:do_localpkgfeed")
try:
-self.start_debuginfod()
+self.start_debuginfod(get_bb_var("LOCALPKGFEED_DIR", "xz"))
with runqemu("core-image-minimal", runqemuparams="nographic") as
qemu:
cmd = "DEBUGINFOD_URLS=http://%s:%d/ debuginfod-find debuginfo
/usr/bin/xz" % (qemu.server_ip, self.port)
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199267):
https://lists.openembedded.org/g/openembedded-core/message/199267
Mute This Topic: https://lists.openembedded.org/mt/106097813/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
