* [OE-core][mickledore 01/15] waffle: upgrade 1.7.0 -> 1.7.2
2023-05-14 16:31 [OE-core][mickledore 00/15] Patch review Steve Sakoman
@ 2023-05-14 16:31 ` Steve Sakoman
2023-05-14 16:31 ` [OE-core][mickledore 02/15] mesa: 23.0.2 -> 23.0.3 Steve Sakoman
` (13 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Steve Sakoman @ 2023-05-14 16:31 UTC (permalink / raw)
To: openembedded-core
From: Upgrade Helper <auh@yoctoproject.org>
The Waffle bugfix release 1.7.1 is now available.
What is new in this release:
- cmake: pass deps' cflags to the build
- gbm: fix crash when platform lacks modifier support
- gitlab-ci: stabilise CI runs under X
- gitlab-ci: add more warnings, make all warnings fatal
- gitlab-ci: update to bullseye
- meson: add override_* support, when using waffle as submodule
- meson: skip installing bash completion when custom prefix is used
- meson: silence deprecation warnings
- meson: generate cmake files only on Windows
- meson: find wayland.xml from wayland-scanner.pc
- misc: zsh completion
- misc: fix dozens of compiler warnings
- misc: update website references
- wayland: fix build against wayland 1.20
The Waffle bugfix release 1.7.2 is now available.
What is new in this release:
- all: use format(gnu_printf), enable in mingw
- meson: don't run TLS checks on mingw
- wgl: remove unused dummy wgl_error.[ch]
Upstream now only generates CMake files on Windows, so remove all
references to CMake.
A zsh completion is now installed, remove this for now as we don't really
use zsh.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 94cf6ef11bba381ab6f65b03ed1ed14022438151)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
...build-request-native-wayland-scanner.patch | 9 ++++----
...-make-core-protocol-into-the-library.patch | 23 ++++---------------
.../{waffle_1.7.0.bb => waffle_1.7.2.bb} | 8 +++----
3 files changed, 13 insertions(+), 27 deletions(-)
rename meta/recipes-graphics/waffle/{waffle_1.7.0.bb => waffle_1.7.2.bb} (92%)
diff --git a/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch b/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch
index 1b62db92e9..4b3a0e7c4a 100644
--- a/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch
+++ b/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch
@@ -1,4 +1,4 @@
-From 2195cec1e5bc66128d72049c11ff381ca4516a4b Mon Sep 17 00:00:00 2001
+From 0961787d2bf0d359a3ead89e9cec642818b32dea Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Tue, 5 Jul 2022 11:51:39 +0200
Subject: [PATCH] meson.build: request native wayland-scanner
@@ -8,15 +8,16 @@ try to use a cross-binary, and fail.
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/110]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
-index 0bb6128..0b6da1f 100644
+index ca6a212..3177bde 100644
--- a/meson.build
+++ b/meson.build
-@@ -108,7 +108,7 @@ else
+@@ -110,7 +110,7 @@ else
'wayland-egl', version : '>= 9.1', required : get_option('wayland'),
)
dep_wayland_scanner = dependency(
@@ -24,4 +25,4 @@ index 0bb6128..0b6da1f 100644
+ 'wayland-scanner', version : '>= 1.15', required : get_option('wayland'), native: true,
)
if dep_wayland_scanner.found()
- prog_wayland_scanner = find_program(dep_wayland_scanner.get_pkgconfig_variable('wayland_scanner'))
+ prog_wayland_scanner = find_program(dep_wayland_scanner.get_variable(pkgconfig: 'wayland_scanner'))
diff --git a/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch b/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch
index 24b2de5d9c..60e6318f7a 100644
--- a/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch
+++ b/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch
@@ -1,4 +1,4 @@
-From 7610ec4b572d3a54d30fca6798f0c406f3fd8a46 Mon Sep 17 00:00:00 2001
+From 71f9399d6cea1e2e885a98b98d82eb628832a86e Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Tue, 26 Oct 2021 08:52:17 +0200
Subject: [PATCH] waffle: do not make core protocol into the library
@@ -9,28 +9,13 @@ wayland.xml from the host.
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+
---
- meson.build | 4 ----
src/waffle/meson.build | 7 -------
- 2 files changed, 11 deletions(-)
+ 1 file changed, 7 deletions(-)
-diff --git a/meson.build b/meson.build
-index ffc02ff..0bb6128 100644
---- a/meson.build
-+++ b/meson.build
-@@ -104,10 +104,6 @@ else
- dep_wayland_client = dependency(
- 'wayland-client', version : '>= 1.10', required : get_option('wayland'),
- )
-- if dep_wayland_client.found()
-- wayland_core_xml = join_paths(dep_wayland_client.get_pkgconfig_variable('pkgdatadir'),
-- 'wayland.xml')
-- endif
- dep_wayland_egl = dependency(
- 'wayland-egl', version : '>= 9.1', required : get_option('wayland'),
- )
diff --git a/src/waffle/meson.build b/src/waffle/meson.build
-index 01898c8..6245868 100644
+index e2636c7..3ff5762 100644
--- a/src/waffle/meson.build
+++ b/src/waffle/meson.build
@@ -88,12 +88,6 @@ if build_surfaceless
diff --git a/meta/recipes-graphics/waffle/waffle_1.7.0.bb b/meta/recipes-graphics/waffle/waffle_1.7.2.bb
similarity index 92%
rename from meta/recipes-graphics/waffle/waffle_1.7.0.bb
rename to meta/recipes-graphics/waffle/waffle_1.7.2.bb
index dc475908d0..cb917d8894 100644
--- a/meta/recipes-graphics/waffle/waffle_1.7.0.bb
+++ b/meta/recipes-graphics/waffle/waffle_1.7.2.bb
@@ -9,16 +9,16 @@ LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \
file://include/waffle-1/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf"
-SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=master \
+SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=maint-1.7 \
file://0001-waffle-do-not-make-core-protocol-into-the-library.patch \
file://0001-meson.build-request-native-wayland-scanner.patch \
"
-SRCREV = "905c6c10f2483adf0cbfa024e2d3c2ed541fb300"
+SRCREV = "f3b42a7216105498842bc6ba77d8481b90d6f5f9"
S = "${WORKDIR}/git"
inherit meson features_check lib_package bash-completion pkgconfig
-DEPENDS:append = " python3 cmake-native"
+DEPENDS:append = " python3"
# This should be overridden per-machine to reflect the capabilities of the GL
# stack.
@@ -47,5 +47,5 @@ PACKAGECONFIG[surfaceless-egl] = "-Dsurfaceless_egl=enabled,-Dsurfaceless_egl=di
# TODO: optionally build manpages and examples
do_install:append() {
- sed -i -e "s,${WORKDIR},,g" ${D}/${libdir}/cmake/Waffle/WaffleConfig.cmake
+ rm -rf ${D}${datadir}/zsh
}
--
2.34.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [OE-core][mickledore 02/15] mesa: 23.0.2 -> 23.0.3
2023-05-14 16:31 [OE-core][mickledore 00/15] Patch review Steve Sakoman
2023-05-14 16:31 ` [OE-core][mickledore 01/15] waffle: upgrade 1.7.0 -> 1.7.2 Steve Sakoman
@ 2023-05-14 16:31 ` Steve Sakoman
2023-05-14 16:31 ` [OE-core][mickledore 03/15] qemu: Update ppc instruction fix to match revised upstream version Steve Sakoman
` (12 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Steve Sakoman @ 2023-05-14 16:31 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
Update to 23.0.3 stable release. Release notes in:
- https://docs.mesa3d.org/relnotes/23.0.3.html
New features
None
Bug fixes
overlay layer: unable to launch titles on steam
radv: possibly not setting state dirty bits correctly
RADV: VRS attachment not working in specific scenario
anv: zink ADL failures
Vulkan loader `vk_common_GetPhysicalDeviceFormatProperties` fails to sanitize properties bits.
Loading a model in PrusaSlicer 2.6.0-alpha5 crashes GNOME on radeonsi
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 0defbb5925e309799162e221285e4cfb2e2c2ca5)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../mesa/{mesa-gl_23.0.2.bb => mesa-gl_23.0.3.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 2 +-
meta/recipes-graphics/mesa/{mesa_23.0.2.bb => mesa_23.0.3.bb} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/mesa/{mesa-gl_23.0.2.bb => mesa-gl_23.0.3.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_23.0.2.bb => mesa_23.0.3.bb} (100%)
diff --git a/meta/recipes-graphics/mesa/mesa-gl_23.0.2.bb b/meta/recipes-graphics/mesa/mesa-gl_23.0.3.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_23.0.2.bb
rename to meta/recipes-graphics/mesa/mesa-gl_23.0.3.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index babd10a855..10efff96f0 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -19,7 +19,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
"
-SRC_URI[sha256sum] = "1b7d3399fc6f16f030361f925d33ebc7600cbf98094582f54775b6a1180529e7"
+SRC_URI[sha256sum] = "386362a5d80df3b096636b67f340e1ce67b705b44767d5bdd11d2ed1037192d5"
UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
diff --git a/meta/recipes-graphics/mesa/mesa_23.0.2.bb b/meta/recipes-graphics/mesa/mesa_23.0.3.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa_23.0.2.bb
rename to meta/recipes-graphics/mesa/mesa_23.0.3.bb
--
2.34.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [OE-core][mickledore 03/15] qemu: Update ppc instruction fix to match revised upstream version
2023-05-14 16:31 [OE-core][mickledore 00/15] Patch review Steve Sakoman
2023-05-14 16:31 ` [OE-core][mickledore 01/15] waffle: upgrade 1.7.0 -> 1.7.2 Steve Sakoman
2023-05-14 16:31 ` [OE-core][mickledore 02/15] mesa: 23.0.2 -> 23.0.3 Steve Sakoman
@ 2023-05-14 16:31 ` Steve Sakoman
2023-05-14 16:31 ` [OE-core][mickledore 04/15] glib-networking: Add test retry to avoid failures Steve Sakoman
` (11 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Steve Sakoman @ 2023-05-14 16:31 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Upstream asked for some changes, this updates our patch to match. The differences
likely don't change our real world use.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 42591e07a469cff881fa087d5251a8c783897634)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-devtools/qemu/qemu/ppc.patch | 127 +++++++++++++++++-----
1 file changed, 102 insertions(+), 25 deletions(-)
diff --git a/meta/recipes-devtools/qemu/qemu/ppc.patch b/meta/recipes-devtools/qemu/qemu/ppc.patch
index 395cdb814f..4fce3c81ac 100644
--- a/meta/recipes-devtools/qemu/qemu/ppc.patch
+++ b/meta/recipes-devtools/qemu/qemu/ppc.patch
@@ -1,70 +1,147 @@
-target/ppc: Fix fallback to MFSS for MFFSCRN, MFFSCRNI, MFFSCE and MFFSL
+From d92b63b7d15d4fd202c5802dfe444a96f5d8109c Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Sat, 6 May 2023 07:42:35 +0100
+Cc: Víctor Colombo <victor.colombo@eldorado.org.br>
+Cc: Matheus Ferst <matheus.ferst@eldorado.org.br>
+Cc: Daniel Henrique Barboza <danielhb413@gmail.com>
+Cc: Richard Henderson <richard.henderson@linaro.org>
+Subject: [PATCH v2] target/ppc: Fix fallback to MFSS for MFFS* instructions on
+ pre 3.0 ISAs
-The following commits changed the code such that these instructions became invalid
-on pre 3.0 ISAs:
+The following commits changed the code such that the fallback to MFSS for MFFSCRN,
+MFFSCRNI, MFFSCE and MFFSL on pre 3.0 ISAs was removed and became an illegal instruction:
- bf8adfd88b547680aa857c46098f3a1e94373160 - target/ppc: Move mffscrn[i] to decodetree
+ bf8adfd88b547680aa857c46098f3a1e94373160 - target/ppc: Move mffscrn[i] to decodetree
394c2e2fda70da722f20fb60412d6c0ca4bfaa03 - target/ppc: Move mffsce to decodetree
- 3e5bce70efe6bd1f684efbb21fd2a316cbf0657e - target/ppc: Move mffsl to decodetree
+ 3e5bce70efe6bd1f684efbb21fd2a316cbf0657e - target/ppc: Move mffsl to decodetree
The hardware will handle them as a MFFS instruction as the code did previously.
-Restore that behaviour. This means applications that were segfaulting under qemu
-when encountering these instructions now operate correctly. The instruction
-is used in glibc libm functions for example.
+This means applications that were segfaulting under qemu when encountering these
+instructions which is used in glibc libm functions for example.
-Upstream-Status: Submitted [https://lore.kernel.org/qemu-devel/20230504110150.3044402-1-richard.purdie@linuxfoundation.org/]
+The fallback for MFFSCDRN and MFFSCDRNI added in a later patch was also missing.
+
+This patch restores the fallback to MFSS for these instructions on pre 3.0s ISAs
+as the hardware decoder would, fixing the segfaulting libm code. It and also ensures
+the MFSS instruction is used for currently reserved bits to handle other potential
+ISA additions more correctly.
+
+Upstream-Status: Submitted [https://lore.kernel.org/qemu-devel/20230506065240.3177798-1-richard.purdie@linuxfoundation.org/]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+---
+ target/ppc/insn32.decode | 19 ++++++++++++-------
+ target/ppc/translate/fp-impl.c.inc | 30 ++++++++++++++++++++++++------
+ 2 files changed, 36 insertions(+), 13 deletions(-)
-Index: qemu-8.0.0/target/ppc/translate/fp-impl.c.inc
-===================================================================
---- qemu-8.0.0.orig/target/ppc/translate/fp-impl.c.inc
-+++ qemu-8.0.0/target/ppc/translate/fp-impl.c.inc
-@@ -584,7 +584,10 @@ static bool trans_MFFSCE(DisasContext *c
+v2 - switch to use decodetree pattern groups per feedback
+
+diff --git a/target/ppc/insn32.decode b/target/ppc/insn32.decode
+index f8f589e9fd..3c4e2c2fc2 100644
+--- a/target/ppc/insn32.decode
++++ b/target/ppc/insn32.decode
+@@ -390,13 +390,18 @@ SETNBCR 011111 ..... ..... ----- 0111100000 - @X_bi
+
+ ### Move To/From FPSCR
+
+-MFFS 111111 ..... 00000 ----- 1001000111 . @X_t_rc
+-MFFSCE 111111 ..... 00001 ----- 1001000111 - @X_t
+-MFFSCRN 111111 ..... 10110 ..... 1001000111 - @X_tb
+-MFFSCDRN 111111 ..... 10100 ..... 1001000111 - @X_tb
+-MFFSCRNI 111111 ..... 10111 ---.. 1001000111 - @X_imm2
+-MFFSCDRNI 111111 ..... 10101 --... 1001000111 - @X_imm3
+-MFFSL 111111 ..... 11000 ----- 1001000111 - @X_t
++{
++ # Before Power ISA v3.0, MFFS bits 11~15 were reserved and should be ignored
++ [
++ MFFSCE 111111 ..... 00001 ----- 1001000111 - @X_t
++ MFFSCRN 111111 ..... 10110 ..... 1001000111 - @X_tb
++ MFFSCDRN 111111 ..... 10100 ..... 1001000111 - @X_tb
++ MFFSCRNI 111111 ..... 10111 ---.. 1001000111 - @X_imm2
++ MFFSCDRNI 111111 ..... 10101 --... 1001000111 - @X_imm3
++ MFFSL 111111 ..... 11000 ----- 1001000111 - @X_t
++ ]
++ MFFS 111111 ..... ----- ----- 1001000111 . @X_t_rc
++}
+
+ ### Decimal Floating-Point Arithmetic Instructions
+
+diff --git a/target/ppc/translate/fp-impl.c.inc b/target/ppc/translate/fp-impl.c.inc
+index 57d8437851..10dfd91aa4 100644
+--- a/target/ppc/translate/fp-impl.c.inc
++++ b/target/ppc/translate/fp-impl.c.inc
+@@ -584,7 +584,10 @@ static bool trans_MFFSCE(DisasContext *ctx, arg_X_t *a)
{
TCGv_i64 fpscr;
- REQUIRE_INSNS_FLAGS2(ctx, ISA300);
-+ if (unlikely(!(ctx->insns_flags2 & PPC2_ISA300))) {
-+ return trans_MFFS(ctx, a);
++ if (!(ctx->insns_flags2 & PPC2_ISA300)) {
++ return false;
+ }
+
REQUIRE_FPU(ctx);
gen_reset_fpstatus();
-@@ -597,7 +600,10 @@ static bool trans_MFFSCRN(DisasContext *
+@@ -597,7 +600,10 @@ static bool trans_MFFSCRN(DisasContext *ctx, arg_X_tb *a)
+ {
+ TCGv_i64 t1, fpscr;
+
+- REQUIRE_INSNS_FLAGS2(ctx, ISA300);
++ if (!(ctx->insns_flags2 & PPC2_ISA300)) {
++ return false;
++ }
++
+ REQUIRE_FPU(ctx);
+
+ t1 = tcg_temp_new_i64();
+@@ -614,7 +620,10 @@ static bool trans_MFFSCDRN(DisasContext *ctx, arg_X_tb *a)
{
TCGv_i64 t1, fpscr;
- REQUIRE_INSNS_FLAGS2(ctx, ISA300);
-+ if (unlikely(!(ctx->insns_flags2 & PPC2_ISA300))) {
-+ return trans_MFFS(ctx, a);
++ if (!(ctx->insns_flags2 & PPC2_ISA300)) {
++ return false;
+ }
+
REQUIRE_FPU(ctx);
t1 = tcg_temp_new_i64();
-@@ -631,7 +637,10 @@ static bool trans_MFFSCRNI(DisasContext
+@@ -631,7 +640,10 @@ static bool trans_MFFSCRNI(DisasContext *ctx, arg_X_imm2 *a)
{
TCGv_i64 t1, fpscr;
- REQUIRE_INSNS_FLAGS2(ctx, ISA300);
-+ if (unlikely(!(ctx->insns_flags2 & PPC2_ISA300))) {
-+ return trans_MFFS(ctx, a);
++ if (!(ctx->insns_flags2 & PPC2_ISA300)) {
++ return false;
+ }
+
REQUIRE_FPU(ctx);
t1 = tcg_temp_new_i64();
-@@ -661,7 +670,10 @@ static bool trans_MFFSCDRNI(DisasContext
+@@ -647,7 +659,10 @@ static bool trans_MFFSCDRNI(DisasContext *ctx, arg_X_imm3 *a)
+ {
+ TCGv_i64 t1, fpscr;
+
+- REQUIRE_INSNS_FLAGS2(ctx, ISA300);
++ if (!(ctx->insns_flags2 & PPC2_ISA300)) {
++ return false;
++ }
++
+ REQUIRE_FPU(ctx);
+
+ t1 = tcg_temp_new_i64();
+@@ -661,7 +676,10 @@ static bool trans_MFFSCDRNI(DisasContext *ctx, arg_X_imm3 *a)
{
TCGv_i64 fpscr;
- REQUIRE_INSNS_FLAGS2(ctx, ISA300);
-+ if (unlikely(!(ctx->insns_flags2 & PPC2_ISA300))) {
-+ return trans_MFFS(ctx, a);
++ if (!(ctx->insns_flags2 & PPC2_ISA300)) {
++ return false;
+ }
+
REQUIRE_FPU(ctx);
gen_reset_fpstatus();
+--
+2.39.2
+
--
2.34.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [OE-core][mickledore 04/15] glib-networking: Add test retry to avoid failures
2023-05-14 16:31 [OE-core][mickledore 00/15] Patch review Steve Sakoman
` (2 preceding siblings ...)
2023-05-14 16:31 ` [OE-core][mickledore 03/15] qemu: Update ppc instruction fix to match revised upstream version Steve Sakoman
@ 2023-05-14 16:31 ` Steve Sakoman
2023-05-14 16:31 ` [OE-core][mickledore 05/15] glib-networking: Correct glib error handling in test patch Steve Sakoman
` (10 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Steve Sakoman @ 2023-05-14 16:31 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
In autobuilder testing we regularly see glib-networking ptest fail with a
"Resource temporarily unavailable (g-io-error-quark, 27)" error.
Add a patch to see if a retry can resolve the issue.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 4deb03ee5af8fcf7c2b1c81c686839341cf753c4)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../glib-networking/eagain.patch | 29 +++++++++++++++++++
.../glib-networking/glib-networking_2.74.0.bb | 1 +
2 files changed, 30 insertions(+)
create mode 100644 meta/recipes-core/glib-networking/glib-networking/eagain.patch
diff --git a/meta/recipes-core/glib-networking/glib-networking/eagain.patch b/meta/recipes-core/glib-networking/glib-networking/eagain.patch
new file mode 100644
index 0000000000..6dfbb2736c
--- /dev/null
+++ b/meta/recipes-core/glib-networking/glib-networking/eagain.patch
@@ -0,0 +1,29 @@
+In autobuilder testing we regularly see glib-networking ptest fail with:
+
+GLib-Net:ERROR:/usr/src/debug/glib-networking/2.74.0-r0/tls/tests/connection.c:1944:simul_read_thread: assertion failed (error == NULL): Resource temporarily unavailable (g-io-error-quark, 27)
+Bail out! GLib-Net:ERROR:/usr/src/debug/glib-networking/2.74.0-r0/tls/tests/connection.c:1944:simul_read_thread: assertion failed (error == NULL): Resource temporarily unavailable (g-io-error-quark, 27)
+FAIL: glib-networking/connection-openssl.test (Child process killed by signal 6)
+SUMMARY: total=4; passed=3; skipped=0; failed=1; user=0.9s; system=0.4s; maxrss=10708
+FAIL: glib-networking/connection-openssl.test (Child process killed by signal 6)
+
+The test should probably retry in this situation so test a patch which does this.
+
+Upstream-Status: Pending [testing to see if patch resolves the issue]
+
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+
+Index: glib-networking-2.74.0/tls/tests/connection.c
+===================================================================
+--- glib-networking-2.74.0.orig/tls/tests/connection.c
++++ glib-networking-2.74.0/tls/tests/connection.c
+@@ -1941,6 +1941,10 @@ simul_read_thread (gpointer user_data)
+ test->buf + test->nread,
+ MIN (TEST_DATA_LENGTH / 2, TEST_DATA_LENGTH - test->nread),
+ NULL, &error);
++
++ if (error == G_IO_STATUS_AGAIN)
++ continue;
++
+ g_assert_no_error (error);
+
+ test->nread += nread;
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb b/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb
index dc0be23357..b3a88aca8d 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb
@@ -24,6 +24,7 @@ GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gettext upstream-version-is-even gio-module-cache ptest-gnome
SRC_URI += "file://run-ptest"
+SRC_URI += "file://eagain.patch"
FILES:${PN} += "\
${libdir}/gio/modules/libgio*.so \
--
2.34.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [OE-core][mickledore 05/15] glib-networking: Correct glib error handling in test patch
2023-05-14 16:31 [OE-core][mickledore 00/15] Patch review Steve Sakoman
` (3 preceding siblings ...)
2023-05-14 16:31 ` [OE-core][mickledore 04/15] glib-networking: Add test retry to avoid failures Steve Sakoman
@ 2023-05-14 16:31 ` Steve Sakoman
2023-05-14 21:49 ` Richard Purdie
2023-05-14 16:31 ` [OE-core][mickledore 06/15] gawk: Disable known ptest fails on musl Steve Sakoman
` (9 subsequent siblings)
14 siblings, 1 reply; 20+ messages in thread
From: Steve Sakoman @ 2023-05-14 16:31 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 4ba74f61f38827d82586cf9c993a4b27065f5c6f)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-core/glib-networking/glib-networking/eagain.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/glib-networking/glib-networking/eagain.patch b/meta/recipes-core/glib-networking/glib-networking/eagain.patch
index 6dfbb2736c..ac6592ffef 100644
--- a/meta/recipes-core/glib-networking/glib-networking/eagain.patch
+++ b/meta/recipes-core/glib-networking/glib-networking/eagain.patch
@@ -21,7 +21,7 @@ Index: glib-networking-2.74.0/tls/tests/connection.c
MIN (TEST_DATA_LENGTH / 2, TEST_DATA_LENGTH - test->nread),
NULL, &error);
+
-+ if (error == G_IO_STATUS_AGAIN)
++ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_BUSY))
+ continue;
+
g_assert_no_error (error);
--
2.34.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [OE-core][mickledore 05/15] glib-networking: Correct glib error handling in test patch
2023-05-14 16:31 ` [OE-core][mickledore 05/15] glib-networking: Correct glib error handling in test patch Steve Sakoman
@ 2023-05-14 21:49 ` Richard Purdie
2023-05-14 21:54 ` Steve Sakoman
0 siblings, 1 reply; 20+ messages in thread
From: Richard Purdie @ 2023-05-14 21:49 UTC (permalink / raw)
To: Steve Sakoman, openembedded-core
On Sun, 2023-05-14 at 06:31 -1000, Steve Sakoman wrote:
> From: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> (cherry picked from commit 4ba74f61f38827d82586cf9c993a4b27065f5c6f)
> Signed-off-by: Steve Sakoman <steve@sakoman.com>
> ---
> meta/recipes-core/glib-networking/glib-networking/eagain.patch | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-core/glib-networking/glib-networking/eagain.patch b/meta/recipes-core/glib-networking/glib-networking/eagain.patch
> index 6dfbb2736c..ac6592ffef 100644
> --- a/meta/recipes-core/glib-networking/glib-networking/eagain.patch
> +++ b/meta/recipes-core/glib-networking/glib-networking/eagain.patch
> @@ -21,7 +21,7 @@ Index: glib-networking-2.74.0/tls/tests/connection.c
> MIN (TEST_DATA_LENGTH / 2, TEST_DATA_LENGTH - test->nread),
> NULL, &error);
> +
> -+ if (error == G_IO_STATUS_AGAIN)
> ++ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_BUSY))
> + continue;
> +
> g_assert_no_error (error);
I'm not sure this is working yet, I suspect we've seen the error in
builds with the patch applied :(
Cheers,
Richard
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [OE-core][mickledore 05/15] glib-networking: Correct glib error handling in test patch
2023-05-14 21:49 ` Richard Purdie
@ 2023-05-14 21:54 ` Steve Sakoman
2023-05-17 8:11 ` Richard Purdie
0 siblings, 1 reply; 20+ messages in thread
From: Steve Sakoman @ 2023-05-14 21:54 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
On Sun, May 14, 2023 at 11:49 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Sun, 2023-05-14 at 06:31 -1000, Steve Sakoman wrote:
> > From: Richard Purdie <richard.purdie@linuxfoundation.org>
> >
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > (cherry picked from commit 4ba74f61f38827d82586cf9c993a4b27065f5c6f)
> > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> > ---
> > meta/recipes-core/glib-networking/glib-networking/eagain.patch | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-core/glib-networking/glib-networking/eagain.patch b/meta/recipes-core/glib-networking/glib-networking/eagain.patch
> > index 6dfbb2736c..ac6592ffef 100644
> > --- a/meta/recipes-core/glib-networking/glib-networking/eagain.patch
> > +++ b/meta/recipes-core/glib-networking/glib-networking/eagain.patch
> > @@ -21,7 +21,7 @@ Index: glib-networking-2.74.0/tls/tests/connection.c
> > MIN (TEST_DATA_LENGTH / 2, TEST_DATA_LENGTH - test->nread),
> > NULL, &error);
> > +
> > -+ if (error == G_IO_STATUS_AGAIN)
> > ++ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_BUSY))
> > + continue;
> > +
> > g_assert_no_error (error);
>
> I'm not sure this is working yet, I suspect we've seen the error in
> builds with the patch applied :(
FWIW, I used to get the error often without the patch. I haven't had
the error since taking this patch. Certainly not proof it is working
100% of the time, but certainly much improved.
Steve
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [OE-core][mickledore 05/15] glib-networking: Correct glib error handling in test patch
2023-05-14 21:54 ` Steve Sakoman
@ 2023-05-17 8:11 ` Richard Purdie
2023-05-17 13:51 ` Steve Sakoman
0 siblings, 1 reply; 20+ messages in thread
From: Richard Purdie @ 2023-05-17 8:11 UTC (permalink / raw)
To: Steve Sakoman, Ross Burton; +Cc: openembedded-core
On Sun, 2023-05-14 at 11:54 -1000, Steve Sakoman wrote:
> On Sun, May 14, 2023 at 11:49 AM Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> >
> > On Sun, 2023-05-14 at 06:31 -1000, Steve Sakoman wrote:
> > > From: Richard Purdie <richard.purdie@linuxfoundation.org>
> > >
> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > > (cherry picked from commit 4ba74f61f38827d82586cf9c993a4b27065f5c6f)
> > > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> > > ---
> > > meta/recipes-core/glib-networking/glib-networking/eagain.patch | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/meta/recipes-core/glib-networking/glib-networking/eagain.patch b/meta/recipes-core/glib-networking/glib-networking/eagain.patch
> > > index 6dfbb2736c..ac6592ffef 100644
> > > --- a/meta/recipes-core/glib-networking/glib-networking/eagain.patch
> > > +++ b/meta/recipes-core/glib-networking/glib-networking/eagain.patch
> > > @@ -21,7 +21,7 @@ Index: glib-networking-2.74.0/tls/tests/connection.c
> > > MIN (TEST_DATA_LENGTH / 2, TEST_DATA_LENGTH - test->nread),
> > > NULL, &error);
> > > +
> > > -+ if (error == G_IO_STATUS_AGAIN)
> > > ++ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_BUSY))
> > > + continue;
> > > +
> > > g_assert_no_error (error);
> >
> > I'm not sure this is working yet, I suspect we've seen the error in
> > builds with the patch applied :(
>
> FWIW, I used to get the error often without the patch. I haven't had
> the error since taking this patch. Certainly not proof it is working
> 100% of the time, but certainly much improved.
Failure on master:
https://autobuilder.yoctoproject.org/typhoon/#/builders/85/builds/2134
https://autobuilder.yocto.io/pub/non-release/20230517-2/testresults/qemuarm64-ptest-fast/glib-networking.log
so not fixed :(
Cheers,
Richard
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [OE-core][mickledore 05/15] glib-networking: Correct glib error handling in test patch
2023-05-17 8:11 ` Richard Purdie
@ 2023-05-17 13:51 ` Steve Sakoman
0 siblings, 0 replies; 20+ messages in thread
From: Steve Sakoman @ 2023-05-17 13:51 UTC (permalink / raw)
To: Richard Purdie; +Cc: Ross Burton, openembedded-core
On Tue, May 16, 2023 at 10:11 PM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Sun, 2023-05-14 at 11:54 -1000, Steve Sakoman wrote:
> > On Sun, May 14, 2023 at 11:49 AM Richard Purdie
> > <richard.purdie@linuxfoundation.org> wrote:
> > >
> > > On Sun, 2023-05-14 at 06:31 -1000, Steve Sakoman wrote:
> > > > From: Richard Purdie <richard.purdie@linuxfoundation.org>
> > > >
> > > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > > > (cherry picked from commit 4ba74f61f38827d82586cf9c993a4b27065f5c6f)
> > > > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> > > > ---
> > > > meta/recipes-core/glib-networking/glib-networking/eagain.patch | 2 +-
> > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/meta/recipes-core/glib-networking/glib-networking/eagain.patch b/meta/recipes-core/glib-networking/glib-networking/eagain.patch
> > > > index 6dfbb2736c..ac6592ffef 100644
> > > > --- a/meta/recipes-core/glib-networking/glib-networking/eagain.patch
> > > > +++ b/meta/recipes-core/glib-networking/glib-networking/eagain.patch
> > > > @@ -21,7 +21,7 @@ Index: glib-networking-2.74.0/tls/tests/connection.c
> > > > MIN (TEST_DATA_LENGTH / 2, TEST_DATA_LENGTH - test->nread),
> > > > NULL, &error);
> > > > +
> > > > -+ if (error == G_IO_STATUS_AGAIN)
> > > > ++ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_BUSY))
> > > > + continue;
> > > > +
> > > > g_assert_no_error (error);
> > >
> > > I'm not sure this is working yet, I suspect we've seen the error in
> > > builds with the patch applied :(
> >
> > FWIW, I used to get the error often without the patch. I haven't had
> > the error since taking this patch. Certainly not proof it is working
> > 100% of the time, but certainly much improved.
>
> Failure on master:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/85/builds/2134
>
> https://autobuilder.yocto.io/pub/non-release/20230517-2/testresults/qemuarm64-ptest-fast/glib-networking.log
>
> so not fixed :(
Sigh, I had one on mickledore yesterday too :-(
Steve
^ permalink raw reply [flat|nested] 20+ messages in thread
* [OE-core][mickledore 06/15] gawk: Disable known ptest fails on musl
2023-05-14 16:31 [OE-core][mickledore 00/15] Patch review Steve Sakoman
` (4 preceding siblings ...)
2023-05-14 16:31 ` [OE-core][mickledore 05/15] glib-networking: Correct glib error handling in test patch Steve Sakoman
@ 2023-05-14 16:31 ` Steve Sakoman
2023-05-14 16:31 ` [OE-core][mickledore 07/15] gawk: Remove redundant patch Steve Sakoman
` (8 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Steve Sakoman @ 2023-05-14 16:31 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Add needed locale rdeps on musl as well.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
(cherry picked from commit 1e71eaf6792727d2335ee2e2ad4c5ce88137fe77)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-extended/gawk/gawk_5.2.1.bb | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/gawk/gawk_5.2.1.bb b/meta/recipes-extended/gawk/gawk_5.2.1.bb
index e381bad148..bbb26231a1 100644
--- a/meta/recipes-extended/gawk/gawk_5.2.1.bb
+++ b/meta/recipes-extended/gawk/gawk_5.2.1.bb
@@ -62,8 +62,21 @@ do_install_ptest() {
rm -f ${D}${PTEST_PATH}/test/timeout.*
}
-RDEPENDS:${PN}-ptest += "make"
+do_install_ptest:append:libc-musl() {
+ # Reported https://lists.gnu.org/archive/html/bug-gawk/2021-02/msg00005.html
+ rm -f ${D}${PTEST_PATH}/test/clos1way6.*
+ # Needs en_US.UTF-8 but then does not work with musl
+ rm -f ${D}${PTEST_PATH}/test/backsmalls1.*
+ # Needs en_US.UTF-8 but then does not work with musl
+ rm -f ${D}${PTEST_PATH}/test/commas.*
+ # The below two need LANG=C inside the make rule for musl
+ rm -f ${D}${PTEST_PATH}/test/rebt8b1.*
+ rm -f ${D}${PTEST_PATH}/test/regx8bit.*
+}
+
+RDEPENDS:${PN}-ptest += "make locale-base-en-us"
-RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-en-us locale-base-en-us.iso-8859-1"
+RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-en-us.iso-8859-1"
+RDEPENDS:${PN}-ptest:append:libc-musl = " musl-locales"
BBCLASSEXTEND = "native nativesdk"
--
2.34.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [OE-core][mickledore 07/15] gawk: Remove redundant patch
2023-05-14 16:31 [OE-core][mickledore 00/15] Patch review Steve Sakoman
` (5 preceding siblings ...)
2023-05-14 16:31 ` [OE-core][mickledore 06/15] gawk: Disable known ptest fails on musl Steve Sakoman
@ 2023-05-14 16:31 ` Steve Sakoman
2023-05-14 16:31 ` [OE-core][mickledore 08/15] gawk: Add skipped.txt to emit test to ignore Steve Sakoman
` (7 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Steve Sakoman @ 2023-05-14 16:31 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
This patch is doing the same things thats already being done in the
do_install_ptest where the problematic tests are being deleted from
final package. run-ptest script runs a find for available tests and runs
each test target found during run therefore its enough to remove
them from final install.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Ross Burton <ross.burton@arm.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
(cherry picked from commit 4a32ad54d6c051fe387c67721cf96eb851ecd835)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../gawk/gawk/remove-sensitive-tests.patch | 43 -------------------
meta/recipes-extended/gawk/gawk_5.2.1.bb | 1 -
2 files changed, 44 deletions(-)
delete mode 100644 meta/recipes-extended/gawk/gawk/remove-sensitive-tests.patch
diff --git a/meta/recipes-extended/gawk/gawk/remove-sensitive-tests.patch b/meta/recipes-extended/gawk/gawk/remove-sensitive-tests.patch
deleted file mode 100644
index ffae55058b..0000000000
--- a/meta/recipes-extended/gawk/gawk/remove-sensitive-tests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 354d24baf7c51977d22ff61ad42e6a2cbd4dc8ac Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@arm.com>
-Date: Tue, 21 Dec 2021 17:09:12 +0000
-Subject: [PATCH] gawk: remove load-sensitive tests
-
-These tests require an unloaded host as otherwise timing sensitive tests can fail
-https://bugzilla.yoctoproject.org/show_bug.cgi?id=14371
-
-Upstream-Status: Inappropriate
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
----
- test/Maketests | 10 ----------
- 1 file changed, 10 deletions(-)
-
-diff --git a/test/Maketests b/test/Maketests
-index 3a667af..f117697 100644
---- a/test/Maketests
-+++ b/test/Maketests
-@@ -2137,11 +2137,6 @@ symtab12:
- @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
--timeout:
-- @echo $@ $(ZOS_FAIL)
-- @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
--
- typedregex1:
- @echo $@
- @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-@@ -2371,11 +2366,6 @@ rwarray:
- @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
--time:
-- @echo $@
-- @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
--
- mpfrbigint:
- @echo $@
- @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk -M >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/meta/recipes-extended/gawk/gawk_5.2.1.bb b/meta/recipes-extended/gawk/gawk_5.2.1.bb
index bbb26231a1..c914326563 100644
--- a/meta/recipes-extended/gawk/gawk_5.2.1.bb
+++ b/meta/recipes-extended/gawk/gawk_5.2.1.bb
@@ -16,7 +16,6 @@ PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr"
SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \
- file://remove-sensitive-tests.patch \
file://run-ptest \
"
--
2.34.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [OE-core][mickledore 08/15] gawk: Add skipped.txt to emit test to ignore
2023-05-14 16:31 [OE-core][mickledore 00/15] Patch review Steve Sakoman
` (6 preceding siblings ...)
2023-05-14 16:31 ` [OE-core][mickledore 07/15] gawk: Remove redundant patch Steve Sakoman
@ 2023-05-14 16:31 ` Steve Sakoman
2023-05-14 16:31 ` [OE-core][mickledore 09/15] libxml2: Disable icu tests on musl Steve Sakoman
` (6 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Steve Sakoman @ 2023-05-14 16:31 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
This file can be processed by run-ptest during runtime and tests
mentioned in skipped.txt will not be run.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
(cherry picked from commit 4d30f3535f53ad6d8f462f99b6cd2fe8d2ecbfb5)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-extended/gawk/gawk/run-ptest | 5 +++++
meta/recipes-extended/gawk/gawk_5.2.1.bb | 6 ++++++
2 files changed, 11 insertions(+)
diff --git a/meta/recipes-extended/gawk/gawk/run-ptest b/meta/recipes-extended/gawk/gawk/run-ptest
index 2675650600..f4ef3e7bd4 100644
--- a/meta/recipes-extended/gawk/gawk/run-ptest
+++ b/meta/recipes-extended/gawk/gawk/run-ptest
@@ -3,6 +3,11 @@
cd test
for i in `grep -E "^[a-z0-9_-]*:$" Maketests |awk -F: '{print $1}'`; do
unset LANG
+ grep -q "^$i$" skipped.txt
+ if [ $? -eq 0 ]; then
+ echo "SKIP: $i"
+ continue
+ fi
srcdir=`pwd` AWKPROG=gawk AWK=gawk CMP=cmp make -f Maketests $i >$i.tmp 2>&1
if [ -e _$i ]; then
cat _$i
diff --git a/meta/recipes-extended/gawk/gawk_5.2.1.bb b/meta/recipes-extended/gawk/gawk_5.2.1.bb
index c914326563..768c8eb364 100644
--- a/meta/recipes-extended/gawk/gawk_5.2.1.bb
+++ b/meta/recipes-extended/gawk/gawk_5.2.1.bb
@@ -59,6 +59,9 @@ do_install_ptest() {
# https://bugzilla.yoctoproject.org/show_bug.cgi?id=14371
rm -f ${D}${PTEST_PATH}/test/time.*
rm -f ${D}${PTEST_PATH}/test/timeout.*
+ for t in time timeout; do
+ echo $t >> ${D}${PTEST_PATH}/test/skipped.txt
+ done
}
do_install_ptest:append:libc-musl() {
@@ -71,6 +74,9 @@ do_install_ptest:append:libc-musl() {
# The below two need LANG=C inside the make rule for musl
rm -f ${D}${PTEST_PATH}/test/rebt8b1.*
rm -f ${D}${PTEST_PATH}/test/regx8bit.*
+ for t in clos1way6 backsmalls1 commas rebt8b1 regx8bit; do
+ echo $t >> ${D}${PTEST_PATH}/test/skipped.txt
+ done
}
RDEPENDS:${PN}-ptest += "make locale-base-en-us"
--
2.34.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [OE-core][mickledore 09/15] libxml2: Disable icu tests on musl
2023-05-14 16:31 [OE-core][mickledore 00/15] Patch review Steve Sakoman
` (7 preceding siblings ...)
2023-05-14 16:31 ` [OE-core][mickledore 08/15] gawk: Add skipped.txt to emit test to ignore Steve Sakoman
@ 2023-05-14 16:31 ` Steve Sakoman
2023-05-14 16:31 ` [OE-core][mickledore 10/15] maintainers.inc: Fix email address typo Steve Sakoman
` (5 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Steve Sakoman @ 2023-05-14 16:31 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
these tests do not work with musl's iconv implementation and would need
enabling icu support using --with-icu which we do not enable by default
Additionally enable locale with musl too.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
(cherry picked from commit 03980db15fa1de2f970705364c2316f17428a3aa)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-core/libxml/libxml2_2.10.3.bb | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/libxml/libxml2_2.10.3.bb b/meta/recipes-core/libxml/libxml2_2.10.3.bb
index 6b3dd3ec42..0ccd48964f 100644
--- a/meta/recipes-core/libxml/libxml2_2.10.3.bb
+++ b/meta/recipes-core/libxml/libxml2_2.10.3.bb
@@ -40,15 +40,15 @@ inherit autotools pkgconfig binconfig-disabled ptest
inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3targetconfig', '', d)}
-RDEPENDS:${PN}-ptest += "bash make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'libgcc python3-core python3-logging python3-shell python3-stringold python3-threading python3-unittest ${PN}-python', '', d)}"
+RDEPENDS:${PN}-ptest += "bash make locale-base-en-us ${@bb.utils.contains('PACKAGECONFIG', 'python', 'libgcc python3-core python3-logging python3-shell python3-stringold python3-threading python3-unittest ${PN}-python', '', d)}"
RDEPENDS:${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}"
+RDEPENDS:${PN}-ptest:append:libc-musl = " musl-locales"
RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-ebcdic-us \
glibc-gconv-ibm1141 \
glibc-gconv-iso8859-5 \
glibc-gconv-euc-jp \
- locale-base-en-us \
"
# WARNING: zlib is required for RPM use
@@ -85,6 +85,11 @@ do_install_ptest () {
fi
}
+# with musl we need to enable icu support explicitly for these tests
+do_install_ptest:append:libc-musl () {
+ rm -rf ${D}/${PTEST_PATH}/test/icu_parse_test.xml
+}
+
do_install:append:class-native () {
# Docs are not needed in the native case
rm ${D}${datadir}/gtk-doc -rf
--
2.34.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [OE-core][mickledore 10/15] maintainers.inc: Fix email address typo
2023-05-14 16:31 [OE-core][mickledore 00/15] Patch review Steve Sakoman
` (8 preceding siblings ...)
2023-05-14 16:31 ` [OE-core][mickledore 09/15] libxml2: Disable icu tests on musl Steve Sakoman
@ 2023-05-14 16:31 ` Steve Sakoman
2023-05-14 16:31 ` [OE-core][mickledore 11/15] cpio: fix appending to archives larger than 2GB Steve Sakoman
` (4 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Steve Sakoman @ 2023-05-14 16:31 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2a86ca028980b501e386f6bb8293a094fd77f97b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
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 682ec2cfdf..5699cac3a2 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -283,7 +283,7 @@ RECIPE_MAINTAINER:pn-intltool = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER:pn-iproute2 = "Changhyeok Bae <changhyeok.bae@gmail.com>"
RECIPE_MAINTAINER:pn-iptables = "Changhyeok Bae <changhyeok.bae@gmail.com>"
RECIPE_MAINTAINER:pn-iputils = "Changhyeok Bae <changhyeok.bae@gmail.com>"
-RECIPE_MAINTAINER:pn-iso-codes = "Wang Mingyu <wangmy@cn.ujitsu.com>"
+RECIPE_MAINTAINER:pn-iso-codes = "Wang Mingyu <wangmy@cn.fujitsu.com>"
RECIPE_MAINTAINER:pn-itstool = "Andreas Müller <schnitzeltony@gmail.com>"
RECIPE_MAINTAINER:pn-iw = "Changhyeok Bae <changhyeok.bae@gmail.com>"
RECIPE_MAINTAINER:pn-libjpeg-turbo = "Anuj Mittal <anuj.mittal@intel.com>"
--
2.34.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [OE-core][mickledore 11/15] cpio: fix appending to archives larger than 2GB
2023-05-14 16:31 [OE-core][mickledore 00/15] Patch review Steve Sakoman
` (9 preceding siblings ...)
2023-05-14 16:31 ` [OE-core][mickledore 10/15] maintainers.inc: Fix email address typo Steve Sakoman
@ 2023-05-14 16:31 ` Steve Sakoman
2023-05-14 16:31 ` [OE-core][mickledore 12/15] systemd-systemctl: fix instance template WantedBy symlink construction Steve Sakoman
` (3 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Steve Sakoman @ 2023-05-14 16:31 UTC (permalink / raw)
To: openembedded-core
From: Ross Burton <ross.burton@arm.com>
Backport a patch to fix appending to archives larger than 2GB.
[ YOCTO #11674 ]
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
...appending-to-archives-bigger-than-2G.patch | 312 ++++++++++++++++++
meta/recipes-extended/cpio/cpio_2.13.bb | 1 +
2 files changed, 313 insertions(+)
create mode 100644 meta/recipes-extended/cpio/cpio-2.13/0001-Fix-appending-to-archives-bigger-than-2G.patch
diff --git a/meta/recipes-extended/cpio/cpio-2.13/0001-Fix-appending-to-archives-bigger-than-2G.patch b/meta/recipes-extended/cpio/cpio-2.13/0001-Fix-appending-to-archives-bigger-than-2G.patch
new file mode 100644
index 0000000000..fefd5b2894
--- /dev/null
+++ b/meta/recipes-extended/cpio/cpio-2.13/0001-Fix-appending-to-archives-bigger-than-2G.patch
@@ -0,0 +1,312 @@
+From 0987d63384f0419b4b14aecdc6a61729b75ce86a Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Fri, 28 Apr 2023 15:23:46 +0300
+Subject: [PATCH] Fix appending to archives bigger than 2G
+
+* src/extern.h (last_header_start): Change type to off_t.
+* src/global.c: Likewise.
+* src/util.c (prepare_append): Use off_t for file offsets.
+
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+---
+ src/extern.h | 11 ++++-----
+ src/global.c | 2 +-
+ src/util.c | 66 ++++++++++++++++++++++++++--------------------------
+ 3 files changed, 39 insertions(+), 40 deletions(-)
+
+diff --git a/src/extern.h b/src/extern.h
+index df7d0ce..6afbdd2 100644
+--- a/src/extern.h
++++ b/src/extern.h
+@@ -68,7 +68,7 @@ extern int ignore_dirnlink_option;
+
+ extern bool to_stdout_option;
+
+-extern int last_header_start;
++extern off_t last_header_start;
+ extern int copy_matching_files;
+ extern int numeric_uid;
+ extern char *pattern_file_name;
+@@ -128,7 +128,7 @@ void field_width_error (const char *filename, const char *fieldname,
+
+ /* copypass.c */
+ void process_copy_pass (void);
+-int link_to_maj_min_ino (char *file_name, int st_dev_maj,
++int link_to_maj_min_ino (char *file_name, int st_dev_maj,
+ int st_dev_min, ino_t st_ino);
+ int link_to_name (char const *link_name, char const *link_target);
+
+@@ -176,7 +176,7 @@ void copy_files_tape_to_disk (int in_des, int out_des, off_t num_bytes);
+ void copy_files_disk_to_tape (int in_des, int out_des, off_t num_bytes, char *filename);
+ void copy_files_disk_to_disk (int in_des, int out_des, off_t num_bytes, char *filename);
+ void warn_if_file_changed (char *file_name, off_t old_file_size,
+- time_t old_file_mtime);
++ time_t old_file_mtime);
+ void create_all_directories (char const *name);
+ void prepare_append (int out_file_des);
+ char *find_inode_file (ino_t node_num,
+@@ -190,7 +190,7 @@ void set_new_media_message (char *message);
+ #ifdef HPUX_CDF
+ char *add_cdf_double_slashes (char *filename);
+ #endif
+-void write_nuls_to_file (off_t num_bytes, int out_des,
++void write_nuls_to_file (off_t num_bytes, int out_des,
+ void (*writer) (char *in_buf,
+ int out_des, off_t num_bytes));
+ #define DISK_IO_BLOCK_SIZE 512
+@@ -234,6 +234,5 @@ void delay_set_stat (char const *file_name, struct stat *st,
+ mode_t invert_permissions);
+ int repair_delayed_set_stat (struct cpio_file_stat *file_hdr);
+ void apply_delayed_set_stat (void);
+-
+-int arf_stores_inode_p (enum archive_format arf);
+
++int arf_stores_inode_p (enum archive_format arf);
+diff --git a/src/global.c b/src/global.c
+index d33516f..7c4bca8 100644
+--- a/src/global.c
++++ b/src/global.c
+@@ -113,7 +113,7 @@ int debug_flag = false;
+
+ /* File position of last header read. Only used during -A to determine
+ where the old TRAILER!!! record started. */
+-int last_header_start = 0;
++off_t last_header_start = 0;
+
+ /* With -i; if true, copy only files that match any of the given patterns;
+ if false, copy only files that do not match any of the patterns. (-f) */
+diff --git a/src/util.c b/src/util.c
+index a38333a..7415e10 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -59,8 +59,8 @@ tape_empty_output_buffer (int out_des)
+ static long output_bytes_before_lseek = 0;
+
+ /* Some tape drivers seem to have a signed internal seek pointer and
+- they lose if it overflows and becomes negative (e.g. when writing
+- tapes > 2Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the
++ they lose if it overflows and becomes negative (e.g. when writing
++ tapes > 2Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the
+ seek pointer and prevent it from overflowing. */
+ if (output_is_special
+ && ( (output_bytes_before_lseek += output_size) >= 1073741824L) )
+@@ -104,7 +104,7 @@ static ssize_t sparse_write (int fildes, char *buf, size_t nbyte, bool flush);
+ descriptor OUT_DES and reset `output_size' and `out_buff'.
+ If `swapping_halfwords' or `swapping_bytes' is set,
+ do the appropriate swapping first. Our callers have
+- to make sure to only set these flags if `output_size'
++ to make sure to only set these flags if `output_size'
+ is appropriate (a multiple of 4 for `swapping_halfwords',
+ 2 for `swapping_bytes'). The fact that DISK_IO_BLOCK_SIZE
+ must always be a multiple of 4 helps us (and our callers)
+@@ -186,8 +186,8 @@ tape_fill_input_buffer (int in_des, int num_bytes)
+ {
+ #ifdef BROKEN_LONG_TAPE_DRIVER
+ /* Some tape drivers seem to have a signed internal seek pointer and
+- they lose if it overflows and becomes negative (e.g. when writing
+- tapes > 4Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the
++ they lose if it overflows and becomes negative (e.g. when writing
++ tapes > 4Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the
+ seek pointer and prevent it from overflowing. */
+ if (input_is_special
+ && ( (input_bytes_before_lseek += num_bytes) >= 1073741824L) )
+@@ -330,8 +330,8 @@ tape_buffered_peek (char *peek_buf, int in_des, int num_bytes)
+
+ #ifdef BROKEN_LONG_TAPE_DRIVER
+ /* Some tape drivers seem to have a signed internal seek pointer and
+- they lose if it overflows and becomes negative (e.g. when writing
+- tapes > 4Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the
++ they lose if it overflows and becomes negative (e.g. when writing
++ tapes > 4Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the
+ seek pointer and prevent it from overflowing. */
+ if (input_is_special
+ && ( (input_bytes_before_lseek += num_bytes) >= 1073741824L) )
+@@ -402,7 +402,7 @@ tape_toss_input (int in_des, off_t num_bytes)
+
+ if (crc_i_flag && only_verify_crc_flag)
+ {
+- int k;
++ int k;
+ for (k = 0; k < space_left; ++k)
+ crc += in_buff[k] & 0xff;
+ }
+@@ -414,14 +414,14 @@ tape_toss_input (int in_des, off_t num_bytes)
+ }
+ \f
+ void
+-write_nuls_to_file (off_t num_bytes, int out_des,
+- void (*writer) (char *in_buf, int out_des, off_t num_bytes))
++write_nuls_to_file (off_t num_bytes, int out_des,
++ void (*writer) (char *in_buf, int out_des, off_t num_bytes))
+ {
+ off_t blocks;
+ off_t extra_bytes;
+ off_t i;
+ static char zeros_512[512];
+-
++
+ blocks = num_bytes / sizeof zeros_512;
+ extra_bytes = num_bytes % sizeof zeros_512;
+ for (i = 0; i < blocks; ++i)
+@@ -601,7 +601,7 @@ create_all_directories (char const *name)
+ char *dir;
+
+ dir = dir_name (name);
+-
++
+ if (dir == NULL)
+ error (PAXEXIT_FAILURE, 0, _("virtual memory exhausted"));
+
+@@ -635,9 +635,9 @@ create_all_directories (char const *name)
+ void
+ prepare_append (int out_file_des)
+ {
+- int start_of_header;
+- int start_of_block;
+- int useful_bytes_in_block;
++ off_t start_of_header;
++ off_t start_of_block;
++ size_t useful_bytes_in_block;
+ char *tmp_buf;
+
+ start_of_header = last_header_start;
+@@ -695,8 +695,8 @@ inode_val_compare (const void *val1, const void *val2)
+ const struct inode_val *ival1 = val1;
+ const struct inode_val *ival2 = val2;
+ return ival1->inode == ival2->inode
+- && ival1->major_num == ival2->major_num
+- && ival1->minor_num == ival2->minor_num;
++ && ival1->major_num == ival2->major_num
++ && ival1->minor_num == ival2->minor_num;
+ }
+
+ static struct inode_val *
+@@ -704,10 +704,10 @@ find_inode_val (ino_t node_num, unsigned long major_num,
+ unsigned long minor_num)
+ {
+ struct inode_val sample;
+-
++
+ if (!hash_table)
+ return NULL;
+-
++
+ sample.inode = node_num;
+ sample.major_num = major_num;
+ sample.minor_num = minor_num;
+@@ -732,7 +732,7 @@ add_inode (ino_t node_num, char *file_name, unsigned long major_num,
+ {
+ struct inode_val *temp;
+ struct inode_val *e = NULL;
+-
++
+ /* Create new inode record. */
+ temp = (struct inode_val *) xmalloc (sizeof (struct inode_val));
+ temp->inode = node_num;
+@@ -1003,7 +1003,7 @@ buf_all_zeros (char *buf, int bufsize)
+
+ /* Write NBYTE bytes from BUF to file descriptor FILDES, trying to
+ create holes instead of writing blockfuls of zeros.
+-
++
+ Return the number of bytes written (including bytes in zero
+ regions) on success, -1 on error.
+
+@@ -1023,7 +1023,7 @@ sparse_write (int fildes, char *buf, size_t nbytes, bool flush)
+
+ enum { begin, in_zeros, not_in_zeros } state =
+ delayed_seek_count ? in_zeros : begin;
+-
++
+ while (nbytes)
+ {
+ size_t rest = nbytes;
+@@ -1038,7 +1038,7 @@ sparse_write (int fildes, char *buf, size_t nbytes, bool flush)
+ if (state == not_in_zeros)
+ {
+ ssize_t bytes = buf - start_ptr + rest;
+-
++
+ n = write (fildes, start_ptr, bytes);
+ if (n == -1)
+ return -1;
+@@ -1087,8 +1087,8 @@ sparse_write (int fildes, char *buf, size_t nbytes, bool flush)
+ if (n != 1)
+ return n;
+ delayed_seek_count = 0;
+- }
+-
++ }
++
+ return nwritten + seek_count;
+ }
+
+@@ -1226,7 +1226,7 @@ set_perms (int fd, struct cpio_file_stat *header)
+ if (!no_chown_flag)
+ {
+ uid_t uid = CPIO_UID (header->c_uid);
+- gid_t gid = CPIO_GID (header->c_gid);
++ gid_t gid = CPIO_GID (header->c_gid);
+ if ((fchown_or_chown (fd, header->c_name, uid, gid) < 0)
+ && errno != EPERM)
+ chown_error_details (header->c_name, uid, gid);
+@@ -1243,13 +1243,13 @@ set_file_times (int fd,
+ const char *name, unsigned long atime, unsigned long mtime)
+ {
+ struct timespec ts[2];
+-
++
+ memset (&ts, 0, sizeof ts);
+
+ ts[0].tv_sec = atime;
+ ts[1].tv_sec = mtime;
+
+- /* Silently ignore EROFS because reading the file won't have upset its
++ /* Silently ignore EROFS because reading the file won't have upset its
+ timestamp if it's on a read-only filesystem. */
+ if (fdutimens (fd, name, ts) < 0 && errno != EROFS)
+ utime_error (name);
+@@ -1301,7 +1301,7 @@ cpio_safer_name_suffix (char *name, bool link_target, bool absolute_names,
+ \f
+ /* This is a simplified form of delayed set_stat used by GNU tar.
+ With the time, both forms will merge and pass to paxutils
+-
++
+ List of directories whose statuses we need to extract after we've
+ finished extracting their subsidiary files. If you consider each
+ contiguous subsequence of elements of the form [D]?[^D]*, where [D]
+@@ -1419,7 +1419,7 @@ cpio_mkdir (struct cpio_file_stat *file_hdr, int *setstat_delayed)
+ {
+ int rc;
+ mode_t mode = file_hdr->c_mode;
+-
++
+ if (!(file_hdr->c_mode & S_IWUSR))
+ {
+ rc = mkdir (file_hdr->c_name, mode | S_IWUSR);
+@@ -1442,10 +1442,10 @@ cpio_create_dir (struct cpio_file_stat *file_hdr, int existing_dir)
+ {
+ int res; /* Result of various function calls. */
+ int setstat_delayed = 0;
+-
++
+ if (to_stdout_option)
+ return 0;
+-
++
+ /* Strip any trailing `/'s off the filename; tar puts
+ them on. We might as well do it here in case anybody
+ else does too, since they cause strange things to happen. */
+@@ -1534,7 +1534,7 @@ arf_stores_inode_p (enum archive_format arf)
+ }
+ return 1;
+ }
+-
++
+ void
+ cpio_file_stat_init (struct cpio_file_stat *file_hdr)
+ {
+--
+2.34.1
+
diff --git a/meta/recipes-extended/cpio/cpio_2.13.bb b/meta/recipes-extended/cpio/cpio_2.13.bb
index df5e09cae8..d48429b8ce 100644
--- a/meta/recipes-extended/cpio/cpio_2.13.bb
+++ b/meta/recipes-extended/cpio/cpio_2.13.bb
@@ -13,6 +13,7 @@ SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \
file://CVE-2021-38185.patch \
file://0001-Use-__alignof__-with-clang.patch \
file://0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch \
+ file://0001-Fix-appending-to-archives-bigger-than-2G.patch \
file://run-ptest \
"
--
2.34.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [OE-core][mickledore 12/15] systemd-systemctl: fix instance template WantedBy symlink construction
2023-05-14 16:31 [OE-core][mickledore 00/15] Patch review Steve Sakoman
` (10 preceding siblings ...)
2023-05-14 16:31 ` [OE-core][mickledore 11/15] cpio: fix appending to archives larger than 2GB Steve Sakoman
@ 2023-05-14 16:31 ` Steve Sakoman
2023-05-14 16:31 ` [OE-core][mickledore 13/15] populate_sdk_ext.bbclass: redirect stderr to stdout so that both end in LOGFILE Steve Sakoman
` (2 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Steve Sakoman @ 2023-05-14 16:31 UTC (permalink / raw)
To: openembedded-core
From: Martin Siegumfeldt <mns@gomspace.com>
Fix issue of the below instance template systemd service dependency
[Install]
WantedBy=svc-wants@%i.service
creating the symlink (instance "a" example)
/etc/systemd/system/svc-wants@%i.service.wants/svc-wanted-by@a.service
which should be
/etc/systemd/system/svc-wants@a.service.wants/svc-wanted-by@a.service
as implemented by this change.
The functionality appears regressed just after "thud" baseline when the
logic was refactored from shell script into python (commit
925e30cb104ece7bfa48b78144e758a46dc9ec3f)
(From OE-Core rev: 308397f0bb3d6f3d4e9ec2c6a10823184049c9b5)
Signed-off-by: Martin Siegumfeldt <mns@gomspace.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../systemd/systemd-systemctl/systemctl | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd-systemctl/systemctl b/meta/recipes-core/systemd/systemd-systemctl/systemctl
index cddae75a06..b45a2dc2f7 100755
--- a/meta/recipes-core/systemd/systemd-systemctl/systemctl
+++ b/meta/recipes-core/systemd/systemd-systemctl/systemctl
@@ -195,12 +195,19 @@ class SystemdUnit():
raise SystemdUnitNotFoundError(self.root, unit)
- def _process_deps(self, config, service, location, prop, dirstem):
+ def _process_deps(self, config, service, location, prop, dirstem, instance):
systemdir = self.root / SYSCONFDIR / "systemd" / "system"
target = ROOT / location.relative_to(self.root)
try:
for dependent in config.get('Install', prop):
+ # determine whether or not dependent is a template with an actual
+ # instance (i.e. a '@%i')
+ dependent_is_template = re.match(r"[^@]+@(?P<instance>[^\.]*)\.", dependent)
+ if dependent_is_template:
+ # if so, replace with the actual instance to achieve
+ # svc-wants@a.service.wants/svc-wanted-by@a.service
+ dependent = re.sub(dependent_is_template.group('instance'), instance, dependent, 1)
wants = systemdir / "{}.{}".format(dependent, dirstem) / service
add_link(wants, target)
@@ -240,8 +247,8 @@ class SystemdUnit():
else:
service = self.unit
- self._process_deps(config, service, path, 'WantedBy', 'wants')
- self._process_deps(config, service, path, 'RequiredBy', 'requires')
+ self._process_deps(config, service, path, 'WantedBy', 'wants', instance)
+ self._process_deps(config, service, path, 'RequiredBy', 'requires', instance)
try:
for also in config.get('Install', 'Also'):
--
2.34.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [OE-core][mickledore 13/15] populate_sdk_ext.bbclass: redirect stderr to stdout so that both end in LOGFILE
2023-05-14 16:31 [OE-core][mickledore 00/15] Patch review Steve Sakoman
` (11 preceding siblings ...)
2023-05-14 16:31 ` [OE-core][mickledore 12/15] systemd-systemctl: fix instance template WantedBy symlink construction Steve Sakoman
@ 2023-05-14 16:31 ` Steve Sakoman
2023-05-14 16:31 ` [OE-core][mickledore 14/15] maintainers.inc: Move repo to unassigned Steve Sakoman
2023-05-14 16:31 ` [OE-core][mickledore 15/15] machine/qemuarm*: don't explicitly set vmalloc Steve Sakoman
14 siblings, 0 replies; 20+ messages in thread
From: Steve Sakoman @ 2023-05-14 16:31 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <Martin.Jansa@gmail.com>
* this in the end doesn't help much, I was debugging warning (about base-files.do_install
signature being different than expected) from:
python3 $target_sdk_dir/ext-sdk-prepare.py $LOGFILE '${SDK_INSTALL_TARGETS}'
this shows the warning on console, but it doesn't end in $LOGFILE, because it
writes only contents of cooker log into the $LOGFILE with:
with open(logfile, 'a') as logf:
logf.write('Preparing SDK for %s...\n' % ', '.join(sdk_targets))
ret = run_command_interruptible('BB_SETSCENE_ENFORCE=1 bitbake --quiet %s' % ' '.join(sdk_targets))
if not ret:
ret = run_command_interruptible('bitbake --quiet build-sysroots')
lastlog = get_last_consolelog()
if lastlog:
with open(lastlog, 'r') as f:
for line in f:
logf.write(line)
if ret:
print('ERROR: SDK preparation failed: error log written to %s' % logfile)
return ret
maybe we could remove whole support for $LOGFILE parameter and just redirect
the output like other commands on this line
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
(cherry picked from commit 719f22df160ebde303274ccfc04049cffdb51577)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes-recipe/populate_sdk_ext.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes-recipe/populate_sdk_ext.bbclass b/meta/classes-recipe/populate_sdk_ext.bbclass
index 476876e03d..fe656ed824 100644
--- a/meta/classes-recipe/populate_sdk_ext.bbclass
+++ b/meta/classes-recipe/populate_sdk_ext.bbclass
@@ -733,7 +733,7 @@ sdk_ext_postinst() {
# current working directory when first ran, nor will it set $1 when
# sourcing a script. That is why this has to look so ugly.
LOGFILE="$target_sdk_dir/preparing_build_system.log"
- sh -c ". buildtools/environment-setup* > $LOGFILE && cd $target_sdk_dir/`dirname ${oe_init_build_env_path}` && set $target_sdk_dir && . $target_sdk_dir/${oe_init_build_env_path} $target_sdk_dir >> $LOGFILE && python3 $target_sdk_dir/ext-sdk-prepare.py $LOGFILE '${SDK_INSTALL_TARGETS}'" || { echo "printf 'ERROR: this SDK was not fully installed and needs reinstalling\n'" >> $env_setup_script ; exit 1 ; }
+ sh -c ". buildtools/environment-setup* > $LOGFILE 2>&1 && cd $target_sdk_dir/`dirname ${oe_init_build_env_path}` && set $target_sdk_dir && . $target_sdk_dir/${oe_init_build_env_path} $target_sdk_dir >> $LOGFILE 2>&1 && python3 $target_sdk_dir/ext-sdk-prepare.py $LOGFILE '${SDK_INSTALL_TARGETS}'" || { echo "printf 'ERROR: this SDK was not fully installed and needs reinstalling\n'" >> $env_setup_script ; exit 1 ; }
fi
if [ -e $target_sdk_dir/ext-sdk-prepare.py ]; then
rm $target_sdk_dir/ext-sdk-prepare.py
--
2.34.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [OE-core][mickledore 14/15] maintainers.inc: Move repo to unassigned
2023-05-14 16:31 [OE-core][mickledore 00/15] Patch review Steve Sakoman
` (12 preceding siblings ...)
2023-05-14 16:31 ` [OE-core][mickledore 13/15] populate_sdk_ext.bbclass: redirect stderr to stdout so that both end in LOGFILE Steve Sakoman
@ 2023-05-14 16:31 ` Steve Sakoman
2023-05-14 16:31 ` [OE-core][mickledore 15/15] machine/qemuarm*: don't explicitly set vmalloc Steve Sakoman
14 siblings, 0 replies; 20+ messages in thread
From: Steve Sakoman @ 2023-05-14 16:31 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a51a069bad78c578122ae1a5b500f715246d413d)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
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 5699cac3a2..94b0e8432e 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -717,7 +717,7 @@ RECIPE_MAINTAINER:pn-quilt-native = "Robert Yang <liezhi.yang@windriver.com>"
RECIPE_MAINTAINER:pn-quota = "Anuj Mittal <anuj.mittal@intel.com>"
RECIPE_MAINTAINER:pn-re2c = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER:pn-readline = "Hongxu Jia <hongxu.jia@windriver.com>"
-RECIPE_MAINTAINER:pn-repo = "Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>"
+RECIPE_MAINTAINER:pn-repo = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-resolvconf = "Chen Qi <Qi.Chen@windriver.com>"
RECIPE_MAINTAINER:pn-rgb = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-rpcbind = "Hongxu Jia <hongxu.jia@windriver.com>"
--
2.34.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [OE-core][mickledore 15/15] machine/qemuarm*: don't explicitly set vmalloc
2023-05-14 16:31 [OE-core][mickledore 00/15] Patch review Steve Sakoman
` (13 preceding siblings ...)
2023-05-14 16:31 ` [OE-core][mickledore 14/15] maintainers.inc: Move repo to unassigned Steve Sakoman
@ 2023-05-14 16:31 ` Steve Sakoman
14 siblings, 0 replies; 20+ messages in thread
From: Steve Sakoman @ 2023-05-14 16:31 UTC (permalink / raw)
To: openembedded-core
From: Ross Burton <ross.burton@arm.com>
In 5c6064 the qemuarm* machines gained vmalloc=256, because in testing
Bruce was seeing problems when the vmalloc area was too big for the
memory size of the machine (eg 256MB).
The intention was for the area to be very small, but 256 bytes is too
small and the kernel sets a minimal vmalloc area of 16MiB:
[ 0.000000] vmalloc area is too small, limiting to 16MiB
However, a 16MiB area is too small and results in pages of messages when
you try and use the system:
[ 242.822481] vmap allocation for size 4100096 failed: use vmalloc=<size> to increase size
There have been a number of changes since this commit, remove the
explicit vmalloc argument and use the default. I've tested that the
system still boots locally.
[1] early_vmalloc(), https://elixir.bootlin.com/linux/latest/source/arch/arm/mm/mmu.c#L1170
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/conf/machine/qemuarm.conf | 2 --
meta/conf/machine/qemuarmv5.conf | 1 -
2 files changed, 3 deletions(-)
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index c5234231e2..aa9ce88203 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -17,8 +17,6 @@ QB_SYSTEM_NAME = "qemu-system-arm"
QB_MACHINE = "-machine virt,highmem=off"
QB_CPU = "-cpu cortex-a15"
QB_SMP ?= "-smp 4"
-# Standard Serial console
-QB_KERNEL_CMDLINE_APPEND = "vmalloc=256"
# For graphics to work we need to define the VGA device as well as the necessary USB devices
QB_GRAPHICS = "-device virtio-gpu-pci"
QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd"
diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf
index 6e59e42c3a..ef1b4ece23 100644
--- a/meta/conf/machine/qemuarmv5.conf
+++ b/meta/conf/machine/qemuarmv5.conf
@@ -12,7 +12,6 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1"
# For runqemu
QB_SYSTEM_NAME = "qemu-system-arm"
QB_MACHINE = "-machine versatilepb"
-QB_KERNEL_CMDLINE_APPEND = "vmalloc=256"
QB_GRAPHICS = "-device virtio-gpu-pci"
QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd"
QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"
--
2.34.1
^ permalink raw reply related [flat|nested] 20+ messages in thread