From patchwork Sun May 14 16:31:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 23915 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 212A7C7EE2A for ; Sun, 14 May 2023 16:31:57 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web10.70162.1684081909105383373 for ; Sun, 14 May 2023 09:31:49 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=F829o5ow; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-64ab2a37812so14508693b3a.1 for ; Sun, 14 May 2023 09:31:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684081908; x=1686673908; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=usZg2lti6oHlAO6MCS26LZatg+BVXjuIF18Mzu0ccNQ=; b=F829o5owhhAqmKFIY/45GOpFeYjBxixPADR2FLu/2+X/IZHVSg3L5rehr50uY35+ey pYsDRQX0g021B6/xXDENrZptHVOi4agxzS0yQKsH2w32h6djk7jM2zTorganRgBvYOYc IYCj6H2NYsqAv5bWv1owk1Nw+6JEsKJo/AN2GHzbEcScJ+9U+EfbrSUbtOgqVgfUVcoG 1Aoy/uxvWDdnRInPMOyYSfAP8nJSxvInyvWW5LRxOtCkASZ20Qx9cR07zAH2AMI7sAe1 Qor4h/rFXUhKTu7FmKvhU5PXf3GD7ULKDYsa9oa/ZO3YDy2WLTe0dnmVvwNMt1bgKlkQ b5vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684081908; x=1686673908; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=usZg2lti6oHlAO6MCS26LZatg+BVXjuIF18Mzu0ccNQ=; b=HCo3NrcfeS2kfmzbopEkGsl7EoHok3xXXuStQgtpjAf8VoGCx4RydYfzpU5MTtzuHs 96bHpBXE3uzLy+ZlpQZeSjCo62B2gMEdiKZ0txlrZrmkqVtilwhxcCb3pH+iGJqSYNyq BpRXeULS+hxqOjFBGGRc1bUi2kq8MwYsrLenr1Vk5a0Bm6SbCtTwG0Q+tqUAB3rXwwFN ErmQUIwXManX7TP1cDal6a0eg9bsVwL9oUVQ2b/n3OvhzZsXDtWfb5o/BZNIMmOaT9A/ kqCmLvvbH02De15obFi4j9N2tgU71TJlSMURu3c1z9FAkCHHF+JuoHH6eyh5Y+AM6yiK v1jQ== X-Gm-Message-State: AC+VfDybHLJjPjOrRgmykIlDVR3Drd4wStv5cCe1psDdeZuCVsDdaupC WQAwMXFDHpX+EHoQIw3DecrzK0G4CGE8MnhTyGg= X-Google-Smtp-Source: ACHHUZ4Jf8TdyIfblyC+N2cpajuNzmXo6sq+VsIifZlJE+rijClo5ArMWajsnYZGIJJBFnp8lSse0A== X-Received: by 2002:a05:6a21:788d:b0:ef:8de0:6a5 with SMTP id bf13-20020a056a21788d00b000ef8de006a5mr30162470pzc.3.1684081907847; Sun, 14 May 2023 09:31:47 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id x14-20020aa784ce000000b006475f831838sm981877pfn.30.2023.05.14.09.31.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 May 2023 09:31:47 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 01/15] waffle: upgrade 1.7.0 -> 1.7.2 Date: Sun, 14 May 2023 06:31:26 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 14 May 2023 16:31:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181202 From: Upgrade Helper 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 Signed-off-by: Richard Purdie (cherry picked from commit 94cf6ef11bba381ab6f65b03ed1ed14022438151) Signed-off-by: Steve Sakoman --- ...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 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 + --- 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 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 + --- - 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 } From patchwork Sun May 14 16:31:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 23914 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1AD5FC7EE26 for ; Sun, 14 May 2023 16:31:57 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web10.70163.1684081910710761650 for ; Sun, 14 May 2023 09:31:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=nTWMAwqv; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-643465067d1so8685496b3a.0 for ; Sun, 14 May 2023 09:31:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684081910; x=1686673910; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=jdDuhepV8745iW233k9U7cT1HQ7Mq4TzKlXaDxsqnhY=; b=nTWMAwqvyNvDDoGFw78WLQbmXpHJIyW96tu2qjV4OB7/GJfLBb+OFi8Wyb6R/g4Rvt Njucf/rAB1UTFCALzFO1KWRi2SlFrMS8p2GF+CEdlSE4oU58zwiqKyRdtin01vqtSeDK OeEbnv3JYlCYu2sM3ezju3Ekm009DUdXp95K0dhGzcXCalIXriPsCXF0M3915TuTSzZZ lTwP/SECM2k59J5Tr1TG3eKzZnTTFu3bMTEMO5nFArIIlqJsVOs0r0WugkZjj5HtR1vv GX02FEcXLrRWM4CTALQ71IXolXoZegvJeSj/Xiie1onBeqkdYweFHQ6+zkuGDF56HXxR snCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684081910; x=1686673910; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jdDuhepV8745iW233k9U7cT1HQ7Mq4TzKlXaDxsqnhY=; b=f5CgiqLMGljV2ribJq4gYmkpVQTKfao/O3FLJq80vR3Lb5WiytrUJXdxdhjabin+Pc 1B0+TTT+/zECOK6cvWPin+IIsHDMWncb+zs35oLlFIxd9JdnACFE1+//GODoqpT9tl73 gPFhyzUohEBWCc6XpKyegCYhDUiZRa3jyVNY+vhs9L6ZUDegwO0XLXv+jQhEwFgN2C6b +6eLJrWeKy0uJziPkeMAQ/518MHH4OyUoDuAVRaTBkPcomVQ8vEIDSXo9izFqh1NEqTK CBcUvUMfB4vdoadnjHwSBbQ2ZmUrSL+7XvVjKnRB5CzXl0dAjiNrz1gce6+Ds98lYT8A vBZg== X-Gm-Message-State: AC+VfDyXvmX3DHdD2LA6/xDL+hBN53M63hi/zIdFL6uG8jun7z9tXjcE pF3/+E5YYO7VBSo99fKpNLsSXh3ACHRKKpLs6b4= X-Google-Smtp-Source: ACHHUZ4NPtHxCe4ahipwDmTaDdXiah5TBJOfPjaS+TvCHvjZcTqB6n6WxJNvJQvCgvkw+L03M+ff3w== X-Received: by 2002:a05:6a00:2289:b0:625:fe95:f120 with SMTP id f9-20020a056a00228900b00625fe95f120mr43557977pfe.8.1684081909704; Sun, 14 May 2023 09:31:49 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id x14-20020aa784ce000000b006475f831838sm981877pfn.30.2023.05.14.09.31.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 May 2023 09:31:49 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 02/15] mesa: 23.0.2 -> 23.0.3 Date: Sun, 14 May 2023 06:31:27 -1000 Message-Id: <77d46f01147036c38c21d7c840144adda89bd894.1684081748.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 14 May 2023 16:31:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181203 From: Otavio Salvador 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 Signed-off-by: Richard Purdie (cherry picked from commit 0defbb5925e309799162e221285e4cfb2e2c2ca5) Signed-off-by: Steve Sakoman --- .../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\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 From patchwork Sun May 14 16:31:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 23913 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1AE69C7EE2D for ; Sun, 14 May 2023 16:31:57 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web10.70162.1684081909105383373 for ; Sun, 14 May 2023 09:31:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=fzt2OZqo; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-64ab2a37812so14508835b3a.1 for ; Sun, 14 May 2023 09:31:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684081912; x=1686673912; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Xzc3zvi7lSAdmEbxNYQswOLQezEEOPnwEEB+h098cvg=; b=fzt2OZqoYjoLm46M6a2KZe4a5ticrJ2fFoVboYx9zzG2162suBFufHiozbe2bI9XZE vBrsK61VScFepEh9iWBWygnE2CSGpx4cM7E4ET8V9CQto7K6pDR/LoEqNeOQ/ip5UgqZ Yk4mXtB/PLD4JbiEvYTOHq3P/3ys+u3iYpZnVy7RwWFptCfi0DwULDyQ8cYuFGu6I/z8 gFU8Ax77R+crFmlPxGwMJ5Xhw6vISZyVYiXGths+DuNOqdl0TY8vgVAiEElI6ff+yyEI gvfW0h7XnHJ0kYL9gVfnuEWLwjA4+GtGfJCvEu/PfpLpfUAEtz8zuSj4kZIJKkQ790s1 XpXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684081912; x=1686673912; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Xzc3zvi7lSAdmEbxNYQswOLQezEEOPnwEEB+h098cvg=; b=jOZ71CwFEE5k47UoYBBxn8ZbK0dLt8SHuvfCIea6bPN+BV4nOfigBNOCXJPQ+9sMzO 4xFybr4GZVtxyr3Oa/hli4v0uribKtLRerafoxEAIvMW3RIunwzF86L+6UQMIuv48/9K I62mX6xeh7YJnuCK5pjZ+RLBcw9ywX6xCXb/CyagzXHtoOkbVKOoWZtJQJacW3wQq8bz 0PaTAXTkLWshj6iPIVv8yANimk4KfETp/5vrE+dBMfvPHcT2LCKpVhZ66Fha4OoULV5M vEQwSggxsFb0TtQxVrSahZFWM5yQpKs60JxNI9iMKiQvUKdHlEWS5tUx0unJxAfD5M3e WREw== X-Gm-Message-State: AC+VfDxgle//OBVPqkqebD9wJD0jY4cEU6Z0IewjP3ux3xN0L9Od4Y6d EqLKj58k4WEmCJ4/KTZaAEGTSJptBR3m3yo1JP4= X-Google-Smtp-Source: ACHHUZ4UX/d3EpilZ1pdlUDM8USUDaf2b985ANIrQ2lr0b7oU16Oec2U5JVoRD5B/WMltKBz7LQplQ== X-Received: by 2002:a05:6a00:3028:b0:643:a841:887a with SMTP id ay40-20020a056a00302800b00643a841887amr35448126pfb.4.1684081911511; Sun, 14 May 2023 09:31:51 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id x14-20020aa784ce000000b006475f831838sm981877pfn.30.2023.05.14.09.31.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 May 2023 09:31:51 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 03/15] qemu: Update ppc instruction fix to match revised upstream version Date: Sun, 14 May 2023 06:31:28 -1000 Message-Id: <411e3f76840c06580fa8d2e764ae504b8f0ad46b.1684081748.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 14 May 2023 16:31:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181204 From: Richard Purdie 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 (cherry picked from commit 42591e07a469cff881fa087d5251a8c783897634) Signed-off-by: Steve Sakoman --- 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 +Date: Sat, 6 May 2023 07:42:35 +0100 +Cc: Víctor Colombo +Cc: Matheus Ferst +Cc: Daniel Henrique Barboza +Cc: Richard Henderson +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 +--- + 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 + From patchwork Sun May 14 16:31:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 23910 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0BE61C7EE23 for ; Sun, 14 May 2023 16:31:57 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web11.69675.1684081914501391518 for ; Sun, 14 May 2023 09:31:54 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=MAFq3pZi; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-643bb9cdd6eso9624807b3a.1 for ; Sun, 14 May 2023 09:31:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684081913; x=1686673913; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=QEYNd8UfCfgPwvDr6yuvJFCD4MrycDcfiDWjTBwER2E=; b=MAFq3pZih/gytDEzpRGnS5NFSXj1+tBKof+cb9Qb8etfKJa+1WqQ2jo0f1NzSRSdj7 qbenhlYbtPS0GvrLAUtOBZMtxiRB8ZRDh2f/X3P3VdFtSP0RY18qbis8Ra+/gaZxMC57 Bu+vD6HURD+4d+wNokUNh0BNEsLPBN/ah9Df0kp+zU6fQVQ8EnKLr2/6f5G1DYSZpUxU m55gRxlqZCrCt1q3BmDRWFYN6tWBBVDe1QKb6yZiENWEtR3Kt+WSLXRRzIQeuOZgNuPY vpJEoyBaNKj/++i5YP3WClR39PH2gEAkxzT4o+X7njhN1o6/ExnQK55yrl6Q1zlBKGTd HJpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684081913; x=1686673913; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QEYNd8UfCfgPwvDr6yuvJFCD4MrycDcfiDWjTBwER2E=; b=VOTgbZkGV2L/7NUHyVefy4rz1oQGQO0plb1+lKW+LuWX6mwYv7PEaNjaIJrFOSJv15 UArArv7BAvuLpkmU08leJAirUPPRQE5bK4d1q2D07DIpsuVIOPnK2d1IDlCFzKUMicEY sclTKBtGtuTNhcdyVUZIyh4M+4HI4Y0K7FZG5gEQ2V76edcewYPxdVjbCM9r5KoyHOG8 SkmqvXmoBKi6tLcJtTi9O4psoLcMsfSgBf/OGdQNFf/uMtmrBr/2utrBZwA5gepCanHj fC1QjM6Ttsmcv20g2ue4KcV1t7vikprg+/9Xe9EXFtOnn75u6HKPxk6TSJFhol7LK4mA 4QDg== X-Gm-Message-State: AC+VfDzXyaR+CiuunsCi7KQvAU1amLHyo1FL2eZ68+VqvZ5IuNfQorRD LX2AXbADmoQ6x6YTdqBgaAvNcTh2ERLAdWHVCNk= X-Google-Smtp-Source: ACHHUZ5hhViUXMnE/RsvhB0BF5vParfAMw/FoYwVhhQRe1T14YQa44WD+8UlMigIl/IumAEjC2LRRA== X-Received: by 2002:a05:6a00:15c6:b0:647:7ee8:6251 with SMTP id o6-20020a056a0015c600b006477ee86251mr25535820pfu.21.1684081913343; Sun, 14 May 2023 09:31:53 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id x14-20020aa784ce000000b006475f831838sm981877pfn.30.2023.05.14.09.31.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 May 2023 09:31:52 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 04/15] glib-networking: Add test retry to avoid failures Date: Sun, 14 May 2023 06:31:29 -1000 Message-Id: <6282f64a6673bcd9b0a6cedfcb8cd3d1a6de1077.1684081748.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 14 May 2023 16:31:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181205 From: Richard Purdie 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 (cherry picked from commit 4deb03ee5af8fcf7c2b1c81c686839341cf753c4) Signed-off-by: Steve Sakoman --- .../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 + +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 \ From patchwork Sun May 14 16:31:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 23912 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C933C7EE22 for ; Sun, 14 May 2023 16:31:57 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web11.69676.1684081916061953933 for ; Sun, 14 May 2023 09:31:56 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=X4S2bBJ/; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-6439b410679so7791978b3a.0 for ; Sun, 14 May 2023 09:31:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684081915; x=1686673915; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=DP3I7fe2lvHoavZKMi6Xx6HnsWXOE9GHD9gJ+fydbCs=; b=X4S2bBJ/53+X9rQYv/MBPX6Hl5sK3MTYfaTPsvKrDQVC9kik6cUaMBgLxZt3JL33aF QhUItB3ogE/65MzdLaGryCxFoDqGALY/bnw66qw4bv9RtMsqTOSORX0p/eq5rJHrYp2X sBGdMdwVBq1vsM7EQPyVFIjZOzY8GkoAuHvSRkCFJgfgovjhWce4QGqgFU5cp5UXNHu7 3kg15rvJWasgVqoyzPP9UoX/rT7fgLkcWGW9ke0pzuwYc7IVSZd4U7wQSMwZzEhbf8Ub W6xULdnAYViVr4b8sHqmkCru0NonIf2Yon/ylmtHhqOzSK22BS//kvKn9Vll7LNdwpH5 ajyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684081915; x=1686673915; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DP3I7fe2lvHoavZKMi6Xx6HnsWXOE9GHD9gJ+fydbCs=; b=E1GLAR1+QkTXMlPNhzS30wOeuEV5YEaY6MyZVVvo6LDMpUD/Go8HRResPgJFlKDJuo X8ZESw15+V4IVB3qhNvnBMlZIe5bXPGmY3LqINcD4YXiRK7VYNLuurGjW5N1dFdInTRI 9+237ymKMKEuFUAplL7b8rhuApskXrLobitfhu004yhe1tbITtEySyppV7K1Hu5N60GU 9m5LnIivp3fVi+dbYn0fkEqOAgRCdB8DbeiPyuDSto3Mhg39DnlvRPgYU4xfDNyhifvj cXmDQ1sfrZJnw5qkeGl4eeHww1FLuPpzP7rXkS7hUc9+0jfJg4cUFKULjxQME13FloFe K/kw== X-Gm-Message-State: AC+VfDzX5vD/pPT25XqDyzn3Pbj1qTrNYWvSYBQhK7QiOrOqQF7pfpcV fClh4JMUQg/1Rq3/eXbSSRINwFEkuMj6ThbM2lA= X-Google-Smtp-Source: ACHHUZ697pHMjUFIaFwRCIGFsj5nLNPOKYCAT9G3wl7W3lmnwSoWJfHdgtOEuabPhscRzrnfDZi8sg== X-Received: by 2002:a05:6a00:2e97:b0:64c:9b56:6215 with SMTP id fd23-20020a056a002e9700b0064c9b566215mr2731596pfb.25.1684081915017; Sun, 14 May 2023 09:31:55 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id x14-20020aa784ce000000b006475f831838sm981877pfn.30.2023.05.14.09.31.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 May 2023 09:31:54 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 05/15] glib-networking: Correct glib error handling in test patch Date: Sun, 14 May 2023 06:31:30 -1000 Message-Id: <66dc4b94e9fad8d209f12fa64bd0673a42c28ac9.1684081748.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 14 May 2023 16:31:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181206 From: Richard Purdie Signed-off-by: Richard Purdie (cherry picked from commit 4ba74f61f38827d82586cf9c993a4b27065f5c6f) Signed-off-by: Steve Sakoman --- 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); From patchwork Sun May 14 16:31:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 23916 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C669CC7EE22 for ; Sun, 14 May 2023 16:32:06 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web11.69677.1684081917766085119 for ; Sun, 14 May 2023 09:31:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=lYjCNoIp; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6436e075166so8794622b3a.0 for ; Sun, 14 May 2023 09:31:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684081917; x=1686673917; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=jdPfFturuwou5luIp7RJvS8layQ9UqruZL/ga6Y7SGU=; b=lYjCNoIp2D3uJisMOQ0gaQbj0JEpkiqLS3e4EsvQj2WPntsuepBJW/G5In7H/EOX5l TfroHhP63NtkY7jviLZGAb7bRtWkt7JhRge5IWfXw1lW3ZUebNtmPMApP9w7tkB4TCpN OZKzwzl3y2xapvX4YYDP6mlBIOpc/ZJpxjG6EifviLjpjao/rcCUyC26QmSUMOVUn/IB a3I0CD4MMQsA5TYdHZinjUOJOxIrd2Br/Md36hX9MjFhYtl0XrJto9zzjWDgsnVj0jIm 4EQsv8lxxBywKGNZM6aAypqhqHkg6KvaZuQaAejMiXZKrS/UqC6bz33CrjiO7bxjNJB3 SvfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684081917; x=1686673917; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jdPfFturuwou5luIp7RJvS8layQ9UqruZL/ga6Y7SGU=; b=UIY4owBjsj11DYYadm5cY+VhTNCNSu7jlzQGYkhvffEqb76PQCmHUKjp6DVyF8wuJs etHTEBin9I7P+wDBRk2ouyFapV9+U/xrAN0TycgsUeAtv6KXNE2uq8jeWwVTt07VtSi9 zwdLWwm4wCnhnIWF1ZtMi8tEMF/OGIBbrCCOybxk5+px46mpNkyQ5f58LY5VpzaZl4b3 gRO8adX1ilVtAH19804ALwaUcIyenUBfa4rk0infSvs9Rov/Nm3P2FO6TMyYdLKDSNVF R6j0p+L3Y7odX2CYjAgUiwlRivcJWogcgnKQsFsQezKSiCeRDuIFQF/itm7iXs4tRtwy 79Jg== X-Gm-Message-State: AC+VfDxH3TkiMy0U8yMm1XDVggy0b0GAXWINHQ/ehC1qw5dAjhDj5gci f6zlrxcV0BivYTKd32K/LE9vslqaZTnwZrGiKX0= X-Google-Smtp-Source: ACHHUZ7xiikd8Thz6LjW+SnqSVaAohhs1sfdFGrj4ZtLbU78/fiZjJPlCkD8rp+GQenahHa3+ly5KA== X-Received: by 2002:a05:6a20:4328:b0:101:1d1d:4396 with SMTP id h40-20020a056a20432800b001011d1d4396mr26949275pzk.2.1684081916704; Sun, 14 May 2023 09:31:56 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id x14-20020aa784ce000000b006475f831838sm981877pfn.30.2023.05.14.09.31.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 May 2023 09:31:56 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 06/15] gawk: Disable known ptest fails on musl Date: Sun, 14 May 2023 06:31:31 -1000 Message-Id: <71f515d63aaf6eeb91170c9ee3eb123935a18da8.1684081748.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 14 May 2023 16:32:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181207 From: Khem Raj Add needed locale rdeps on musl as well. Signed-off-by: Khem Raj Signed-off-by: Luca Ceresoli (cherry picked from commit 1e71eaf6792727d2335ee2e2ad4c5ce88137fe77) Signed-off-by: Steve Sakoman --- 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" From patchwork Sun May 14 16:31:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 23920 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D57BBC7EE2A for ; Sun, 14 May 2023 16:32:06 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mx.groups.io with SMTP id smtpd.web10.70167.1684081919592572721 for ; Sun, 14 May 2023 09:31:59 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=xypBTM9c; spf=softfail (domain: sakoman.com, ip: 209.85.210.177, mailfrom: steve@sakoman.com) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-643a6f993a7so7331815b3a.1 for ; Sun, 14 May 2023 09:31:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684081918; x=1686673918; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=DItNwap013RgRF80OFjEIfgnubjR40kTiorfcIhia94=; b=xypBTM9cpgEn8hfr/5Cq2wpD42pi6xjxGCtuM6wyj3OvWuOM8G3Z4ffQH0Is0Y/yLk 3mFo7wWTTPvrpD6dgHBj/OOrzL9CGVgdQAy8bZjm4/uaEuosjbXZoicTwdL5IYobaFvb EH5LQpNbagY6zT0XEWe8zAQhsfH2Q2dwejGik7fL5W5LTnW2h8EKHcUwkhsvW+w6fUsA hsEmY1pKep2szZSGJTfPLEL/VOL6x9DJnfA+W03HflaKMWUdLZ2GzlIk/9DjGtcHKEmw eWhALD5vT/GR5DaaREJR8x9Y/hJHFfWM2dW6xRpTy3rrswFq9Qrb5mpw5XmI20I4x2e8 RIBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684081918; x=1686673918; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DItNwap013RgRF80OFjEIfgnubjR40kTiorfcIhia94=; b=COonCVs0AZHfQ03z3k4qKeByTWfwM6eqEeltnMvbOJslvfeEahtCwsZBtw11H39BWU 9O4vcED395Hur/HLjOA/HmT7l1LkSFIt5PTPwo+gRGggo0BeDK6yaFNZ+EQYAHtRY852 R5NsCMDSAn3MJGdyedcBA2NRlN6lHeM2QWvHAKsR8dA+5Moi4QK1zyz9NZtZJV66Lomj 7PVBPzNbyK4emhskGgjijSYvdYiiWxCGrEletwLbuzF9Rlrfo+Okefdv6gmfnjX5R51P Iut2f8NqW3CtO/PSWWv5BNJ2yHBUX+tqSBLDzRZ/3/Bx1/hB01PxMYR3Osy+NDQwL0mr +uDA== X-Gm-Message-State: AC+VfDwZP17YQVOSjIN+2sKCojN7XPKCha+DrfbiHpFIrFKwczkDl5ZS DkjsFjW8jjHm+rg98N2PsFblxrbS4xLXquU3gcM= X-Google-Smtp-Source: ACHHUZ7e9ui8YWgSYbs3aox3RYS7PfIU2CJ8Ddr5BoXbdUR2Q9NWGoo+Mf1rJyimpbqKJfKsy+Vn8A== X-Received: by 2002:a05:6a00:21d0:b0:643:bb16:7ca6 with SMTP id t16-20020a056a0021d000b00643bb167ca6mr40149651pfj.21.1684081918519; Sun, 14 May 2023 09:31:58 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id x14-20020aa784ce000000b006475f831838sm981877pfn.30.2023.05.14.09.31.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 May 2023 09:31:58 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 07/15] gawk: Remove redundant patch Date: Sun, 14 May 2023 06:31:32 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 14 May 2023 16:32:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181208 From: Khem Raj 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 Cc: Ross Burton Signed-off-by: Luca Ceresoli (cherry picked from commit 4a32ad54d6c051fe387c67721cf96eb851ecd835) Signed-off-by: Steve Sakoman --- .../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 -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 - ---- - 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 \ " From patchwork Sun May 14 16:31:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 23919 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5805C7EE2D for ; Sun, 14 May 2023 16:32:06 +0000 (UTC) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mx.groups.io with SMTP id smtpd.web10.70168.1684081921297500129 for ; Sun, 14 May 2023 09:32:01 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=ohNywVO5; spf=softfail (domain: sakoman.com, ip: 209.85.210.178, mailfrom: steve@sakoman.com) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-64359d9c531so8781767b3a.3 for ; Sun, 14 May 2023 09:32:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684081920; x=1686673920; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=N7ymsqdihMNAnQYBKCrbSTxViDBPZUcqmp9xniQVmLw=; b=ohNywVO5BKB6P7tkxj2wAhA9JS4nMMw4r5XkL21/wrUIH8/IO8F29d6RPkSuEn6WKj MzJS8EM4Zstfl9HfHp5GbwakSG336hvv8L4BAKDuZZmFvS+DIJAuYPHDEAoslljnjfbb w1PpVflTRVh84yhAJGqV3XO5EJ90rTeaemKt1mm259sF4d3AvQpVG6mh2FVACdJ/KSpN mh5HRWLhLcFqvJTfx6ZN/pXZ8KGv+AzRDWfdHxShleJPEbrEKoBxN2G0CBQ9V2xf297N ps6FqKx5P9GkwvAsgH6AK56/XFMb/qCA0W6xAbsZcEhyGIWELDY5ZuJsrK1AljClgn09 M9tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684081920; x=1686673920; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N7ymsqdihMNAnQYBKCrbSTxViDBPZUcqmp9xniQVmLw=; b=bQvyWYreP0AN/m+AqPhhOMDG6QGaTLQCzcUhwFncXm5/npN5aC7rt35JSHwFXQDbAG P6cAFNMnGtCFer1qeYeUfBgCteX23RgYIIWhtMwEKg9s2oCifsPQ46RlekAS8sEbOpJh s9l67DRF4GIpXjxcqQ5Ia9ZuNfRLxplzppNM5UzDuxndj32V5eIK36T79mEuxCXAs8Ck jwEfXUjdcjlzmfXpm3pEOqdcUyyp1h0i/yaUPCkXIs0qOjXQDOQAZB0t3tw9HkYIAN3T sg7ZyM7KRDGI9XgaWRJHP2ogKx+2XOPdlAd4s15vHZU/jZSBRtglALwrvpRAvDBJIvXa iKQg== X-Gm-Message-State: AC+VfDx76JNopUxuvgVYVDJC4gAOQnkJt+EZWEEodZquvu5WQ9vcZK41 WKQzq29mlJZvolT5SK+KK5jyyGbOaabsCK8wleo= X-Google-Smtp-Source: ACHHUZ5MfV5sy12WnOb4bJiUBXAQyX8so2TMhzYcTXYUFzeCwb7NlXS25SLsiZ8fu3JTScaY7atEDA== X-Received: by 2002:a05:6a00:a82:b0:646:e11c:f602 with SMTP id b2-20020a056a000a8200b00646e11cf602mr26154777pfl.0.1684081920195; Sun, 14 May 2023 09:32:00 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id x14-20020aa784ce000000b006475f831838sm981877pfn.30.2023.05.14.09.31.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 May 2023 09:31:59 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 08/15] gawk: Add skipped.txt to emit test to ignore Date: Sun, 14 May 2023 06:31:33 -1000 Message-Id: <58818cf22dc378ee5fa9089da1f4b8f0fd02bc44.1684081748.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 14 May 2023 16:32:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181209 From: Khem Raj 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 Signed-off-by: Luca Ceresoli (cherry picked from commit 4d30f3535f53ad6d8f462f99b6cd2fe8d2ecbfb5) Signed-off-by: Steve Sakoman --- 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" From patchwork Sun May 14 16:31:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 23917 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C671EC7EE23 for ; Sun, 14 May 2023 16:32:06 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mx.groups.io with SMTP id smtpd.web11.69680.1684081923017055645 for ; Sun, 14 May 2023 09:32:03 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=S3to+IS+; spf=softfail (domain: sakoman.com, ip: 209.85.215.173, mailfrom: steve@sakoman.com) Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-530638a60e1so4427660a12.2 for ; Sun, 14 May 2023 09:32:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684081922; x=1686673922; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=150ICT9y+ttVleVrnlWIr/EB22qXKsRIQZY6Hkq26VM=; b=S3to+IS+COGZDCJLWaOJai5FM/FWYoK0UWayJxx+zv5x3yfuVpeKUHWetFUZb+XhwL jG2an5u1Cwp/FBrAKH2iRurJY+umul3yujFbuDqKmBXAvC5EWiSQ94AM4AHfgZzZXxXi raubqKYiixuFUv927MFTrplNYJ62qhWGe3fTWCIS7OxVIL1fUQRZWqaGhWC2dZmU8TKc mm00Eh+sNy7x3vmzYcm4SI2+JHkHZNMEs1pftfAMKSilFES7/L5Q1OxF4BGZ4hSnwUs8 qjai/+cxEhzfJS2bQtTGrFGFfSlo4NAu6yzRK+g5l+YmN/p7hkO4XAlbeKU9O+mlJEVy 96IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684081922; x=1686673922; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=150ICT9y+ttVleVrnlWIr/EB22qXKsRIQZY6Hkq26VM=; b=KGGYAV7VwrLBxTP17971fF1SdABYWHvOlWeaWY5cdTyU8tdvB2i/Je0QQtKh5qnvd4 f8TrNruIRqaQbktJRixWmbxu3rm9Y4fzrlfcJsCSkUGvnG5Jctgsi1bh4fR27Y1aPZpD DZB0kH282fLhpao3Lo/1lek0slaZfV2gx3FvY7yJHKgddw4mip/rJ5HhMoskoMJP9OtN EBXuIBuw9UHaD/R1AYQoGBxouqawJhOjUGrUQkP95ly5BplCOSREuZdGRFTKgeh5NcLA W8jyt4xwNS0lzIUatsPDot+01rqF5QF512I3PwXMylAVJxK2rkizYdTsjRxVhmyrw6lS cfKQ== X-Gm-Message-State: AC+VfDy/2E33Ny7HBFqdJy0C5aLf1gEx+0gWYFKODOr26WwvEDQhw196 Nf3RCvd98FR4Pj4/xHdM2AkMjjR4gYpkZmt4XBM= X-Google-Smtp-Source: ACHHUZ7qtKgD33Xp56WLTfOKp+mhjhB7tnW3SOnxCNY4S8kCaKJAwfRvr5Vk3uGpHoLwalqV+XW/yw== X-Received: by 2002:a05:6a20:1587:b0:102:f744:a70c with SMTP id h7-20020a056a20158700b00102f744a70cmr19866792pzj.3.1684081921971; Sun, 14 May 2023 09:32:01 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id x14-20020aa784ce000000b006475f831838sm981877pfn.30.2023.05.14.09.32.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 May 2023 09:32:01 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 09/15] libxml2: Disable icu tests on musl Date: Sun, 14 May 2023 06:31:34 -1000 Message-Id: <1fbab00c9d887285a9e966e81ff75a7fc7039baa.1684081748.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 14 May 2023 16:32:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181210 From: Khem Raj 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 Signed-off-by: Luca Ceresoli (cherry picked from commit 03980db15fa1de2f970705364c2316f17428a3aa) Signed-off-by: Steve Sakoman --- 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 From patchwork Sun May 14 16:31:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 23918 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C73DEC7EE26 for ; Sun, 14 May 2023 16:32:06 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web10.70171.1684081924638576932 for ; Sun, 14 May 2023 09:32:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=VHR5k93o; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-5208be24dcbso8414644a12.1 for ; Sun, 14 May 2023 09:32:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684081924; x=1686673924; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=byUyx3bXwVHaD2x9g6IjyIr35vJhgEmwjGq9LMu9ACg=; b=VHR5k93oC2yMbFUPRxjqfAhLTjCPFJBhOr80CwuMvzmnQY5FRkD91KXrfDB7b15Lou WpRN6Inu8E2oi0uXZ6vDD4SOdqDWR1dWkbRG5+NVUY9vi4dXsEce5wL1tKKPRm6UMzmz gZ4gXE6rN6/vrj2Pt0ZqEqqbQeTB3VPL1CdPO8WFpR0emVEVYvwjjHTTdEPf4aWvcCwM 9MvAyUU/n4EdZgFeOCAW7dT4tspydyYq1SHxiX0pi/4cfyjeZvfYPxx9eqA1r8KyDURs 15yELUMh+RfHMmLoQG6VFqFz3GTpk4YiVBMKZr9bVUW9qibCLUy6jy6rfWmkcl9tbBgw wSUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684081924; x=1686673924; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=byUyx3bXwVHaD2x9g6IjyIr35vJhgEmwjGq9LMu9ACg=; b=KHPmKSgUZe0cDQm1HOqctWGZfah5ueXWtAK950rM8LgeOHcrK4Ck6VOo0vBH1aXKly J4teKzh/fKj6BaFJ2piBxXZdIUMEBgP4pF6C/NspOyq6MoJVHqVmZ8nIzGqn2Q9SW1vy Gx96pELLru5JolLbTrjptknzvQmthPzc6VLIDl7eQ3pnzqN+SntjAHi8JwLu104Ea26T ERfRGA67zbb8NYxoSxMsgRo2dxXa6w2OAFQQ4XxQWitMl2TDI7nooqak3HkB1SCJXoF/ mYrbSX6DicJUrs+MSYXUKJp2Vh5eXFs4hgPavWWTAyIjGcM2vQllJkbbwbIDp4RQoJ2I ShcA== X-Gm-Message-State: AC+VfDwFrqGTQmBqzvU3XJDAmMGZQFvjkPHtrMuPCqDjfNJOWhUwPUew tNNKezYl4SWBpMxIoU2Y5Fj3klHQYPKccRDke5w= X-Google-Smtp-Source: ACHHUZ6ho7EiSM0tgNixdGRwpt9E093dbxTTDtSrGFWT93cxgnPm7d4meDynp/0VrkmlqO4aCCgcxA== X-Received: by 2002:a05:6a00:21d0:b0:643:bb16:7ca6 with SMTP id t16-20020a056a0021d000b00643bb167ca6mr40149917pfj.21.1684081923631; Sun, 14 May 2023 09:32:03 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id x14-20020aa784ce000000b006475f831838sm981877pfn.30.2023.05.14.09.32.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 May 2023 09:32:03 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 10/15] maintainers.inc: Fix email address typo Date: Sun, 14 May 2023 06:31:35 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 14 May 2023 16:32:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181211 From: Richard Purdie Signed-off-by: Richard Purdie (cherry picked from commit 2a86ca028980b501e386f6bb8293a094fd77f97b) Signed-off-by: Steve Sakoman --- 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 " RECIPE_MAINTAINER:pn-iproute2 = "Changhyeok Bae " RECIPE_MAINTAINER:pn-iptables = "Changhyeok Bae " RECIPE_MAINTAINER:pn-iputils = "Changhyeok Bae " -RECIPE_MAINTAINER:pn-iso-codes = "Wang Mingyu " +RECIPE_MAINTAINER:pn-iso-codes = "Wang Mingyu " RECIPE_MAINTAINER:pn-itstool = "Andreas Müller " RECIPE_MAINTAINER:pn-iw = "Changhyeok Bae " RECIPE_MAINTAINER:pn-libjpeg-turbo = "Anuj Mittal " From patchwork Sun May 14 16:31:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 23925 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6638C77B7F for ; Sun, 14 May 2023 16:32:16 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mx.groups.io with SMTP id smtpd.web10.70172.1684081926740793272 for ; Sun, 14 May 2023 09:32:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=jQZglV7O; spf=softfail (domain: sakoman.com, ip: 209.85.210.173, mailfrom: steve@sakoman.com) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-6434e263962so8680515b3a.2 for ; Sun, 14 May 2023 09:32:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684081926; x=1686673926; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=lO2ioT0qzsIqDytd8aLIk/sL53G+SLodX23NwpdlxEM=; b=jQZglV7OKMjpZ5VB8Ejo/inhxl2Ebn5faU6O/ViQmCISJsiyVvQSCABbvRNZ7GlwAO +ut3u55IBkxun2xsZ2QpwNWl9eh624ugExekhXaFML1dAQjkIbFBe+YTZvqlKHPtYD84 bog71VXO1yIwglRJFVK/cZISLER5584S2mF5IZGfCbgMuKNYnPjSnUxLzi1cWhR2ymoQ +fyKlHekdJVjVzY3ocNtgZlMy3ojevsKgvsw1TjVfLjlTr2SvvV5xqbtdyEBzGMrZnnX nWU9gWybmLJY7OtWnhhUxOEYU3echdAFxTDg/B1NXpfM3azBlE8TOAxXnneDl36wCZHH mKOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684081926; x=1686673926; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lO2ioT0qzsIqDytd8aLIk/sL53G+SLodX23NwpdlxEM=; b=h2Ms6rS710bVJVvjfSrA65QbNOHH4GupAG6wRw6eJ27COW8GatGZAS56sOb1tNG+OO sjFOLcJZiiFT290X6d8Rf8hywc6P6OuKwwsCIOr1x3iWQXv75VdrMEjg3heB6GmgoEUw M5grWmwYA0FiAqPl21KKrbIMbf+CqGFxRhwC1mek3PgQVrP3E2LjypqllsfF4wPPnJHd l7yVVs9Rp06BgS4lg1FnSmpSMGivhngpsjwGEfg4aTny2C3qpAB7JCb4nBRE1M6RLdqg 1aOyyt2mRDtIVRmXj7mHm977ZWjgkNhQctDhFgbeGP/4v6crKrL+EELMwfQcrmSDj0SI RuJA== X-Gm-Message-State: AC+VfDx9/rEWA22KNqctLcBdjiuMHhsUb6mAyd9mCpQFXS9sQzAoC6ge lsbfq+jRmmAKoMiUDvFjBkt1n6jj/MJN85KtS+4= X-Google-Smtp-Source: ACHHUZ5kc8TFR0To3mVAL9Yt8mAf91mNyim//3Nh6GSJnh8wqje3M8xS7s+EvIF4WPy2rtrQlUv0YA== X-Received: by 2002:a05:6a00:2189:b0:644:ad0e:ec3e with SMTP id h9-20020a056a00218900b00644ad0eec3emr33512235pfi.33.1684081925505; Sun, 14 May 2023 09:32:05 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id x14-20020aa784ce000000b006475f831838sm981877pfn.30.2023.05.14.09.32.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 May 2023 09:32:05 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 11/15] cpio: fix appending to archives larger than 2GB Date: Sun, 14 May 2023 06:31:36 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 14 May 2023 16:32:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181212 From: Ross Burton Backport a patch to fix appending to archives larger than 2GB. [ YOCTO #11674 ] Signed-off-by: Ross Burton Signed-off-by: Steve Sakoman --- ...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 +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 +--- + 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) + } + + 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, + + /* 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 \ " From patchwork Sun May 14 16:31:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 23922 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7951C7EE2A for ; Sun, 14 May 2023 16:32:16 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web10.70174.1684081928446285192 for ; Sun, 14 May 2023 09:32:08 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=IWKWO4Yj; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-643846c006fso12577027b3a.0 for ; Sun, 14 May 2023 09:32:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684081927; x=1686673927; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=6shsjqqSNJNiS1k+I7/FHyfdavPBzFbfLX+xZCB0yJE=; b=IWKWO4YjvmVQUfdaj+1PF72LfdSKGQzdFF0mjjSl3YadMOE6uZ6trMB8+w6OtPeCEx FmMYaii8W4mfRb22tlEYcHWN5HJ5HNIV33X0/WLwTD+tt8YMYE61kUxLbkkwDfYtUufQ hLcBL+ZDMOx8oYKLfM5FYQULLCr1AoaSFvRFRtogSijwLPMkoCVbr9VAqEeEkAiSKGz8 SylieqlQHJdmmohC1SUZ8HpV9Ur9CzDrhwZjQzlfDhxXgYeu/1ulFdzlsV+Cl1pZscwT qIO2fa9qwCkufwPQQAlOPZecrLholTXBl1yOtH222a94Jdktqyw338jY2b7ZR5blOVIJ 8yeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684081927; x=1686673927; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6shsjqqSNJNiS1k+I7/FHyfdavPBzFbfLX+xZCB0yJE=; b=hcIZUsHguniEvWiz3YBN/UdLAjyMLlQkmfdzJBA+kC9KG13klrg90meGVvClZ/3WFH 9xXjWjgSW4tH5ukV/x1kpfGzy8ylZumPZZATSvmELsaIxWjXgVuQBxE8YgCJjdfNlpLk R3HDws3OHitPMjYrsWns1QhXkm3VZjFROhV0DEIu8UXTGhxpII6/W/DPfGNLz8ZVZga1 M5R+OYm0xjUYFgAQvn+iRcQ2AmolwyR7v07Zp6k8dFtYoYKfZe0WVqth1XkIdFMaUkIN hE8r2GlOlI45mhLsvkLfhoJ9pdl8JS13jCTKsiSvQPldNCrzr4snG4YcldDJdIGgPX/Q x68w== X-Gm-Message-State: AC+VfDx/ono7ROU1uNIV2cPP2wfxJ9bau2Rb0qq3suulk4M/xH1UAiBN ms+OLU4TJTvKchTEG+pckwUT2W0+KyOcxZiNNSk= X-Google-Smtp-Source: ACHHUZ5Zf4Jd+dq7O4aEK4OGJe4bEGdQ6q1d0kF4ejwlOAmR5qht5L6KoHKBQ7mM1ZBUs1L7iRjhHA== X-Received: by 2002:a05:6a20:7f8a:b0:ff:8911:c695 with SMTP id d10-20020a056a207f8a00b000ff8911c695mr35715194pzj.43.1684081927548; Sun, 14 May 2023 09:32:07 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id x14-20020aa784ce000000b006475f831838sm981877pfn.30.2023.05.14.09.32.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 May 2023 09:32:07 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 12/15] systemd-systemctl: fix instance template WantedBy symlink construction Date: Sun, 14 May 2023 06:31:37 -1000 Message-Id: <372b29c8ad270d4d430c26a4e614976c7029afaf.1684081748.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 14 May 2023 16:32:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181213 From: Martin Siegumfeldt 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 Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- .../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[^\.]*)\.", 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'): From patchwork Sun May 14 16:31:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 23923 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8886C7EE2D for ; Sun, 14 May 2023 16:32:16 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web10.70175.1684081930451683708 for ; Sun, 14 May 2023 09:32:10 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=oUd6aqJ7; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-6436dfa15b3so7912601b3a.1 for ; Sun, 14 May 2023 09:32:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684081929; x=1686673929; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=2Gec32DQWS++iJzj1iKRxvYcbs98s53koGnfDOTceWo=; b=oUd6aqJ78eFYARhGfYJqqXBd1gdn4qJjPkr6BtdBizZzm22EhZ14/5UjAVLNMXrSMq 42BybT774IPHLposr49Jy74cYmK0lN5NmzdWrHTIfiPCMyjlFt0edYhbtWj2i9GVM2Vz 7RAoirc1NkyVhah8Uzc8+JjIqKj0ybunqe+PEivZh9QNiMa5xolrGkjj/yAfWFCv6Fgr 2Mh4TGQH0nDR4kouHD/HFSSnBEy/Fj5vkLbaoWH5P55pGOjjWPbBKHO6NmoQo9QHdURd IH6dd7K5zO/SCzmAeRY6rOHYSYaX9+sq4t8xQp7ASr3K3zhX6iKsUC2pQu9viMU06k3h V4nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684081929; x=1686673929; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2Gec32DQWS++iJzj1iKRxvYcbs98s53koGnfDOTceWo=; b=ECwmCVK3XaGukx0w9L6391ViOUJUPcSLPt0MHMcegU35CflfomcA8HZWMtLisMF9Pu xL1pBZ0aN9DRFCXDLqZUh93Nv6GETADHrkzI2kB9H9K0+kvx94ezogpnfC5IlLCtwHVO jYUZhy5bsLQ0rnfq/xCR7Ths8h4VHID2AazZ5X2S3AyfU0J4eM7El8d9uPc5zLi29HAi HNQS5mQXRGycGSrD/8fqZ42SlW5Ix46NQ/hKLNP77afAT0KSfmn4aiYPzS/OqMSxtSXM pmaRMfjSji5NRli6b24n0ll+2zsQgsQG9t6moei5e5w2l2ORZGkPkS1m+1hcTScv2qlB XNFQ== X-Gm-Message-State: AC+VfDyH81E0/7pFzElnhuVHJ7zJX3EHjYskXbPz5fiOrdGsohb9w9Xx CdIjrBz6+a+TjY0pc9T059Kcq+EhnAGbu2s8odc= X-Google-Smtp-Source: ACHHUZ4uVN5x8RSeH+wvzEprB9RLGL+cMQtFzSqlm5PsdebF47HKSY9XsxOoQPHmZL6prUBN+IhUyQ== X-Received: by 2002:a05:6a21:9011:b0:f2:bfe1:4867 with SMTP id tq17-20020a056a21901100b000f2bfe14867mr32617289pzb.17.1684081929474; Sun, 14 May 2023 09:32:09 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id x14-20020aa784ce000000b006475f831838sm981877pfn.30.2023.05.14.09.32.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 May 2023 09:32:09 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 13/15] populate_sdk_ext.bbclass: redirect stderr to stdout so that both end in LOGFILE Date: Sun, 14 May 2023 06:31:38 -1000 Message-Id: <766c6f7ae72576cfab3654362ae949688f42acce.1684081748.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 14 May 2023 16:32:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181214 From: Martin Jansa * 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 Signed-off-by: Luca Ceresoli (cherry picked from commit 719f22df160ebde303274ccfc04049cffdb51577) Signed-off-by: Steve Sakoman --- 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 From patchwork Sun May 14 16:31:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 23924 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCC1CC7EE22 for ; Sun, 14 May 2023 16:32:16 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web10.70177.1684081932406911614 for ; Sun, 14 May 2023 09:32:12 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=VroUgE2j; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-6436e004954so12278632b3a.0 for ; Sun, 14 May 2023 09:32:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684081931; x=1686673931; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=zPfrUkaTAgP5PdKDBCba+VWzcKYj10eedYkXl25GdsY=; b=VroUgE2jZwASVGzN2Jf2Kmt+jz/V8JOTMdyp8nZrglXAj13gqQLWugZGwEcnRc3JkU UBKoB6P5YMbBOUTRwnbJqjdmLRqL2hfJ2qkqo8W1+qfJaj1THcRxLsPTD0QtH99Lv7/e fsweHI//HZt0MOcb78IaSFyxkFlIjZijt5yCy4IMgpc3PLlLFPs9cMQgAsOoDbrIptMn Uh9rwk0GGsqInUWBY5Vz047Yt8jP+biHq1CPzM9WZTqfmTYIkbFHpbmpfV1LbMJHaYbU r20rYiNdN0HeHKbAgoyDANhBg1G5UHy9yyIcjvgUYC1wRhJSSCuJ6qrmIcHtWacQB+R4 P2dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684081931; x=1686673931; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zPfrUkaTAgP5PdKDBCba+VWzcKYj10eedYkXl25GdsY=; b=khS7hrdOhKG89YkrhjBqvcBuYw0HqR33n7DhJmaYCB7n7hFq5NZ5PTzSZsoNM/+V+1 gCp4OqDo4vbJZXQAotueLmQxgodFQMDnTzYi/fpdzf+qnbYhdVni1SPd2HJZqA8sXXdt st03qphLr3hRs0x/ytm6Xfm4GRuTTIOtoWl6i80BLYg7LW1RA9aQG8vGxoqtjOJMVt2i +yvGnlRyUSGRa/8WTqZp3jMzucmrTRudNAvSiNlnkPn+ymIWVG1Y+AeOrEFAwh4Ndmsw dzRu6jyHPJArgyV3UJzRl8IVUn6T/mVQ2UN/PjvZbe3fOxg7g5n2oYu441txob6BMMff GHew== X-Gm-Message-State: AC+VfDz1/YkySeGIEKu+2y+iQGZADKg2SO80/WOhxf1z7gj2+vXIQkW7 bVSV3GNt39Hpz5fJFv5fKrqO7x48lWY/nIn63rE= X-Google-Smtp-Source: ACHHUZ4M4E3O38jWHJpCK4j0bveU3Ig+VPBv/xF/SXQTn9L8B0eciY/GqAb+/vE/8WEmHcxc7VuQ5w== X-Received: by 2002:a05:6a00:10ce:b0:639:9089:798e with SMTP id d14-20020a056a0010ce00b006399089798emr40640335pfu.19.1684081931521; Sun, 14 May 2023 09:32:11 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id x14-20020aa784ce000000b006475f831838sm981877pfn.30.2023.05.14.09.32.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 May 2023 09:32:11 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 14/15] maintainers.inc: Move repo to unassigned Date: Sun, 14 May 2023 06:31:39 -1000 Message-Id: <0b5bab7aa8bae98ee7fcb2a8863d4c10ac0ca37f.1684081748.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 14 May 2023 16:32:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181215 From: Richard Purdie Signed-off-by: Richard Purdie (cherry picked from commit a51a069bad78c578122ae1a5b500f715246d413d) Signed-off-by: Steve Sakoman --- 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 " RECIPE_MAINTAINER:pn-quota = "Anuj Mittal " RECIPE_MAINTAINER:pn-re2c = "Khem Raj " RECIPE_MAINTAINER:pn-readline = "Hongxu Jia " -RECIPE_MAINTAINER:pn-repo = "Jasper Orschulko " +RECIPE_MAINTAINER:pn-repo = "Unassigned " RECIPE_MAINTAINER:pn-resolvconf = "Chen Qi " RECIPE_MAINTAINER:pn-rgb = "Unassigned " RECIPE_MAINTAINER:pn-rpcbind = "Hongxu Jia " From patchwork Sun May 14 16:31:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 23921 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6673C7EE23 for ; Sun, 14 May 2023 16:32:16 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web11.69687.1684081934176543339 for ; Sun, 14 May 2023 09:32:14 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=0QmRPCzF; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6434e65d808so12560554b3a.3 for ; Sun, 14 May 2023 09:32:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684081933; x=1686673933; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Mr6EXtWOz5a0FnAsDLC/NPPCikoz8p0AbDOZS/clu+s=; b=0QmRPCzFVTBtVOGH1mJ/1m2m+DPEXU5xD9ybtNWYu3vIHg3pQQMF4d64XJ/2nAIIL8 iNQYWzlrr0M8dZzCuZEWi23xcctJBC2Cpeop/iJrGqSto3zNI1zPq7X/mBmoRgkNptQA +PTGSw8ewVOx6AmuXwxbSXc4kjjb5+i8/l3m2uC5Bof8qaJVCwBRSuRDBckLGwys99IU DoNfZvPKallTfvmcRZZFjw8U+L9hT9P58yDosQ8CjR2aLVV20vyVbMec9VshQPDhGYLD phpzr2p323IINLp3X7/Aes354MIR/59oUWt0wOKqe2zMTGRnUdlCmpJkTMLzHAI29udB qY3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684081933; x=1686673933; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Mr6EXtWOz5a0FnAsDLC/NPPCikoz8p0AbDOZS/clu+s=; b=Snpgdnh9OcgP840BQxiWtlwNBzj8TqGQCRv+SCzqmQft00ljdQRXYCwfu+LNxDeRw9 snr8gnaK5u9W6aNbM+p5c4IZ4VVanO0P2MPuJc55tU84Nv/Tcg7FCjnduCECadTarkNj 89phmHwH8w81c2urN4ejrSQ0QRXqh9K+Cik2qeAh5FMuH3KPtLmm0+Zq5+cASFhlQdsp 4nM9ALXBvGp5W0gIp1qhHVpC3VpqyNI0q5azWPMHxAjY2A8Uf7ozBMFOndXZUa5eEHF4 QB9ZJrdsaz1Wwv6fCKwpFvkd/DwmQYNr+aDoD/xBIKCFpLkMzmGyToAhb5fHzNos7WMN NcXQ== X-Gm-Message-State: AC+VfDzKGqjXUbbciA9d2P9vqqhVya9vZu6P0VHZKmXc8y6iw6XPB61p uvSrUSpFgpyVXhk153r9zNBqDyJBhtAoPPzurjY= X-Google-Smtp-Source: ACHHUZ4boe7bNYbL6fP1bG5BfMOwClYs3vZjXxkAKBdyIR9jRlQT3C6XHGVfQ+3CodQJTuUiG3DDMw== X-Received: by 2002:a05:6a00:a21:b0:62a:d752:acc5 with SMTP id p33-20020a056a000a2100b0062ad752acc5mr43315042pfh.32.1684081933236; Sun, 14 May 2023 09:32:13 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id x14-20020aa784ce000000b006475f831838sm981877pfn.30.2023.05.14.09.32.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 May 2023 09:32:12 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 15/15] machine/qemuarm*: don't explicitly set vmalloc Date: Sun, 14 May 2023 06:31:40 -1000 Message-Id: <2c5af07819b4a555737da9f07aa5236579300027.1684081748.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 14 May 2023 16:32:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181216 From: Ross Burton 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= 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 Signed-off-by: Steve Sakoman --- 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)}"