Patch review
cover Patch review
Please review this set of changes for mickledore and comments back by end of day Monday.
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/5547
The following changes since commit 4df0b835fae3af1dbde4a06568a652ce46d7af7a:
maintainers.inc: update version for gcc-source (2023-06-27 12:12:05 -1000)
are available in the Git repository at:
https://git.openembedded.org/openembedded-core-contrib stable/mickledore-nut
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/mickledore-nut
Alexander Kanavin (10):
apr: upgrade 1.7.3 -> 1.7.4
scripts/runqemu: split lock dir creation into a reusable function scripts/runqemu: allocate unfsd ports in a way that doesn't race or
clash with unrelated processes
qemu: a pending patch was submitted and accepted upstream maintainers.inc: unassign Adrian Bunk from wireless-regdb maintainers.inc: unassign Alistair Francis from opensbi maintainers.inc: unassign Chase Qi from libc-test maintainers.inc: unassign Oleksandr Kravchuk from python3 and all
other items
maintainers.inc: unassign Ricardo Neri from ovmf
grub: submit determinism.patch upstream
Changqing Li (1):
systemd: fix a dead link under /var/log
Charlie Wu (1):
devtool: Fix the wrong variable in srcuri_entry
Fabien Mahot (2):
useradd-example: package typo correction oeqa/selftest/bbtests: add non-existent prefile/postfile tests
Khem Raj (3):
glibc: Pass linker choice via compiler flags
babeltrace2: Always use BFD linker when building tests with ld-is-lld
distro feature
parted: Add missing libuuid to linker cmdline for
libparted-fs-resize.so
Markus Volk (1):
gtk4: upgrade 4.10.3 -> 4.10.4
Mikko Rapeli (1):
useradd-staticids.bbclass: improve error message
Mingli Yu (1):
python3-numpy: remove NPY_INLINE, use inline instead
Randolph Sapp (6):
weston-init: make sure the render group exists
weston-init: add weston user to the render group
weston-init: add the weston user to the wayland group
weston-init: fix the mixed indentation
weston-init: guard against systemd configs
weston-init: add profile to point users to global socket
Ross Burton (1):
gobject-introspection: remove obsolete DEPENDS
Sakib Sajal (1):
bno_plot.py, btt_plot.py: Ask for python3 specifically
Siddharth (1):
tiff: Security fix for CVE-2023-25434 and CVE-2023-26965
Wang Mingyu (1):
libxml2: upgrade 2.10.3 -> 2.10.4
.../useradd/useradd-example.bb | 2 +-
meta/classes/useradd-staticids.bbclass | 2 +-
meta/conf/distro/include/maintainers.inc | 44 ++---
meta/lib/oeqa/selftest/cases/bbtests.py | 8 +
meta/recipes-bsp/grub/files/determinism.patch | 2 +-
meta/recipes-core/glibc/glibc_2.37.bb | 4 +-
.../{libxml2_2.10.3.bb => libxml2_2.10.4.bb} | 2 +-
...on-t-create-symlink-README-in-this-f.patch | 42 +++++
meta/recipes-core/systemd/systemd_253.1.bb | 1 +
....inc.src-Change-NPY_INLINE-to-inline.patch | 135 +++++++++++++++
.../python/python3-numpy_1.24.2.bb | 1 +
...lative-paths-for-line-preprocessor-d.patch | 2 +-
...o-linker-flags-for-libparted-fs-resi.patch | 34 ++++
meta/recipes-extended/parted/parted_3.5.bb | 1 +
.../gobject-introspection_1.74.0.bb | 2 +-
.../gtk+/{gtk4_4.10.3.bb => gtk4_4.10.4.bb} | 2 +-
meta/recipes-graphics/wayland/weston-init.bb | 46 ++---
.../wayland/weston-init/weston-socket.sh | 20 +++
...plot.py-Ask-for-python3-specifically.patch | 35 ++++
meta/recipes-kernel/blktrace/blktrace_git.bb | 4 +-
.../recipes-kernel/lttng/babeltrace2_2.0.5.bb | 1 +
.../libtiff/files/CVE-2023-25434.patch | 159 ++++++++++++++++++
.../libtiff/files/CVE-2023-26965.patch | 99 +++++++++++
meta/recipes-multimedia/libtiff/tiff_4.5.0.bb | 2 +
.../apr/{apr_1.7.3.bb => apr_1.7.4.bb} | 2 +-
scripts/lib/devtool/standard.py | 2 +-
scripts/runqemu | 48 +++---
27 files changed, 623 insertions(+), 79 deletions(-)
rename meta/recipes-core/libxml/{libxml2_2.10.3.bb => libxml2_2.10.4.bb} (97%)
create mode 100644 meta/recipes-core/systemd/systemd/0001-legacy.conf.in-Don-t-create-symlink-README-in-this-f.patch
create mode 100644 meta/recipes-devtools/python/python3-numpy/0001-simd.inc.src-Change-NPY_INLINE-to-inline.patch
create mode 100644 meta/recipes-extended/parted/files/0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch
rename meta/recipes-gnome/gtk+/{gtk4_4.10.3.bb => gtk4_4.10.4.bb} (98%)
create mode 100755 meta/recipes-graphics/wayland/weston-init/weston-socket.sh
create mode 100644 meta/recipes-kernel/blktrace/blktrace/0001-bno_plot.py-btt_plot.py-Ask-for-python3-specifically.patch
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2023-25434.patch
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2023-26965.patch
rename meta/recipes-support/apr/{apr_1.7.3.bb => apr_1.7.4.bb} (98%)Signature · 1 line
2.34.1
PATCH 1/30 tiff: Security fix for CVE-2023-25434 and CVE-2023-26965
From: Siddharth <[email protected]>
Upstream-Status: Backport from [https://gitlab.com/libtiff/libtiff/-/commit/69818e2f2d246e6631ac2a2da692c3706b849c38, https://gitlab.com/libtiff/libtiff/-/commit/ec8ef90c1f573c9eb1f17d6a056aa0015f184acf]
--- .../libtiff/files/CVE-2023-25434.patch | 159 ++++++++++++++++++ .../libtiff/files/CVE-2023-26965.patch | 99 +++++++++++ meta/recipes-multimedia/libtiff/tiff_4.5.0.bb | 2 + 3 files changed, 260 insertions(+) create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2023-25434.patch create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2023-26965.patch
meta/recipes-multimedia/libtiff/files/CVE-2023-25434.patch new file +159 -0
@@ -0,0 +1,159 @@ +From 69818e2f2d246e6631ac2a2da692c3706b849c38 Mon Sep 17 00:00:00 2001 +From: Su_Laus <[email protected]> +Date: Sun, 29 Jan 2023 11:09:26 +0100 +Subject: [PATCH] tiffcrop: Amend rotateImage() not to toggle the input (main) + image width and length parameters when only cropped image sections are + rotated. Remove buffptr from region structure because never used. + +Closes #492 #493 #494 #495 #499 #518 #519 + +Upstream-Status: Backport from [https://gitlab.com/libtiff/libtiff/-/commit/69818e2f2d246e6631ac2a2da692c3706b849c38] +CVE: CVE-2023-25434 + +Signed-off-by: Siddharth Doshi <[email protected]> +--- + tools/tiffcrop.c | 51 ++++++++++++++++++++++++++++-------------------- + 1 file changed, 30 insertions(+), 21 deletions(-) + +diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c +index fc5b34b..6e1acc4 100644 +--- a/tools/tiffcrop.c ++++ b/tools/tiffcrop.c +@@ -296,7 +296,6 @@ struct region + uint32_t width; /* width in pixels */ + uint32_t length; /* length in pixels */ + uint32_t buffsize; /* size of buffer needed to hold the cropped region */ +- unsigned char *buffptr; /* address of start of the region */ + }; + + /* Cropping parameters from command line and image data +@@ -577,7 +576,7 @@ static int rotateContigSamples24bits(uint16_t, uint16_t, uint16_t, uint32_t, + static int rotateContigSamples32bits(uint16_t, uint16_t, uint16_t, uint32_t, + uint32_t, uint32_t, uint8_t *, uint8_t *); + static int rotateImage(uint16_t, struct image_data *, uint32_t *, uint32_t *, +- unsigned char **); ++ unsigned char **, int); + static int mirrorImage(uint16_t, uint16_t, uint16_t, uint32_t, uint32_t, + unsigned char *); + static int invertImage(uint16_t, uint16_t, uint16_t, uint32_t, uint32_t, +@@ -5779,7 +5778,6 @@ static void initCropMasks(struct crop_mask *cps) + cps->regionlist[i].width = 0; + cps->regionlist[i].length = 0; + cps->regionlist[i].buffsize = 0; +- cps->regionlist[i].buffptr = NULL; + cps->zonelist[i].position = 0; + cps->zonelist[i].total = 0; + } +@@ -7221,8 +7219,13 @@ static int correct_orientation(struct image_data *image, + return (-1); + } + +- if (rotateImage(rotation, image, &image->width, &image->length, +- work_buff_ptr)) ++ /* Dummy variable in order not to switch two times the ++ * image->width,->length within rotateImage(), ++ * but switch xres, yres there. */ ++ uint32_t width = image->width; ++ uint32_t length = image->length; ++ if (rotateImage(rotation, image, &width, &length, work_buff_ptr, ++ TRUE)) + { + TIFFError("correct_orientation", "Unable to rotate image"); + return (-1); +@@ -7291,7 +7294,6 @@ static int extractCompositeRegions(struct image_data *image, + /* These should not be needed for composite images */ + crop->regionlist[i].width = crop_width; + crop->regionlist[i].length = crop_length; +- crop->regionlist[i].buffptr = crop_buff; + + src_rowsize = ((img_width * bps * spp) + 7) / 8; + dst_rowsize = (((crop_width * bps * count) + 7) / 8); +@@ -7552,7 +7554,6 @@ static int extractSeparateRegion(struct image_data *image, + + crop->regionlist[region].width = crop_width; + crop->regionlist[region].length = crop_length; +- crop->regionlist[region].buffptr = crop_buff; + + src = read_buff; + dst = crop_buff; +@@ -8543,7 +8544,7 @@ static int processCropSelections(struct image_data *image, + reallocate the buffer */ + { + if (rotateImage(crop->rotation, image, &crop->combined_width, +- &crop->combined_length, &crop_buff)) ++ &crop->combined_length, &crop_buff, FALSE)) + { + TIFFError("processCropSelections", + "Failed to rotate composite regions by %" PRIu32 +@@ -8668,7 +8669,7 @@ static int processCropSelections(struct image_data *image, + */ + if (rotateImage(crop->rotation, image, + &crop->regionlist[i].width, +- &crop->regionlist[i].length, &crop_buff)) ++ &crop->regionlist[i].length, &crop_buff, FALSE)) + { + TIFFError("processCropSelections", + "Failed to rotate crop region by %" PRIu16 +@@ -8815,7 +8816,7 @@ static int createCroppedImage(struct image_data *image, struct crop_mask *crop, + CROP_ROTATE) /* rotate should be last as it can reallocate the buffer */ + { + if (rotateImage(crop->rotation, image, &crop->combined_width, +- &crop->combined_length, crop_buff_ptr)) ++ &crop->combined_length, crop_buff_ptr, TRUE)) + { + TIFFError("createCroppedImage", + "Failed to rotate image or cropped selection by %" PRIu16 +@@ -9531,7 +9532,7 @@ static int rotateContigSamples32bits(uint16_t rotation, uint16_t spp, + /* Rotate an image by a multiple of 90 degrees clockwise */ + static int rotateImage(uint16_t rotation, struct image_data *image, + uint32_t *img_width, uint32_t *img_length, +- unsigned char **ibuff_ptr) ++ unsigned char **ibuff_ptr, int rot_image_params) + { + int shift_width; + uint32_t bytes_per_pixel, bytes_per_sample; +@@ -9747,11 +9748,15 @@ static int rotateImage(uint16_t rotation, struct image_data *image, + + *img_width = length; + *img_length = width; +- image->width = length; +- image->length = width; +- res_temp = image->xres; +- image->xres = image->yres; +- image->yres = res_temp; ++ /* Only toggle image parameters if whole input image is rotated. */ ++ if (rot_image_params) ++ { ++ image->width = length; ++ image->length = width; ++ res_temp = image->xres; ++ image->xres = image->yres; ++ image->yres = res_temp; ++ } + break; + + case 270: +@@ -9834,11 +9839,15 @@ static int rotateImage(uint16_t rotation, struct image_data *image, + + *img_width = length; + *img_length = width; +- image->width = length; +- image->length = width; +- res_temp = image->xres; +- image->xres = image->yres; +- image->yres = res_temp; ++ /* Only toggle image parameters if whole input image is rotated. */ ++ if (rot_image_params) ++ { ++ image->width = length; ++ image->length = width; ++ res_temp = image->xres; ++ image->xres = image->yres; ++ image->yres = res_temp; ++ } + break; + default: + break; +-- +2.35.7 +
meta/recipes-multimedia/libtiff/files/CVE-2023-26965.patch new file +99 -0
99 lines not on this page · raw message
meta/recipes-multimedia/libtiff/tiff_4.5.0.bb +2 -0
@@ -11,6 +11,8 @@ CVE_PRODUCT = "libtiff" SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ file://CVE-2022-48281.patch \ file://CVE-2023-2731.patch \ + file://CVE-2023-25434.patch \ + file://CVE-2023-26965.patch \ " SRC_URI[sha256sum] = "c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464"
Signature · 1 line
2.34.1
PATCH 2/30 libxml2: upgrade 2.10.3 -> 2.10.4
In reply to Steve SakomanFrom: Wang Mingyu <[email protected]>
Changelog:
==========
### Security
- [CVE-2023-29469] Hashing of empty dict strings isn't deterministic
- [CVE-2023-28484] Fix null deref in xmlSchemaFixupComplexType
- schemas: Fix null-pointer-deref in xmlSchemaCheckCOSSTDerivedOK
### Regressions
- SAX2: Ignore namespaces in HTML documents
- io: Fix "buffer full" error with certain buffer sizes
---
.../libxml/{libxml2_2.10.3.bb => libxml2_2.10.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-core/libxml/{libxml2_2.10.3.bb => libxml2_2.10.4.bb} (97%)meta/recipes-core/libxml/libxml2_2.10.4.bb renamed from meta/recipes-core/libxml/libxml2_2.10.3.bb +1 -1
@@ -21,7 +21,7 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt file://libxml-m4-use-pkgconfig.patch \ " -SRC_URI[archive.sha256sum] = "5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c" +SRC_URI[archive.sha256sum] = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45" SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273" BINCONFIG = "${bindir}/xml2-config"
Signature · 1 line
2.34.1
PATCH 3/30 gtk4: upgrade 4.10.3 -> 4.10.4
In reply to Steve SakomanFrom: Markus Volk <[email protected]>
Overview of Changes in 4.10.4, 05-06 2023
=========================================
* GtkFileChooser
- Fix some memory leaks
* GtkUriLauncher
- Validate the uri
* GtkStack
- Fix a crash
* GtkGridView
- Respect css border-spacing
* GtkScrolledWindow
- Propagate child measure size whenever possible
* GtkPopoverMenu:
- Avoid unnecessary left padding
* GtkSearchEntry:
- Improve size allocation for the clear icon
* X11
- Avoid black flickering with xwayland window decorations
- Trap XRandr errors
* CSS
- Various fixes to transitions
* Translation updates:
Basque
Catalan
Chinese (China)
French
Galician
Indonesian
Lithuanian
Persian
Russian
Swedish
Turkish
Ukrainian
---
meta/recipes-gnome/gtk+/{gtk4_4.10.3.bb => gtk4_4.10.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-gnome/gtk+/{gtk4_4.10.3.bb => gtk4_4.10.4.bb} (98%)meta/recipes-gnome/gtk+/gtk4_4.10.4.bb renamed from meta/recipes-gnome/gtk+/gtk4_4.10.3.bb +1 -1
@@ -37,7 +37,7 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" UPSTREAM_CHECK_REGEX = "gtk-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz" -SRC_URI[sha256sum] = "4545441ad79e377eb6e0a705026dc7a46886e46a1b034db40912909da801cea9" +SRC_URI[sha256sum] = "7725400482e0685e28265e226c62847f4e73cfca9e9b416ac5838207f5377a24" S = "${WORKDIR}/gtk-${PV}"
Signature · 1 line
2.34.1
PATCH 4/30 apr: upgrade 1.7.3 -> 1.7.4
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
Changes for APR 1.7.4
*) Fix a regression where writing to a file opened with both APR_FOPEN_APPEND
and APR_FOPEN_BUFFERED did not properly append the data on Windows. (This regression was introduced in APR 1.7.3) [Evgeny Kotkov]
---
meta/recipes-support/apr/{apr_1.7.3.bb => apr_1.7.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/apr/{apr_1.7.3.bb => apr_1.7.4.bb} (98%)meta/recipes-support/apr/apr_1.7.4.bb renamed from meta/recipes-support/apr/apr_1.7.3.bb +1 -1
@@ -24,7 +24,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \ " -SRC_URI[sha256sum] = "455e218c060c474f2c834816873f6ed69c0cf0e4cfee54282cc93e8e989ee59e" +SRC_URI[sha256sum] = "fc648de983f3a2a6c9e78dea1f180639bd2fad6c06d556d4367a701fe5c35577" inherit autotools-brokensep lib_package binconfig multilib_header ptest multilib_script
Signature · 1 line
2.34.1
PATCH 5/30 bno_plot.py, btt_plot.py: Ask for python3 specifically
In reply to Steve SakomanFrom: Sakib Sajal <[email protected]>
python2 has been deprecated, use python3 instead
--- ...plot.py-Ask-for-python3-specifically.patch | 35 +++++++++++++++++++ meta/recipes-kernel/blktrace/blktrace_git.bb | 4 ++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-kernel/blktrace/blktrace/0001-bno_plot.py-btt_plot.py-Ask-for-python3-specifically.patch
meta/recipes-kernel/blktrace/blktrace/0001-bno_plot.py-btt_plot.py-Ask-for-python3-specifically.patch new file +35 -0
@@ -0,0 +1,35 @@ +From b8d9618cbbec5a04cf6dede0a6ceda41021b92ae Mon Sep 17 00:00:00 2001 +From: Sakib Sajal <[email protected]> +Date: Mon, 26 Jun 2023 17:34:01 -0400 +Subject: [PATCH] bno_plot.py, btt_plot.py: Ask for python3 specifically + +python2 is deprecated, use python3. + +Upstream-Status: Denied [https://www.spinics.net/lists/linux-btrace/msg01364.html] + +Signed-off-by: Sakib Sajal <[email protected]> +--- + btt/bno_plot.py | 2 +- + btt/btt_plot.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/btt/bno_plot.py b/btt/bno_plot.py +index 3aa4e19..d7d7159 100644 +--- a/btt/bno_plot.py ++++ b/btt/bno_plot.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # + # btt blkno plotting interface + # +diff --git a/btt/btt_plot.py b/btt/btt_plot.py +index 40bc71f..8620d31 100755 +--- a/btt/btt_plot.py ++++ b/btt/btt_plot.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # + # btt_plot.py: Generate matplotlib plots for BTT generate data files + #
meta/recipes-kernel/blktrace/blktrace_git.bb +3 -1
@@ -14,7 +14,9 @@ SRCREV = "366d30b9cdb20345c5d064af850d686da79b89eb" PV = "1.3.0+git${SRCPV}" -SRC_URI = "git://git.kernel.dk/blktrace.git;branch=master;protocol=https" +SRC_URI = "git://git.kernel.dk/blktrace.git;branch=master;protocol=https \ + file://0001-bno_plot.py-btt_plot.py-Ask-for-python3-specifically.patch \ + " S = "${WORKDIR}/git"
Signature · 1 line
2.34.1
PATCH 6/30 python3-numpy: remove NPY_INLINE, use inline instead
In reply to Steve SakomanFrom: Mingli Yu <[email protected]>
The build fails when DEBUG_BUILD is enabled with GCC-13 as [1] and [2].
Fixes:
| numpy/core/src/umath/simd.inc.src:977:20: note: called from here
| 977 | @vtype@ zeros = _mm512_setzero_@vsuffix@();
| ^~~~~~~~~~~~~~~~~~~
| numpy/core/src/umath/simd.inc.src:596:1: error: inlining failed in call to ‘always_inline’ ‘avx512_get_full_load_mask_ps’: target specific option mismatch
596 | avx512_get_full_load_mask_ps(void)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
| numpy/core/src/umath/simd.inc.src:976:27: note: called from here
976 | @mask@ load_mask = avx512_get_full_load_mask_@vsuffix@();
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| /usr/lib/gcc/x86_64-redhat-linux/13/include/avx512fintrin.h:6499:1: error: inlining failed in call to ‘always_inline’ ‘_mm512_loadu_si512’: target specific option mismatchReference: https://github.com/numpy/numpy/pull/22674/commits/3947b1a023a07a55522de65b4d302339bac2bad7
[1] https://git.openembedded.org/openembedded-core/commit/?id=8596678667797971559aed962b1c204266032186
[2] http://errors.yoctoproject.org/Errors/Details/689841/
--- ....inc.src-Change-NPY_INLINE-to-inline.patch | 135 ++++++++++++++++++ .../python/python3-numpy_1.24.2.bb | 1 + 2 files changed, 136 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-numpy/0001-simd.inc.src-Change-NPY_INLINE-to-inline.patch
meta/recipes-devtools/python/python3-numpy/0001-simd.inc.src-Change-NPY_INLINE-to-inline.patch new file +135 -0
@@ -0,0 +1,135 @@ +From f2a722aa30a29709bb9b5f60fc6d20a10fe6b4f5 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <[email protected]> +Date: Wed, 28 Jun 2023 17:58:52 +0800 +Subject: [PATCH] simd.inc.src: Change NPY_INLINE to inline +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + | numpy/core/src/umath/simd.inc.src:977:20: note: called from here + | 977 | @vtype@ zeros = _mm512_setzero_@vsuffix@(); + | ^~~~~~~~~~~~~~~~~~~ + | numpy/core/src/umath/simd.inc.src:596:1: error: inlining failed in call to ‘always_inline’ ‘avx512_get_full_load_mask_ps’: target specific option mismatch + 596 | avx512_get_full_load_mask_ps(void) + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ + | numpy/core/src/umath/simd.inc.src:976:27: note: called from here + 976 | @mask@ load_mask = avx512_get_full_load_mask_@vsuffix@(); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + | /usr/lib/gcc/x86_64-redhat-linux/13/include/avx512fintrin.h:6499:1: error: inlining failed in call to ‘always_inline’ ‘_mm512_loadu_si512’: target specific option mismatch + +Upstream-Status: Inappropriate [The file simd.inc.src have been removed in new version as + https://github.com/numpy/numpy/commit/640e85017aa8eac3e9be68b475acf27d623b16b7] + +Signed-off-by: Mingli Yu <[email protected]> +--- + numpy/core/src/umath/simd.inc.src | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/numpy/core/src/umath/simd.inc.src b/numpy/core/src/umath/simd.inc.src +index d6c9a7e..39aec9a 100644 +--- a/numpy/core/src/umath/simd.inc.src ++++ b/numpy/core/src/umath/simd.inc.src +@@ -61,11 +61,11 @@ + */ + + #if defined HAVE_ATTRIBUTE_TARGET_AVX512F_WITH_INTRINSICS && defined NPY_HAVE_SSE2_INTRINSICS +-static NPY_INLINE NPY_GCC_TARGET_AVX512F void ++static inline NPY_GCC_TARGET_AVX512F void + AVX512F_@func@_@TYPE@(@type@*, @type@*, const npy_intp n, const npy_intp stride); + #endif + +-static NPY_INLINE int ++static inline int + run_unary_avx512f_@func@_@TYPE@(char **args, const npy_intp *dimensions, const npy_intp *steps) + { + #if defined HAVE_ATTRIBUTE_TARGET_AVX512F_WITH_INTRINSICS && defined NPY_HAVE_SSE2_INTRINSICS +@@ -99,11 +99,11 @@ run_unary_avx512f_@func@_@TYPE@(char **args, const npy_intp *dimensions, const n + */ + + #if defined HAVE_ATTRIBUTE_TARGET_AVX512_SKX_WITH_INTRINSICS && defined NPY_HAVE_SSE2_INTRINSICS && @EXISTS@ +-static NPY_INLINE NPY_GCC_TARGET_AVX512_SKX void ++static inline NPY_GCC_TARGET_AVX512_SKX void + AVX512_SKX_@func@_@TYPE@(npy_bool*, @type@*, const npy_intp n, const npy_intp stride); + #endif + +-static NPY_INLINE int ++static inline int + run_@func@_avx512_skx_@TYPE@(char **args, npy_intp const *dimensions, npy_intp const *steps) + { + #if defined HAVE_ATTRIBUTE_TARGET_AVX512_SKX_WITH_INTRINSICS && defined NPY_HAVE_SSE2_INTRINSICS && @EXISTS@ +@@ -144,7 +144,7 @@ sse2_@func@_@TYPE@(@type@ *, @type@ *, const npy_intp n); + + #endif + +-static NPY_INLINE int ++static inline int + run_@name@_simd_@func@_@TYPE@(char **args, npy_intp const *dimensions, npy_intp const *steps) + { + #if @vector@ && defined NPY_HAVE_SSE2_INTRINSICS +@@ -169,7 +169,7 @@ sse2_@kind@_@TYPE@(npy_bool * op, @type@ * ip1, npy_intp n); + + #endif + +-static NPY_INLINE int ++static inline int + run_@kind@_simd_@TYPE@(char **args, npy_intp const *dimensions, npy_intp const *steps) + { + #if @vector@ && defined NPY_HAVE_SSE2_INTRINSICS +@@ -205,7 +205,7 @@ static void + sse2_reduce_@kind@_BOOL(npy_bool * op, npy_bool * ip, npy_intp n); + #endif + +-static NPY_INLINE int ++static inline int + run_binary_simd_@kind@_BOOL(char **args, npy_intp const *dimensions, npy_intp const *steps) + { + #if defined NPY_HAVE_SSE2_INTRINSICS +@@ -220,7 +220,7 @@ run_binary_simd_@kind@_BOOL(char **args, npy_intp const *dimensions, npy_intp co + } + + +-static NPY_INLINE int ++static inline int + run_reduce_simd_@kind@_BOOL(char **args, npy_intp const *dimensions, npy_intp const *steps) + { + #if defined NPY_HAVE_SSE2_INTRINSICS +@@ -245,7 +245,7 @@ static void + sse2_@kind@_BOOL(npy_bool *, npy_bool *, const npy_intp n); + #endif + +-static NPY_INLINE int ++static inline int + run_unary_simd_@kind@_BOOL(char **args, npy_intp const *dimensions, npy_intp const *steps) + { + #if defined NPY_HAVE_SSE2_INTRINSICS +@@ -875,7 +875,7 @@ NPY_FINLINE NPY_GCC_OPT_3 NPY_GCC_TARGET_@ISA@ @vtype@d + */ + + #if defined HAVE_ATTRIBUTE_TARGET_AVX512_SKX_WITH_INTRINSICS && defined NPY_HAVE_SSE2_INTRINSICS +-static NPY_INLINE NPY_GCC_TARGET_AVX512_SKX void ++static inline NPY_GCC_TARGET_AVX512_SKX void + AVX512_SKX_@func@_@TYPE@(npy_bool* op, @type@* ip, const npy_intp array_size, const npy_intp steps) + { + const npy_intp stride_ip = steps/(npy_intp)sizeof(@type@); +@@ -954,7 +954,7 @@ AVX512_SKX_@func@_@TYPE@(npy_bool* op, @type@* ip, const npy_intp array_size, co + */ + + #if defined HAVE_ATTRIBUTE_TARGET_AVX512F_WITH_INTRINSICS && defined NPY_HAVE_SSE2_INTRINSICS +-static NPY_GCC_OPT_3 NPY_INLINE NPY_GCC_TARGET_AVX512F void ++static NPY_GCC_OPT_3 inline NPY_GCC_TARGET_AVX512F void + AVX512F_@func@_@TYPE@(@type@ * op, + @type@ * ip, + const npy_intp array_size, +@@ -1001,7 +1001,7 @@ AVX512F_@func@_@TYPE@(@type@ * op, + /**end repeat1**/ + + #if defined HAVE_ATTRIBUTE_TARGET_AVX512F_WITH_INTRINSICS && defined NPY_HAVE_SSE2_INTRINSICS +-static NPY_GCC_OPT_3 NPY_INLINE NPY_GCC_TARGET_AVX512F void ++static NPY_GCC_OPT_3 inline NPY_GCC_TARGET_AVX512F void + AVX512F_absolute_@TYPE@(@type@ * op, + @type@ * ip, + const npy_intp array_size, +-- +2.25.1 +
meta/recipes-devtools/python/python3-numpy_1.24.2.bb +1 -0
@@ -10,6 +10,7 @@ SRCNAME = "numpy" SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ file://0001-numpy-core-Define-RISCV-32-support.patch \ + file://0001-simd.inc.src-Change-NPY_INLINE-to-inline.patch \ file://run-ptest \ " SRC_URI[sha256sum] = "003a9f530e880cb2cd177cba1af7220b9aa42def9c4afc2a2fc3ee6be7eb2b22"
Signature · 1 line
2.34.1
PATCH 7/30 systemd: fix a dead link under /var/log
In reply to Steve SakomanFrom: Changqing Li <[email protected]>
Commit 6fe23ff31c0 changed README to a symlink to README.logs, and install README.logs under systemd doc dir.
But for OE, systemd doc dir is splited into package systemd-doc, when it is not installed on the target, there will be an dead link:
Eg:
root@intel-x86-64:/var/log# ls -l README lrwxrwxrwx 1 root root 39 Jun 20 08:57 README -> ../../usr/share/doc/systemd/README.logs root@intel-x86-64:/var/log# ls -l ../../usr/share/doc/systemd/README.logs ls: cannot access '../../usr/share/doc/systemd/README.logs': No such file or directory
Meantime, relative path for a symlink also will meet issue like "No such file or directory"
Since OE have set ForwardToSyslog=yes, this README is not needed. So remove this symlink from package systemd
--- ...on-t-create-symlink-README-in-this-f.patch | 42 +++++++++++++++++++ meta/recipes-core/systemd/systemd_253.1.bb | 1 + 2 files changed, 43 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0001-legacy.conf.in-Don-t-create-symlink-README-in-this-f.patch
meta/recipes-core/systemd/systemd/0001-legacy.conf.in-Don-t-create-symlink-README-in-this-f.patch new file +42 -0
@@ -0,0 +1,42 @@ +From b17826490c1db2051dda23550ebdcd7f10e23479 Mon Sep 17 00:00:00 2001 +From: Changqing Li <[email protected]> +Date: Wed, 28 Jun 2023 13:49:41 +0800 +Subject: [PATCH 1/2] legacy.conf.in: Don't create symlink README in this file + +Commit 6fe23ff31c0 changed README to an symlink to README.logs, and +install README.logs under systemd doc dir. + +But for OE, systemd doc dir is splited into package systemd-doc, when it +is not installed on the target, there will be an dead link: +Eg: +root@intel-x86-64:/var/log# ls -l README +lrwxrwxrwx 1 root root 39 Jun 20 08:57 README -> ../../usr/share/doc/systemd/README.logs +root@intel-x86-64:/var/log# ls -l ../../usr/share/doc/systemd/README.logs +ls: cannot access '../../usr/share/doc/systemd/README.logs': No such file or directory + +So remove this symlink from package systemd + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Changqing Li <[email protected]> +--- + tmpfiles.d/legacy.conf.in | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/tmpfiles.d/legacy.conf.in b/tmpfiles.d/legacy.conf.in +index 4f2c0d7c43..62e2ae0986 100644 +--- a/tmpfiles.d/legacy.conf.in ++++ b/tmpfiles.d/legacy.conf.in +@@ -12,9 +12,6 @@ + + d /run/lock 0755 root root - + L /var/lock - - - - ../run/lock +-{% if CREATE_LOG_DIRS %} +-L /var/log/README - - - - ../..{{DOC_DIR}}/README.logs +-{% endif %} + + # /run/lock/subsys is used for serializing SysV service execution, and + # hence without use on SysV-less systems. +-- +2.25.1 +
meta/recipes-core/systemd/systemd_253.1.bb +1 -0
@@ -25,6 +25,7 @@ SRC_URI += " \ file://0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0008-implment-systemd-sysv-install-for-OE.patch \ file://0004-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch \ + file://0001-legacy.conf.in-Don-t-create-symlink-README-in-this-f.patch \ " # patches needed by musl
Signature · 1 line
2.34.1
PATCH 8/30 weston-init: make sure the render group exists
In reply to Steve SakomanFrom: Randolph Sapp <[email protected]>
Add the render group explicitly here to make sure it exists for the useradd command.
--- meta/recipes-graphics/wayland/weston-init.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/wayland/weston-init.bb +1 -1
@@ -93,5 +93,5 @@ CONFFILES:${PN} += "${sysconfdir}/xdg/weston/weston.ini ${sysconfdir}/default/we SYSTEMD_SERVICE:${PN} = "weston.service weston.socket" USERADD_PARAM:${PN} = "--home /home/weston --shell /bin/sh --user-group -G video,input weston" -GROUPADD_PARAM:${PN} = "-r wayland" +GROUPADD_PARAM:${PN} = "-r wayland; -r render"
Signature · 1 line
2.34.1
PATCH 9/30 weston-init: add weston user to the render group
In reply to Steve SakomanFrom: Randolph Sapp <[email protected]>
The weston user must be in the render group in order to access render device nodes for standard user-space graphics.
--- meta/recipes-graphics/wayland/weston-init.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/wayland/weston-init.bb +1 -1
@@ -92,6 +92,6 @@ FILES:${PN} += "\ CONFFILES:${PN} += "${sysconfdir}/xdg/weston/weston.ini ${sysconfdir}/default/weston" SYSTEMD_SERVICE:${PN} = "weston.service weston.socket" -USERADD_PARAM:${PN} = "--home /home/weston --shell /bin/sh --user-group -G video,input weston" +USERADD_PARAM:${PN} = "--home /home/weston --shell /bin/sh --user-group -G video,input,render weston" GROUPADD_PARAM:${PN} = "-r wayland; -r render"
Signature · 1 line
2.34.1
PATCH 10/30 weston-init: add the weston user to the wayland group
In reply to Steve SakomanFrom: Randolph Sapp <[email protected]>
Add the weston user to the wayland group so all users accessing the global weston socket in /run all share a group.
--- meta/recipes-graphics/wayland/weston-init.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/wayland/weston-init.bb +1 -1
@@ -92,6 +92,6 @@ FILES:${PN} += "\ CONFFILES:${PN} += "${sysconfdir}/xdg/weston/weston.ini ${sysconfdir}/default/weston" SYSTEMD_SERVICE:${PN} = "weston.service weston.socket" -USERADD_PARAM:${PN} = "--home /home/weston --shell /bin/sh --user-group -G video,input,render weston" +USERADD_PARAM:${PN} = "--home /home/weston --shell /bin/sh --user-group -G video,input,render,wayland weston" GROUPADD_PARAM:${PN} = "-r wayland; -r render"
Signature · 1 line
2.34.1
PATCH 11/30 weston-init: fix the mixed indentation
In reply to Steve SakomanFrom: Randolph Sapp <[email protected]>
I know my text editor is going to get angry at me if this continues.
--- meta/recipes-graphics/wayland/weston-init.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta/recipes-graphics/wayland/weston-init.bb +5 -5
@@ -25,19 +25,19 @@ DEFAULTBACKEND ??= "" DEFAULTBACKEND:qemuall ?= "drm" do_install() { - if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then + if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}/${sysconfdir}/init.d/weston - fi + fi install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston # Install Weston systemd service and accompanying udev rule install -D -p -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service install -D -p -m0644 ${WORKDIR}/weston.socket ${D}${systemd_system_unitdir}/weston.socket - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then install -D -p -m0644 ${WORKDIR}/weston-autologin ${D}${sysconfdir}/pam.d/weston-autologin - fi + fi sed -i -e s:/etc:${sysconfdir}:g \ -e s:/usr/bin:${bindir}:g \ -e s:/var:${localstatedir}:g \
@@ -46,7 +46,7 @@ do_install() { install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start - if [ -n "${DEFAULTBACKEND}" ]; then + if [ -n "${DEFAULTBACKEND}" ]; then sed -i -e "/^\[core\]/a backend=${DEFAULTBACKEND}-backend.so" ${D}${sysconfdir}/xdg/weston/weston.ini fi
Signature · 1 line
2.34.1
PATCH 12/30 weston-init: guard against systemd configs
In reply to Steve SakomanFrom: Randolph Sapp <[email protected]>
Just as sysvinit scripts shouldn't be present in a distro using systemd, systemd scripts shouldn't be present in a system not using systemd.
--- meta/recipes-graphics/wayland/weston-init.bb | 29 ++++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-)
meta/recipes-graphics/wayland/weston-init.bb +17 -12
@@ -25,27 +25,32 @@ DEFAULTBACKEND ??= "" DEFAULTBACKEND:qemuall ?= "drm" do_install() { + # Install weston-start script if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then + install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start + sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start + sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}/${sysconfdir}/init.d/weston fi - install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini - install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston # Install Weston systemd service and accompanying udev rule - install -D -p -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service - install -D -p -m0644 ${WORKDIR}/weston.socket ${D}${systemd_system_unitdir}/weston.socket + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -D -p -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service + install -D -p -m0644 ${WORKDIR}/weston.socket ${D}${systemd_system_unitdir}/weston.socket + sed -i -e s:/etc:${sysconfdir}:g \ + -e s:/usr/bin:${bindir}:g \ + -e s:/var:${localstatedir}:g \ + ${D}${systemd_system_unitdir}/weston.service + fi + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then install -D -p -m0644 ${WORKDIR}/weston-autologin ${D}${sysconfdir}/pam.d/weston-autologin fi - sed -i -e s:/etc:${sysconfdir}:g \ - -e s:/usr/bin:${bindir}:g \ - -e s:/var:${localstatedir}:g \ - ${D}${systemd_system_unitdir}/weston.service - # Install weston-start script - install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start - sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start - sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start + + install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini + install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston + if [ -n "${DEFAULTBACKEND}" ]; then sed -i -e "/^\[core\]/a backend=${DEFAULTBACKEND}-backend.so" ${D}${sysconfdir}/xdg/weston/weston.ini fi
Signature · 1 line
2.34.1
PATCH 13/30 weston-init: add profile to point users to global socket
In reply to Steve SakomanFrom: Randolph Sapp <[email protected]>
Add profile script to point users capable of interacting with the global socket to it by default.
--- meta/recipes-graphics/wayland/weston-init.bb | 3 +++ .../wayland/weston-init/weston-socket.sh | 20 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100755 meta/recipes-graphics/wayland/weston-init/weston-socket.sh
meta/recipes-graphics/wayland/weston-init.bb +3 -0
@@ -9,6 +9,7 @@ SRC_URI = "file://init \ file://weston.ini \ file://weston.service \ file://weston.socket \ + file://weston-socket.sh \ file://weston-autologin \ file://weston-start"
@@ -38,6 +39,7 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -D -p -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service install -D -p -m0644 ${WORKDIR}/weston.socket ${D}${systemd_system_unitdir}/weston.socket + install -D -p -m0644 ${WORKDIR}/weston-socket.sh ${D}${sysconfdir}/profile.d/weston-socket.sh sed -i -e s:/etc:${sysconfdir}:g \ -e s:/usr/bin:${bindir}:g \ -e s:/var:${localstatedir}:g \
@@ -87,6 +89,7 @@ INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." FILES:${PN} += "\ ${sysconfdir}/xdg/weston/weston.ini \ + ${sysconfdir}/profile.d/weston-socket.sh \ ${systemd_system_unitdir}/weston.service \ ${systemd_system_unitdir}/weston.socket \ ${sysconfdir}/default/weston \
meta/recipes-graphics/wayland/weston-init/weston-socket.sh new file +20 -0
@@ -0,0 +1,20 @@ +#!/bin/sh + +# set weston variables for use with global weston socket +global_socket="/run/wayland-0" +if [ -e "$global_socket" ]; then + weston_group=$(stat -c "%G" "$global_socket") + if [ "$(id -u)" = "0" ]; then + export WAYLAND_DISPLAY="$global_socket" + else + case "$(groups "$USER")" in + *"$weston_group"*) + export WAYLAND_DISPLAY="$global_socket" + ;; + *) + ;; + esac + fi + unset weston_group +fi +unset global_socket
Signature · 1 line
2.34.1
PATCH 14/30 glibc: Pass linker choice via compiler flags
In reply to Steve SakomanFrom: Khem Raj <[email protected]>
glibc configury tries to detect ld version and assumes BFD or gold linker but when system ld is pointing to lld or mold it might fail the linker check, therefore pass LD variable to explicitly point at ld.bfd we are using BFD linker only to link glibc after all.
Second problem in such a case is that some partial objects are linked with CC -r which will fail if we do not inform the compiler to use BFD linker thusly pass it via appending to CC variable
--- meta/recipes-core/glibc/glibc_2.37.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-core/glibc/glibc_2.37.bb +3 -1
@@ -103,10 +103,12 @@ do_configure () { # version check and doesn't really help with anything (cd ${S} && gnu-configize) || die "failure in running gnu-configize" find ${S} -name "configure" | xargs touch - CPPFLAGS="" oe_runconf + CPPFLAGS="" LD="${HOST_PREFIX}ld.bfd ${TOOLCHAIN_OPTIONS}" oe_runconf } LDFLAGS += "-fuse-ld=bfd" +CC += "-fuse-ld=bfd" + do_compile () { base_do_compile echo "Adjust ldd script"
Signature · 1 line
2.34.1
PATCH 15/30 useradd-example: package typo correction
In reply to Steve SakomanFrom: Fabien Mahot <[email protected]>
Fixes [YOCTO #15143]
--- meta-skeleton/recipes-skeleton/useradd/useradd-example.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-skeleton/recipes-skeleton/useradd/useradd-example.bb +1 -1
@@ -32,7 +32,7 @@ USERADD_PACKAGES = "${PN} ${PN}-user3" # user1 and user2: USERADD_PARAM:${PN} = "-u 1200 -d /home/user1 -r -s /bin/bash user1; -u 1201 -d /home/user2 -r -s /bin/bash user2" -# user3 will be managed in the useradd-example-user3 pacakge: +# user3 will be managed in the useradd-example-user3 package: # As an example, we use the -p option to set password ('user3') for user3 USERADD_PARAM:${PN}-user3 = "-u 1202 -d /home/user3 -r -s /bin/bash -p '\$6\$XAWr.8nc\$bUE4pYYaVb8n6BbnBitU0zeJMtfhTpFpiOBLL9zRl4e4YQo88UU4r/1kjRzmTimCy.BvDh4xoFwVqcO.pihLa1' user3"
Signature · 1 line
2.34.1
PATCH 16/30 scripts/runqemu: split lock dir creation into a reusable function
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
--- scripts/runqemu | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-)
scripts/runqemu +13 -16
@@ -1083,6 +1083,17 @@ to your build configuration. self.set('NETWORK_CMD', '-netdev bridge,br=%s,id=net0,helper=%s -device virtio-net-pci,netdev=net0 ' % ( self.net_bridge, os.path.join(self.bindir_native, 'qemu-oe-bridge-helper'))) + def make_lock_dir(self, lockdir): + if not os.path.exists(lockdir): + # There might be a race issue when multi runqemu processess are + # running at the same time. + try: + os.mkdir(lockdir) + os.chmod(lockdir, 0o777) + except FileExistsError: + pass + return + def setup_slirp(self): """Setup user networking"""
@@ -1101,14 +1112,7 @@ to your build configuration. mac = 2 lockdir = "/tmp/qemu-port-locks" - if not os.path.exists(lockdir): - # There might be a race issue when multi runqemu processess are - # running at the same time. - try: - os.mkdir(lockdir) - os.chmod(lockdir, 0o777) - except FileExistsError: - pass + self.make_lock_dir(lockdir) # Find a free port to avoid conflicts for p in ports[:]:
@@ -1148,14 +1152,7 @@ to your build configuration. logger.error("ip: %s" % ip) raise OEPathError("runqemu-ifup, runqemu-ifdown or ip not found") - if not os.path.exists(lockdir): - # There might be a race issue when multi runqemu processess are - # running at the same time. - try: - os.mkdir(lockdir) - os.chmod(lockdir, 0o777) - except FileExistsError: - pass + self.make_lock_dir(lockdir) cmd = (ip, 'link') logger.debug('Running %s...' % str(cmd))
Signature · 1 line
2.34.1
PATCH 17/30 scripts/runqemu: allocate unfsd ports in a way that doesn't race or clash with unrelated processes
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
There is already a neat check_free_port() function for finding an available port atomically, so use that and make two additional tweaks:
- no need to allocate two separate ports; per unfsd documentation they can be the same
- move lockfile release until after unfsd has been shut down and the port(s) used has been freed
[YOCTO #15077]
--- scripts/runqemu | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
scripts/runqemu +8 -11
@@ -1011,17 +1011,14 @@ to your build configuration. else: self.nfs_server = '192.168.7.@GATEWAY@' - # Figure out a new nfs_instance to allow multiple qemus running. - ps = subprocess.check_output(("ps", "auxww")).decode('utf-8') - pattern = '/bin/unfsd .* -i .*\.pid -e .*/exports([0-9]+) ' - all_instances = re.findall(pattern, ps, re.M) - if all_instances: - all_instances.sort(key=int) - self.nfs_instance = int(all_instances.pop()) + 1 - - nfsd_port = 3049 + 2 * self.nfs_instance - mountd_port = 3048 + 2 * self.nfs_instance + nfsd_port = 3048 + self.nfs_instance + lockdir = "/tmp/qemu-port-locks" + self.make_lock_dir(lockdir) + while not self.check_free_port('localhost', nfsd_port, lockdir): + self.nfs_instance += 1 + nfsd_port += 1 + mountd_port = nfsd_port # Export vars for runqemu-export-rootfs export_dict = { 'NFS_INSTANCE': self.nfs_instance,
@@ -1595,13 +1592,13 @@ to your build configuration. logger.debug('Running %s' % str(cmd)) subprocess.check_call(cmd) self.release_taplock() - self.release_portlock() if self.nfs_running: logger.info("Shutting down the userspace NFS server...") cmd = ("runqemu-export-rootfs", "stop", self.rootfs) logger.debug('Running %s' % str(cmd)) subprocess.check_call(cmd) + self.release_portlock() if self.saved_stty: subprocess.check_call(("stty", self.saved_stty))
Signature · 1 line
2.34.1
PATCH 18/30 oeqa/selftest/bbtests: add non-existent prefile/postfile tests
In reply to Steve SakomanFrom: Fabien Mahot <[email protected]>
Fixes [YOCTO #10725]
--- meta/lib/oeqa/selftest/cases/bbtests.py | 8 ++++++++ 1 file changed, 8 insertions(+)
meta/lib/oeqa/selftest/cases/bbtests.py +8 -0
@@ -188,6 +188,10 @@ SSTATE_DIR = \"${TOPDIR}/download-selftest\" self.assertTrue(find, "No version returned for searched recipe. bitbake output: %s" % result.output) def test_prefile(self): + # Test when the prefile does not exist + result = runCmd('bitbake -r conf/prefile.conf', ignore_status=True) + self.assertEqual(1, result.status, "bitbake didn't error and should have when a specified prefile didn't exist: %s" % result.output) + # Test when the prefile exists preconf = os.path.join(self.builddir, 'conf/prefile.conf') self.track_for_cleanup(preconf) ftools.write_file(preconf ,"TEST_PREFILE=\"prefile\"")
@@ -198,6 +202,10 @@ SSTATE_DIR = \"${TOPDIR}/download-selftest\" self.assertIn('localconf', result.output) def test_postfile(self): + # Test when the postfile does not exist + result = runCmd('bitbake -R conf/postfile.conf', ignore_status=True) + self.assertEqual(1, result.status, "bitbake didn't error and should have when a specified postfile didn't exist: %s" % result.output) + # Test when the postfile exists postconf = os.path.join(self.builddir, 'conf/postfile.conf') self.track_for_cleanup(postconf) ftools.write_file(postconf , "TEST_POSTFILE=\"postfile\"")
Signature · 1 line
2.34.1
PATCH 19/30 qemu: a pending patch was submitted and accepted upstream
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
--- ...1-tracetool-use-relative-paths-for-line-preprocessor-d.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/qemu/qemu/0001-tracetool-use-relative-paths-for-line-preprocessor-d.patch +1 -1
@@ -8,7 +8,7 @@ The event filename is an absolute path. Convert it to a relative path when writing '#line' directives, to preserve reproducibility of the generated output when different base paths are used. -Upstream-Status: Pending +Upstream-Status: Accepted [https://gitlab.com/qemu-project/qemu/-/commit/9d672e290475001fcecdcc9dc79ad088ff89d17f] --- scripts/tracetool/backend/ftrace.py | 4 +++-
Signature · 1 line
2.34.1
PATCH 20/30 maintainers.inc: unassign Adrian Bunk from wireless-regdb
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
We were not able to get a response about availability over email, and so the recipe has to be unassigned.
--- meta/conf/distro/include/maintainers.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/distro/include/maintainers.inc +1 -1
@@ -838,7 +838,7 @@ RECIPE_MAINTAINER:pn-weston-init = "Denys Dmytriyenko <[email protected]>" RECIPE_MAINTAINER:pn-wget = "Yi Zhao <[email protected]>" RECIPE_MAINTAINER:pn-which = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-wic-tools = "Anuj Mittal <[email protected]>" -RECIPE_MAINTAINER:pn-wireless-regdb = "Adrian Bunk <[email protected]>" +RECIPE_MAINTAINER:pn-wireless-regdb = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-wpa-supplicant = "Changhyeok Bae <[email protected]>" RECIPE_MAINTAINER:pn-wpebackend-fdo = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-x11perf = "Unassigned <[email protected]>"
Signature · 1 line
2.34.1
PATCH 21/30 maintainers.inc: unassign Alistair Francis from opensbi
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
We were not able to get a response about availability over email, and so the recipe has to be unassigned.
--- meta/conf/distro/include/maintainers.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/distro/include/maintainers.inc +1 -1
@@ -555,7 +555,7 @@ RECIPE_MAINTAINER:pn-npth = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-nss-myhostname = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-numactl = "Richard Purdie <[email protected]>" RECIPE_MAINTAINER:pn-ofono = "Ross Burton <[email protected]>" -RECIPE_MAINTAINER:pn-opensbi = "Alistair Francis <[email protected]>" +RECIPE_MAINTAINER:pn-opensbi = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-openssh = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-openssl = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-opkg = "Alex Stewart <[email protected]>"
Signature · 1 line
2.34.1
PATCH 22/30 maintainers.inc: unassign Chase Qi from libc-test
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
We were not able to get a response about availability over email, and so the recipe has to be unassigned.
--- meta/conf/distro/include/maintainers.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/distro/include/maintainers.inc +1 -1
@@ -313,7 +313,7 @@ RECIPE_MAINTAINER:pn-libarchive = "Otavio Salvador <[email protected] RECIPE_MAINTAINER:pn-libassuan = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-libatomic-ops = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-libbsd = "Yi Zhao <[email protected]>" -RECIPE_MAINTAINER:pn-libc-test = "Chase Qi <[email protected]>" +RECIPE_MAINTAINER:pn-libc-test = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-libcap = "Yi Zhao <[email protected]>" RECIPE_MAINTAINER:pn-libcap-ng = "Yi Zhao <[email protected]>" RECIPE_MAINTAINER:pn-libcap-ng-python = "Yi Zhao <[email protected]>"
Signature · 1 line
2.34.1
PATCH 23/30 maintainers.inc: unassign Oleksandr Kravchuk from python3 and all other items
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
We were not able to get a response about availability over email, and so the recipes have to be unassigned.
--- meta/conf/distro/include/maintainers.inc | 34 ++++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-)
meta/conf/distro/include/maintainers.inc +17 -17
@@ -426,7 +426,7 @@ RECIPE_MAINTAINER:pn-libx11 = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-libx11-compose-data = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-libxau = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-libxcb = "Unassigned <[email protected]>" -RECIPE_MAINTAINER:pn-libxcvt = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER:pn-libxcvt = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-libxcomposite = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-libxcursor = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-libxcrypt = "Khem Raj <[email protected]>"
@@ -599,7 +599,7 @@ RECIPE_MAINTAINER:pn-ptest-runner = "Ross Burton <[email protected]>" RECIPE_MAINTAINER:pn-pulseaudio = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-pulseaudio-client-conf-sato = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-puzzles = "Anuj Mittal <[email protected]>" -RECIPE_MAINTAINER:pn-python3 = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER:pn-python3 = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-python3-alabaster = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-async = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER:pn-python3-asn1crypto = "Tim Orling <[email protected]>"
@@ -613,20 +613,20 @@ RECIPE_MAINTAINER:pn-python3-cffi = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-chardet = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-cryptography = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-cryptography-vectors = "Tim Orling <[email protected]>" -RECIPE_MAINTAINER:pn-python3-cython = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER:pn-python3-cython = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-python3-dbus = "Zang Ruochen <[email protected]>" -RECIPE_MAINTAINER:pn-python3-dbusmock = "Oleksandr Kravchuk <[email protected]>" -RECIPE_MAINTAINER:pn-python3-docutils = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER:pn-python3-dbusmock = "Unassigned <[email protected]>" +RECIPE_MAINTAINER:pn-python3-docutils = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-python3-dtschema = "Bruce Ashfield <[email protected]>" RECIPE_MAINTAINER:pn-python3-dtschema-wrapper = "Bruce Ashfield <[email protected]>" RECIPE_MAINTAINER:pn-python3-editables = "Ross Burton <[email protected]>" RECIPE_MAINTAINER:pn-python3-pycryptodome = "Joshua Watt <[email protected]>" RECIPE_MAINTAINER:pn-python3-pycryptodomex = "Joshua Watt <[email protected]>" RECIPE_MAINTAINER:pn-python3-pyrsistent = "Bruce Ashfield <[email protected]>" -RECIPE_MAINTAINER:pn-python3-extras = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER:pn-python3-extras = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-python3-flit-core = "Tim Orling <[email protected]>" -RECIPE_MAINTAINER:pn-python3-git = "Oleksandr Kravchuk <[email protected]>" -RECIPE_MAINTAINER:pn-python3-gitdb = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER:pn-python3-git = "Unassigned <[email protected]>" +RECIPE_MAINTAINER:pn-python3-gitdb = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-python3-hatchling = "Ross Burton <[email protected]>" RECIPE_MAINTAINER:pn-python3-hatch-fancy-pypi-readme = "Ross Burton <[email protected]>" RECIPE_MAINTAINER:pn-python3-hatch-vcs = "Ross Burton <[email protected]>"
@@ -635,7 +635,7 @@ RECIPE_MAINTAINER:pn-python3-idna = "Bruce Ashfield <[email protected]>" RECIPE_MAINTAINER:pn-python3-imagesize = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-importlib-metadata = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-iniconfig = "Tim Orling <[email protected]>" -RECIPE_MAINTAINER:pn-python3-iniparse = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER:pn-python3-iniparse = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-python3-iso8601 = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-installer = "Ross Burton <[email protected]>" RECIPE_MAINTAINER:pn-python3-jinja2 = "Richard Purdie <[email protected]>"
@@ -644,12 +644,12 @@ RECIPE_MAINTAINER:pn-python3-jsonschema = "Bruce Ashfield <bruce.ashfield@gmail. RECIPE_MAINTAINER:pn-python3-libarchive-c = "Joshua Watt <[email protected]>" RECIPE_MAINTAINER:pn-python3-lxml = "Khem Raj <[email protected]>" RECIPE_MAINTAINER:pn-python3-magic = "Joshua Watt <[email protected]>" -RECIPE_MAINTAINER:pn-python3-mako = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER:pn-python3-mako = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-python3-markdown = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-python3-markupsafe = "Richard Purdie <[email protected]>" RECIPE_MAINTAINER:pn-python3-more-itertools = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-ndg-httpsclient = "Tim Orling <[email protected]>" -RECIPE_MAINTAINER:pn-python3-numpy = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER:pn-python3-numpy = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-python3-packaging = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-pathlib2 = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-pathspec = "Ross Burton <[email protected]>"
@@ -665,10 +665,10 @@ RECIPE_MAINTAINER:pn-python3-pyasn1 = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-pycairo = "Zang Ruochen <[email protected]>" RECIPE_MAINTAINER:pn-python3-pycparser = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-pyelftools = "Joshua Watt <[email protected]>" -RECIPE_MAINTAINER:pn-python3-pygments = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER:pn-python3-pygments = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-python3-pygobject = "Zang Ruochen <[email protected]>" RECIPE_MAINTAINER:pn-python3-pyopenssl = "Tim Orling <[email protected]>" -RECIPE_MAINTAINER:pn-python3-pyparsing = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER:pn-python3-pyparsing = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-python3-pyproject-hooks = "Ross Burton <[email protected]>" RECIPE_MAINTAINER:pn-python3-pysocks = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-pytest = "Tim Orling <[email protected]>"
@@ -683,12 +683,12 @@ RECIPE_MAINTAINER:pn-python3-rfc3987 = "Bruce Ashfield <[email protected] RECIPE_MAINTAINER:pn-python3-ruamel-yaml = "Bruce Ashfield <[email protected]>" RECIPE_MAINTAINER:pn-python3-scons = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-semantic-version = "Tim Orling <[email protected]>" -RECIPE_MAINTAINER:pn-python3-setuptools = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER:pn-python3-setuptools = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-python3-setuptools-rust = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-setuptools-scm = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-six = "Zang Ruochen <[email protected]>" RECIPE_MAINTAINER:pn-python3-smartypants = "Alexander Kanavin <[email protected]>" -RECIPE_MAINTAINER:pn-python3-smmap = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER:pn-python3-smmap = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-python3-snowballstemmer = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-sortedcontainers = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-sphinx = "Tim Orling <[email protected]>"
@@ -699,8 +699,8 @@ RECIPE_MAINTAINER:pn-python3-sphinxcontrib-serializinghtml = "Tim Orling <tim.or RECIPE_MAINTAINER:pn-python3-sphinxcontrib-jsmath = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-sphinxcontrib-applehelp = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-sphinx-rtd-theme = "Tim Orling <[email protected]>" -RECIPE_MAINTAINER:pn-python3-subunit = "Oleksandr Kravchuk <[email protected]>" -RECIPE_MAINTAINER:pn-python3-testtools = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER:pn-python3-subunit = "Unassigned <[email protected]>" +RECIPE_MAINTAINER:pn-python3-testtools = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-python3-toml = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-tomli = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-typing-extensions = "Tim Orling <[email protected]>"
Signature · 1 line
2.34.1
PATCH 24/30 maintainers.inc: unassign Ricardo Neri from ovmf
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
We were not able to get a response about availability over email, and so the recipe has to be unassigned.
--- meta/conf/distro/include/maintainers.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/conf/distro/include/maintainers.inc +2 -2
@@ -564,8 +564,8 @@ RECIPE_MAINTAINER:pn-opkg-keyrings = "Alex Stewart <[email protected]>" RECIPE_MAINTAINER:pn-opkg-utils = "Alex Stewart <[email protected]>" RECIPE_MAINTAINER:pn-orc = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-os-release = "Ross Burton <[email protected]>" -RECIPE_MAINTAINER:pn-ovmf = "Ricardo Neri <[email protected]>" -RECIPE_MAINTAINER:pn-ovmf-shell-image = "Ricardo Neri <[email protected]>" +RECIPE_MAINTAINER:pn-ovmf = "Unassigned <[email protected]>" +RECIPE_MAINTAINER:pn-ovmf-shell-image = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-p11-kit = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-package-index = "Ross Burton <[email protected]>" RECIPE_MAINTAINER:pn-pango = "Ross Burton <[email protected]>"
Signature · 1 line
2.34.1
PATCH 25/30 babeltrace2: Always use BFD linker when building tests with ld-is-lld distro feature
In reply to Steve SakomanFrom: Khem Raj <[email protected]>
lld results in textrels in some .so used in tests, fixes
babeltrace2-ptest: ELF binary /usr/lib/babeltrace2/ptest/tests/lib/test-plugin-plugins/plugin-minimal.so has relocations in .text
babeltrace2-ptest: ELF binary /usr/lib/babeltrace2/ptest/tests/lib/test-plugin-plugins/plugin-sfs.so has relocations in .text [textrel]
ERROR: babeltrace2-2.0.5-r0 do_package_qa: QA Issue: babeltrace2: ELF binary /usr/lib/babeltrace2/plugins/babeltrace-plugin-ctf.so has relocations in .text
babeltrace2: ELF binary /usr/lib/babeltrace2/plugins/babeltrace-plugin-utils.so has relocations in .text
babeltrace2: ELF binary /usr/lib/babeltrace2/plugins/babeltrace-plugin-text.so has relocations in .text [textrel]
--- meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb +1 -0
@@ -28,6 +28,7 @@ FILES:${PN}-staticdev += "${libdir}/babeltrace2/plugins/*.a" FILES:${PN} += "${libdir}/babeltrace2/plugins/*.so" ASNEEDED = "" +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld ptest', ' -fuse-ld=bfd ', '', d)}" # coreutils since we need full mktemp RDEPENDS:${PN}-ptest += "bash gawk python3 make grep coreutils findutils"
Signature · 1 line
2.34.1
PATCH 26/30 gobject-introspection: remove obsolete DEPENDS
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
This recipe uses meson, so doesn't need to DEPEND on autoconf-archive.
--- .../gobject-introspection/gobject-introspection_1.74.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb +1 -1
@@ -27,7 +27,7 @@ GTKDOC_MESON_OPTION = "gtk_doc" MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" -DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-archive-native" +DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native" # target build needs qemu to run temporary introspection binaries created # on the fly by g-ir-scanner and a native version of itself to run
Signature · 1 line
2.34.1
PATCH 27/30 parted: Add missing libuuid to linker cmdline for libparted-fs-resize.so
In reply to Steve SakomanFrom: Khem Raj <[email protected]>
--- ...o-linker-flags-for-libparted-fs-resi.patch | 34 +++++++++++++++++++ meta/recipes-extended/parted/parted_3.5.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-extended/parted/files/0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch
meta/recipes-extended/parted/files/0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 1fc88332f7e906294fd889287b9e84cefc7f1586 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Mon, 12 Jun 2023 10:40:07 -0700 +Subject: [PATCH] fs: Add libuuid to linker flags for libparted-fs-resize + library + +This library uses uuid_generate function which comes from libuuid and +hence it should be mentioned on linker cmdline + +fixes +| aarch64-yoe-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: uuid_generate +| >>> referenced by /mnt/b/yoe/master/build/tmp/work/cortexa72-cortexa53-crypto-yoe-linux/fatresize/1.1.0-r0/recipe-sysroot/usr/lib/libparted-fs-resize.so + +Upstream-Status: Submitted [https://alioth-lists.debian.net/pipermail/parted-devel/2023-June/005873.html] +Signed-off-by: Khem Raj <[email protected]> +--- + libparted/fs/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am +index 2f345f3..a8970eb 100644 +--- a/libparted/fs/Makefile.am ++++ b/libparted/fs/Makefile.am +@@ -75,6 +75,7 @@ libparted_fs_resize_la_LDFLAGS = \ + EXTRA_DIST += fsresize.sym + libparted_fs_resize_la_DEPENDENCIES = $(sym_file) + ++libparted_fs_resize_la_LIBADD = $(UUID_LIBS) + libparted_fs_resize_la_SOURCES = \ + r/filesys.c \ + r/fat/bootsector.c \ +-- +2.41.0 +
meta/recipes-extended/parted/parted_3.5.bb +1 -0
@@ -8,6 +8,7 @@ DEPENDS = "ncurses util-linux virtual/libiconv" SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ file://fix-doc-mandir.patch \ + file://0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch \ file://run-ptest \ "
Signature · 1 line
2.34.1
PATCH 28/30 useradd-staticids.bbclass: improve error message
In reply to Steve SakomanFrom: Mikko Rapeli <[email protected]>
Current error message is difficult to read:
ERROR: Nothing PROVIDES 'image'
trs-image was skipped: image - image: normal username test does not have a static ID defined. Add test to one of these files
It's not clear that first "image" is recipe name, second "image" is binary package name and that "test" is the user account which does not have a static ID defined. Improve the error message so that these are more explicit. Now the error message looks like:
image was skipped: Recipe image, package image: normal username "test" does not have a static ID defined.
--- meta/classes/useradd-staticids.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/useradd-staticids.bbclass +1 -1
@@ -47,7 +47,7 @@ def update_useradd_static_config(d): def handle_missing_id(id, type, pkg, files, var, value): # For backwards compatibility we accept "1" in addition to "error" error_dynamic = d.getVar('USERADD_ERROR_DYNAMIC') - msg = "%s - %s: %sname %s does not have a static ID defined." % (d.getVar('PN'), pkg, type, id) + msg = 'Recipe %s, package %s: %sname "%s" does not have a static ID defined.' % (d.getVar('PN'), pkg, type, id) if files: msg += " Add %s to one of these files: %s" % (id, files) else:
Signature · 1 line
2.34.1
PATCH 29/30 devtool: Fix the wrong variable in srcuri_entry
In reply to Steve SakomanFrom: Charlie Wu <[email protected]>
devtool crashes when running "update-recipe" and append changes on the recipe. "$ devtool update-recipe -a <layer> <recipe>"
Traceback (most recent call last):
...
File "/ovss/ovss_quanta/poky/scripts/lib/devtool/standard.py", line 1636, in srcuri_entry
return 'file://%s%s' % (basepath, paramstr)
^^^^^^^^NameError: cannot access free variable 'basepath' where it is not associated with a value in enclosing scope
The input variable 'fname' should have the same meaning as the variable 'basepath'. Modify the 'fname' to 'basepath' and solve the issue.
--- scripts/lib/devtool/standard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/lib/devtool/standard.py +1 -1
@@ -1629,7 +1629,7 @@ def _update_recipe_patch(recipename, workspace, srctree, rd, appendlayerdir, wil else: patchdir_params = {'patchdir': relpatchdir} - def srcuri_entry(fname): + def srcuri_entry(basepath): if patchdir_params: paramstr = ';' + ';'.join('%s=%s' % (k,v) for k,v in patchdir_params.items()) else:
Signature · 1 line
2.34.1
PATCH 30/30 grub: submit determinism.patch upstream
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
--- meta/recipes-bsp/grub/files/determinism.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-bsp/grub/files/determinism.patch +1 -1
@@ -14,7 +14,7 @@ missing sorting of the list used to generate it. Add such a sort. Also ensure the generated unidata.c file is deterministic by sorting the keys of the dict. -Upstream-Status: Pending +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/grub-devel/2023-06/index.html] Richard Purdie <[email protected]> Signed-off-by: Naveen Saini <[email protected]> ---
Signature · 1 line
2.34.1