From patchwork Thu Apr 6 16:01:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22322 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 45C9DC76196 for ; Thu, 6 Apr 2023 16:02:06 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web11.162506.1680796922262100891 for ; Thu, 06 Apr 2023 09:02:02 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=xKrzI6P4; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id q2so1811696pll.7 for ; Thu, 06 Apr 2023 09:02:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796921; x=1683388921; 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=BBPyuz6fAzAgSWagEh0hoS4OG7ikz5s0xRsc81gcWQA=; b=xKrzI6P41XExGipTTm/pHk6Qhvqf7uDz2s1B9VX6m6YJbY8h3lqNa2F3AhwKD+9Jgn 3mKtDeKBODe1qH/R26d6IFYz4B8dTSauLjH7oMzhhbYe+2FkV4SBDM6vFUVo2CzTEfR+ uqqyQss9pEk2+h3rFM8dfYBZyBlSJlaikt5/VBgLWbuVsEK40rFr28iRqga6tbRHDOaG ZLdbvoGOvr90NngqQ2sQpQzErYrBsottcbCVspsNDVbIdwB6IkBLxytscbkbAbitoxuN up7LFBXqkpuoxubcn95yF0myHD2OakevSJQt5nThsrH0zmK5gxgU1u42KDkijm1fpYvh csVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796921; x=1683388921; 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=BBPyuz6fAzAgSWagEh0hoS4OG7ikz5s0xRsc81gcWQA=; b=w0dAS3zFuohQ71osoJbOGFyDFimx+z5GRNVM+RNUPX7cDuh2k0tf0nG1QV3+y2CTc5 4jhgDZG5vtMrmPymUq8iAVdZNOw/asZ608VC5iBDofTQKcRNOBlx/P2rCGAZrwJR/LM0 +rXFFY3d0O7p04/n6Qiuy39NZyyNmxYA8KVOmCOfb2TP/BAkiTbGwllBhJI2AvjuBMg1 QuUxG6GOCmXC7+QS7g4j6nxy1mJwqkEHb5T1tdav+dVZ4sleW9nEWTsHOL4Jhau0y9Cp 108mq4cxihEcHZ3zOsblzPefNbeDGxyKNf1MuBeWfiN69lgWV1GD8kXM0F93hc/iIpWr Tl9Q== X-Gm-Message-State: AAQBX9cKs5UMcbqG5RO8mdhbgTVguWGZVAdFPHpiLmO338838xHFuUHP To/RzX9HSM9QtaSRT9ZYDfiQqAm8MtdB2apRaGk= X-Google-Smtp-Source: AKy350bnPbltYeQThPbGTTijxVLPtp7B/izE4k1Juv3mhONFJ2IFhmlSlymTsgDJG/+wsjnp0a/ZmA== X-Received: by 2002:a05:6a20:4d83:b0:d9:840f:79c2 with SMTP id gj3-20020a056a204d8300b000d9840f79c2mr88136pzb.2.1680796921178; Thu, 06 Apr 2023 09:02:01 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:00 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 01/26] xdg-utils: Add a patch for CVE-2020-27748 Date: Thu, 6 Apr 2023 06:01:28 -1000 Message-Id: <5b14528e7bfe2f0a29cc2d40253e49be5202efcf.1680796770.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 ; Thu, 06 Apr 2023 16:02:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179779 From: Richard Purdie Take a patch submitted upstream for the issue while upstream decide what to do. We don't use thunderbird integration so this isn't an issue for us. Signed-off-by: Richard Purdie (cherry picked from commit b85b7714a44caa70beb2f115483ee52745aa1b97) Signed-off-by: Steve Sakoman --- .../xdg-utils/xdg-utils/CVE-2020-27748.patch | 145 ++++++++++++++++++ .../xdg-utils/xdg-utils_1.1.3.bb | 1 + 2 files changed, 146 insertions(+) create mode 100644 meta/recipes-extended/xdg-utils/xdg-utils/CVE-2020-27748.patch diff --git a/meta/recipes-extended/xdg-utils/xdg-utils/CVE-2020-27748.patch b/meta/recipes-extended/xdg-utils/xdg-utils/CVE-2020-27748.patch new file mode 100644 index 0000000000..ec3605e158 --- /dev/null +++ b/meta/recipes-extended/xdg-utils/xdg-utils/CVE-2020-27748.patch @@ -0,0 +1,145 @@ +xdg-email does not parse mailto uris properly for thunderbird + +When using thunderbird as mailto handler xdg-email translates mailto uris into an 'thunderbird -compose' argument. While to, cc and bcc values are properly enclosed in single quotes this is not the case for subject or body. This breaks functionality and allows to use all thunderbird -compose arguments within a mailto uri, e.g. + +xdg-email 'mailto:test@example.com?subject=Test,attachment=~/.thunderbird/profiles.ini,message=/home/test/test.txt' + +translates into + +thunderbird -compose to='test@example.com,',subject=Test,attachment=~/.thunderbird/profiles.ini,message=/home/test/test.txt + +with working attachment and message. (And, yes, ~ expands to the home directory.) + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/xdg/xdg-utils/-/issues/205] + +Signed-off-by: Richard Purdie + +CVE: CVE-2020-27748 + + +Index: xdg-utils-1.1.3/scripts/xdg-email.in +=================================================================== +--- xdg-utils-1.1.3.orig/scripts/xdg-email.in ++++ xdg-utils-1.1.3/scripts/xdg-email.in +@@ -30,53 +30,6 @@ _USAGE + + #@xdg-utils-common@ + +-run_thunderbird() +-{ +- local THUNDERBIRD MAILTO NEWMAILTO TO CC BCC SUBJECT BODY +- THUNDERBIRD="$1" +- MAILTO=$(echo "$2" | sed 's/^mailto://') +- echo "$MAILTO" | grep -qs "^?" +- if [ "$?" = "0" ] ; then +- MAILTO=$(echo "$MAILTO" | sed 's/^?//') +- else +- MAILTO=$(echo "$MAILTO" | sed 's/^/to=/' | sed 's/?/\&/') +- fi +- +- MAILTO=$(echo "$MAILTO" | sed 's/&/\n/g') +- TO=$(/bin/echo -e $(echo "$MAILTO" | grep '^to=' | sed 's/^to=//;s/%\(..\)/\\x\1/g' | awk '{ printf "%s,",$0 }')) +- CC=$(/bin/echo -e $(echo "$MAILTO" | grep '^cc=' | sed 's/^cc=//;s/%\(..\)/\\x\1/g' | awk '{ printf "%s,",$0 }')) +- BCC=$(/bin/echo -e $(echo "$MAILTO" | grep '^bcc=' | sed 's/^bcc=//;s/%\(..\)/\\x\1/g' | awk '{ printf "%s,",$0 }')) +- SUBJECT=$(echo "$MAILTO" | grep '^subject=' | tail -n 1) +- BODY=$(echo "$MAILTO" | grep '^body=' | tail -n 1) +- +- if [ -z "$TO" ] ; then +- NEWMAILTO= +- else +- NEWMAILTO="to='$TO'" +- fi +- if [ -n "$CC" ] ; then +- NEWMAILTO="${NEWMAILTO},cc='$CC'" +- fi +- if [ -n "$BCC" ] ; then +- NEWMAILTO="${NEWMAILTO},bcc='$BCC'" +- fi +- if [ -n "$SUBJECT" ] ; then +- NEWMAILTO="${NEWMAILTO},$SUBJECT" +- fi +- if [ -n "$BODY" ] ; then +- NEWMAILTO="${NEWMAILTO},$BODY" +- fi +- +- NEWMAILTO=$(echo "$NEWMAILTO" | sed 's/^,//') +- DEBUG 1 "Running $THUNDERBIRD -compose \"$NEWMAILTO\"" +- "$THUNDERBIRD" -compose "$NEWMAILTO" +- if [ $? -eq 0 ]; then +- exit_success +- else +- exit_failure_operation_failed +- fi +-} +- + open_kde() + { + if [ -n "$KDE_SESSION_VERSION" ] && [ "$KDE_SESSION_VERSION" -ge 5 ]; then +@@ -130,15 +83,6 @@ open_kde() + + open_gnome3() + { +- local client +- local desktop +- desktop=`xdg-mime query default "x-scheme-handler/mailto"` +- client=`desktop_file_to_binary "$desktop"` +- echo $client | grep -E 'thunderbird|icedove' > /dev/null 2>&1 +- if [ $? -eq 0 ] ; then +- run_thunderbird "$client" "$1" +- fi +- + if gio help open 2>/dev/null 1>&2; then + DEBUG 1 "Running gio open \"$1\"" + gio open "$1" +@@ -159,13 +103,6 @@ open_gnome3() + + open_gnome() + { +- local client +- client=`gconftool-2 --get /desktop/gnome/url-handlers/mailto/command | cut -d ' ' -f 1` || "" +- echo $client | grep -E 'thunderbird|icedove' > /dev/null 2>&1 +- if [ $? -eq 0 ] ; then +- run_thunderbird "$client" "$1" +- fi +- + if gio help open 2>/dev/null 1>&2; then + DEBUG 1 "Running gio open \"$1\"" + gio open "$1" +@@ -231,15 +168,6 @@ open_flatpak() + + open_generic() + { +- local client +- local desktop +- desktop=`xdg-mime query default "x-scheme-handler/mailto"` +- client=`desktop_file_to_binary "$desktop"` +- echo $client | grep -E 'thunderbird|icedove' > /dev/null 2>&1 +- if [ $? -eq 0 ] ; then +- run_thunderbird "$client" "$1" +- fi +- + xdg-open "$1" + local ret=$? + +@@ -364,21 +292,6 @@ while [ $# -gt 0 ] ; do + shift + ;; + +- --attach) +- if [ -z "$1" ] ; then +- exit_failure_syntax "file argument missing for --attach option" +- fi +- check_input_file "$1" +- file=`readlink -f "$1"` # Normalize path +- if [ -z "$file" ] || [ ! -f "$file" ] ; then +- exit_failure_file_missing "file '$1' does not exist" +- fi +- +- url_encode "$file" +- options="${options}attach=${result}&" +- shift +- ;; +- + -*) + exit_failure_syntax "unexpected option '$parm'" + ;; diff --git a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb b/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb index 73acf6b744..d95bcccd2a 100644 --- a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb +++ b/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb @@ -21,6 +21,7 @@ SRC_URI = "https://portland.freedesktop.org/download/${BPN}-${PV}.tar.gz \ file://0001-Reinstate-xdg-terminal.patch \ file://0001-Don-t-build-the-in-script-manual.patch \ file://1f199813e0eb0246f63b54e9e154970e609575af.patch \ + file://CVE-2020-27748.patch \ " SRC_URI[md5sum] = "902042508b626027a3709d105f0b63ff" From patchwork Thu Apr 6 16:01: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: 22323 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 1BEF8C7618D for ; Thu, 6 Apr 2023 16:02:26 +0000 (UTC) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mx.groups.io with SMTP id smtpd.web10.162507.1680796942953414508 for ; Thu, 06 Apr 2023 09:02:23 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=RkauMXK7; spf=softfail (domain: sakoman.com, ip: 209.85.215.169, mailfrom: steve@sakoman.com) Received: by mail-pg1-f169.google.com with SMTP id d22so24024832pgw.2 for ; Thu, 06 Apr 2023 09:02:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796942; x=1683388942; 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=o2ipQVtPBK3Fbd8TRu+R0EH2BoZd9S5KIz27LFTFGmc=; b=RkauMXK7IrR1dnJh1IqbdnlGdfGRUZa8+c7eI+mWYlCYdxeJhDmKSR+gmYSlXRlGgW y3aHZZY5LwVsYhNYABOkwsUr9OOhwUc6mbJjgpEGc8lHJcZ5wJxZRl2ml6TP/E7FC48n PT0PLnLleeg8oqHxERAw9mbr4KkeXLsJmZlF6anCRe2DJtJt4kVPbAR4RLnakttzcaIr GW9/PI5icEY+MYYrrb8cjkfC1yIlxIyyYy5D3i0W2cexfAQZ/hjvwF8MplrO0O06wVSU 70hYqUURvoOR1WDvQ6b1LjQs9qTZbG265d9wju1HweiZCdRZK1nPMlI793ngJw02krQP cm+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796942; x=1683388942; 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=o2ipQVtPBK3Fbd8TRu+R0EH2BoZd9S5KIz27LFTFGmc=; b=wMZE7fNRegocrebGgTqEJO4u1bHDv613XF3x7cL/+/uld5nGuEV8bHtMzcBe6qLMBU Y8I2+skOlmxl/PSMj4ZDOhiEBVV5xjnHvXCd/ezcKiCpc1XarJueMBcozUDteCgL3XeB g1c4t7RkViRksb1YY00P49gZ/PASvdDyw92UwQxpdaU3o2oVJllTKF2diG8Z+1ZjdK7H 8nPRLDIr8ceWtNxwNHl3FT/I8ePb/ZIDSvzVWsctxNI0W4z87uhdTUs/QQ0St+f8MGl8 C24WGIPz0qdbYB7BYITiIW8lHc/3YgPi2l0eFCce8ZgMEdoR8yh9SjO3WKSSoFhMU8Fs bKqQ== X-Gm-Message-State: AAQBX9fZ3Gfibfzj9NOZdHjgyVFnV/vP47VbAi6+j32hgcoqM2l/fK0M hQ7iFxHb7E43etwI2udWmMOvJeB4td+R3qP3cBc= X-Google-Smtp-Source: AKy350aMdE/ZoDe4KufmkJhaslie5Tf/Jj3h+iWgudhuDKdD8E2p4Wag30oowV7xGo8s8P7mai1lHQ== X-Received: by 2002:a62:1842:0:b0:62a:4503:53ba with SMTP id 63-20020a621842000000b0062a450353bamr10272226pfy.26.1680796941891; Thu, 06 Apr 2023 09:02:21 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:21 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 02/26] xdg-utils: Fix CVE number Date: Thu, 6 Apr 2023 06:01:29 -1000 Message-Id: <2d03615127bb58d7865e04230ff42421b56a4c43.1680796770.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 ; Thu, 06 Apr 2023 16:02:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179780 From: Richard Purdie In the previous commit I somehow mixed up and used an incorrect CVE number. Use the correct one. Signed-off-by: Richard Purdie (cherry picked from commit b3e2729f686ff6e16e11590bcd701c057ae5f1e2) Signed-off-by: Steve Sakoman --- .../xdg-utils/{CVE-2020-27748.patch => CVE-2022-4055.patch} | 2 +- meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/xdg-utils/xdg-utils/{CVE-2020-27748.patch => CVE-2022-4055.patch} (99%) diff --git a/meta/recipes-extended/xdg-utils/xdg-utils/CVE-2020-27748.patch b/meta/recipes-extended/xdg-utils/xdg-utils/CVE-2022-4055.patch similarity index 99% rename from meta/recipes-extended/xdg-utils/xdg-utils/CVE-2020-27748.patch rename to meta/recipes-extended/xdg-utils/xdg-utils/CVE-2022-4055.patch index ec3605e158..b236030108 100644 --- a/meta/recipes-extended/xdg-utils/xdg-utils/CVE-2020-27748.patch +++ b/meta/recipes-extended/xdg-utils/xdg-utils/CVE-2022-4055.patch @@ -14,7 +14,7 @@ Upstream-Status: Submitted [https://gitlab.freedesktop.org/xdg/xdg-utils/-/issue Signed-off-by: Richard Purdie -CVE: CVE-2020-27748 +CVE: CVE-2022-4055 Index: xdg-utils-1.1.3/scripts/xdg-email.in diff --git a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb b/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb index d95bcccd2a..4d93180535 100644 --- a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb +++ b/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb @@ -21,7 +21,7 @@ SRC_URI = "https://portland.freedesktop.org/download/${BPN}-${PV}.tar.gz \ file://0001-Reinstate-xdg-terminal.patch \ file://0001-Don-t-build-the-in-script-manual.patch \ file://1f199813e0eb0246f63b54e9e154970e609575af.patch \ - file://CVE-2020-27748.patch \ + file://CVE-2022-4055.patch \ " SRC_URI[md5sum] = "902042508b626027a3709d105f0b63ff" From patchwork Thu Apr 6 16:01:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22324 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 1D45CC761A6 for ; Thu, 6 Apr 2023 16:02:26 +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.162485.1680796920610777600 for ; Thu, 06 Apr 2023 09:02:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=3mZT3kDj; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id u38so26062683pfg.10 for ; Thu, 06 Apr 2023 09:02:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796944; x=1683388944; 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=BsAAXkhSia67lYmUiW39q3nSzzFD17qNN+iZGar2KLE=; b=3mZT3kDjeOrh7jCkel1DNWSsHm7LRRs4GUsM/+jQZTD1Cuf/0Od2pK1xlBFUCIeldQ paJMrxMEclyvHqKlsWaAWspz702j+zKT1xaqUCEVAJruLl510vAtjZrTAVTtS6VBt7EH rhjjwDwVgS5uqY/sRAtbrJfGuoLEj3Xnvz+G1aNsQYtMQR6L0YGT8zzhzJO69dUIWCfs kJfYAb67h+6kXRV1jr4rrwb/Z7CiUOHVKuwasjJIAGsJ9sLn+2teWCsNnEpuGPh+29Ey BJs1ttN1AjBuhKfo2r52wuMYosD79KMMITVqPjFXomEw2NrazBPN0U9BUdlXxCtdrX+U kYww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796944; x=1683388944; 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=BsAAXkhSia67lYmUiW39q3nSzzFD17qNN+iZGar2KLE=; b=qNqAuMgzHIFCiRKZi8wWCWkBOm4QCx62QhD+3Cy6vyyKTBOt+06QyDf/cz/PqgDd4g jzk0q7XLJQwkWW1ElnmMJKAmugytR/gFvM/VQ6uHBtTDrhxl558IqaA744NYVR001RmW XIfreTdOrAjaViOzUzbbYXp/yrIY3ql+CbjC2/OXTYzOPVWj77ynrKIc/Sb2vkFrWrB1 ehLp/2syLB0lLSEfbahawKi1nkB3Mh3Ph4jzpcCQzuEnOJbzBcDN9Xg8q6Ko8Un5JlUt nTZSqbKGkqRC8byiS297aumYaaXJt7MX2TtFeD3IM55djKkUAY0aoHelqbc68DnzT33+ VJ4g== X-Gm-Message-State: AAQBX9cdFqUx+HcM3Z5dj8iLx7P6QoIy1GHg+OrAWtYZq5kV1QX7CiRx YYsNOF6LOY655xFQgG5ILylGqE59WGJKzw0CkdY= X-Google-Smtp-Source: AKy350aDeaYRwEQFUqiJQbWqFH+IecOQGQekwHoYogVIyE2fWrmQeuDUkV2MBR9ZffiG9hYQfircIg== X-Received: by 2002:aa7:9734:0:b0:627:e61e:1ae with SMTP id k20-20020aa79734000000b00627e61e01aemr9423400pfg.12.1680796943833; Thu, 06 Apr 2023 09:02:23 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:23 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 03/26] tzdata: upgrade to 2023c Date: Thu, 6 Apr 2023 06:01:30 -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 ; Thu, 06 Apr 2023 16:02:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179781 From: Ross Burton Drop a backport patch as it is now integrated. Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni (cherry picked from commit 80d26d1da47dcd9213a7083d9493a7bce0897a57) Signed-off-by: Steve Sakoman --- meta/recipes-extended/timezone/timezone.inc | 6 +- .../timezone/tzcode-native.bb | 2 - ...0001-Fix-C23-related-conformance-bug.patch | 301 ------------------ 3 files changed, 3 insertions(+), 306 deletions(-) delete mode 100644 meta/recipes-extended/timezone/tzcode/0001-Fix-C23-related-conformance-bug.patch diff --git a/meta/recipes-extended/timezone/timezone.inc b/meta/recipes-extended/timezone/timezone.inc index eec7177228..14a1ce18f3 100644 --- a/meta/recipes-extended/timezone/timezone.inc +++ b/meta/recipes-extended/timezone/timezone.inc @@ -6,7 +6,7 @@ SECTION = "base" LICENSE = "PD & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" -PV = "2022g" +PV = "2023c" SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode;subdir=tz \ http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata;subdir=tz \ @@ -16,5 +16,5 @@ S = "${WORKDIR}/tz" UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" -SRC_URI[tzcode.sha256sum] = "9610bb0b9656ff404c361a41f3286da53064b5469d84f00c9cb2314c8614da74" -SRC_URI[tzdata.sha256sum] = "4491db8281ae94a84d939e427bdd83dc389f26764d27d9a5c52d782c16764478" +SRC_URI[tzcode.sha256sum] = "46d17f2bb19ad73290f03a203006152e0fa0d7b11e5b71467c4a823811b214e7" +SRC_URI[tzdata.sha256sum] = "3f510b5d1b4ae9bb38e485aa302a776b317fb3637bdb6404c4adf7b6cadd965c" diff --git a/meta/recipes-extended/timezone/tzcode-native.bb b/meta/recipes-extended/timezone/tzcode-native.bb index 6d52b3c422..d0b23a9d80 100644 --- a/meta/recipes-extended/timezone/tzcode-native.bb +++ b/meta/recipes-extended/timezone/tzcode-native.bb @@ -2,8 +2,6 @@ require timezone.inc SUMMARY = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" -SRC_URI += "file://0001-Fix-C23-related-conformance-bug.patch" - inherit native EXTRA_OEMAKE += "cc='${CC}'" diff --git a/meta/recipes-extended/timezone/tzcode/0001-Fix-C23-related-conformance-bug.patch b/meta/recipes-extended/timezone/tzcode/0001-Fix-C23-related-conformance-bug.patch deleted file mode 100644 index c91ef93e95..0000000000 --- a/meta/recipes-extended/timezone/tzcode/0001-Fix-C23-related-conformance-bug.patch +++ /dev/null @@ -1,301 +0,0 @@ -From 509c5974398952618abdd17f39117b88e3f50057 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Thu, 1 Dec 2022 10:28:04 -0800 -Subject: [PATCH] Fix C23-related conformance bug -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Problem reported by Houge Langley for ‘gcc -std=gnu99’ in: -https://bugs.gentoo.org/show_bug.cgi?id=883719 -* NEWS: Mention this. -* date.c, localtime.c, private.h, zdump.c, zic.c: -Use ATTRIBUTE_* at the start of function declarations, -not later (such as after the keyword ‘static’). -This is required for strict conformance to C23. - -Upstream-Status: Backport [https://github.com/eggert/tz/commit/9cfe9507fcc22cd4a0c4da486ea1c7f0de6b075f] - -NEWS change skipped to avoid conflicts. - -Signed-off-by: Martin Jansa ---- - date.c | 2 +- - localtime.c | 4 ++-- - private.h | 6 +++--- - zdump.c | 12 ++++++------ - zic.c | 34 +++++++++++++++++----------------- - 5 files changed, 29 insertions(+), 29 deletions(-) - -diff --git a/date.c b/date.c -index 11c5e5fe..97df6ab0 100644 ---- a/date.c -+++ b/date.c -@@ -42,7 +42,7 @@ static void display(const char *, time_t); - static void dogmt(void); - static void errensure(void); - static void timeout(FILE *, const char *, const struct tm *); --static ATTRIBUTE_NORETURN void usage(void); -+ATTRIBUTE_NORETURN static void usage(void); - - int - main(const int argc, char *argv[]) -diff --git a/localtime.c b/localtime.c -index 1d22d351..3bf1b911 100644 ---- a/localtime.c -+++ b/localtime.c -@@ -838,7 +838,7 @@ is_digit(char c) - ** Return a pointer to that character. - */ - --static ATTRIBUTE_REPRODUCIBLE const char * -+ATTRIBUTE_REPRODUCIBLE static const char * - getzname(register const char *strp) - { - register char c; -@@ -859,7 +859,7 @@ getzname(register const char *strp) - ** We don't do any checking here; checking is done later in common-case code. - */ - --static ATTRIBUTE_REPRODUCIBLE const char * -+ATTRIBUTE_REPRODUCIBLE static const char * - getqzname(register const char *strp, const int delim) - { - register int c; -diff --git a/private.h b/private.h -index 7a73eff7..ae522986 100644 ---- a/private.h -+++ b/private.h -@@ -628,7 +628,7 @@ char *asctime(struct tm const *); - char *asctime_r(struct tm const *restrict, char *restrict); - char *ctime(time_t const *); - char *ctime_r(time_t const *, char *); --double difftime(time_t, time_t) ATTRIBUTE_UNSEQUENCED; -+ATTRIBUTE_UNSEQUENCED double difftime(time_t, time_t); - size_t strftime(char *restrict, size_t, char const *restrict, - struct tm const *restrict); - # if HAVE_STRFTIME_L -@@ -740,10 +740,10 @@ timezone_t tzalloc(char const *); - void tzfree(timezone_t); - # ifdef STD_INSPIRED - # if TZ_TIME_T || !defined posix2time_z --time_t posix2time_z(timezone_t, time_t) ATTRIBUTE_REPRODUCIBLE; -+ATTRIBUTE_REPRODUCIBLE time_t posix2time_z(timezone_t, time_t); - # endif - # if TZ_TIME_T || !defined time2posix_z --time_t time2posix_z(timezone_t, time_t) ATTRIBUTE_REPRODUCIBLE; -+ATTRIBUTE_REPRODUCIBLE time_t time2posix_z(timezone_t, time_t); - # endif - # endif - #endif -diff --git a/zdump.c b/zdump.c -index 7acb3e2d..3e482ba3 100644 ---- a/zdump.c -+++ b/zdump.c -@@ -89,7 +89,7 @@ static bool warned; - static bool errout; - - static char const *abbr(struct tm const *); --static intmax_t delta(struct tm *, struct tm *) ATTRIBUTE_REPRODUCIBLE; -+ATTRIBUTE_REPRODUCIBLE static intmax_t delta(struct tm *, struct tm *); - static void dumptime(struct tm const *); - static time_t hunt(timezone_t, time_t, time_t, bool); - static void show(timezone_t, char *, time_t, bool); -@@ -97,7 +97,7 @@ static void showextrema(timezone_t, char *, time_t, struct tm *, time_t); - static void showtrans(char const *, struct tm const *, time_t, char const *, - char const *); - static const char *tformat(void); --static time_t yeartot(intmax_t) ATTRIBUTE_REPRODUCIBLE; -+ATTRIBUTE_REPRODUCIBLE static time_t yeartot(intmax_t); - - /* Is C an ASCII digit? */ - static bool -@@ -125,7 +125,7 @@ is_alpha(char a) - } - } - --static ATTRIBUTE_NORETURN void -+ATTRIBUTE_NORETURN static void - size_overflow(void) - { - fprintf(stderr, _("%s: size overflow\n"), progname); -@@ -134,7 +134,7 @@ size_overflow(void) - - /* Return A + B, exiting if the result would overflow either ptrdiff_t - or size_t. */ --static ATTRIBUTE_REPRODUCIBLE ptrdiff_t -+ATTRIBUTE_REPRODUCIBLE static ptrdiff_t - sumsize(size_t a, size_t b) - { - #ifdef ckd_add -@@ -151,7 +151,7 @@ sumsize(size_t a, size_t b) - - /* Return a pointer to a newly allocated buffer of size SIZE, exiting - on failure. SIZE should be nonzero. */ --static void * ATTRIBUTE_MALLOC -+ATTRIBUTE_MALLOC static void * - xmalloc(size_t size) - { - void *p = malloc(size); -@@ -920,7 +920,7 @@ showextrema(timezone_t tz, char *zone, time_t lo, struct tm *lotmp, time_t hi) - # include - - /* A substitute for snprintf that is good enough for zdump. */ --static int ATTRIBUTE_FORMAT((printf, 3, 4)) -+ATTRIBUTE_FORMAT((printf, 3, 4)) static int - my_snprintf(char *s, size_t size, char const *format, ...) - { - int n; -diff --git a/zic.c b/zic.c -index 892414af..f143fcef 100644 ---- a/zic.c -+++ b/zic.c -@@ -459,20 +459,20 @@ static char roll[TZ_MAX_LEAPS]; - ** Memory allocation. - */ - --static ATTRIBUTE_NORETURN void -+ATTRIBUTE_NORETURN static void - memory_exhausted(const char *msg) - { - fprintf(stderr, _("%s: Memory exhausted: %s\n"), progname, msg); - exit(EXIT_FAILURE); - } - --static ATTRIBUTE_NORETURN void -+ATTRIBUTE_NORETURN static void - size_overflow(void) - { - memory_exhausted(_("size overflow")); - } - --static ATTRIBUTE_REPRODUCIBLE ptrdiff_t -+ATTRIBUTE_REPRODUCIBLE static ptrdiff_t - size_sum(size_t a, size_t b) - { - #ifdef ckd_add -@@ -487,7 +487,7 @@ size_sum(size_t a, size_t b) - size_overflow(); - } - --static ATTRIBUTE_REPRODUCIBLE ptrdiff_t -+ATTRIBUTE_REPRODUCIBLE static ptrdiff_t - size_product(ptrdiff_t nitems, ptrdiff_t itemsize) - { - #ifdef ckd_mul -@@ -502,7 +502,7 @@ size_product(ptrdiff_t nitems, ptrdiff_t itemsize) - size_overflow(); - } - --static ATTRIBUTE_REPRODUCIBLE ptrdiff_t -+ATTRIBUTE_REPRODUCIBLE static ptrdiff_t - align_to(ptrdiff_t size, ptrdiff_t alignment) - { - ptrdiff_t lo_bits = alignment - 1, sum = size_sum(size, lo_bits); -@@ -526,7 +526,7 @@ memcheck(void *ptr) - return ptr; - } - --static void * ATTRIBUTE_MALLOC -+ATTRIBUTE_MALLOC static void * - emalloc(size_t size) - { - return memcheck(malloc(size)); -@@ -538,7 +538,7 @@ erealloc(void *ptr, size_t size) - return memcheck(realloc(ptr, size)); - } - --static char * ATTRIBUTE_MALLOC -+ATTRIBUTE_MALLOC static char * - estrdup(char const *str) - { - return memcheck(strdup(str)); -@@ -608,7 +608,7 @@ eat(int fnum, lineno num) - eats(fnum, num, 0, -1); - } - --static void ATTRIBUTE_FORMAT((printf, 1, 0)) -+ATTRIBUTE_FORMAT((printf, 1, 0)) static void - verror(const char *const string, va_list args) - { - /* -@@ -626,7 +626,7 @@ verror(const char *const string, va_list args) - fprintf(stderr, "\n"); - } - --static void ATTRIBUTE_FORMAT((printf, 1, 2)) -+ATTRIBUTE_FORMAT((printf, 1, 2)) static void - error(const char *const string, ...) - { - va_list args; -@@ -636,7 +636,7 @@ error(const char *const string, ...) - errors = true; - } - --static void ATTRIBUTE_FORMAT((printf, 1, 2)) -+ATTRIBUTE_FORMAT((printf, 1, 2)) static void - warning(const char *const string, ...) - { - va_list args; -@@ -666,7 +666,7 @@ close_file(FILE *stream, char const *dir, char const *name, - } - } - --static ATTRIBUTE_NORETURN void -+ATTRIBUTE_NORETURN static void - usage(FILE *stream, int status) - { - fprintf(stream, -@@ -3597,7 +3597,7 @@ lowerit(char a) - } - - /* case-insensitive equality */ --static ATTRIBUTE_REPRODUCIBLE bool -+ATTRIBUTE_REPRODUCIBLE static bool - ciequal(register const char *ap, register const char *bp) - { - while (lowerit(*ap) == lowerit(*bp++)) -@@ -3606,7 +3606,7 @@ ciequal(register const char *ap, register const char *bp) - return false; - } - --static ATTRIBUTE_REPRODUCIBLE bool -+ATTRIBUTE_REPRODUCIBLE static bool - itsabbr(register const char *abbr, register const char *word) - { - if (lowerit(*abbr) != lowerit(*word)) -@@ -3622,7 +3622,7 @@ itsabbr(register const char *abbr, register const char *word) - - /* Return true if ABBR is an initial prefix of WORD, ignoring ASCII case. */ - --static ATTRIBUTE_REPRODUCIBLE bool -+ATTRIBUTE_REPRODUCIBLE static bool - ciprefix(char const *abbr, char const *word) - { - do -@@ -3725,14 +3725,14 @@ getfields(char *cp, char **array, int arrayelts) - return nsubs; - } - --static ATTRIBUTE_NORETURN void -+ATTRIBUTE_NORETURN static void - time_overflow(void) - { - error(_("time overflow")); - exit(EXIT_FAILURE); - } - --static ATTRIBUTE_REPRODUCIBLE zic_t -+ATTRIBUTE_REPRODUCIBLE static zic_t - oadd(zic_t t1, zic_t t2) - { - #ifdef ckd_add -@@ -3746,7 +3746,7 @@ oadd(zic_t t1, zic_t t2) - time_overflow(); - } - --static ATTRIBUTE_REPRODUCIBLE zic_t -+ATTRIBUTE_REPRODUCIBLE static zic_t - tadd(zic_t t1, zic_t t2) - { - #ifdef ckd_add From patchwork Thu Apr 6 16:01: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: 22325 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 1D8B0C77B6F for ; Thu, 6 Apr 2023 16:02:36 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web11.162531.1680796946727881274 for ; Thu, 06 Apr 2023 09:02:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=0zhgnDMe; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id y2so26072619pfw.9 for ; Thu, 06 Apr 2023 09:02:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796946; x=1683388946; 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=EqHsZdI+56VguszBP+3kQ0EH/f89RdfyP19rdBlNR64=; b=0zhgnDMe37UGgTTHIbzpGdOxWpPyrfmE0cIkINoeo6S0M1hb+gqAicLU6nwB4Cpr1O D6JPPHGbPsE72IoSht/qYim63bDAMwv0R0VX+MTRt2e7M4CCuu1yJ/Mn90jgoXcurUqI 1jkAY5NFPWT1YDzSyLioHzyjY4ld2uAeDzduH1Tzwa2UENvOjpLrz4CxWw7LKbZyI3mo aCuudHQcPL/UysL73qICPkrI+pGBUtRfIcu67gFyel0jeXNInvOtRrzCj35RNLitDU/O gh1gIUuOy7SEVBnRNvkeqL02q4HgBMqKjyJHLJNqpuUmaw9G1jeQgK/m8i8XVq6TKhEa 1Ipg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796946; x=1683388946; 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=EqHsZdI+56VguszBP+3kQ0EH/f89RdfyP19rdBlNR64=; b=IS+6FWirFGZ69JTA4nPfPWcTDlsdS1Q4NU1zpNCpyzYreZ3pXTDzRpqJ2c5zKPkFCe 8BMF7fuUsiXgL6lgbHbSYC6NPnzU8J+yNDcteXVushjm5NoJribfqSOTLtsqJuij7ZyI llhktlKgla/4DeLyvuAX9PRmzCZdQN1/e2dRqTlHGZlZ5owMyUlnaJIT8+z+NZM8fare Wvf6kflQ3XTPx+smQYxkvrLXcK/W6y5PLLTTDhIYE3K3OAjkbkLvd2mbvvAHaGHAmOUt wJ7NQYMQojsaqCtJ+x8LhjJ9q3egvLwrk2ae2A57y0IW9llQV8w0m86QcwW43veU6xsg sE6A== X-Gm-Message-State: AAQBX9fiRVFNECQrTXD9rTOBoLE1FHIddfO1dQ44+GST+10pB+r6VZWa b8eYxXC2QGeFECppi4ow49iD1hBdMUNuFVRxlKQ= X-Google-Smtp-Source: AKy350ZAnO5kDdqgtKHl3y8870Vm8o9aSSSiRYai1KoYSFX+9Z6U4XGo2Jq7fuSM1/nyDXlC9HyTcw== X-Received: by 2002:a62:19c2:0:b0:624:9205:977d with SMTP id 185-20020a6219c2000000b006249205977dmr9470108pfz.27.1680796945724; Thu, 06 Apr 2023 09:02:25 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:25 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 04/26] uninative: Upgrade to 3.9 to include glibc 2.37 Date: Thu, 6 Apr 2023 06:01:31 -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 ; Thu, 06 Apr 2023 16:02:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179782 From: Michael Halstead Update uninative to work with the new glibc 2.37. Signed-off-by: Michael Halstead Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/conf/distro/include/yocto-uninative.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/conf/distro/include/yocto-uninative.inc b/meta/conf/distro/include/yocto-uninative.inc index 51c0cdee43..8a5cab5360 100644 --- a/meta/conf/distro/include/yocto-uninative.inc +++ b/meta/conf/distro/include/yocto-uninative.inc @@ -6,10 +6,10 @@ # to the distro running on the build machine. # -UNINATIVE_MAXGLIBCVERSION = "2.36" -UNINATIVE_VERSION = "3.8.1" +UNINATIVE_MAXGLIBCVERSION = "2.37" +UNINATIVE_VERSION = "3.9" UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/${UNINATIVE_VERSION}/" -UNINATIVE_CHECKSUM[aarch64] ?= "3f15d420049b21854bd7a8843da0f42f17064559492c8b752d7a6f998ff5ea65" -UNINATIVE_CHECKSUM[i686] ?= "a6dcf316d738ade2e5e463bd3b33a270b4bfc25bba41770ad5cbdc3b0e24044c" -UNINATIVE_CHECKSUM[x86_64] ?= "5fab9a5c97fc73a21134e5a81f74498cbaecda75d56aab971c934e0b803bcc00" +UNINATIVE_CHECKSUM[aarch64] ?= "de35708c95c34573af140da910132c3291ba4fd26ebf7b74b755ada432cdf07b" +UNINATIVE_CHECKSUM[i686] ?= "adac07b08adb88eb26fc7fd87fee0cec9d5be167bf7c5ffd3a549a2a6699c29c" +UNINATIVE_CHECKSUM[x86_64] ?= "3dd82c3fbdb59e87bf091c3eef555a05fae528eeda3083828f76cd4deaceca8b" From patchwork Thu Apr 6 16:01: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: 22330 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 30079C77B73 for ; Thu, 6 Apr 2023 16:02:36 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web11.162533.1680796948448294563 for ; Thu, 06 Apr 2023 09:02:28 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=mjQhd7pt; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id bt19so26095616pfb.3 for ; Thu, 06 Apr 2023 09:02:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796947; x=1683388947; 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=SwwYX6Ou/Mn7OOk9YoZGwYlGFXwIC2yaFnpJkLXbetw=; b=mjQhd7ptvwe+ixKeQbOXrAHwMfvIKqGOXzLz/S7QRO8WuteSIqsNXUyckje2a8MO1K o1b4C36+xPwtM7nhsmsEjz6QDh44vYcf6JIlAYnaT+DYI/XkzY7VXtsnuHBH1l9wIrLd GZiI7N+4QUlP2nYcnxO2xlNZtV9NoEo27cc6uZLCPPPeX0+WBXWD09xUMzh7EyNy+t/H 6f9YglioFpYyOnZ+SVAHL9KoTKyuvG0vsZ6PopP44x5t/CZy8jGPkFjB9hM+zvMmqPrX P1p59lYlQ+kKoXpRGOZWIRCPQOdTx+j/TySm8BHzhvkVPEJ1OgH6cLZoNUbsvIIkqadM 2xwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796947; x=1683388947; 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=SwwYX6Ou/Mn7OOk9YoZGwYlGFXwIC2yaFnpJkLXbetw=; b=UFVdyzhzZQFq4pilYqnJNsSJE2tL4q6CG8tmOokJf8ih5qeJVEaWUO4tZjaYkhl/dK ZRHzIoDEYcTSKsczTdAM1A6nTQiAoT0CpZ/7d7fvTiJxmmMmGmJVPUYfWtQ0wb+T9xMk oxDhRTldPbJ/5XLHBCme1WVtZs6giJlrfM9pZaY0EExXxN3DLBZ71F/NFsMn1mB4/4XR G8svgKbt768ceQGyWdQaxj/K5PLX0/XiwDgq71wzzsbt+i8tg+JuwfJ/V007ZedoDXXZ TLknaQC/UWd4TzYrJ1zWSkfHtiIVgAlHRbB6dlad+iWBcDsJy2wXAHU1udv2EM2cZzIU poIw== X-Gm-Message-State: AAQBX9fvM/2fBB06LKBC6sIvtlowdMIOfO4aSMZvJsYqY68QslIGyCC4 JNSigqOqC3S4cKPjBEqvKi7/0G6Brctk9fxkFoI= X-Google-Smtp-Source: AKy350bVSyWH7SnDpAJyHcu2aRMf+sqpWDDGkSxxwTYQR/JQBvXBmKy/2iUZqto32L0wtulPXNUvYg== X-Received: by 2002:a05:6a00:2d83:b0:627:f1ac:f46e with SMTP id fb3-20020a056a002d8300b00627f1acf46emr8309801pfb.1.1680796947461; Thu, 06 Apr 2023 09:02:27 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:27 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 05/26] filemap.py: enforce maximum of 4kb block size Date: Thu, 6 Apr 2023 06:01:32 -1000 Message-Id: <303cc9ce3a9d7ca85542f12ebfda27eeb449e73b.1680796770.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 ; Thu, 06 Apr 2023 16:02:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179783 From: Andrew Geissler The logic in this script validates that the length of data sections are evenly divisible by the block size. On most systems the block size is 4KB and all is good. Some systems though, such as ppc64le, have a block size larger then 4KB. For example on a POWER9 based ppc64le system, the block size is 64KB. This results in this script failing with errors like this when building wic images: |440, in _do_get_mapped_ranges | assert extent_len % self.block_size == 0 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | AssertionError In this case the data section size was 268KB and the block size was 64KB, resulting in the above assert failure. Resolves https://bugzilla.yoctoproject.org/show_bug.cgi?id=15075 Signed-off-by: Andrew Geissler Signed-off-by: Richard Purdie (cherry picked from commit 1e23b803af6991fc20e4a4e88a0ef0541399e722) Signed-off-by: Steve Sakoman --- scripts/lib/wic/filemap.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/lib/wic/filemap.py b/scripts/lib/wic/filemap.py index 4d9da28172..85b39d5d74 100644 --- a/scripts/lib/wic/filemap.py +++ b/scripts/lib/wic/filemap.py @@ -46,6 +46,13 @@ def get_block_size(file_obj): bsize = stat.st_blksize else: raise IOError("Unable to determine block size") + + # The logic in this script only supports a maximum of a 4KB + # block size + max_block_size = 4 * 1024 + if bsize > max_block_size: + bsize = max_block_size + return bsize class ErrorNotSupp(Exception): From patchwork Thu Apr 6 16:01: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: 22329 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 2B573C76196 for ; Thu, 6 Apr 2023 16:02:36 +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.web11.162535.1680796950490326416 for ; Thu, 06 Apr 2023 09:02:30 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=uRZtrKdU; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id z10so24028732pgr.8 for ; Thu, 06 Apr 2023 09:02:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796949; x=1683388949; 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=rJZMjZGhPlxemcvB3Mu2z9THqSgn1nVVPdwHBjlnK4c=; b=uRZtrKdU5SzaY5yc+W/w5KW3iSF/SeNgKq47suN9/Uusy9DeRqix1MZxzCwUxTurxt tmGPmGexC0QK2jay6UYdoGquq8Ab/z0jz9yFyPV2Zhy73a857VTpyo3RLlGrlg6lB1AG jHyZio4W3F4/k4HPRECCt+M3IyxIS/2jLjdoq8eNr3b+xQ/xDKXi4r7yLV3wVoQ6YzPE NuwZNGkTJka4Uqy5OE8Ifbw970Q4p//N1G+0ptxllsPXaybp+vn/uhVEaFg98pXTIpJa PaAAoIzvmKraLstms5fpgbGKi6451Acp5YiBDM8Vxmyq9A21yIk1vWmHX2K4IjsbnDk0 NIMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796949; x=1683388949; 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=rJZMjZGhPlxemcvB3Mu2z9THqSgn1nVVPdwHBjlnK4c=; b=fUfUbdNFdwqBmxpLN9xGgYgO2q0/jOXbPuRSYSjG6KyoZ9OW31gCKMp+wTAFZ/1h41 5449G8VTtdSihEiiaDCzW0YXiAwPQ/Hfn9JS3Z8duIhqhphOt68MelBY8pjZr/LMLQ5f MW6tnerqEZczuI4Px38NgBN6L7vYABuRdvvZFatoM4jU+9pbi0lrbsFqyWj7jg8Hwl0W Lr575HVkBTnKPuuw0I1FsLJ3FUlJSacuNRtqcWQ9Yk7xe9p6Bx7fooBqiYidpKBvDZ08 mO1TNS5AamDmcIX+ty3IWK0isPV1SxcFav2q6J/ChJxTnrhUslT3GWJk1MLP4F5TLewK u0BA== X-Gm-Message-State: AAQBX9f6Si+3vqaQY/wJw+xXUZM5Efb1Ro8YpNY2lKbt3mrisua4pcP9 Sgd2MM0oqj/7rJt4jvYNY5IfvK4uPpSYLhwJelg= X-Google-Smtp-Source: AKy350aba4Rrpzie1licbq4GcHTfqr0vtpVXUdOxPL7XweT8Pkwb5xULNbOETwo9E7kla56nnnzETA== X-Received: by 2002:a62:1c0a:0:b0:625:cf03:e8cb with SMTP id c10-20020a621c0a000000b00625cf03e8cbmr7374975pfc.4.1680796949276; Thu, 06 Apr 2023 09:02:29 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:29 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 06/26] oeqs/selftest: OESelftestTestContext: replace the os.environ after subprocess.check_output Date: Thu, 6 Apr 2023 06:01:33 -1000 Message-Id: <273cc6d6a11c4f11f80830f23489a287f38c1a17.1680796770.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 ; Thu, 06 Apr 2023 16:02:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179784 From: Jose Quaresma No function change but is needed to simplify the next patch. Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni (cherry picked from commit 193d8f0d6383f54c61f90d58eeb8f41580c2360a) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/context.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 78c7a467e2..0d26a07438 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -86,17 +86,17 @@ class OESelftestTestContext(OETestContext): oe.path.copytree(builddir + "/cache", newbuilddir + "/cache") oe.path.copytree(selftestdir, newselftestdir) + subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) + + # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow + subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) + for e in os.environ: if builddir + "/" in os.environ[e]: os.environ[e] = os.environ[e].replace(builddir + "/", newbuilddir + "/") if os.environ[e].endswith(builddir): os.environ[e] = os.environ[e].replace(builddir, newbuilddir) - subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) - - # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow - subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) - os.chdir(newbuilddir) def patch_test(t): From patchwork Thu Apr 6 16:01:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22326 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 2BB2CC77B71 for ; Thu, 6 Apr 2023 16:02:36 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.web11.162538.1680796952152204316 for ; Thu, 06 Apr 2023 09:02:32 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=FSUYtDse; spf=softfail (domain: sakoman.com, ip: 209.85.215.180, mailfrom: steve@sakoman.com) Received: by mail-pg1-f180.google.com with SMTP id h31so24028149pgl.6 for ; Thu, 06 Apr 2023 09:02:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796951; x=1683388951; 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=OzOWUjymoYwBMvV1hYYCCzNX1ONc56VVcUQNegh0erw=; b=FSUYtDseY3MPpkEg40K8XV9c14GLJT6SSuQso7bug9CdQbw1HQwLOxfK5vwsXcETwd 6cusRuQRs7H68jYboMIbTQJLKAjzdCMHGDWf2LxivkEM1N9uP+xAJ6HoF4pDdl6KAO2h 4YhdYPaW5tMREOhM9aMq6hnJ2TntLeLcl11UnyAhgq0lsQmZUopasOcjhTW2htRzFdCZ 9kmQQkV3bUPQT3zPziKs5DF0J5ed30n8vZ8NKMYxWtF5X0KaSrpX7TR6evPQ6AdGWVRZ 99cBnZVNBKglC+z53Ro92voD0jb1Sgn6B1urHcUJXklTWChrFN9DP+mAY69OhKD/96my f3lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796951; x=1683388951; 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=OzOWUjymoYwBMvV1hYYCCzNX1ONc56VVcUQNegh0erw=; b=s2y2tQ5J4n8dUVME1KTnEF/WBV+tk1p61qTRgmFvfvPB6iiN8d6JWSls9I087L0GPR V3n1ydKHdY1E9vTjiqo4eYympvEqUKt9DiA5ZiTsS9ho3oQKHJZJWHBRfSqQmACPp/Jb n33yH9hHR7J+WYjKQoAgJjqTAc5imA6cw2t0oNXeqpdtHxmtZgceO/ySPWHJGsMoa41B oun57cIDKOQDNhQFICj4+9x1ftEZ5shxFY0evp0E3UKQSKmWaMoZRLtIREQlrISJ2gax SiiQDrqSBjQmgt+Qblf8POg+qDXVWvzWN4MI1G+iT5Vd2quSNY9B24wO7eqkXmboa7Sb q4zQ== X-Gm-Message-State: AAQBX9dfOT75NuVkMKDJX75iVkafOXUjI3KLVhLCOGbKmnlKXl/XC5Kl YKV9Tr4TkNJWYM6MddNU5dNYyqw3HK/peW6ph4A= X-Google-Smtp-Source: AKy350aOYYrA9/b1Wo7y3nadLUsjMDuBxXOcZ7yXeolaQTOyuWJmx1itC5eg6PpEq87HNR0se1kULQ== X-Received: by 2002:aa7:988a:0:b0:628:642:c533 with SMTP id r10-20020aa7988a000000b006280642c533mr9131100pfl.31.1680796951076; Thu, 06 Apr 2023 09:02:31 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:30 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 07/26] oeqa/selftest: OESelftestTestContext: convert relative to full path when newbuilddir is provided Date: Thu, 6 Apr 2023 06:01:34 -1000 Message-Id: <41f169ea23078cc8f4a6b6fc6b59230f05cb758b.1680796770.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 ; Thu, 06 Apr 2023 16:02:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179785 From: Jose Quaresma Relative paths in BBLAYERS only works when the new build dir are on the same ascending directory node: . ├── build ├── build-st It works because they share the same ascending relative directory node. So use the full path when the argument newbuilddir is provided to make the oe-selftest work everywere regardless of the location chosen. Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni (cherry picked from commit 2e022c1977bc1006c00a87e08a2dca5b69db4801) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/context.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 0d26a07438..0e3244a1c5 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -91,6 +91,16 @@ class OESelftestTestContext(OETestContext): # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) + # Relative paths in BBLAYERS only works when the new build dir share the same ascending node + if self.newbuilddir: + bblayers = subprocess.check_output("bitbake-getvar --value BBLAYERS | tail -1", cwd=builddir, shell=True, text=True) + if '..' in bblayers: + bblayers_abspath = [os.path.abspath(path) for path in bblayers.split()] + with open("%s/conf/bblayers.conf" % newbuilddir, "a") as f: + newbblayers = "# new bblayers to be used by selftest in the new build dir '%s'\n" % newbuilddir + newbblayers += 'BBLAYERS = "%s"\n' % ' '.join(bblayers_abspath) + f.write(newbblayers) + for e in os.environ: if builddir + "/" in os.environ[e]: os.environ[e] = os.environ[e].replace(builddir + "/", newbuilddir + "/") From patchwork Thu Apr 6 16:01:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22327 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 1D4E9C761A6 for ; Thu, 6 Apr 2023 16:02:36 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web10.162521.1680796953959888493 for ; Thu, 06 Apr 2023 09:02:34 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=rC+W9t6v; spf=softfail (domain: sakoman.com, ip: 209.85.216.47, mailfrom: steve@sakoman.com) Received: by mail-pj1-f47.google.com with SMTP id lr16-20020a17090b4b9000b0023f187954acso41092375pjb.2 for ; Thu, 06 Apr 2023 09:02:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796953; x=1683388953; 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=J11PGA1CMXE/5tnyQAm/M8K2MRWOE2Kl3DpgjN2Bhfo=; b=rC+W9t6vCwgn/l0SZD9PnT4aLhhDW0KRrSyLNwCO1LI6cKdO0vjfetcqd7VPly/Buk D1wJPVMzU3hNrZKNb9ZfKhyh5TtIKL0+RILeVmUrboYK+ODy59FtRidrUjYM5MdcI9HL Bb2SMtvAEvV+vKAAsJ5K3NXcAcF+7gVIXDHKZzZ+NvXH7LfZabZnD06IVnpswz8uKfYJ rtt5sPO3GpO+e606lT/uUOj+CT3deXCTMQrYrO4ibA2KT9Y+5H5rYtd7MLmW6arjNAC7 z4s0NnMsiJLfOoCB8hNHFLyAoyWqSFTg7dg11+sdPxzxh9lZ9psgAwpAP2y2oNabP1G5 yVtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796953; x=1683388953; 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=J11PGA1CMXE/5tnyQAm/M8K2MRWOE2Kl3DpgjN2Bhfo=; b=KutZF8jPnYA89xHyvcsXXNlhp8vNj1VuOSuSWnkBcbCHcGjzCxC6kURwJRwnLCV2WT 6mMGt4M1Z/xfsyL2O4lFH1o7P8eyZ31rSvX6Z4khw4VlO06anaYKhGPX4MPql2GtQWGm 5CHeKT+aPT8l/6bSsC3Rsgv85tSOR6pTNPMOAOB4wNCTxvjYkV+e4hugPT0dsij1i7Sz AzzJ/cDs0TLfkvs3WadNG6BgAqygyXKTy2Pw0JbpXsaBPsRs85pUvGY7wtVCHsBsIQ7q SXqqdr8O9ZsDao/yFqC6DYIAXyLpr7xN3NeIEHtsPXlfW2zwN0daiSqfYezyqXXPafDj jmXg== X-Gm-Message-State: AAQBX9c39jwuctNcbFJBJG++yGn+cpBB6EHNOdLDD3ftvo38+qsjkeEa VLcQYuZpq4WJhOWYFUBgSZNahek/V9qPdUcgGZw= X-Google-Smtp-Source: AKy350b2vbDQM3oGmhFkxBIPoayBJf4xxXog8WhA7lO64xLGSyBwwD9VSDJe+bVzWgvd6+ebMIIlUg== X-Received: by 2002:a05:6a20:b98:b0:cb:8885:5650 with SMTP id i24-20020a056a200b9800b000cb88855650mr2893750pzh.55.1680796952970; Thu, 06 Apr 2023 09:02:32 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:32 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 08/26] oeqa/selftest/reproducible: Split different packages from missing packages output Date: Thu, 6 Apr 2023 06:01: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 ; Thu, 06 Apr 2023 16:02:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179786 From: Jose Quaresma When we provide sstate_targets recipes they are reported as missing which is not quite correct because they are proveided to cut build/debugging time. Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni (cherry picked from commit fd70a564d6946fa460638dd04ce2daecf4566cf3) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/reproducible.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index f4dd779842..cd7aa8aafa 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -292,9 +292,13 @@ class ReproducibleTests(OESelftestTestCase): self.copy_file(d.reference, '/'.join([save_dir, 'packages-excluded', strip_topdir(d.reference)])) self.copy_file(d.test, '/'.join([save_dir, 'packages-excluded', strip_topdir(d.test)])) - if result.missing or result.different: - fails.append("The following %s packages are missing or different and not in exclusion list: %s" % - (c, '\n'.join(r.test for r in (result.missing + result.different)))) + if result.different: + fails.append("The following %s packages are different and not in exclusion list:\n%s" % + (c, '\n'.join(r.test for r in (result.different)))) + + if result.missing and len(self.sstate_targets) == 0: + fails.append("The following %s packages are missing and not in exclusion list:\n%s" % + (c, '\n'.join(r.test for r in (result.missing)))) # Clean up empty directories if self.save_results: From patchwork Thu Apr 6 16:01: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: 22328 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 20EC7C77B70 for ; Thu, 6 Apr 2023 16:02:36 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web10.162523.1680796955851529054 for ; Thu, 06 Apr 2023 09:02:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=XrFFFwSx; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id o6-20020a17090a9f8600b0023f32869993so43304693pjp.1 for ; Thu, 06 Apr 2023 09:02:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796955; x=1683388955; 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=bs/Pomw7s+s/CibVeTODBJNNdNiFjDw4aYO1Ru3irds=; b=XrFFFwSxCLFzMHzOMDPO5pOfpfXh7c0cV/CXxAedmNopj68QH2Ls0QRYoMFX5BBZzj kz/KBWwcu79R8xClcduuPALsbtsXDKfMl1uIzqil4mvkWE9CFCHs2NCUXyNFdvGG7ptY z7oTro/G1Yd2f9AP2vWnlM2ld3hjrk0XF4zU9Vjzylsf0BvBKxE/kZHGuVqjadwplGnq tCKku8h3o+dwUsaJ7c7PLIf4OV2444zkTDH5GR3Gm1Anqi6nVlaq9dS9D6ww8xAJKkE/ V9FvtIO5OmDx3QqW093x8v0pr4myfYVOXyRXInMJYj6ygJGUp7gOstjdBUAFo2KUkTX+ lH1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796955; x=1683388955; 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=bs/Pomw7s+s/CibVeTODBJNNdNiFjDw4aYO1Ru3irds=; b=pARV04uRIzLhfFWgjQZ20iPNneS5Ls4Nbi/9UwYWzKUDZf3XDfPHF6a0U/UQoPiBPL u/S6LR7ajiMJMs6pvkLgtcwY3SAfQxfd215r7m6Er8ECUSRFMU6qct3P8wJrMUnOGxp7 Q8cpVeufujo+vjt0LrARidcegImKGtJypd5odQhAcbx2BnGrVfc7a9roFXej+EcgpHU2 JSD9SUGmGXcPNY4108I/XkaH3+xAZM2VIGJNZiX7eye0IBmcj5gJLul03eXDv+whDEF9 opuhNqI+B4GU3OqkHkJ0yXg0OF7RVZNc/DyQtaGaGfZ6vm/9qEuNM3pivRP/rVve9Al8 /E7g== X-Gm-Message-State: AAQBX9e7dSbUKT/BctNeHQx6op7JDYc/CZeL5CgDIIwTvb3/S4wLyy2S k7KXvfNIcOzvOV+Ytsv5w3ro3G3W9yJRk0FI6zQ= X-Google-Smtp-Source: AKy350aY0XR1z5kyInwor7JFgf+FZKqmI8XoYWMNg8jYo3QmGGmrUYtB8xlwpCrKUlwX+rt0OTZ3jQ== X-Received: by 2002:a05:6a20:bc88:b0:e5:58e6:be37 with SMTP id fx8-20020a056a20bc8800b000e558e6be37mr2813786pzb.61.1680796954821; Thu, 06 Apr 2023 09:02:34 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:34 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 09/26] run-postinsts: Set dependency for ldconfig to avoid boot issues Date: Thu, 6 Apr 2023 06:01:36 -1000 Message-Id: <8362859236d7b9f312f2d36f2437f4abbdeb5716.1680796770.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 ; Thu, 06 Apr 2023 16:02:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179787 From: Arturo Buzarra If a package with a postsints script requires ldconfig, the package class adds a ldconfig postinst fragment to initialize it before. Systemd has its own ldconfig.service to initialize it and sometimes if both services are running at the same time in the first boot, the first one will work, but the second one will fail with the following error: ldconfig[141]: /sbin/ldconfig: Renaming of /etc/ld.so.cache~ to /etc/ld.so.cache failed: No such file or directory This commit adds a ordering dependency between them to make sure that only one service is running at the same time. Signed-off-by: Arturo Buzarra Signed-off-by: Richard Purdie (cherry picked from commit 4e9d812e127dc6743f52f4881e509e8e2e833afe) Signed-off-by: Steve Sakoman --- .../run-postinsts/run-postinsts/run-postinsts.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service index 7f72f3388a..b6b81d5c1a 100644 --- a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service +++ b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service @@ -1,7 +1,7 @@ [Unit] Description=Run pending postinsts DefaultDependencies=no -After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount +After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount ldconfig.service Before=sysinit.target [Service] From patchwork Thu Apr 6 16:01: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: 22331 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 230A6C7618D for ; Thu, 6 Apr 2023 16:02:46 +0000 (UTC) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by mx.groups.io with SMTP id smtpd.web11.162546.1680796957657966344 for ; Thu, 06 Apr 2023 09:02:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=nfmYOvHW; spf=softfail (domain: sakoman.com, ip: 209.85.216.51, mailfrom: steve@sakoman.com) Received: by mail-pj1-f51.google.com with SMTP id om3-20020a17090b3a8300b0023efab0e3bfso43298379pjb.3 for ; Thu, 06 Apr 2023 09:02:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796957; x=1683388957; 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=vLia87a0OHlk5P7VFltvOtJKzXidEBVILREuSyL/WLE=; b=nfmYOvHWaU9tktNdDlctaW4Nqh3clOY7RvXNVU0SYU33pspSBewlya9M/YJO5dhHSz ou2mXkKKr3/38jM9yeqiImwIKDa+7e9Aw2FS7lXFGQlT8byf8bya8QwZEByn0SVf8oOy 9c7gla4UEKn+g2T4Rqcnwa/JPupJlA763cg33ccULqt+wJUCHfkPFoeY1DQgheDXq/D8 6fn0snLQ4/iIQo67X0aePkCVKH3m/050l+7rxcFlE/WkMg19tIJFPsQ4RJmV/aGV+hu5 88ePEBLbvM5VSYq3z3nWFrQIS+AyQWlYV/5TeSJ+chaC37vkUyK/XzyEjJREJ7Skr+qe BWkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796957; x=1683388957; 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=vLia87a0OHlk5P7VFltvOtJKzXidEBVILREuSyL/WLE=; b=CoUNvX9ErLEfgmJGXGyWNbaYNrvAsJQxpR3P3Df1xfTSw4p+LSnX00UCkm5c2fl55L wssIkNsVZERjIba8vjLXeYgCqRnCn/WforfJsTZ/Abj8oDKy5NYeQvx5t/BLeDN8Fut3 GePBIypLsHhFdKIZNU2s0TYS9bgNjMiWb+uWlOIJwwQAnNCLqrsuLTtJOlAFdKlNcQA9 AqT1qBlBM+x8CPpDluoWx7v+MHQUkAsi1GM+szuyMJ4Nm/JvG8MLhrP+PL0o1UxH2BlK HsYT7ro2dVOQ4PomsRK3l2SvfChR/UdzLKGERj3IAP4+agqg68dW6CQMjpcBFj+rp10v h1gQ== X-Gm-Message-State: AAQBX9dadkAHc1mDq8A/8wny2j3HCJ6GmGFDtLi4fdpV+PV4JJVIQzZx 3+hGtJ23evQhME/JuNsbWtfesZ2kewIXjIW6uOU= X-Google-Smtp-Source: AKy350bBT/EKnzZBIxVNEjeeMteI59SnhnxNHOF49ybbZBSFm7y5D8TmgMGDlLtrzJn80rTPIEES7g== X-Received: by 2002:a05:6a20:6696:b0:d6:c9e2:17a1 with SMTP id o22-20020a056a20669600b000d6c9e217a1mr4010231pzh.62.1680796956618; Thu, 06 Apr 2023 09:02:36 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:36 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 10/26] package.bbclass: check packages name conflict in do_package Date: Thu, 6 Apr 2023 06:01:37 -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 ; Thu, 06 Apr 2023 16:02:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179788 From: Fawzi KHABER It is possible to rename packages with the macro PKG:${PN} and result in a package name conflict if the target name exists already. Add a fatal check to prevent this issue to go unnoticed. Fix [Yocto #12060] Reviewed-by: Yoann CONGAL Signed-off-by: Fawzi KHABER Signed-off-by: Richard Purdie (cherry picked from commit f6cb63d3a871c4eef52d981131a56bf41aa1dcdf) Signed-off-by: Steve Sakoman --- meta/classes-global/package.bbclass | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/meta/classes-global/package.bbclass b/meta/classes-global/package.bbclass index 7a0a428b30..a47da14ea5 100644 --- a/meta/classes-global/package.bbclass +++ b/meta/classes-global/package.bbclass @@ -2449,6 +2449,15 @@ python do_package () { bb.build.exec_func("package_convert_pr_autoinc", d) + # Check for conflict between renamed packages and existing ones + # for each package in PACKAGES, check if it will be renamed to an existing one + for p in packages: + localdata = bb.data.createCopy(d) + localdata.setVar('OVERRIDES', p) + rename = localdata.getVar('PKG') + if (rename != None) and rename in packages: + bb.fatal('package "%s" is renamed to "%s" using PKG:%s, but package name already exists'%(p,rename,p)) + ########################################################################### # Optimisations ########################################################################### From patchwork Thu Apr 6 16:01: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: 22333 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 29FF2C77B6F for ; Thu, 6 Apr 2023 16:02:46 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web10.162526.1680796959265406526 for ; Thu, 06 Apr 2023 09:02:39 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=4SWYy+fG; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id le6so37888417plb.12 for ; Thu, 06 Apr 2023 09:02:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796958; x=1683388958; 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=SQ0dnNduopsBqurJjoW4QSi6yGAtzTyLePI5cbYeD88=; b=4SWYy+fG9CB+XD8Aw1X9XTxQVNNYlWJ7YpHDCUBPJJbvHKJyq4Uu4lAbBtpZ4CK2Y6 jW8tounrb4knY/RfZzjiC4Hx85JcGGKT1IG0dquCUefSTKzmwDWKu4qsUKUtVVLQy3dA hK47mlYGdVDBYUbMD3B3Id9zUQ1SM/U93f3us2Vw8HdRPi/XqWqnu7bSsKUWr46NQNee eK2mNWnRkRaHma/YtY52iM1p2ol7SBN8zT1874WOsik9OGIo39WrNM4Q6+cMw/4JU/g6 /LfW81jR7S7nXbQwyG+1Q8GzfKg4GDdiKacCNvVICojeRPwgmh4uBrFoqw3ElrWCQkxP BXiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796958; x=1683388958; 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=SQ0dnNduopsBqurJjoW4QSi6yGAtzTyLePI5cbYeD88=; b=OnZxbSdCLjiWwe+IQdJXyiJaKuiDJUUh9iMiiSj8W9/wEBGaN783/7P2PnrVsPwbQl If0V1wF9EXklhhhGSCfsI66CW63csDWR5R1jHklqx/xoY0B+dtleRmeGi02VN4ZRqzfv yCOCAlg64NsA/3CeiHBiwsxctzNhxArLQNWxBy2QImN+P4y8xI3GfllFHjoGA1qs/inm mWxQv316Q+S5cSDfi/aOx+4Y2GduIFkrgyviXrOCaXsI20vEJYTJdBKoPnAJ2ig+HtVR fAGDaho4myeXxXwxMeT2KXbrvCgQJf2FdUAaOH1gKiMGRL6nyo5igwQitt/Uv2O0Lrdl 6y1w== X-Gm-Message-State: AAQBX9d0AvcLkVdbCyCk+r/UPiFMdpOcVLUVjy8bV+rd3/HZjdiQ/Wvl r7LT+FbtE9kc8NypvIFjXGER/IOn2Spi76QVNRI= X-Google-Smtp-Source: AKy350YGQ9D8snfxL9uic+YtN442tBmXTrEB8B90+vbu4Guq87bcNm4OwzSSAKUjAJ6FQIN+ge5mCQ== X-Received: by 2002:a05:6a20:4c15:b0:da:53ca:8f26 with SMTP id fm21-20020a056a204c1500b000da53ca8f26mr37428pzb.30.1680796958299; Thu, 06 Apr 2023 09:02:38 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:38 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 11/26] oeqa/selftest/cases/package.py: adding unittest for package rename conflicts Date: Thu, 6 Apr 2023 06:01:38 -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 ; Thu, 06 Apr 2023 16:02:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179789 From: Fawzi KHABER This Unittest tries to rename a package, using an already used name and fails on do_package. Reviewed-by: Yoann CONGAL Signed-off-by: Fawzi KHABER Signed-off-by: Richard Purdie (cherry picked from commit c3fe173d5196506d89aa464ba56aabcf581a60db) Signed-off-by: Steve Sakoman --- .../packagenameconflict/packagenameconflict.bb | 10 ++++++++++ meta/lib/oeqa/selftest/cases/package.py | 7 +++++++ 2 files changed, 17 insertions(+) create mode 100644 meta-selftest/recipes-test/packagenameconflict/packagenameconflict.bb diff --git a/meta-selftest/recipes-test/packagenameconflict/packagenameconflict.bb b/meta-selftest/recipes-test/packagenameconflict/packagenameconflict.bb new file mode 100644 index 0000000000..5d19a4dd25 --- /dev/null +++ b/meta-selftest/recipes-test/packagenameconflict/packagenameconflict.bb @@ -0,0 +1,10 @@ +SUMMARY = "Test case that tries to rename a package to an existing one and fails" +DESCRIPTION = "This generates a packaging error when a package is renamed to a pre-existing name" +LICENSE = "MIT" + +# Add a new package ${PN}-renametest +PACKAGES += "${PN}-renametest" +# ... and try to rename the ${PN}-dev to the new ${PN}-renametest (conflict) +PKG:${PN}-dev = "${PN}-renametest" + +EXCLUDE_FROM_WORLD = "1" diff --git a/meta/lib/oeqa/selftest/cases/package.py b/meta/lib/oeqa/selftest/cases/package.py index 2d1b48a15d..cc09a1442d 100644 --- a/meta/lib/oeqa/selftest/cases/package.py +++ b/meta/lib/oeqa/selftest/cases/package.py @@ -89,6 +89,13 @@ class VersionOrdering(OESelftestTestCase): self.assertEqual(status - 100, sort, "%s %s (%d) failed" % (ver1, ver2, sort)) class PackageTests(OESelftestTestCase): + # Verify that a recipe cannot rename a package into an existing one + def test_package_name_conflict(self): + res = bitbake("packagenameconflict", ignore_status=True) + self.assertNotEqual(res.status, 0) + err = "package name already exists" + self.assertTrue(err in res.output) + # Verify that a recipe which sets up hardlink files has those preserved into split packages # Also test file sparseness is preserved def test_preserve_sparse_hardlinks(self): From patchwork Thu Apr 6 16:01: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: 22332 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 1CA36C761A6 for ; Thu, 6 Apr 2023 16:02:46 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web10.162529.1680796961067041969 for ; Thu, 06 Apr 2023 09:02:41 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=BRgBXwB5; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id iw3so37906861plb.6 for ; Thu, 06 Apr 2023 09:02:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796960; x=1683388960; 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=2XlUz4EcGsVc9eC/VOcQGgF0ueyvCD1vEdjV9EIdYX0=; b=BRgBXwB5dqQcRwx/R2Kv6qZjbixK1bCdyWDgEoLsD6ZjjiRqsmDv0y/fUYJLQO/WJ4 +b86S8Y+f7tM+I7Yt6mJf+jPrN4iI2mbsnO95hce1IvPCz0xvSOsP4f2tsmZECrE5jgB TNXj/0vsPVdx6VOzNzz3j2eXT4gemlLnNeH2a2LawLqRHah/qdV3k+wewoYZeo6j8hKz jaZIyuiguT6VPOtIbhCW3WSdU4e1indAmbZ83erXpfm5eUAgbh08SF+lRjY0E23Wb6If 26Pu3hm+hu3q8vPDD5HRv3k+IWsacUYIRhGoy6HAVFeimBi4kbPYnfuNLqpOcs6+GFgy MKDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796960; x=1683388960; 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=2XlUz4EcGsVc9eC/VOcQGgF0ueyvCD1vEdjV9EIdYX0=; b=Vyl8eUz2YSeXLTjAdWymRSrgeDiMBfRX7UNYrNClOzY5uBY8kdoSjlJl+lpn3F2IR6 3DuvIwyiFjLbXdIpCGnKWBmQNxqKsSqYE5EJDL4E433n+f4vlqIKblVSj8XqoRxkpQFH fqyHIIAYmEL+JN8kxcIT0qWV+utf6iwPw+r4MH3bJiVrdFVO6dwtG6xL9ubr+s2sZAa5 Yx6usutckFXKM4kOnjwCWqNjjMEOrskOXC8TWqWXanlRfsBVOwyQx+H4Zr9eGiYcbL24 s6/86Uq+V+km8g8kG4LGaMwDToilMixUDXVG2WY1D9GNgUxfv8ML/2PMs0WGZszNy6ZI WPIQ== X-Gm-Message-State: AAQBX9dtv7Sva4KNSJvOQEHWV9Yl/+uEapcgtvkQK8NqAXHwsnbO+Acw oVXY4vpPTxXEuhHY9vBMLVdk/Q2yuLvmSaoLu0g= X-Google-Smtp-Source: AKy350bqVV05B2h004dCJEg5cgo8vZ8eB/B8ebgZqJt1HsjRnIiWb2CQtN2agNuSiy87zQKGJN5k6Q== X-Received: by 2002:a05:6a21:8697:b0:d9:91d2:b81e with SMTP id ox23-20020a056a21869700b000d991d2b81emr3441640pzb.62.1680796960054; Thu, 06 Apr 2023 09:02:40 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:39 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 12/26] Revert "runqemu: Add workaround for APIC hang on pre 4.15 kernels on qemux86" Date: Thu, 6 Apr 2023 06:01:39 -1000 Message-Id: <3479caf1eb1a67c53722ca774bfd94145b3669b5.1680796770.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 ; Thu, 06 Apr 2023 16:02:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179790 From: Khem Raj This reverts commit 82e67b82ea8e12aa0b7b9db1d84fec0436dec71b. It was commited as part of https://bugzilla.yoctoproject.org/show_bug.cgi?id=12301 for kernels < 4.15, as of now oldest builder kernel we have is 4.15 on ubuntu 18.04 so we should not require this workaround. Moreover, this fixes an smp problem with qemux86 where no matter what -smp option is used, qemu always starts with single core. Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni (cherry picked from commit fa8a7c0608fc800c48d0ff1cd832ad63c51eeab1) Signed-off-by: Steve Sakoman --- scripts/runqemu | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index db35d83fa9..efc135e535 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -591,11 +591,6 @@ class BaseConfig(object): if os.access(dev_kvm, os.W_OK|os.R_OK): self.qemu_opt_script += ' -enable-kvm' - if self.get('MACHINE') == "qemux86": - # Workaround for broken APIC window on pre 4.15 host kernels which causes boot hangs - # See YOCTO #12301 - # On 64 bit we use x2apic - self.kernel_cmdline_script += " clocksource=kvm-clock hpet=disable noapic nolapic" else: logger.error("You have no read or write permission on /dev/kvm.") logger.error("Please change the ownership of this file as described at:") From patchwork Thu Apr 6 16:01: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: 22334 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 1CA02C76196 for ; Thu, 6 Apr 2023 16:02:46 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web10.162531.1680796963675900486 for ; Thu, 06 Apr 2023 09:02:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=sLEXs14C; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id cv11so13348879pfb.8 for ; Thu, 06 Apr 2023 09:02:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796963; x=1683388963; 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=R5zlVQ3/WR2iV/TZltBkW3Owb7yMk4ffFzBtWR6O1bk=; b=sLEXs14CFwd9ihIoVEg6tn3AzSNTYChAf9tRq7lZ1NZAtVPL8zxVOxzJ285kX3wGQ7 tFw4RJmaQJvg8TaRTdix7roodzVuPLVE7P8Qay2TS3hRBErw+rReUPCifimvh70M4JNi zgS1j7L1FAwfGWhlOHt2JZjJlEqi4VrLKB/xci8Y8Pw95vCVXJG/yV6Rtx/H0t+du1Dq +LlfWvZACZ4Xu6XYi6NnilPNBW/VxMnhLjn+DmnYVYTnF5fx360V9ckmP35vdJp/0PYg VoS6/ho5pVnplTIezZlUy2fJiI3ZV470wGRl0Hh4pmimtivIwclXSZGHX6KIPppJyMB4 QbfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796963; x=1683388963; 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=R5zlVQ3/WR2iV/TZltBkW3Owb7yMk4ffFzBtWR6O1bk=; b=rpwpHfldmht1np7AFr4QIL52IPKI8VZ3EoObcfH2HVAKYkbcNNXMIERZxfv7/E9JIc mYsK7K8nT5ztL9BarxSzQctIYJX0y4kCAKbcvjtD0v4mxgQOIxq30NyDV8wbtcfCnlrD 6PJTQ1ctzgpfluQF7tDH3LcsiAa52PMiHsi5Vmhh3O8PNcROWapFGgzjAYJsqNVnRBs5 IX1+F0R2kxa0rmwFFE6xnNhsnC0IOzJb46ISFhp8OUj1oZq7RHZ+oz7bmEBjCaondpNJ Zw7Dj6AFyfD/rqVQM4L/szjcrktKZ2IeDZahl6NXgjnhKlWsdijL1Pep6eutlIWFU7J4 BOPQ== X-Gm-Message-State: AAQBX9cQKxjYvnU23qKmvrDUUxi/wqevLp4Dt06h3ZWrnxHRGsgYrsJB rT5Y9Nnc5Vts5zcytT2MlZSJVrreF4s6gBRymPI= X-Google-Smtp-Source: AKy350Y5KYR4n+DNcum2uo2idHj3+k1uly2OiaCnznBxnN8OvN4uu12egXaAiNNvxph/W1+HPS/nAQ== X-Received: by 2002:aa7:9a07:0:b0:626:2ae6:31f6 with SMTP id w7-20020aa79a07000000b006262ae631f6mr9756050pfj.7.1680796962686; Thu, 06 Apr 2023 09:02:42 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:41 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 13/26] lib/oe/gpg_sign.py: Avoid race when creating .sig files in detach_sign Date: Thu, 6 Apr 2023 06:01:40 -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 ; Thu, 06 Apr 2023 16:02:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179791 From: Tobias Hagelborn Move the signature file into place only after it is successfully signed. This to avoid race and corrupted .sig files in cases multiple onging builds write to a shared sstate-cache dir. Signed-off-by: Tobias Hagelborn Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie (cherry picked from commit b4ec08ea9efebac262d43f47d95a356fe2829de9) Signed-off-by: Steve Sakoman --- meta/lib/oe/gpg_sign.py | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/meta/lib/oe/gpg_sign.py b/meta/lib/oe/gpg_sign.py index 613dab8561..ede6186c84 100644 --- a/meta/lib/oe/gpg_sign.py +++ b/meta/lib/oe/gpg_sign.py @@ -5,11 +5,12 @@ # """Helper module for GPG signing""" -import os import bb -import subprocess +import os import shlex +import subprocess +import tempfile class LocalSigner(object): """Class for handling local (on the build host) signing""" @@ -73,8 +74,6 @@ class LocalSigner(object): cmd += ['--homedir', self.gpg_path] if armor: cmd += ['--armor'] - if output_suffix: - cmd += ['-o', input_file + "." + output_suffix] if use_sha256: cmd += ['--digest-algo', "SHA256"] @@ -83,19 +82,27 @@ class LocalSigner(object): if self.gpg_version > (2,1,): cmd += ['--pinentry-mode', 'loopback'] - cmd += [input_file] - try: if passphrase_file: with open(passphrase_file) as fobj: passphrase = fobj.readline(); - job = subprocess.Popen(cmd, stdin=subprocess.PIPE, stderr=subprocess.PIPE) - (_, stderr) = job.communicate(passphrase.encode("utf-8")) + if not output_suffix: + output_suffix = 'asc' if armor else 'sig' + output_file = input_file + "." + output_suffix + with tempfile.TemporaryDirectory(dir=os.path.dirname(output_file)) as tmp_dir: + tmp_file = os.path.join(tmp_dir, os.path.basename(output_file)) + cmd += ['-o', tmp_file] + + cmd += [input_file] + + job = subprocess.Popen(cmd, stdin=subprocess.PIPE, stderr=subprocess.PIPE) + (_, stderr) = job.communicate(passphrase.encode("utf-8")) - if job.returncode: - bb.fatal("GPG exited with code %d: %s" % (job.returncode, stderr.decode("utf-8"))) + if job.returncode: + bb.fatal("GPG exited with code %d: %s" % (job.returncode, stderr.decode("utf-8"))) + os.rename(tmp_file, output_file) except IOError as e: bb.error("IO error (%s): %s" % (e.errno, e.strerror)) raise Exception("Failed to sign '%s'" % input_file) From patchwork Thu Apr 6 16:01:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22336 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 1BDCBC77B6F for ; Thu, 6 Apr 2023 16:02:56 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web11.162548.1680796966123452587 for ; Thu, 06 Apr 2023 09:02:46 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=B58u+JGX; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id x15so37652906pjk.2 for ; Thu, 06 Apr 2023 09:02:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796965; x=1683388965; 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=N7wKPdAFfi1EMmTlywiFS9ZXS8FPww6XGmxAsaOZFvs=; b=B58u+JGXBcrcS7gyQp/baoCbq1qTKeMy/8cLkBYuW4g3hxZWAv3USU8UE8TQyddb/A HSBS4dZ+Zr0kYPiXIf6ioMYw/MnuhKZXuenB9jTs8OF8heF6krKO7Wjkj42di/6MM/U3 Bw/5THz96JxwB1ebG2iswpsoVkLZlbDNDZ8+A3W9oISMJxZ5xePgOMUiRy9hugHmfXhg rJJY9K9GY9nB4KiYLQo8GQbeW/yBzwmMlZA9jzYdaMSv1i79+AUM7P39Y4l7Ei8Hd0es EL0h8jePGSwcxYAZ5McHR8d7/CWt8tNgTetgAb+QMgd9bBFC0S8693Zuc3izXNhKBgRY b/hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796965; x=1683388965; 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=N7wKPdAFfi1EMmTlywiFS9ZXS8FPww6XGmxAsaOZFvs=; b=int79lALwTFBGMxRHVnlwVp1Xa6ImUX0xeV6qA9Qjfj7NYmSYhoS7t1gajxx5HkzfT 9sQYo5pYTmQrmvW+L0IW68m+ZeeJiAn5AJaaF4pDJNnGXeXGwOiOvkrgPMdsQkNdFy/F Axn0J8ZTa8sV3gs07a3V9iow04szjLkl/1TnEiO5SnniPWSZ+UjyCc2yY9t1+9SkkU9g xLhzcPLUJ+svSOOqEtfQ30eb3S6htlen8r0N87qCiahAPCxgMaGkXfHn5sqzAA44udR6 wrYBJoTFiuk6ICrSR/eC6TDhDFwIcZ4vRGADidoEgfWjkdmlzVmvIMrgkfPqG0afnV1J nqBg== X-Gm-Message-State: AAQBX9cwSZCC0JcoCJWHHLCQ0rNUXpEo2SjMxHH3oXo9YEr21B3rOsUn AsCe9ur8Iia8/ZzdJASgCcjsin17B6ZR+SKTukg= X-Google-Smtp-Source: AKy350ai+pQPEEN+0sh0Q1QbxfWeVzP9XvLMdTZU/xaIzRw3pWv4mmjBgcRyMD0WP7iWQmOzO3G8og== X-Received: by 2002:a05:6a20:b127:b0:db:52da:367a with SMTP id ed39-20020a056a20b12700b000db52da367amr24876pzb.33.1680796965095; Thu, 06 Apr 2023 09:02:45 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:44 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 14/26] oeqa/selftest/cases/runqemu: update imports Date: Thu, 6 Apr 2023 06:01:41 -1000 Message-Id: <21a31082b7100f82280c1e0b225e6d82b9f6e4f9.1680796770.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 ; Thu, 06 Apr 2023 16:02:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179792 From: Enrico Jörns 'tempfile' and 'oeqa.utils.command.runCmd' are unused while 'os' is actually used. Signed-off-by: Enrico Jorns Signed-off-by: Richard Purdie (cherry picked from commit 50f766233e83528eebeca92877277374c7193530) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/runqemu.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/runqemu.py b/meta/lib/oeqa/selftest/cases/runqemu.py index c1d277a095..72ca77b845 100644 --- a/meta/lib/oeqa/selftest/cases/runqemu.py +++ b/meta/lib/oeqa/selftest/cases/runqemu.py @@ -4,13 +4,13 @@ # SPDX-License-Identifier: MIT # +import os import re -import tempfile import time import oe.types from oeqa.core.decorator import OETestTag from oeqa.selftest.case import OESelftestTestCase -from oeqa.utils.commands import bitbake, runqemu, get_bb_var, runCmd +from oeqa.utils.commands import bitbake, runqemu, get_bb_var @OETestTag("runqemu") class RunqemuTests(OESelftestTestCase): From patchwork Thu Apr 6 16:01:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22340 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 2A320C77B72 for ; Thu, 6 Apr 2023 16:02:56 +0000 (UTC) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mx.groups.io with SMTP id smtpd.web11.162551.1680796968039447023 for ; Thu, 06 Apr 2023 09:02:48 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=C1G5On7H; spf=softfail (domain: sakoman.com, ip: 209.85.215.178, mailfrom: steve@sakoman.com) Received: by mail-pg1-f178.google.com with SMTP id l184so14923560pgd.11 for ; Thu, 06 Apr 2023 09:02:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796967; x=1683388967; 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=eJJPajX1qLA1bDQtINuXwSBhq4UmQEZnbwiSF5kOAlM=; b=C1G5On7HOAEPmdzZB7yZngKcnWvZZf+VvVi4MxLUL7xsXfvNWiHPw0EcNwSGVzSFKe yMR8WSwskbShdNKgD+icZ4vLhLYUmPJ4I6vk9t8TKW0z0LQ87k5MoVwXh/Pc9BOExYaq jikhbt88lvlLyfbtIrHruFDMJYkW6dbrqqkZ+3VEfJsQ778OfGQW5hUrLLTUdK+Uzw0Y W+iOTIkTGcKyY3HmBozU8OWHm3COmtArzgP+gYurYOB44DYHcnT/iLa908WQzY5NIV7q KBHowfbhFkkMiy51J6XLe/Bd7fueSSXKtW5aIv4pbaVqTdpaHvHVFd7vcT0/niloJgKz xkMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796967; x=1683388967; 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=eJJPajX1qLA1bDQtINuXwSBhq4UmQEZnbwiSF5kOAlM=; b=0QPru7SLSuouMKjc8rrp9DK41aiqUkQZ5l4brQ6vHUB3JRXSCmDdIi2+fGpmVXPJ4y rhfOWyXKb/xD7Moe+wGrx8pTYjxUHsCDA1ZGvA7Rzt6aJfZVpz5Zw+cJbAnAeX7ExFug VUIwgp8JktGBIyRkLAkP3ubLgRrR0vs9uU7MXU2U2r1Y76F29fmXEuRLWS6AtmtD1dSl 9WGbFdO1BrFnp9kWMMd+ty5d97jFFl6oWlG9WvArwMcPG5NTe7+skp1wZIwk8D9+Vleh pMZlmFzJPhZ+anfMSwI19lIQlIdVoxcodPkw6ZlWbeF1zkvf3Uz85PnmugQ5h4FcSbIu lDgg== X-Gm-Message-State: AAQBX9c8FKlYWVBpHxwc2EC8iQXZYFJN69EexjWtEhT23uIBf7VYxsoU 2tkEctu5vkFa8l/wvTBZrrwphhXgYgYuB9ZNNOI= X-Google-Smtp-Source: AKy350Zmp1r9geyY0+SvYBIF+z3CVH5fF+pumkb/AwlzW1BsG+LyGi15XbopIhfHopfQk4uVQAThcg== X-Received: by 2002:a62:790e:0:b0:627:f837:2f5b with SMTP id u14-20020a62790e000000b00627f8372f5bmr10393764pfc.11.1680796967053; Thu, 06 Apr 2023 09:02:47 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:46 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 15/26] oeqa/targetcontrol: fix misspelled RuntimeError Date: Thu, 6 Apr 2023 06:01:42 -1000 Message-Id: <21c513fccbf743f9000c3b7b13fc4962c3ae5c7d.1680796770.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 ; Thu, 06 Apr 2023 16:02:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179793 From: Enrico Jörns Signed-off-by: Enrico Jorns Signed-off-by: Richard Purdie (cherry picked from commit 92ffc35052768c753a89b4839c70db87072437a2) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/targetcontrol.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py index 1fdff82889..b8d4ea8a70 100644 --- a/meta/lib/oeqa/targetcontrol.py +++ b/meta/lib/oeqa/targetcontrol.py @@ -205,7 +205,7 @@ class QemuTarget(BaseTarget): self.server_ip = self.runner.server_ip self.connection = SSHControl(ip=self.ip, logfile=self.sshlog) else: - raise RuntimError("%s - FAILED to re-start qemu - check the task log and the boot log" % self.pn) + raise RuntimeError("%s - FAILED to re-start qemu - check the task log and the boot log" % self.pn) def run_serial(self, command, timeout=60): return self.runner.run_serial(command, timeout=timeout) From patchwork Thu Apr 6 16:01:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22338 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 2A244C77B71 for ; Thu, 6 Apr 2023 16:02:56 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web11.162555.1680796969929678038 for ; Thu, 06 Apr 2023 09:02:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=x1OJcbK0; spf=softfail (domain: sakoman.com, ip: 209.85.214.172, mailfrom: steve@sakoman.com) Received: by mail-pl1-f172.google.com with SMTP id w4so37887400plg.9 for ; Thu, 06 Apr 2023 09:02:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796969; x=1683388969; 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=o+i4g2DirhqVPDbMjKUgAzHTn0kwzyYv7E45CijIFwM=; b=x1OJcbK0PzmAPfmPQ4qxCf7Fu3q37rqX1jW49vTJZcrqj/79XKg05zr/1W0/kAy/mw +ktM4d6KGpYP7gom6LY81VaPJivlxRh2a9OfMr9yOPy46lANnHljuihwj20YSCfOGNAs lRaYnZk19rR2OaKdWFpa6YdRpHNudK/oZdggchsla2W+O6Tfeef+oPlnoMeqvMPWKHto hQY6veh/6ttxMneYKdaDxfaGtL0OBkGdtRtqAYL7YgPM8TzuHFNBsT75jw73bTuNu93q p9Qgy7/uefgGjV8LGnePvKAO/+bDOzIdfDCqopwYQEMWNcDF8F4Phpv+ndSFl0sMZUej 4YKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796969; x=1683388969; 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=o+i4g2DirhqVPDbMjKUgAzHTn0kwzyYv7E45CijIFwM=; b=N8bz9cig2lAvxjgzgj1tgAGVDTEnrZYfl321o63GpDf6MuHuWGmA3ZKbc8y0v77GMg 332ypjR/u+yxcvt7KQwgC7HP4U3569IDClLMmbGFSOrmiLmOEDa2hqTOD5hmowfDnnS+ hJuaMURFQ9VeHJzf3OKZX7868SJ0weboVAoAt8m8Uv89VBNP6NyjEv3DeIsQLCz7qT1l zUqWqV3gJlHDMJFqmRoz4G2JfK8twsSdvZrMBmxNjC8nXqkkGaIUGm4RDqU0LMkj2bp8 iz6nwD9eAMGENkgQKi29pv83rNz8LTx3XMcUv6n65IV8fZpSBWfFZhpr9WevGdR+gYq1 nvPw== X-Gm-Message-State: AAQBX9eo1sOuhnmE+frcNgbDfuwuoxCJvYtJil0HyfiPU5dr0Fir1W87 4kugUlm6eFDy4TOmSdW+IWSlTfR6QxeAWuqksHc= X-Google-Smtp-Source: AKy350ah8nfwBkbXuytsQXGFtP1P0vmNHuQ8wvuPlSKQwDgPLd0nqE1gWe5ySJaFCcik1yShsZbCow== X-Received: by 2002:a05:6a20:6d13:b0:db:8f0c:6a3e with SMTP id fv19-20020a056a206d1300b000db8f0c6a3emr74487pzb.16.1680796968957; Thu, 06 Apr 2023 09:02:48 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:48 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 16/26] oeqa/targetcontrol: do not set dump_host_cmds redundantly Date: Thu, 6 Apr 2023 06:01:43 -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 ; Thu, 06 Apr 2023 16:02:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179794 From: Enrico Jörns This is already set above, thus simply use the set value from there. Signed-off-by: Enrico Jorns Signed-off-by: Richard Purdie (cherry picked from commit 2f6571ffb23b1a0b5bd6a1212fc108e536f04539) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/targetcontrol.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py index b8d4ea8a70..bc6b91e994 100644 --- a/meta/lib/oeqa/targetcontrol.py +++ b/meta/lib/oeqa/targetcontrol.py @@ -145,7 +145,7 @@ class QemuTarget(BaseTarget): boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT")), use_kvm = use_kvm, dump_dir = dump_dir, - dump_host_cmds = d.getVar("testimage_dump_host"), + dump_host_cmds = dump_host_cmds, logger = logger, tmpfsdir = d.getVar("RUNQEMU_TMPFS_DIR"), serial_ports = len(d.getVar("SERIAL_CONSOLES").split())) From patchwork Thu Apr 6 16:01:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22335 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 2636FC77B70 for ; Thu, 6 Apr 2023 16:02:56 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web10.162539.1680796971803094908 for ; Thu, 06 Apr 2023 09:02:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=mt1KZh9P; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id x37so24024469pga.1 for ; Thu, 06 Apr 2023 09:02:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796971; x=1683388971; 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=CJumSe93pZIKv5lRmTOyhtUDMOKK0Jyr+T0eNgl7Upg=; b=mt1KZh9P2991+e3ow8dsFqSaNmJ8z0v8tdRgGi+WvAPCFK0/2vstvLpUBXhLpUjNuu d4/+K35umpTo9pM4MPsQA6z1yEAaDz7rQjEFPJpIZgTR4exbSgGXU8Hu1+tl2dE3u/Sb WgJcnXG2BxmSUA7MlkZBMKQWaWqECo4qLgNP2J2jXJ6Qt1OJaGf0ljhpscIH0Kl1vddL 1p2o5CcjIDltRUGcQJ/cLalB/GnTxzANtD+UynBTWH4qp2ZdMLf8STgeSADYTERPzNpV 4hAuk0wrqWUidxpUI4E66Fabp1CrSkta/pmlt4gTfWB0NAW341SRpfbQVOmvOIAss9Jf THrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796971; x=1683388971; 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=CJumSe93pZIKv5lRmTOyhtUDMOKK0Jyr+T0eNgl7Upg=; b=OY5PGsLIc9wi6cetGc5tatRetETOCgiJMWD79BvILlcv7Va8VYXa8XpbqYp9RZvAXy U+8Fll8DIVgYoNUB8FXk9UGTc2IrBk6WiDlvoqjs3VH0t6uDZXzZ/2AknPj1u7sxq7Jp rYwgOmLfUfy2Xm7oT+TrvzHKTXKosm0bf9xTBgzBVqY0SsqFpXafMpRFF1+HM+Z1sPTL fJnLFMc9dbmP7N8EsNWkXVZakVXy6nzXVSy9/88ODvc3ECvqbfXOc60RYdxjjjf32mNj Tx6Vwg+IojY3sFiUaOZMEZ/XoAJSOBBIsFwFdHYj8//+FW1aEbEFxS3GTC048ponEv3w iZkw== X-Gm-Message-State: AAQBX9dB6UXfh723B3E8iYJf+ZIRzHKJxgEV+kSPZwp5p96h+oWivRRz k88tz9CkTMkqEn6d7JSZ1d67CmvjPCSsuD1jUmY= X-Google-Smtp-Source: AKy350Z46Tj8ZKIeb//Y5ddx7Wr10PETtgODxJh6N+Pt+WslYx6BH99WJvh0Zi2xy3DV85XWpESE3A== X-Received: by 2002:a05:6a00:1d8b:b0:626:9a1:3731 with SMTP id z11-20020a056a001d8b00b0062609a13731mr6367227pfw.7.1680796970781; Thu, 06 Apr 2023 09:02:50 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:50 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 17/26] oeqa/targetcontrol: remove unused imports Date: Thu, 6 Apr 2023 06:01:44 -1000 Message-Id: <6659360828b5d022b90e71883159a75f4def7382.1680796770.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 ; Thu, 06 Apr 2023 16:02:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179795 From: Enrico Jörns Signed-off-by: Enrico Jorns Signed-off-by: Richard Purdie (cherry picked from commit 46b42edbf814d15be3a18283018ede2d4f817bc6) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/targetcontrol.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py index bc6b91e994..f5f2ce2f12 100644 --- a/meta/lib/oeqa/targetcontrol.py +++ b/meta/lib/oeqa/targetcontrol.py @@ -7,18 +7,14 @@ # This module is used by testimage.bbclass for setting up and controlling a target machine. import os -import shutil import subprocess import bb -import traceback -import sys import logging from oeqa.utils.sshcontrol import SSHControl from oeqa.utils.qemurunner import QemuRunner from oeqa.utils.qemutinyrunner import QemuTinyRunner from oeqa.utils.dump import TargetDumper from oeqa.utils.dump import MonitorDumper -from oeqa.controllers.testtargetloader import TestTargetLoader from abc import ABCMeta, abstractmethod class BaseTarget(object, metaclass=ABCMeta): From patchwork Thu Apr 6 16:01:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22339 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 1BD96C76196 for ; Thu, 6 Apr 2023 16:02:56 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web10.162523.1680796955851529054 for ; Thu, 06 Apr 2023 09:02:53 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=IpdBJYqY; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id o6-20020a17090a9f8600b0023f32869993so43305715pjp.1 for ; Thu, 06 Apr 2023 09:02:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796972; x=1683388972; 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=1Jyj6qhjUELm5ewXNc3ljgchk9AKgOkQbvH7vd30ARs=; b=IpdBJYqYS6NQ4QpEabFTHR6cb/10LzXv5IcUOsw50FV1EnJsdJ+118egi/hbngiWOV tmHy08UinfDEQnIOSzWn6EuGIuIUc2xawz/ZCKzqrRnmVgxiIufn3zUX8FB99Fni/YCd 3Dkj/LRWNu1AA0s/JYSytbHQXwX8V3eJbmfqPLzx0EgApvlk4i4oe/h6Allo0lHHS40b ka+xn4Lw3w38EkULgrB1O/0A5Sumob/skYI+yTpFrisMPAls8msGYDhCvJlJkI9WDJhh dn5bq+3NkwsDmgdhpnKbp9KA39y3k/CiBBtHEsWyIuk3dV65RM3hvUtJlrhc8CGfK6NY l99A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796972; x=1683388972; 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=1Jyj6qhjUELm5ewXNc3ljgchk9AKgOkQbvH7vd30ARs=; b=Tc63kZRiFJ9KkOg+ZJcjlZPBJiIvSlYnXN3n4zhoIZtm+0tRQeCH0DMnwe0wVvyXoE RDCRtp5F41up6scq5iuzIhHZGyhE2gYDA9NYSsx9i54wy/YEBdk0wu4430YD9r9+LW7c +cxKdMOOXj5+0GiLMMxaU+CNZDnrGN0E4+vlOuxYQ57po1n5pO3DD40p2zy+ofPv2i6P psTtTCiRETDMRZ90CRW2D6x0rpwZu5ow3EAYFMMXrmcQYs7kVFQiRWtyU03m6Gl3gEYL 4Z3el1Mj3lZPWaqqbXjjyKgC53oN7optFVNfiRosSpXeEtnaSXXQIvP3HSsyzd0idKGN nnWQ== X-Gm-Message-State: AAQBX9fGAMGw/Bg0SonFaSVuE0U9ah9J4BCzwIaPLLTUXZDoQ9RIfCN7 f3gHOiNYA8D2J84NZMz2G5enlAG1wpoE5tZxcwY= X-Google-Smtp-Source: AKy350b9LtD2+2/w4psaRheasovf2AYDwcCTZylhPrwCBtaoTipQwUQHPXrUbExl6yKEPD7ReGW+pA== X-Received: by 2002:a05:6a20:b213:b0:da:144:92bf with SMTP id eh19-20020a056a20b21300b000da014492bfmr7268pzb.14.1680796972589; Thu, 06 Apr 2023 09:02:52 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:52 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 18/26] oeqa/utils/commands: fix usage of undefined EPIPE Date: Thu, 6 Apr 2023 06:01:45 -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 ; Thu, 06 Apr 2023 16:02:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179796 From: Enrico Jörns Signed-off-by: Enrico Jorns Signed-off-by: Richard Purdie (cherry picked from commit 1cb17e37e275794e26debed2d171c2394d8bb945) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/utils/commands.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py index f733fcdf3c..c03ba52ef2 100644 --- a/meta/lib/oeqa/utils/commands.py +++ b/meta/lib/oeqa/utils/commands.py @@ -21,6 +21,7 @@ from oeqa.utils import CommandError from oeqa.utils import ftools import re import contextlib +import errno # Export test doesn't require bb try: import bb @@ -85,7 +86,7 @@ class Command(object): except OSError as ex: # It's not an error when the command does not consume all # of our data. subprocess.communicate() also ignores that. - if ex.errno != EPIPE: + if ex.errno != errno.EPIPE: raise # We write in a separate thread because then we can read From patchwork Thu Apr 6 16:01:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22337 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 17A1DC7618D for ; Thu, 6 Apr 2023 16:02:56 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web11.162561.1680796975445000780 for ; Thu, 06 Apr 2023 09:02:55 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=NMZ/R3nW; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id q2so1814309pll.7 for ; Thu, 06 Apr 2023 09:02:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796974; x=1683388974; 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=ea3wJOyoVPGDfVTJ1za20bEFMltUjh+vpJLCxD+J0js=; b=NMZ/R3nW4DLcIWVoXKPU9YTpYkEJvs8DagkPhvopuZCVXm2MLlNjUZ3B7qaz+ElZMP e92uu+6fXvXEjZz3E622A/qF9MvRS+/3XlAhEkdrTQoq2ektVGYi4K/l4Ohwyh4lTDpD fo54o7sjTeaHL7+sXh84hiRxQ2ZhFoux/lJseyaSmeCAwNZvW7rm52i+as3ULnrsAIH+ H1s3xxl+j7UbjeHVVURd7R8xbxB0d5Dm2JL5vijcpyy6mscB97SA6wXk4Ogh4twYcbhs 7KOSFjHkmCSKvbdbqAg+lsFPio7c8o3uq9X3dQnkL3Q9Iznp2p8DXwT9Uge4Hw+X8cXN 5ILQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796974; x=1683388974; 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=ea3wJOyoVPGDfVTJ1za20bEFMltUjh+vpJLCxD+J0js=; b=tvWOSDgLjtmeGFPr9DCgyQV7xaao3GMbxU40f/Co2vt+/96LEzG9Or4ZBkoMDLixr/ lhSoyKs7nVPtWYFhUoC2ttTR7RPFTdqqqy9Y3fqEg54SZ5C9Xn2xMQeBUbFPRNHCQmQ7 IHlk1tmDZMC7NSOfnU3EF/q11LXhKAmX89kA5zO4IQrHDApTTJEJYnh5JeauApSWcGbC WUMwM8OnXsBBLhWBJ3oY/7iXsUC8vUDmlY4A3Q6KrugAyhvgCJtoZWvszOzEWkWd9leH dh55qoHOXfmWtHzIt3ChadiTePqLM486YMW52R25WOzZWtP/TJS2/GughsZO/cIhRbSG jHpg== X-Gm-Message-State: AAQBX9cZdy9K2EqfG/slEFEU3EftZS2bbG000iy+y7ff6u6JOqYvWhIo iDV71a7butvfQAVNy7RBgRYC3tdia+1sGUW+X8Y= X-Google-Smtp-Source: AKy350YMwjzTt5ziMyR6NvdeMExIoUsFnkMgqFmDXqbT2V5LOtUwmLSPz45ekGJXnEvyQ8UeMGrweg== X-Received: by 2002:a05:6a20:3094:b0:d8:cfcc:555d with SMTP id 20-20020a056a20309400b000d8cfcc555dmr54822pzn.17.1680796974525; Thu, 06 Apr 2023 09:02:54 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:54 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 19/26] oeqa/utils/commands: remove unused imports Date: Thu, 6 Apr 2023 06:01:46 -1000 Message-Id: <9faa5ad7ea61a2edd121b526c688f964e0b656ac.1680796770.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 ; Thu, 06 Apr 2023 16:02:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179797 From: Enrico Jörns Signed-off-by: Enrico Jorns Signed-off-by: Richard Purdie (cherry picked from commit 0c00b5cdd57c3d9c47d4780d6627c74221911b72) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/utils/commands.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py index c03ba52ef2..473aa38d41 100644 --- a/meta/lib/oeqa/utils/commands.py +++ b/meta/lib/oeqa/utils/commands.py @@ -8,11 +8,8 @@ # This module is mainly used by scripts/oe-selftest and modules under meta/oeqa/selftest # It provides a class and methods for running commands on the host in a convienent way for tests. - - import os import sys -import signal import subprocess import threading import time From patchwork Thu Apr 6 16:01:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22342 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 1CA8BC761A6 for ; Thu, 6 Apr 2023 16:03:06 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web10.162545.1680796977406173180 for ; Thu, 06 Apr 2023 09:02:57 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=WlhWKScW; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id s19so24060929pgi.0 for ; Thu, 06 Apr 2023 09:02:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796976; x=1683388976; 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=BfJTgfKJL1AHYr0wqsoKCd53Jaqu1EXfaQA3j0hjcwg=; b=WlhWKScW0ipBLMfjgcFr74RJN8lW9KP49fN4Xjozdyu9Z2+hk7E1jAWUGWZZ9LUJqA RN0EUfScLTHfsD5q+j78dIB09s60sIIJSIxQqstC/xml7gx5GeCogxPj+Kg2DvRpCmCX nAQe7ZbRlTNf5XXPNMVJBdgojnUFxF0K2q7fwBh+UJmt76l6QNzGFdBxmPupe2YJwhoX k8hb3uJZO5/FawcW9rfUSapcDn8vZzJonzkViDDbDIm9Z2VLVmLR14k6xnPnZYw5Jg9W RCOOFB+Xlh8pkAuPwkkBzEiobjOap7/85HhxqojsWXpRCxLU6c8KDJ/hz5S3fgP2dwPZ 2b6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796976; x=1683388976; 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=BfJTgfKJL1AHYr0wqsoKCd53Jaqu1EXfaQA3j0hjcwg=; b=nFifHaSTfscqG54iM0d1dscFgLwRouiVI/s3FeG0nqEpTnxuc/RWbSt6SMzqJaXJIm TEbZyR4IhcnOmSkFAS0vTD73wGzO3aOC/CX3W+gF76p3H819ATSHw6BomVtyK7B4d2in /1eCtPhNI5kWE3PnOGpbCcEOBA5K/SZO5IO0tj3yUqNjRUr5afi4+h+foMSNec5TX6y2 3nTarb7xPfM/cP8C/scURZ17cx5Nr4OzTu1hxFlRoO1LRNKurdvKz9GMx3GXI1VsbDmH 1+FbC26N1jPzj1GVFZGd3gOpvy0w4vO+brEDvYKm0bL9nn5bpVprpKohbcRthW9iLQy9 Rm2A== X-Gm-Message-State: AAQBX9d293w9GgShLWyMdFZ04XIUON1aq6Own57g4CXFT44Hzc3BNs3b x8Z327jnHqmXnaqaFbphbcaki5+ELBrO0JggpCM= X-Google-Smtp-Source: AKy350ZRQGyIbznks9i7F79aEQOGCcEzK4au9E07dbmewMcLGH0n8SK06fVifX1naT6Z1FVP82V4Cg== X-Received: by 2002:aa7:9a5c:0:b0:623:cc95:e517 with SMTP id x28-20020aa79a5c000000b00623cc95e517mr10005729pfj.17.1680796976436; Thu, 06 Apr 2023 09:02:56 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:56 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 20/26] oeqa/utils/qemurunner: replace hard-coded user 'root' in debug output Date: Thu, 6 Apr 2023 06:01:47 -1000 Message-Id: <386f55d2ba5783038c810dfde98b421191fa00de.1680796770.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 ; Thu, 06 Apr 2023 16:03:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179798 From: Enrico Jörns Since login user is configurable with boot_patterns['send_login_user'], unconditionally using 'root' in the debug message can be confusing. Also fix the debug message to say 'Logged in' instead of 'Logged'. Signed-off-by: Enrico Jorns Signed-off-by: Richard Purdie (cherry picked from commit 900e3d42b918b5a33d8d952b3a8078fbe72ba98f) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/utils/qemurunner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 1aaba02bd8..a455b3b389 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -511,7 +511,7 @@ class QemuRunner: (status, output) = self.run_serial(self.boot_patterns['send_login_user'], raw=True, timeout=120) if re.search(self.boot_patterns['search_login_succeeded'], output): self.logged = True - self.logger.debug("Logged as root in serial console") + self.logger.debug("Logged in as %s in serial console" % self.boot_patterns['send_login_user'].replace("\n", "")) if netconf: # configure guest networking cmd = "ifconfig eth0 %s netmask %s up\n" % (self.ip, self.netmask) @@ -522,7 +522,7 @@ class QemuRunner: self.logger.debug("Couldn't configure guest networking") else: self.logger.warning("Couldn't login into serial console" - " as root using blank password") + " as %s using blank password" % self.boot_patterns['send_login_user'].replace("\n", "")) self.logger.warning("The output:\n%s" % output) except: self.logger.warning("Serial console failed while trying to login") From patchwork Thu Apr 6 16:01:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22345 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 2940BC77B6F for ; Thu, 6 Apr 2023 16:03:06 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web10.162547.1680796979381046015 for ; Thu, 06 Apr 2023 09:02:59 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=KJLR2ahg; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id p3-20020a17090a74c300b0023f69bc7a68so41075862pjl.4 for ; Thu, 06 Apr 2023 09:02:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796978; x=1683388978; 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=HrXOdH+8/U0fdwgCbqlR8eWdBhJ4cY1Tp0Wtyh0PNLM=; b=KJLR2ahggVsfoYu6VNB6QxiF/bZ5723ovacsoHNSEXYNxL7a6RnWk+iQmXriS1aWNv s8fO4f1L1yQeg2FMJMdFwlFwb68dOtjIvr34LZmoCASYeYQq8dtF735tCimyaDCQhQFH kg3uzQU7OapFu9kyevQPbqsQiEP/2x+xdSNPOoj7N7z9qH3PDxlANoujbCDyutDyygLU Pvc8RCx3paNF/MemvnNK9E52HtTTWu377TGDsT9IEEL7pQPBhB19KSj6BaoeiA5mNd/4 E4FzqAuBgNKp4afSESv7OrQQ6Q7+FkNYZB5tlTotJm62XJ0UiITXLghSFxIprl+GGmmF LKkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796978; x=1683388978; 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=HrXOdH+8/U0fdwgCbqlR8eWdBhJ4cY1Tp0Wtyh0PNLM=; b=wZOtfEjmNK5MHhpHZT52NfCt1j3bIwb14MlXpO0HUtEAkcckpcgsVtFvZ95XVlH+c2 9VCG07+An6jMZVp1ihmgwCMnakK2c1jVxYCUV9yDylmeMDzC9VteJveTHxXrmntNosK0 wpA1/K4U77uppnFx/jUyqX5+mxjsjPMzqvXj4VBrqoiZF0HmoVFBLMpl2sVP8/FT1mU/ NODdzc88Rs4Mazj3QzuSQV+ZUjaswVxpC82r+FmkIyWakBiYsF1qCYxLIX6WYciWctde t4REaKD4YJfknhbgHGogfDUgVMnZSo6r3LA4QjL2Pyo2w9EkCiNH3Eo5Zh7GS+MwyuKx g4Zg== X-Gm-Message-State: AAQBX9dajGP1mkuu/SRicGkALRcOuArb1WO3MM0hBG2b5sF47cnUNYM0 3L1OhysEDQxz3/ybpwwempWsylGONHHZIy/y6Xk= X-Google-Smtp-Source: AKy350a+5NmfcwLn227DnBzMbHkXTbVU6tWwcvzyOaFaQ7tMz9YVP3EN427LuN8dSjbAOOKJRv4W5w== X-Received: by 2002:a05:6a20:3b18:b0:d9:3440:9a26 with SMTP id c24-20020a056a203b1800b000d934409a26mr72796pzh.20.1680796978476; Thu, 06 Apr 2023 09:02:58 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:58 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 21/26] selftest: runqemu: better check for ROOTFS: in the log Date: Thu, 6 Apr 2023 06:01:48 -1000 Message-Id: <1079fade975c54b62b0187b1acd9c9475a5bbe7e.1680796770.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 ; Thu, 06 Apr 2023 16:03:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179799 From: Martin Jansa * it was searching for line like this: ROOTFS: [/OE/build/poky/build/build-st-2023-03-20-esdk-runqemu-patch1/runqemu.RunqemuTests.test_boot_machine_ext4/build-st/tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64-20230320081121.rootfs.ext4] but with IMAGE_NAME_SUFFIX changed to something else than default ".rootfs" or with my pending changes the line looks like this: ROOTFS: [/OE/build/poky/build/build-st-2023-03-20-esdk-runqemu-patch2/runqemu.RunqemuTests.test_boot_machine_ext4/build-st/tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.rootfs-20230320085744.ext4] and test was failing. * Check for whole line starting with ROOTFS: and ending just with .ext4 [YOCTO #12937] Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie (cherry picked from commit 7a0f622f23aff2c4eeca0606e7682931eb53287a) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/runqemu.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/runqemu.py b/meta/lib/oeqa/selftest/cases/runqemu.py index 72ca77b845..e72dc1036e 100644 --- a/meta/lib/oeqa/selftest/cases/runqemu.py +++ b/meta/lib/oeqa/selftest/cases/runqemu.py @@ -57,7 +57,8 @@ SYSLINUX_TIMEOUT = "10" cmd = "%s %s ext4" % (self.cmd_common, self.machine) with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: with open(qemu.qemurunnerlog) as f: - self.assertIn('rootfs.ext4', f.read(), "Failed: %s" % cmd) + regexp = r'\nROOTFS: .*\.ext4]\n' + self.assertRegex(f.read(), regexp, "Failed to find '%s' in '%s' after running '%s'" % (regexp, qemu.qemurunnerlog, cmd)) def test_boot_machine_iso(self): """Test runqemu machine iso""" From patchwork Thu Apr 6 16:01:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22343 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 29613C77B71 for ; Thu, 6 Apr 2023 16:03:06 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web10.162529.1680796961067041969 for ; Thu, 06 Apr 2023 09:03:01 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=tAVEy93i; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id iw3so37907830plb.6 for ; Thu, 06 Apr 2023 09:03:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796980; x=1683388980; 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=s6TqyLke9G/XVvHTNVp2hhe1HAshStAG4Qw5AVUYnGM=; b=tAVEy93i4zInPeUQJEWaivFvsg3guJmBGdO8peeJ1r61ehOLeESrTUvkjKCw16EvBB ulSEJESwHYr27ZnB3uk8WTd8FdzVsvvk3zTgd8UeDFNJjbt9e3H//GEb50EMwsrsBVAY eJfVdbWvjg94v19WlH+N96D0ctRrJLsHh9WhTcbub8Z5eUpcplYSOPrzvSJniRWQgu1p AoLahkqvceC6hZCZJg+w9NNjAM8PZrN1Woj7svPXSyOfV8pqwsLMsLxh0wl8IoYD7Hp4 yVA5wMwSSLJFXycQdukyOYx9muCQJNtzc3/ow7soTh4Ca00zUbOxCFyk+0cB326z8Tfv O+pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796980; x=1683388980; 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=s6TqyLke9G/XVvHTNVp2hhe1HAshStAG4Qw5AVUYnGM=; b=Tttqn4Z4+HuF0KoI18JwEZAbHbjAkBS5udEODgH+fM1GM+gbREAWHeMav0KQQekGII d+3/ZuERlbmVXCUX0++Sd1hpe3jl54pzpnb2H3dsaqK+/hPb87830DQl2vnts8g6qR9e JksCD1po/5aOW8O3I9rs8G0GLYe61YQLmyT8vy1wWkxBdAA9bt6qN03BKoBeCKC6CX0M KbOGGVMvd7jyetToPaPgLSIgcbMzJUott4sLRN9kiP29psQQT7uK+Q0nK+zNIjct4TNd 8fhbiopJbvrbqkWQUz0GGl+Li4Ux0O+a6nUvABCV87MEORvVOGgH7+d1SczjE8fu0bIs YEhg== X-Gm-Message-State: AAQBX9cYXLqCmHmX3RixLhBo4+lmfc7t3m0EzGI5ep2dA6kXvs7x7lOa /Ojs+gFcktdoRV+cFGC4BeeBhJ3lr/0Mc+OpKss= X-Google-Smtp-Source: AKy350aRrh4qPCl/OoF4jOf3ReiuMm4PYemYx4m/3PvBRhfm1PlxvlTuxbO65NjAml9L/9R14Mv5FQ== X-Received: by 2002:a05:6a20:1207:b0:da:368e:7c73 with SMTP id v7-20020a056a20120700b000da368e7c73mr19404pzf.37.1680796980199; Thu, 06 Apr 2023 09:03:00 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.02.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:02:59 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 22/26] selftest: runqemu: use better error message when asserts fail Date: Thu, 6 Apr 2023 06:01:49 -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 ; Thu, 06 Apr 2023 16:03:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179800 From: Martin Jansa * It was showing whole log and that the runqemu command failed, but not where the log file is, nor why it thinks the runqemu failed [YOCTO #12937] Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie (cherry picked from commit ad4b72e6524114a3bdee10cab71f194ea143cd24) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/runqemu.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/runqemu.py b/meta/lib/oeqa/selftest/cases/runqemu.py index e72dc1036e..d3eeee3b41 100644 --- a/meta/lib/oeqa/selftest/cases/runqemu.py +++ b/meta/lib/oeqa/selftest/cases/runqemu.py @@ -65,7 +65,8 @@ SYSLINUX_TIMEOUT = "10" cmd = "%s %s iso" % (self.cmd_common, self.machine) with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: with open(qemu.qemurunnerlog) as f: - self.assertIn('media=cdrom', f.read(), "Failed: %s" % cmd) + text_in = 'media=cdrom' + self.assertIn(text_in, f.read(), "Failed to find '%s' in '%s' after running '%s'" % (text_in, qemu.qemurunnerlog, cmd)) def test_boot_recipe_image(self): """Test runqemu recipe-image""" @@ -80,14 +81,16 @@ SYSLINUX_TIMEOUT = "10" cmd = "%s %s wic.vmdk" % (self.cmd_common, self.recipe) with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: with open(qemu.qemurunnerlog) as f: - self.assertIn('format=vmdk', f.read(), "Failed: %s" % cmd) + text_in = 'format=vmdk' + self.assertIn(text_in, f.read(), "Failed to find '%s' in '%s' after running '%s'" % (text_in, qemu.qemurunnerlog, cmd)) def test_boot_recipe_image_vdi(self): """Test runqemu recipe-image vdi""" cmd = "%s %s wic.vdi" % (self.cmd_common, self.recipe) with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: with open(qemu.qemurunnerlog) as f: - self.assertIn('format=vdi', f.read(), "Failed: %s" % cmd) + text_in = 'format=vdi' + self.assertIn(text_in, f.read(), "Failed to find '%s' in '%s' after running '%s'" % (text_in, qemu.qemurunnerlog, cmd)) def test_boot_deploy(self): """Test runqemu deploy_dir_image""" From patchwork Thu Apr 6 16:01:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22344 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 23B86C7618D for ; Thu, 6 Apr 2023 16:03:06 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web11.162569.1680796983156235941 for ; Thu, 06 Apr 2023 09:03:03 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=5YDbMapk; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id ml21so15700882pjb.4 for ; Thu, 06 Apr 2023 09:03:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796982; x=1683388982; 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=+BOIsCvrubmQ5Nr8+XgfBhrE+9kVoI3A+E0fcqwPPQI=; b=5YDbMapkYaFA5X+yRjW7Gn2Ep5PC2qnrJCt8iCKxRu2fzqiC0w8BEazao1q4fFiQVq zK9RPKJuIblE+o5kar9TsDWs7CDscgGWr8nE7elff/wzR15wncL1mxoT974RWMRNhaid 5znSDK47jGa6MrM6IFmn6yFKwlxyRfIkl1meDqwBnNfURVG/iz07BxqdiuE8Vz8gymHm KpRzFRjZzJfMrhuWmcImjzB6frStO6EQlQFYBlsduPXPpau+7VhLaqvlKm+XPXeLlLKW 2FTz4gcRInAiIMaByM2pJx8s9kBdgEpxArHvjrpde0srZoCmN43yi/k9R3qU1Fc2FR8o re/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796982; x=1683388982; 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=+BOIsCvrubmQ5Nr8+XgfBhrE+9kVoI3A+E0fcqwPPQI=; b=doSox+ZbEw0O+MobLF3ej0ObtkAgrrYWYjV3tWzlu4Vg0Oq/A6cKW+xoPgO81cIxSo ok0DkB56qeVg05Vjat1zLAvZW800O/WxgRhcoHOYwEVaT9ME8EDKc+hBpl9s+4uAAjxH +bkx6b/MJbeLV85T5PaymU/Z8UZltb3uSAj4bq4tkKYxgNFBDXr9WAyOA/JMEvvZyU2F z1yoI7NTc7G8M0U1dkB8KWUaurEweGjL4fHDb1Naku2PKnqGhOXsnEZsCtKHIfNa40Zw bvqbTGt9CUbpGdt/ip3hyLsnm0QI6bRusk43+TczJmYWzck4JqfRzt2/HpJtpaVHFNql HWbA== X-Gm-Message-State: AAQBX9dvAVfydyZWwvdUulHVx6yKNAfak+p9kHxKoG8Vv1cFbY9hu0jR Q2aAj7vKu8NYDj9AodIBb59VNuyr6kBRXflnpZA= X-Google-Smtp-Source: AKy350bEZcvaRi4bckC1AsioDd7AqN/b/1+Y5S2518HWbnRMdxAg+qpr1Z19ezKGqFYpCfb9yMzAsg== X-Received: by 2002:a05:6a20:7523:b0:d3:9c13:606 with SMTP id r35-20020a056a20752300b000d39c130606mr2786244pzd.47.1680796982100; Thu, 06 Apr 2023 09:03:02 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.03.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:03:01 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 23/26] oeqa/runtime: clean up deprecated backslash expansion Date: Thu, 6 Apr 2023 06:01:50 -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 ; Thu, 06 Apr 2023 16:03:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179801 From: Ross Burton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 77085a05240c3f8226b9f2199c977f2555807789) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/runtime/cases/apt.py | 4 ++-- meta/lib/oeqa/runtime/cases/buildcpio.py | 7 +++++-- meta/lib/oeqa/runtime/cases/systemd.py | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/apt.py b/meta/lib/oeqa/runtime/cases/apt.py index 4e09374add..8000645843 100644 --- a/meta/lib/oeqa/runtime/cases/apt.py +++ b/meta/lib/oeqa/runtime/cases/apt.py @@ -39,9 +39,9 @@ class AptRepoTest(AptTest): self.target.run('cd %s; echo deb [ allow-insecure=yes ] %s/all ./ > sources.list' % (apt_get_sourceslist_dir, apt_get_source_server)) def setup_source_config_for_package_install_signed(self): - apt_get_source_server = 'http:\/\/%s:%s' % (self.tc.target.server_ip, self.repo_server.port) + apt_get_source_server = 'http://%s:%s' % (self.tc.target.server_ip, self.repo_server.port) apt_get_sourceslist_dir = '/etc/apt/' - self.target.run("cd %s; cp sources.list sources.list.bak; sed -i 's/\[trusted=yes\] http:\/\/bogus_ip:bogus_port/%s/g' sources.list" % (apt_get_sourceslist_dir, apt_get_source_server)) + self.target.run("cd %s; cp sources.list sources.list.bak; sed -i 's|\[trusted=yes\] http://bogus_ip:bogus_port|%s|g' sources.list" % (apt_get_sourceslist_dir, apt_get_source_server)) def cleanup_source_config_for_package_install(self): apt_get_sourceslist_dir = '/etc/apt/' diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index bd3b46d9ef..3728855d24 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py @@ -29,7 +29,10 @@ class BuildCpioTest(OERuntimeTestCase): @OEHasPackage(['autoconf']) def test_cpio(self): self.project.download_archive() - self.project.run_configure('--disable-maintainer-mode', - 'sed -i -e "/char \*program_name/d" src/global.c;') + self.project.run_configure('--disable-maintainer-mode') + # This sed is needed until + # https://git.savannah.gnu.org/cgit/cpio.git/commit/src/global.c?id=641d3f489cf6238bb916368d4ba0d9325a235afb + # is in a release. + self.project._run(r'sed -i -e "/char \*program_name/d" %s/src/global.c' % self.project.targetdir) self.project.run_make() self.project.run_install() diff --git a/meta/lib/oeqa/runtime/cases/systemd.py b/meta/lib/oeqa/runtime/cases/systemd.py index 720b4b517a..37f295492d 100644 --- a/meta/lib/oeqa/runtime/cases/systemd.py +++ b/meta/lib/oeqa/runtime/cases/systemd.py @@ -154,7 +154,7 @@ class SystemdJournalTests(SystemdTest): """ # The expression chain that uniquely identifies the time boot message. - expr_items=['Startup finished', 'kernel', 'userspace','\.$'] + expr_items=['Startup finished', 'kernel', 'userspace', r'\.$'] try: output = self.journalctl(args='-o cat --reverse') except AssertionError: From patchwork Thu Apr 6 16:01:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22341 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 1CA41C76196 for ; Thu, 6 Apr 2023 16:03:06 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web10.162523.1680796955851529054 for ; Thu, 06 Apr 2023 09:03:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=4RFam6dM; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id o6-20020a17090a9f8600b0023f32869993so43306366pjp.1 for ; Thu, 06 Apr 2023 09:03:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796984; x=1683388984; 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=jDhPPwUVseEmZjOr1MzNMbA4KEaBFrBZQFF/kDRtpm4=; b=4RFam6dMteklIalyETJWNqD45PteJMeHF/EVdEOoPJ0qmXS+7itIEgUo8OSU1ZoZ4V n8OJsjyht0lMLX0T2jZLf3GVahvYVtQRAV+4jv6XEZXDqOTEA869qshUYvAcqPEKTgqQ 9KDIdaeMzkWCX1gGWNFfQ1DsEMsErotSCPEN9EKgVKxETwvQwWaKuIdemrIu7k3o+rQn ictJfMwOH+o3/GVpT4OShpX5lxlRPXfJuywdAtg+4UWJthAriNOmkwWYAWsoIwiXycaF zVjp59+EjeJRY8rbRN8A67VwJw1h6zAt3TsfAe85NBZlDaIdRSDYDn5LSZN0eGpJc+be VAWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796984; x=1683388984; 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=jDhPPwUVseEmZjOr1MzNMbA4KEaBFrBZQFF/kDRtpm4=; b=UahbqXvJrBNvnumaePzWv/xcnYQ4Mql7GA9xqD6Zx7Y6aQ0K07hIq6go3epfFPn9a5 ehkGfc6Ln7E2Nv/Pg6KMnrRXyH8Y6xs79LHne/rw3QzIXi22GkoqP76HJPTX3r7GnJG5 +8b5Jy4q6qEbWoiFo2HtZ2iMxgKMGRgGja8YGvP57khwLNBCRtq+0LbSddjKob17znIP Qy2D7qHAjB4xeqW2alo/m6jvRPxpsKU3VllMmE8qOzsBv7YKqHBu/hS++KidVYm2agCZ C1+0Yu9dMlcNBUKGlMR0NKCvCzsJEIoB5kZ98o7BjANmFithfFgY6vaSd0UZmG2ERYb1 qdrw== X-Gm-Message-State: AAQBX9ftL5dKgNVUgMoC+Hma4k8y9DC58GMa9SAtD/f+Hr73tXvIYkvo kyXO8UWqiEm2pWyTUDXxSN6B/aCCSybrrcM3cuY= X-Google-Smtp-Source: AKy350YwS1wNBmUd2BrXV8MOS3TcprjSOFAn8iB7dbahsu0sBh9SE44IBJqURuwaIapwrLcgYRiHlA== X-Received: by 2002:a05:6a20:5009:b0:d0:76e3:16ec with SMTP id n9-20020a056a20500900b000d076e316ecmr67070pza.13.1680796983876; Thu, 06 Apr 2023 09:03:03 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.03.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:03:03 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 24/26] shadow: Fix can not print full login timeout message Date: Thu, 6 Apr 2023 06:01:51 -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 ; Thu, 06 Apr 2023 16:03:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179802 From: Soumya When we do not enter password during login, it is expected to display message "Login timed out after 60 seconds". But it prints only first few bytes(like "Login t") when write is immediately followed by exit. Fix - Calling exit from new handler provides enough time to display full message. Upstream-Status: Accepted [https://github.com/shadow-maint/shadow/commit/670cae834827a8f794e6f7464fa57790d911b63c] Signed-off-by: Soumya Signed-off-by: Richard Purdie (cherry picked from commit 644cfe9dcf351bfa6c67f4b4d1e7dec416a59021) Signed-off-by: Steve Sakoman --- .../0001-Fix-can-not-print-full-login.patch | 41 +++++++++++++++++++ meta/recipes-extended/shadow/shadow.inc | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch diff --git a/meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch b/meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch new file mode 100644 index 0000000000..37ba5f3dc2 --- /dev/null +++ b/meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch @@ -0,0 +1,41 @@ +commit 670cae834827a8f794e6f7464fa57790d911b63c +Author: SoumyaWind <121475834+SoumyaWind@users.noreply.github.com> +Date: Tue Dec 27 17:40:17 2022 +0530 + + shadow: Fix can not print full login timeout message + + Login timed out message prints only first few bytes when write is immediately followed by exit. + Calling exit from new handler provides enough time to display full message. + +Upstream-Status: Accepted [https://github.com/shadow-maint/shadow/commit/670cae834827a8f794e6f7464fa57790d911b63c] + +diff --git a/src/login.c b/src/login.c +index 116e2cb3..c55f4de0 100644 +--- a/src/login.c ++++ b/src/login.c +@@ -120,6 +120,7 @@ static void get_pam_user (char **ptr_pam_user); + + static void init_env (void); + static void alarm_handler (int); ++static void exit_handler (int); + + /* + * usage - print login command usage and exit +@@ -391,11 +392,16 @@ static void init_env (void) + #endif /* !USE_PAM */ + } + ++static void exit_handler (unused int sig) ++{ ++ _exit (0); ++} + + static void alarm_handler (unused int sig) + { + write (STDERR_FILENO, tmsg, strlen (tmsg)); +- _exit (0); ++ signal(SIGALRM, exit_handler); ++ alarm(2); + } + + #ifdef USE_PAM diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 5656a375b7..0ed220ac5c 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -15,6 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ file://0001-shadow-use-relaxed-usernames.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ file://useradd \ + file://0001-Fix-can-not-print-full-login.patch \ " SRC_URI:append:class-target = " \ From patchwork Thu Apr 6 16:01:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22347 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 1E80FC77B70 for ; Thu, 6 Apr 2023 16:03:16 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web10.162558.1680796986750560344 for ; Thu, 06 Apr 2023 09:03:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=kCxD/GGr; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id j14-20020a17090a7e8e00b002448c0a8813so2007207pjl.0 for ; Thu, 06 Apr 2023 09:03:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796986; x=1683388986; 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=sVjXo83jJk7VPkLIpCjpthUzWAZu1nP4Stn3sWIk5f8=; b=kCxD/GGrmo3RmWFq0ro/9IHHOKAG0LhGdP4MYGf2z5BAlQ8GfP3ehsJLaCAQ7E8qpq XSAObldx1YDwWtbPDQRSB8PHkolZKkRVn6lrAQPcbELQEwD11KEXyp7SpDmALpL09P72 oXzYz4rs+ZzsJmT7QGcAbUop0TNcxvUaSc49HonqMb5BprCkLrdMg3y/WykZdnSGOcEM 4INDTiJIUQTFKVrEmb2Zuz43gnkiiNUqXevR75+2NtK94USYtVywgnzndtWcCIeQHpjo 78x/dnk0M9CmBVGFVAiov0mpp9oZ4si7gxCys4apvizwCz4u8TIjJkDsQ9rlcTj7NoGk zPBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796986; x=1683388986; 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=sVjXo83jJk7VPkLIpCjpthUzWAZu1nP4Stn3sWIk5f8=; b=c1vJ8wHPwbvfUAFKLeqmjtoS92dhVh+c05/0KbyhojJUUCKm7YtAsULsz4amYMO1f7 zjiAiViXAnclohz6aDqIbHtv9N3Lx1oVjolIGBBosURPz+++qoM+xpMrM1lVTcv98p+4 3q1aAMvpLqZG6teZ5uvR+ajoaEFIW8+GGdn4JLMG8diWL9p/YWQj719Vw16c89UWRb1o jnvkI5siLJXqfC51IpTUjnGo1NVQbSkqy4dvip12hwS1D2wFQ5N5n5mU4n1wymE4Ronj 6xhN6mhRv+ECFH6rSmiZYDQDCe1RIY/XDthWI8plv2nQ3ytB31cjNLOs4MLL6a+LCPR4 A34w== X-Gm-Message-State: AAQBX9fpC9e1AZIKaOJXUsZoEfuQSjZny13+tcy+SVv2UU2DoxHHGnSQ l3z3Zq5Isp5EIPhaVPXi4Yw3Ipg8Nccz0EfjjVU= X-Google-Smtp-Source: AKy350Z7+WdfFBSkEXsn00piMirzczFcVfnXYeavNVdgk+rk0asEOHqMLtfNj3OxN5EikCDPC3y/fQ== X-Received: by 2002:a05:6a20:6089:b0:e4:9ac9:844e with SMTP id p9-20020a056a20608900b000e49ac9844emr2660951pza.61.1680796985580; Thu, 06 Apr 2023 09:03:05 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.03.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:03:05 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 25/26] runqemu: respect IMAGE_LINK_NAME Date: Thu, 6 Apr 2023 06:01:52 -1000 Message-Id: <82b7a8d5e81d766d0a5c2d0fef0f4c13a8f80c31.1680796770.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 ; Thu, 06 Apr 2023 16:03:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179803 From: Martin Jansa * when searching for qemuboot.conf * don't assume that IMAGE_LINK_NAME is always - (with -.qemuboot.conf) * runqemu: use IMAGE_LINK_NAME set by testimage.bbclass or query with bitbake -e * testimage.bbclass was setting DEPLOY_DIR which I don't see used anywhere else, so I assume it was supposed to be DEPLOY_DIR_IMAGE as mentioned in corresponding runqemu code, do the same with IMAGE_LINK_NAME variable * add virtual/kernel as bitbake -e target in run_bitbake_env to make sure IMAGE_LINK_NAME is defined (kernel-artifact-names.bbclass inherits image-artifact-names.bbclass as well) * improve .qemuboot.conf search 1st search for file matching the rootfs and only when not found try again with .rootfs suffix removed [YOCTO #12937] Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie (cherry picked from commit 716eb55bb963db7b02d985849cb025898aabc855) Signed-off-by: Steve Sakoman --- meta/classes-recipe/testimage.bbclass | 2 +- scripts/runqemu | 69 ++++++++++++++++++++------- 2 files changed, 52 insertions(+), 19 deletions(-) diff --git a/meta/classes-recipe/testimage.bbclass b/meta/classes-recipe/testimage.bbclass index df22bb2344..b48cd96575 100644 --- a/meta/classes-recipe/testimage.bbclass +++ b/meta/classes-recipe/testimage.bbclass @@ -98,7 +98,7 @@ TESTIMAGELOCK:qemuall = "" TESTIMAGE_DUMP_DIR ?= "${LOG_DIR}/runtime-hostdump/" -TESTIMAGE_UPDATE_VARS ?= "DL_DIR WORKDIR DEPLOY_DIR" +TESTIMAGE_UPDATE_VARS ?= "DL_DIR WORKDIR DEPLOY_DIR_IMAGE IMAGE_LINK_NAME" testimage_dump_target () { top -bn1 diff --git a/scripts/runqemu b/scripts/runqemu index efc135e535..9a3c9d2ce4 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -381,13 +381,19 @@ class BaseConfig(object): fst = m.group(1) if fst: self.check_arg_fstype(fst) - qb = re.sub('\.' + fst + "$", '', self.rootfs) - qb = '%s%s' % (re.sub('\.rootfs$', '', qb), '.qemuboot.conf') + qb = re.sub('\.' + fst + "$", '.qemuboot.conf', self.rootfs) if os.path.exists(qb): self.qemuboot = qb self.qbconfload = True else: - logger.warning("%s doesn't exist" % qb) + logger.warning("%s doesn't exist, will try to remove '.rootfs' from filename" % qb) + # They to remove .rootfs (IMAGE_NAME_SUFFIX) as well + qb = re.sub('\.rootfs.qemuboot.conf$', '.qemuboot.conf', qb) + if os.path.exists(qb): + self.qemuboot = qb + self.qbconfload = True + else: + logger.warning("%s doesn't exist" % qb) else: raise RunQemuError("Can't find FSTYPE from: %s" % p) @@ -421,6 +427,7 @@ class BaseConfig(object): # are there other scenarios in which we need to support being # invoked by bitbake? deploy = self.get('DEPLOY_DIR_IMAGE') + image_link_name = self.get('IMAGE_LINK_NAME') bbchild = deploy and self.get('OE_TMPDIR') if bbchild: self.set_machine_deploy_dir(arg, deploy) @@ -445,6 +452,12 @@ class BaseConfig(object): else: logger.error("%s not a directory valid DEPLOY_DIR_IMAGE" % deploy_dir_image) self.set("MACHINE", arg) + if not image_link_name: + s = re.search('^IMAGE_LINK_NAME="(.*)"', self.bitbake_e, re.M) + if s: + image_link_name = s.group(1) + self.set("IMAGE_LINK_NAME", image_link_name) + logger.debug('Using IMAGE_LINK_NAME = "%s"' % image_link_name) def set_dri_path(self): # As runqemu can be run within bitbake (when using testimage, for example), @@ -557,11 +570,18 @@ class BaseConfig(object): self.check_arg_machine(unknown_arg) if not (self.get('DEPLOY_DIR_IMAGE') or self.qbconfload): - self.load_bitbake_env() + self.load_bitbake_env(target=self.rootfs) s = re.search('^DEPLOY_DIR_IMAGE="(.*)"', self.bitbake_e, re.M) if s: self.set("DEPLOY_DIR_IMAGE", s.group(1)) + if not self.get('IMAGE_LINK_NAME') and self.rootfs: + s = re.search('^IMAGE_LINK_NAME="(.*)"', self.bitbake_e, re.M) + if s: + image_link_name = s.group(1) + self.set("IMAGE_LINK_NAME", image_link_name) + logger.debug('Using IMAGE_LINK_NAME = "%s"' % image_link_name) + def check_kvm(self): """Check kvm and kvm-host""" if not (self.kvm_enabled or self.vhost_enabled): @@ -667,8 +687,8 @@ class BaseConfig(object): if self.rootfs and not os.path.exists(self.rootfs): # Lazy rootfs - self.rootfs = "%s/%s-%s.%s" % (self.get('DEPLOY_DIR_IMAGE'), - self.rootfs, self.get('MACHINE'), + self.rootfs = "%s/%s.%s" % (self.get('DEPLOY_DIR_IMAGE'), + self.get('IMAGE_LINK_NAME'), self.fstype) elif not self.rootfs: cmd_name = '%s/%s*.%s' % (self.get('DEPLOY_DIR_IMAGE'), self.get('IMAGE_NAME'), self.fstype) @@ -872,8 +892,10 @@ class BaseConfig(object): machine = self.get('MACHINE') if not machine: machine = os.path.basename(deploy_dir_image) - self.qemuboot = "%s/%s-%s.qemuboot.conf" % (deploy_dir_image, - self.rootfs, machine) + if not self.get('IMAGE_LINK_NAME'): + raise RunQemuError("IMAGE_LINK_NAME wasn't set to find corresponding .qemuboot.conf file") + self.qemuboot = "%s/%s.qemuboot.conf" % (deploy_dir_image, + self.get('IMAGE_LINK_NAME')) else: cmd = 'ls -t %s/*.qemuboot.conf' % deploy_dir_image logger.debug('Running %s...' % cmd) @@ -1569,7 +1591,7 @@ class BaseConfig(object): self.cleaned = True - def run_bitbake_env(self, mach=None): + def run_bitbake_env(self, mach=None, target=''): bitbake = shutil.which('bitbake') if not bitbake: return @@ -1582,22 +1604,33 @@ class BaseConfig(object): multiconfig = "mc:%s" % multiconfig if mach: - cmd = 'MACHINE=%s bitbake -e %s' % (mach, multiconfig) + cmd = 'MACHINE=%s bitbake -e %s %s' % (mach, multiconfig, target) else: - cmd = 'bitbake -e %s' % multiconfig + cmd = 'bitbake -e %s %s' % (multiconfig, target) logger.info('Running %s...' % cmd) - return subprocess.check_output(cmd, shell=True).decode('utf-8') + try: + return subprocess.check_output(cmd, shell=True).decode('utf-8') + except subprocess.CalledProcessError as err: + logger.warning("Couldn't run '%s' to gather environment information, maybe the target wasn't an image name, will retry with virtual/kernel as a target:\n%s" % (cmd, err.output.decode('utf-8'))) + # need something with IMAGE_NAME_SUFFIX/IMAGE_LINK_NAME defined (kernel also inherits image-artifact-names.bbclass) + target = 'virtual/kernel' + if mach: + cmd = 'MACHINE=%s bitbake -e %s %s' % (mach, multiconfig, target) + else: + cmd = 'bitbake -e %s %s' % (multiconfig, target) + try: + return subprocess.check_output(cmd, shell=True).decode('utf-8') + except subprocess.CalledProcessError as err: + logger.warning("Couldn't run '%s' to gather environment information, giving up with 'bitbake -e':\n%s" % (cmd, err.output.decode('utf-8'))) + return '' - def load_bitbake_env(self, mach=None): + + def load_bitbake_env(self, mach=None, target=None): if self.bitbake_e: return - try: - self.bitbake_e = self.run_bitbake_env(mach=mach) - except subprocess.CalledProcessError as err: - self.bitbake_e = '' - logger.warning("Couldn't run 'bitbake -e' to gather environment information:\n%s" % err.output.decode('utf-8')) + self.bitbake_e = self.run_bitbake_env(mach=mach, target=target) def validate_combos(self): if (self.fstype in self.vmtypes) and self.kernel: From patchwork Thu Apr 6 16:01:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22346 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 1E70BC7618D for ; Thu, 6 Apr 2023 16:03:16 +0000 (UTC) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mx.groups.io with SMTP id smtpd.web11.162575.1680796988320831201 for ; Thu, 06 Apr 2023 09:03:08 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=yOmn2uMT; spf=softfail (domain: sakoman.com, ip: 209.85.210.171, mailfrom: steve@sakoman.com) Received: by mail-pf1-f171.google.com with SMTP id l14so26060020pfc.11 for ; Thu, 06 Apr 2023 09:03:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680796987; x=1683388987; 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=IsFDWjkAPRhQrfr2klNHePAqg/0YKLYQcUvlS5pdx/Q=; b=yOmn2uMT/NynlA8vmECqvCo2bcoCbZMKxIOySp30YFs7leKbC3o9vOtU6UFwpQcC8u CwyDhY88zKna1Bm5hoZWwU1S482Lg4xk2mDW7lUFTydzb4/25wiAuKR+FMG6yGI6bTnk jSy39R3EebCu9x/O5jS4mpxgPkXNN/1nBSmXojXO4FDhbZ0TuMDVAAcdgsN77O8+c+Yr RNSxpGpddyR/s54o/jU9iMiezYmktMvxNILrC8ByZMBe5uNxq/bUZb+xQHZ9YNQwQf9z WHuFJVgCTZcfWF/KpMAU2NTs3+5CDIVOgUFPfD0B3SWVFsoJ8eRZr4G7TiRetjkcQXJ7 30Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680796987; x=1683388987; 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=IsFDWjkAPRhQrfr2klNHePAqg/0YKLYQcUvlS5pdx/Q=; b=YteF93pzwzlMDNh91+yxAE/mfZAlPnWTe4tlAcl8DZxDS+N+YtWdXTpO96zS1xC6GJ kC9TlaojeULFRAt1Iz2ZXxSlnRtIVDnC1WFgIwRbttrAaN+EOsLUsF3EsIxrfIegpg9Q X7AAHx+ji5h1GFhHIq699ID2hlEY4AoCT/1ZRKeRa22BWCSYNu6RL13I+MVQkA9NMY7J tiDiba1zmv9pSLwBfWd3kD/8q7uCjWbBv7jOW/C/OmLTv1u9iJu30yDCY5lw+84Ek/Jp +8ivfOMoPlS6Il5NrNDFrT/hPQjxOhtviaqka74yOblvXgyYTlmSgrXDE+A4WBr8czBR 8VIw== X-Gm-Message-State: AAQBX9dlAajiqUrj7OwqXmouWUO3/g7hVNs9wPYaKhJIz5/sIfZJB7fM X58ghvBVykp1EHzXj+MkctIRr/IfBgKeVPpsheM= X-Google-Smtp-Source: AKy350ZadzHc1YdyUWwJ1WbdMpV+txM0Edia1oL26IT6idA6zGbxly+LGwyc5bup77OuvCAgk1LeEw== X-Received: by 2002:a62:7902:0:b0:625:ce95:f2ba with SMTP id u2-20020a627902000000b00625ce95f2bamr10708051pfc.22.1680796987340; Thu, 06 Apr 2023 09:03:07 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id b13-20020aa7870d000000b0062e26487e7esm1532588pfo.155.2023.04.06.09.03.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 09:03:07 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 26/26] report-error: catch Nothing PROVIDES error Date: Thu, 6 Apr 2023 06:01:53 -1000 Message-Id: <5f2d74856e6790e8742f7d6049f7a21c4c17d987.1680796770.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 ; Thu, 06 Apr 2023 16:03:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179804 From: Mingli Yu Make the report-error catch Nothing PROVIDES error and then we can check it directly via error report web. Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie (cherry picked from commit a57d8f82b83554c821a83eacc02f9c73b263ff02) Signed-off-by: Steve Sakoman --- meta/classes/report-error.bbclass | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/meta/classes/report-error.bbclass b/meta/classes/report-error.bbclass index 2f692fbbcc..2b2ad56514 100644 --- a/meta/classes/report-error.bbclass +++ b/meta/classes/report-error.bbclass @@ -107,6 +107,31 @@ python errorreport_handler () { errorreport_savedata(e, jsondata, "error-report.txt") bb.utils.unlockfile(lock) + elif isinstance(e, bb.event.NoProvider): + bb.utils.mkdirhier(logpath) + data = {} + machine = e.data.getVar("MACHINE") + data['machine'] = machine + data['build_sys'] = e.data.getVar("BUILD_SYS") + data['nativelsb'] = nativelsb() + data['distro'] = e.data.getVar("DISTRO") + data['target_sys'] = e.data.getVar("TARGET_SYS") + data['failures'] = [] + data['component'] = str(e._item) + data['branch_commit'] = str(oe.buildcfg.detect_branch(e.data)) + ": " + str(oe.buildcfg.detect_revision(e.data)) + data['bitbake_version'] = e.data.getVar("BB_VERSION") + data['layer_version'] = get_layers_branch_rev(e.data) + data['local_conf'] = get_conf_data(e, 'local.conf') + data['auto_conf'] = get_conf_data(e, 'auto.conf') + taskdata={} + taskdata['log'] = str(e) + taskdata['package'] = str(e._item) + taskdata['task'] = "Nothing provides " + "'" + str(e._item) + "'" + data['failures'].append(taskdata) + lock = bb.utils.lockfile(datafile + '.lock') + errorreport_savedata(e, data, "error-report.txt") + bb.utils.unlockfile(lock) + elif isinstance(e, bb.event.BuildCompleted): lock = bb.utils.lockfile(datafile + '.lock') jsondata = json.loads(errorreport_getdata(e)) @@ -120,4 +145,4 @@ python errorreport_handler () { } addhandler errorreport_handler -errorreport_handler[eventmask] = "bb.event.BuildStarted bb.event.BuildCompleted bb.build.TaskFailed" +errorreport_handler[eventmask] = "bb.event.BuildStarted bb.event.BuildCompleted bb.build.TaskFailed bb.event.NoProvider"