From patchwork Wed Jan 18 14:22:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 18283 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 3F04BC32793 for ; Wed, 18 Jan 2023 14:22:34 +0000 (UTC) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.groups.io with SMTP id smtpd.web10.16171.1674051745049916113 for ; Wed, 18 Jan 2023 06:22:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=V2qPCXhJ; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.54, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f54.google.com with SMTP id l8so7664340wms.3 for ; Wed, 18 Jan 2023 06:22:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=jw0d5rmnnNUcZmDYUJMD+BYhG8emKFc4Bw9KwgdRoh4=; b=V2qPCXhJxkN1rAJ5Vcn6mdGDxRUMOtsbOxH5bXDFT3kh34az/UoTnbUzYroYaodP83 /SCB/7PLQGlS7PNenY5ivdomGbqvgbDz9LY+5vNmWEmZlfHTAKaPs8YSG48cc7MUWhiD IXc10q8OV4Xu6Vh2eYcYhCekq26z3Lkr/cGMU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jw0d5rmnnNUcZmDYUJMD+BYhG8emKFc4Bw9KwgdRoh4=; b=kmDiRRQyT9bGdcAFqTspQ0ED362i/ffl/5B65SimlrUwiifMP9lPULMSSNeqSHYyRm hT8CVHUWMplHobrKm/85qRM3ym8E7A730xrz6eAKsDXYDOQ5W2/ZMfRcYL6TNByAwbaK rw72Coqj9tfWByalPyGkWM28kBe9d0RquXXmyRPXSaFJVCmrBuMBNqkjv0BTX0qLgc5T jPlGv9uYCyeBpgKiBr8KA65cbLpbxkO5IsI1d6VBj5U/lKoBKlMABZ3i00a9hEg2UK+b 3JO3tNIUNQxk4tKq6+R9B3o3vvadavPBjHwrHLvIndLgfbl4uv/AWcB0GUjreoKYhiLt 1TCg== X-Gm-Message-State: AFqh2kp6WJT2VAu3/DMuEH74jeKLHtIAarbRZZbYu//7itI2/onREPmy kNa2aqDC2Fl4P+c9RV2gVy1yekA3tQv7+d5N X-Google-Smtp-Source: AMrXdXt+9Y8ixOckqPGNlB0slkXbj4S9QnJm5NQHpMWocqCm94i4LB/1bXl/u4A/5f9CFChdE0WxUg== X-Received: by 2002:a05:600c:384d:b0:3da:f7ee:6a80 with SMTP id s13-20020a05600c384d00b003daf7ee6a80mr6819225wmr.37.1674051742943; Wed, 18 Jan 2023 06:22:22 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:54cb:642:5dda:e3f7]) by smtp.gmail.com with ESMTPSA id bd24-20020a05600c1f1800b003db122d5ac2sm2133304wmb.15.2023.01.18.06.22.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 06:22:22 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/3] insane: Improve patch warning/error handling Date: Wed, 18 Jan 2023 14:22:19 +0000 Message-Id: <20230118142221.1926666-1-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 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 ; Wed, 18 Jan 2023 14:22:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176098 Currently, whilst patch errors or warnings are shown, the errors don't stop builds. The configuration isn't very configurable from WARN_QA and ERROR_QA either. This patch: * Uses the standard mechanisms to handle the patch fuzz warnings/errors * Makes Upstream-Status checking configurable from WARN/ERROR_QA * Allows that checking to be used with non-core layers * Makes patch-fuzz an error by default * Enables warnings for missing Upstream-Status in non-core layer patches by default Signed-off-by: Richard Purdie --- meta/classes-global/insane.bbclass | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass index ada8a7ef4e4..e1295f85392 100644 --- a/meta/classes-global/insane.bbclass +++ b/meta/classes-global/insane.bbclass @@ -29,11 +29,12 @@ WARN_QA ?= " libdir xorg-driver-abi buildpaths \ textrel incompatible-license files-invalid \ infodir build-deps src-uri-bad symlink-to-sysroot multilib \ - invalid-packageconfig host-user-contaminated uppercase-pn patch-fuzz \ + invalid-packageconfig host-user-contaminated uppercase-pn \ mime mime-xdg unlisted-pkg-lics unhandled-features-check \ missing-update-alternatives native-last missing-ptest \ license-exists license-no-generic license-syntax license-format \ license-incompatible license-file-missing obsolete-license \ + patch-status-noncore \ " ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \ perms dep-cmp pkgvarcheck perm-config perm-line perm-link \ @@ -44,6 +45,7 @@ ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \ already-stripped installed-vs-shipped ldflags compile-host-path \ install-host-path pn-overrides unknown-configure-option \ useless-rpaths rpaths staticdev empty-dirs \ + patch-fuzz patch-status-core\ " # Add usrmerge QA check based on distro feature ERROR_QA:append = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', ' usrmerge', '', d)}" @@ -1334,24 +1336,27 @@ python do_qa_patch() { msg += " devtool modify %s\n" % d.getVar('PN') msg += " devtool finish --force-patch-refresh %s \n\n" % d.getVar('PN') msg += "Don't forget to review changes done by devtool!\n" - if bb.utils.filter('ERROR_QA', 'patch-fuzz', d): - bb.error(msg) - elif bb.utils.filter('WARN_QA', 'patch-fuzz', d): - bb.warn(msg) - msg = "Patch log indicates that patches do not apply cleanly." + msg += "\nPatch log indicates that patches do not apply cleanly." oe.qa.handle_error("patch-fuzz", msg, d) # Check if the patch contains a correctly formatted and spelled Upstream-Status import re from oe import patch + allpatches = False + if bb.utils.filter('ERROR_QA', 'patch-status-noncore', d) or bb.utils.filter('WARN_QA', 'patch-status-noncore', d): + allpatches = True + coremeta_path = os.path.join(d.getVar('COREBASE'), 'meta', '') for url in patch.src_patches(d): (_, _, fullpath, _, _, _) = bb.fetch.decodeurl(url) # skip patches not in oe-core + patchtype = "patch-status-core" if not os.path.abspath(fullpath).startswith(coremeta_path): - continue + patchtype = "patch-status-noncore" + if not allpatches: + continue kinda_status_re = re.compile(r"^.*upstream.*status.*$", re.IGNORECASE | re.MULTILINE) strict_status_re = re.compile(r"^Upstream-Status: (Pending|Submitted|Denied|Accepted|Inappropriate|Backport|Inactive-Upstream)( .+)?$", re.MULTILINE) @@ -1364,9 +1369,13 @@ python do_qa_patch() { if not match_strict: if match_kinda: - bb.error("Malformed Upstream-Status in patch\n%s\nPlease correct according to %s :\n%s" % (fullpath, guidelines, match_kinda.group(0))) + msg = "Malformed Upstream-Status in patch\n%s\nPlease correct according to %s :\n%s" % (fullpath, guidelines, match_kinda.group(0)) + oe.qa.handle_error(patchtype, msg, d) else: - bb.error("Missing Upstream-Status in patch\n%s\nPlease add according to %s ." % (fullpath, guidelines)) + msg = "Missing Upstream-Status in patch\n%s\nPlease add according to %s ." % (fullpath, guidelines) + oe.qa.handle_error(patchtype, msg, d) + + oe.qa.exit_if_errors(d) } python do_qa_configure() { From patchwork Wed Jan 18 14:22:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 18284 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 40F6AC38147 for ; Wed, 18 Jan 2023 14:22:34 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.groups.io with SMTP id smtpd.web10.16172.1674051745327130099 for ; Wed, 18 Jan 2023 06:22:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=Q4ACmdKw; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.47, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f47.google.com with SMTP id f25-20020a1c6a19000000b003da221fbf48so1637867wmc.1 for ; Wed, 18 Jan 2023 06:22:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; 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=EPfeP7Tw9jQsX58dNQ139Dsl2kloTur9inSXiUiKfMY=; b=Q4ACmdKwcmStmUF5XjsIwUq214gSvcPXmRcLDPgd1q20DTiNTeK4BC+OmeW7MkQiDK zndgiiNxhjd6Z8YCKIRat9sf7od2j9dxMg/7n/WSTS4B31nDoWduXKY3W4Em2WfO7I0F eFEmHVqbe/pqdzv3MB5MjxfS8I+Tma44YlP4g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=EPfeP7Tw9jQsX58dNQ139Dsl2kloTur9inSXiUiKfMY=; b=CnJyQKO4uBHDSRXK/GnT7e7GsZdibwFpbeBDboGL0wRWEAZMTYMqTNAO4owkAX3RkC 1eCPn4INYVUl3DzelGxgGrdLOyxfZymJgrEP2oTP3huX0VIz1zMIMBY+tAI5/i4y2k8w ds5WxFoKmoS2GPlHljwvDYri/6ktA8P11Ob8JrOgELtuj+hrlElhW7UQHiTEHqETcMHH 2EzAnVsu+UpPTmKYHcvhwoYTukk6DsntgsEsNzzx5bTOMMwhC7H/l1bPH6vK9EgxLICp aPI+v61WNEPaPIOPkWzOP/iWlIgHF2mgtGe71GUikjyQ/1fEXhVYwqPEnr0pUBSm3PgW bz/A== X-Gm-Message-State: AFqh2kohIIUV0rcNgPbJNIqdpHMnPeyoNgK6avsbKQb/cm1Bc9pX4lAs UBP0gbc5lH+xiJh1XrSHA3wdgrd8fURpCqie X-Google-Smtp-Source: AMrXdXsRMlhcU7Q4mHYrUlx1fgjG0sbxMlZVt/FzHYYH433omyB1qdC9Jdli8KGqWnvJgGrP9YjaXw== X-Received: by 2002:a7b:cb88:0:b0:3d9:f801:73bf with SMTP id m8-20020a7bcb88000000b003d9f80173bfmr6990398wmi.12.1674051743485; Wed, 18 Jan 2023 06:22:23 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:54cb:642:5dda:e3f7]) by smtp.gmail.com with ESMTPSA id bd24-20020a05600c1f1800b003db122d5ac2sm2133304wmb.15.2023.01.18.06.22.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 06:22:23 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/3] pseudo: Update to pull in linux-libc-headers race fix Date: Wed, 18 Jan 2023 14:22:20 +0000 Message-Id: <20230118142221.1926666-2-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230118142221.1926666-1-richard.purdie@linuxfoundation.org> References: <20230118142221.1926666-1-richard.purdie@linuxfoundation.org> 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 ; Wed, 18 Jan 2023 14:22:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176099 Update to pull in: pseudo.c: Avoid patch mismatch errors for NAMELESS file entries In rare cases we see failures, often in linux-libc-headers for things like: | INSTALL /XXX/linux-libc-headers/6.1-r0/image/usr/include | abort()ing pseudo client by server request. See https://wiki.yoctoproject.org/wiki/Pseudo_Abort for more details on this. Pseudo log: path mismatch [2 links]: ino 46662476 db 'NAMELESS FILE' req '/XXX/linux-libc-headers/6.1-r0/image/usr'. Setup complete, sending SIGUSR1 to pid 3630890. Whilst this doesn't easily reproduce, the issue is that multiple different processes are likely working on the directory and the creation in pseudo might not match accesses made by other processes. Ultimately, the "NAMELESS FILE" is harmless and pseudo will reconcile things so rather than error out, we should ignore this case. Signed-off-by: Richard Purdie --- meta/recipes-devtools/pseudo/pseudo_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index 1a708066f73..c9386c3f090 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -13,7 +13,7 @@ SRC_URI:append:class-nativesdk = " \ file://older-glibc-symbols.patch" SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa" -SRCREV = "c9670c27ff67ab899007ce749254b16091577e55" +SRCREV = "cc1f6167cb5065daba1462056e2dce8ff72aa855" S = "${WORKDIR}/git" PV = "1.9.0+git${SRCPV}" From patchwork Wed Jan 18 14:22:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 18285 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 54EE2C46467 for ; Wed, 18 Jan 2023 14:22:34 +0000 (UTC) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.groups.io with SMTP id smtpd.web11.16443.1674051745820458003 for ; Wed, 18 Jan 2023 06:22:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=bVxAwPGw; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.44, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f44.google.com with SMTP id f19-20020a1c6a13000000b003db0ef4dedcso1505241wmc.4 for ; Wed, 18 Jan 2023 06:22:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; 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=adNb7KXOYcpJAAtnn3lvKYxM0GEGZnav6d9sj93OZnI=; b=bVxAwPGw7+fXCyKVWkgE+UKa+/qlQgfqOtT2PIERRChHZpx7/xf9883hX6/SDDvnSb PwVGMPMrIZ3nC56LuXIB4LIeNB8GuS7NI3YwBVoorKZxANI+1tTgOljxeKwguI+Z2l7U gHHB5ple2LbVU5DK+2IVeX9mmfwqmd7Xm+Jws= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=adNb7KXOYcpJAAtnn3lvKYxM0GEGZnav6d9sj93OZnI=; b=Cr8CmW1NYXj51RlAvC8uK23zr1GbB0aJ2QG5CPbUHVDPdUFPI0DVFOL/SJrfxN+HwE fN5jzAXD+b+AxdT76GzeNdNulcupf/svwH+uh2cNg14vJiElHs1XqRICVfdNT++YZdZx VL/Qvn3Jo0MI2Yoev14AJNxXgBbREKjfNQSPSlKkJZtKWgPUINSCnJyxoGt0YVOXDrZ2 6pBpPyhv9QyJznDUzc98ZCmyJ5a4NqFdbHhPaSb/cQ3qTFPDnHGhwEhUSCjhQoYl89ZP qw9qMRrJWLJotBXTr6E7igjZiYASx+GGceth/a9mj7QJVIlsfQ+lynfLvQzXFiiK0VrB SMqg== X-Gm-Message-State: AFqh2kpkwYwbnqs/cy83lo8/QAHURoS4AvbVSnUvX7NPkWMRYgbi3mAu ugFDErOCzORcQCGFLwevya/kGwKwpM6TlBA7 X-Google-Smtp-Source: AMrXdXsBCCi4fdlYNbDoVVlE/LzwrF3ZlbcOculbhTRFnSCNxjN4Dv6WqPZZ2QekjOolhK7AOImF2Q== X-Received: by 2002:a05:600c:314b:b0:3d2:3ca2:2d4f with SMTP id h11-20020a05600c314b00b003d23ca22d4fmr7197527wmo.36.1674051744126; Wed, 18 Jan 2023 06:22:24 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:54cb:642:5dda:e3f7]) by smtp.gmail.com with ESMTPSA id bd24-20020a05600c1f1800b003db122d5ac2sm2133304wmb.15.2023.01.18.06.22.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 06:22:23 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/3] pseudo: Switch back to the master branch Date: Wed, 18 Jan 2023 14:22:21 +0000 Message-Id: <20230118142221.1926666-3-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230118142221.1926666-1-richard.purdie@linuxfoundation.org> References: <20230118142221.1926666-1-richard.purdie@linuxfoundation.org> 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 ; Wed, 18 Jan 2023 14:22:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176100 OE is the main user of pseudo and we've had the changes in the oe-core branch around long enough that we're going to run with them. Swicth back to directly using the master branch. Signed-off-by: Richard Purdie --- meta/recipes-devtools/pseudo/pseudo_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index c9386c3f090..553f0254ee4 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -1,6 +1,6 @@ require pseudo.inc -SRC_URI = "git://git.yoctoproject.org/pseudo;branch=oe-core \ +SRC_URI = "git://git.yoctoproject.org/pseudo \ file://0001-configure-Prune-PIE-flags.patch \ file://fallback-passwd \ file://fallback-group \