From patchwork Sun Jun 19 19:34:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9353 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 E0B31CCA47A for ; Sun, 19 Jun 2022 19:35:27 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web10.21999.1655667319360080207 for ; Sun, 19 Jun 2022 12:35:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ILiZzjr/; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id x1-20020a17090abc8100b001ec7f8a51f5so4894603pjr.0 for ; Sun, 19 Jun 2022 12:35:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=dX2/Xa8Pn99XMtJqunaMAJ9iI5URGpn2pM/3M5WmS0Q=; b=ILiZzjr/iasUUd5i2H7c9M3LQNL3ExnVUQHbnRUIFcWwkVgoWUZM0QqxIJvVuO2d3b qmonZJe2s9ncNdqp2K+6pcTW42CDFLNMVcY9PQgf5SWxjM4RbjzHX3OVqOqQJW/kF7H2 TW1wqGqoHDqWZk1CgWlWQVsQwIYEfFzzOH9dm8cZpi07K30kBLDFqK/ZLca0XIrHL1S5 ZMXwqjq7WBzCiRI5i3F5p5m1R50AIu/Q5+lCJE6gua92wSu5Hnfvy2ft8GagiszOy8Gi JcbMThMeFPEnVV7p1bEYHr9b8X5JuqTY2i/YM/8N00ZuvkuHTf4CFNENQwz1CU88OwKn Sk2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dX2/Xa8Pn99XMtJqunaMAJ9iI5URGpn2pM/3M5WmS0Q=; b=Nhaku4scJb/XOCycz+khSSrkww1V1q+1o0kXXwQXIk5JRqs2ijBBlaMyA3M6REl8aH TwLVAs56FL1yGv8TANzfy13WApf7dURjiq2FEgqyM0LKE6iAVC0kNtMPIW6ZLOraXO7l DI+O+kKUxp1sB5QH1f8eLjjG6wx2yYP9pLxZjTee7VFQ8PK0S6ME/9CX02R7JPeVaZgE L9I5it4ot3fszvTBNBjm9MQ05O0l63p/Nm6HnUArfNkXPt3mGlL/iyWaDEX/JDBZB+cU fjFLOArcOgiYGwRRBZszsKcYHQ2ojT0C3t2Udf6CTgT2D829VP5YfWdDU5XLonXfOe7u SnhQ== X-Gm-Message-State: AJIora8Gw7j+1jGBAaXmdXgu2cPkwCRqSr4sFI2uIHSRKRXIlgPO3dQk Ti5MTJJQk1wTbk+1dgbAxTir8+ObJb80mcOJ X-Google-Smtp-Source: AGRyM1szC0gSA5CgRQUAbITuqCl/oWr36VoUGkrzINrfexht0CARTto1TVVSKy375KzC5V6DfF0Ljw== X-Received: by 2002:a17:902:a609:b0:169:a8b:7c3c with SMTP id u9-20020a170902a60900b001690a8b7c3cmr17484693plq.67.1655667318247; Sun, 19 Jun 2022 12:35:18 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id e5-20020a170902ed8500b001678dcb4c5asm216994plj.100.2022.06.19.12.35.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:35:17 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 01/12] cups: fix CVE-2022-26691 Date: Sun, 19 Jun 2022 09:34:55 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 19 Jun 2022 19:35:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167063 In scheduler/cert.c the previous algorithm didn't expect the strings can have a different length, so one string can be a substring of the other and such substring was reported as equal to the longer string. Backport patch from upstream to fix: https://github.com/OpenPrinting/cups/commit/de4f8c196106033e4c372dce3e91b9d42b0b9444 CVE: CVE-2022-26691 Signed-off-by: Steve Sakoman --- meta/recipes-extended/cups/cups.inc | 3 +- .../cups/cups/CVE-2022-26691.patch | 33 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/cups/cups/CVE-2022-26691.patch diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 15f46937e1..21c56e1430 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -13,6 +13,7 @@ SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.t file://0002-don-t-try-to-run-generated-binaries.patch \ file://0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch \ file://0004-cups-fix-multilib-install-file-conflicts.patch\ + file://CVE-2022-26691.patch \ " UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases" @@ -119,4 +120,4 @@ cups_sysroot_preprocess () { # -25317 concerns /var/log/cups having lp ownership. Our /var/log/cups is # root:root, so this doesn't apply. -CVE_CHECK_WHITELIST += "CVE-2021-25317" \ No newline at end of file +CVE_CHECK_WHITELIST += "CVE-2021-25317" diff --git a/meta/recipes-extended/cups/cups/CVE-2022-26691.patch b/meta/recipes-extended/cups/cups/CVE-2022-26691.patch new file mode 100644 index 0000000000..1fa5a54c70 --- /dev/null +++ b/meta/recipes-extended/cups/cups/CVE-2022-26691.patch @@ -0,0 +1,33 @@ +From de4f8c196106033e4c372dce3e91b9d42b0b9444 Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Thu, 26 May 2022 06:27:04 +0200 +Subject: [PATCH] scheduler/cert.c: Fix string comparison (fixes + CVE-2022-26691) + +The previous algorithm didn't expect the strings can have a different +length, so one string can be a substring of the other and such substring +was reported as equal to the longer string. + +CVE: CVE-2022-26691 +Upstream-Status: Backport [https://github.com/OpenPrinting/cups/commit/de4f8c196106033e4c372dce3e91b9d42b0b9444] +Signed-off-by: Steve Sakoman + +--- +diff --git a/scheduler/cert.c b/scheduler/cert.c +index b268bf1b2..9b65b96c9 100644 +--- a/scheduler/cert.c ++++ b/scheduler/cert.c +@@ -434,5 +434,12 @@ ctcompare(const char *a, /* I - First string */ + b ++; + } + +- return (result); ++ /* ++ * The while loop finishes when *a == '\0' or *b == '\0' ++ * so after the while loop either both *a and *b == '\0', ++ * or one points inside a string, so when we apply logical OR on *a, ++ * *b and result, we get a non-zero return value if the compared strings don't match. ++ */ ++ ++ return (result | *a | *b); + } From patchwork Sun Jun 19 19:34:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9354 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 E166ACCA480 for ; Sun, 19 Jun 2022 19:35:27 +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.web08.22292.1655667321367033970 for ; Sun, 19 Jun 2022 12:35:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=o6akNAnm; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id f8so7990891plo.9 for ; Sun, 19 Jun 2022 12:35:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=uhoYbVhcOVSoviKAByMea85CKCrCq+tjBPRE5Mk8/zc=; b=o6akNAnmR4IckSCC1bG7tZf6bnPYY9D4Em2lWubXoEBElZuzfAe805axmMi5jgaaSt ZbwbcbBALMUQMFD8kNxLybZLn4g9nJa+9DYnI64J2A1JPHdAx6L+VmvfeKI3JXXceq3S z3y/RZU3/wQGDPpVbsBHCW9sLFcNRPcyOqLmGJSDgUxQjhzOdBgYwXhzMlF7ZUB9TWHl +sGBj3C1IQNg8SOKZ3c9dvEhOXKqYtH47CnCGqEAk77Z7NmD3gaiooRzkMHJKd75D0LL ZIY6a8e+vhibW4jLVFnD35bNpwOj8xH86kw5m83XKFSb1MfFqk4/Qq/UyujKjlAaOKw0 eVzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uhoYbVhcOVSoviKAByMea85CKCrCq+tjBPRE5Mk8/zc=; b=xtsEsc2/QxbyyvUNlraLjSQCytwPL7aSd12GWaWIe8cNAEUJjKSXmYMP/j4IkVm9dL k4n3WDCimUD3WaaVvC8Fh4J7W5jeg2p1wkgYbOe2hOWesWl5K5DnUacHtKfMMbfUgLzj zE9eIXTVFgFvPYxJ21bZo76cjXJskRBAZkz35Uotc7nMiD6bbzvZlrUN427/KTNuqw3X twD2QUASPjZ8AilZGm8tYaLVmPMM1LQhw7F8oGDCT3+O46B1AJqksdXq+KuMpqfx2p1n 6Efp5WN6ZM4kF1dpIxe0cbCJFwDklFLWkSK9tcDuJN0a2Tsx0iEED+uwPXYXByvtfXzk y28Q== X-Gm-Message-State: AJIora/zGkgnkAReYwASGhuwbbu1sDFTwm8iw74t12CkC0ytlk/b7VaL AljoOSh+oZ+ZUfv+nCsh144GYOiKm5vbPDba X-Google-Smtp-Source: AGRyM1ssvMeSmbOdTXDs8R1Nai/6F8G8+oJ1fh/a5RloD1UC2ceLSxhT5J3ZRRRVB8hFDx4xjS91iA== X-Received: by 2002:a17:90b:384d:b0:1e3:1266:d378 with SMTP id nl13-20020a17090b384d00b001e31266d378mr33791114pjb.127.1655667320381; Sun, 19 Jun 2022 12:35:20 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id e5-20020a170902ed8500b001678dcb4c5asm216994plj.100.2022.06.19.12.35.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:35:19 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 02/12] openssh: Whitelist CVE-2021-36368 Date: Sun, 19 Jun 2022 09:34:56 -1000 Message-Id: <179b862e97d95ef57f8ee847e54a78b5f3f52ee7.1655667170.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 19 Jun 2022 19:35:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167064 From: Pawan Badganchi As per debian, the issue is fixed by a feature called "agent restriction" in openssh 8.9. Urgency is unimportant as per debian, Hence this CVE is whitelisting. Link: https://security-tracker.debian.org/tracker/CVE-2021-36368 https://bugzilla.mindrot.org/show_bug.cgi?id=3316#c2 https://docs.ssh-mitm.at/trivialauth.html Signed-off-by: Pawan Badganchi Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/openssh/openssh_8.2p1.bb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/recipes-connectivity/openssh/openssh_8.2p1.bb b/meta/recipes-connectivity/openssh/openssh_8.2p1.bb index ddc9ed0b32..eaec26cac0 100644 --- a/meta/recipes-connectivity/openssh/openssh_8.2p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_8.2p1.bb @@ -60,6 +60,13 @@ CVE_CHECK_WHITELIST += "CVE-2008-3844" # https://ubuntu.com/security/CVE-2016-20012 CVE_CHECK_WHITELIST += "CVE-2016-20012" +# As per debian, the issue is fixed by a feature called "agent restriction" in openssh 8.9 +# Urgency is unimportant as per debian, Hence this CVE is whitelisting. +# https://security-tracker.debian.org/tracker/CVE-2021-36368 +# https://bugzilla.mindrot.org/show_bug.cgi?id=3316#c2 +# https://docs.ssh-mitm.at/trivialauth.html +CVE_CHECK_WHITELIST += "CVE-2021-36368" + PAM_SRC_URI = "file://sshd" inherit manpages useradd update-rc.d update-alternatives systemd From patchwork Sun Jun 19 19:34:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9351 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 D9821C433EF for ; Sun, 19 Jun 2022 19:35:27 +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.web08.22293.1655667323529440942 for ; Sun, 19 Jun 2022 12:35:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=T4ETvA2L; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id d129so8442821pgc.9 for ; Sun, 19 Jun 2022 12:35:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=hvbEm0R6oebZxUKXmJws1hmfoAurif3zuW99DhK8YMM=; b=T4ETvA2LYC0L1Kj+up/RFZ+GiYyThFLKbtZddJKt4rF9i8nc4ZH1lK7U/Hx1NB247h RXjUPikdGcNYFausbm+wl069JOC5nxloLBaM3ybHOYmv8Yv/AbDDI2VD0cIiTIm/V0YR flMAz3XeRQBsn0Z4QkFO4tqiDuuAnmQTn1wSL6h3asnnaNZHEiePoSzwInczw1njrK4j 2+pALazXxnLBLwio2PzDML9xhx71KfH53CihRDnH+9M6Y6Ijjo2bEJGp9C9vpqI0sNYQ Px26Mi5GYChaz8lOkOVjnpn1l72pVsGfbZKjYGspq0E6K0eLkFB6iU2H4WxA3iqURggN YXCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hvbEm0R6oebZxUKXmJws1hmfoAurif3zuW99DhK8YMM=; b=XXd69ay291lRkkd1lP/hIEGxChMdZTQvJMuUR6562djZezI4ImI7Cl3mZFk+SmP4jh tdbuQmHoWL7CvriRADlZFOG4E4cvJhnUCYUAjropGZTTyy5LSjMX2rpr3FPAJR+wUkVC Rj8T6di20KdmIFCtQNCvsxlMbGHho2t32LLYzy7aaG7gGg5+a3Og3dyLhD6d/WrSvllB 3y0r5w7fpUq8Q/Nk1l6kBSh2ijZvG4pVfbS0P+kWk3eoeDq2bWmc/1cjjSNBUJNs+4hf hkXwMfX0DArm4Qu+minnRYnM6j7xxwrYscKWm6WGYwnstYgyjEMeNmLCrlKEQnTMoh3j 19Fg== X-Gm-Message-State: AJIora+jaOEsVwyMZrYUzl4VF9L6qE/5S4qa8duKyZS2IUdg9LdCltBk fR50YRX8sqeM4ZL26Re6wwKlhvzFNpoV4xMv X-Google-Smtp-Source: AGRyM1uAX8m5syjCsbQU5t8atlfPEGefBsSIO4EH6rwtFRTLiHrK0A7rX0eAD8vKC2mQTJPZaf+uYQ== X-Received: by 2002:a63:145e:0:b0:405:70e2:1d04 with SMTP id 30-20020a63145e000000b0040570e21d04mr18427984pgu.487.1655667322452; Sun, 19 Jun 2022 12:35:22 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id e5-20020a170902ed8500b001678dcb4c5asm216994plj.100.2022.06.19.12.35.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:35:21 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 03/12] vim: Upgrade 8.2.5034 -> 8.2.5083 Date: Sun, 19 Jun 2022 09:34:57 -1000 Message-Id: <2bba60d687fb45a8367cb683a8e9d385384ad51a.1655667170.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 19 Jun 2022 19:35:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167065 From: Richard Purdie Includes fixes for CVE-2022-1927, CVE-2022-1942. Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 1e740b5c2227c0040621ae63436d06db4873670f) Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 9d918379b4..31a1b57be8 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -21,8 +21,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://racefix.patch \ " -PV .= ".5034" -SRCREV = "5a6ec10cc80ab02eeff644ab19b82312630ea855" +PV .= ".5083" +SRCREV = "db77c49401145d76441fbb3d22a1d7d987681c13" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Sun Jun 19 19:34:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9352 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 D60C3C43334 for ; Sun, 19 Jun 2022 19:35:27 +0000 (UTC) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web12.22123.1655667325721353466 for ; Sun, 19 Jun 2022 12:35:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=df0bw8a8; spf=softfail (domain: sakoman.com, ip: 209.85.210.175, mailfrom: steve@sakoman.com) Received: by mail-pf1-f175.google.com with SMTP id bo5so8473939pfb.4 for ; Sun, 19 Jun 2022 12:35:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=GUzIR1E959xBdVkxlqAAXlOITSPfZphrRxIw7kCLTGc=; b=df0bw8a8KqWJf+z9s5sphIHtrtN2lRs/c1Pmxajqua5vS6sAAJVF8I3+auqZdIbfun irMSZ8powPpoyNOu8uHhmNqPrVvnu2R4c5Fe16e3x4EHm4bUJ+0tg+bSrBcLkGmDIbFH GvAjoP58mp+KAHzgAMHxcRzCvbC8b+BrSR3pxWeLCRUk6Lbpb86vukTpKA5x8ebKJRFq /hlzIt2F1+yTaEdDhSOHCUhXjwY5AK7Ud4B0ymzBGne0ZLovBDw3I4hh+DhHKENsuXuv MwXnJhyyIV8g7soGMK1SVqXsK8OhTvBubCKy4NHsT8hCM8NSXyJ9h9dWuRr+6Ld05p2y BFug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GUzIR1E959xBdVkxlqAAXlOITSPfZphrRxIw7kCLTGc=; b=Ac4EK+d87qS+QFRqZ9G4mSz4DU8ol5v2x0IJj1aQO1+5xe2oDl+RzXOFW9YbmgQTmI i5gOBjWf95tCa44+RozBYzNZWzVfR/FvJzEd7ddUZCu0yagx/XHCK0Umghn0uOrlzn7/ qWJvsPIOYyhZeEmcPRISeyeiJNypLTiE0jv0ABFP7ut2vMKD7dLXHOREKIu0381sc+Si RMZ7Pvau6iDuk5RSzsxpSxjxQBiIwUpGHU2eb3ElZA0IqHbNxQ9GtmzytBQIEE2BsStE gq6j1Ro80pkqwCQaXyExEOBlF1HHp1FRgLf8UVxPw/AYQWhrpVJ/vgjsY245p3HjHXlu /gww== X-Gm-Message-State: AJIora/SPyInEcRwfhFjNoWVfPlb/GO+KbW71Ms0T7p4TMAnLlsMIlhQ kOkdq0LGbyLwyLpIVxIR1h906HlA8oGL1q+b X-Google-Smtp-Source: AGRyM1sCQuzi1/6wJJ83a4/iAewGrbeWRCH3elG2g6JmeF4oQo0D4G2yjU0aPU24zYuzVFU8xIB+GQ== X-Received: by 2002:a05:6a00:1306:b0:512:ca3d:392f with SMTP id j6-20020a056a00130600b00512ca3d392fmr21272295pfu.79.1655667324697; Sun, 19 Jun 2022 12:35:24 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id e5-20020a170902ed8500b001678dcb4c5asm216994plj.100.2022.06.19.12.35.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:35:23 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 04/12] kernel-yocto.bbclass: Reset to exiting on non-zero return code at end of task Date: Sun, 19 Jun 2022 09:34:58 -1000 Message-Id: <7777cc853db7200b819095be6f6a3561738ac94d.1655667170.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 19 Jun 2022 19:35:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167066 From: Stefan Wiehler Several tasks deactivate exiting on non-zero return codes via set +e because they run subcommands that have legitimate non-zero return codes. However when appending to those tasks, this behavior is not expected and can lead to builds silently proceeding in case of an error. Therefore reset the default behavior at the end of the respective tasks via set -e. Signed-off-by: Stefan Wiehler Signed-off-by: Richard Purdie (cherry picked from commit 83a6f28d2e464f00202090e998a63045adba9e4e) Signed-off-by: Steve Sakoman --- meta/classes/kernel-yocto.bbclass | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index a1a073b738..2a6231803b 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -269,6 +269,8 @@ do_kernel_metadata() { bbnote "KERNEL_FEATURES: $KERNEL_FEATURES_FINAL" bbnote "Final scc/cfg list: $sccs_defconfig $bsp_definition $sccs $KERNEL_FEATURES_FINAL" fi + + set -e } do_patch() { @@ -298,6 +300,8 @@ do_patch() { fi done fi + + set -e } do_kernel_checkout() { @@ -356,6 +360,8 @@ do_kernel_checkout() { git commit -q -m "baseline commit: creating repo for ${PN}-${PV}" git clean -d -f fi + + set -e } do_kernel_checkout[dirs] = "${S}" @@ -523,6 +529,8 @@ do_validate_branches() { kgit-s2q --clean fi fi + + set -e } OE_TERMINAL_EXPORTS += "KBUILD_OUTPUT" From patchwork Sun Jun 19 19:34:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9356 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 D66CEC433EF for ; Sun, 19 Jun 2022 19:35:37 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web10.22001.1655667328003947298 for ; Sun, 19 Jun 2022 12:35:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=NLV1Laor; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id 31so8437836pgv.11 for ; Sun, 19 Jun 2022 12:35:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=PEJ8TmAQY2llFvlpFJqoNHMQ8aoYfWNWibG9KOrsNd4=; b=NLV1LaorKNIRbvFjPOFQGPwpoSlVMjEueZryCePo9ECMsUX6Pe6DO5AUcmU3GAEO2e 7Wfpbqqcx62dBlVgtpBnYVVqhxRO+OVqEOt590SWXKk+Mj0O7Ux1eXzJ4xIw0oxQFU1Q x2uRVUi266YR6t9T3feFCq3mjseJAOH0ljtjrlC8rCpYNzXZGYD+Vb8bKPY/zlWWFBGw 63x8OJjByB1p1PToUolB0k3PMT7SQ0XVJWpsehFrvhJNKP5kBYhf3cf4WtwnHeJ5M+U0 vUcMVdy6uvKGffHICVuSeplDpYYEL9XWJzr05twLk8AMRhdkwyw8DE6AemAPLFUysn/h deJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PEJ8TmAQY2llFvlpFJqoNHMQ8aoYfWNWibG9KOrsNd4=; b=M1fUpPgl8y8l6rfevV4mSzmDF5fzJWCLrDMxeXa5n9ZHNRtIz0tLw8o7KYtVO9kGOx luKAoWJA32qWOpohmY7Ev01/OeuE0ZuO62rf+epwvbxW6N7EUW46bXuoY2Bm0p3hfE/T 4xkVD2SaE3N/fn4LvrWWTR3O+SWDWMaBEFn1wH164xePGrLxSX5Mb9+hnOBdgCXhGeeI 111NDAfkdVIXZeHo/WkrAunTl/9OfxpLsyT1nH9KfvWFAceuQZtDBSW8X93pHvePdjwK 8UCMfOzXLEpNcQaYdzTH3qFrCioz7CumOcwTBMd+OUBC1+ZDdKPKTFhO3CXEc7vtWukY uwIQ== X-Gm-Message-State: AJIora9MMqQfovIEBTM0TF3n/h7sKn3bsgZvAJ6hNGsAZcG0QZ6Mb0a9 kkCLU3aGv8uRQK6Ghb8ffOq8NVsTvYqjBEvZ X-Google-Smtp-Source: AGRyM1ukmqCK1zlDOFh7LUWk1PnH2Al/Irbfnsq6FPaseO78SttrK5cEgWp4A2N2Es/kF1ehhlIASw== X-Received: by 2002:a65:4501:0:b0:3fc:4895:283b with SMTP id n1-20020a654501000000b003fc4895283bmr18788584pgq.231.1655667326947; Sun, 19 Jun 2022 12:35:26 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id e5-20020a170902ed8500b001678dcb4c5asm216994plj.100.2022.06.19.12.35.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:35:26 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 05/12] alsa-plugins: fix libavtp vs. avtp packageconfig Date: Sun, 19 Jun 2022 09:34:59 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 19 Jun 2022 19:35:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167067 From: Marcel Ziswiler Fix PACKAGECONFIG to refer to libavtp instead of avtp as this is what the project and everything is really called everywhere. Signed-off-by: Marcel Ziswiler Signed-off-by: Richard Purdie (cherry picked from commit 8824d91fe2063195014c38c134b97946d3b429c2) Signed-off-by: Steve Sakoman --- meta/recipes-multimedia/alsa/alsa-plugins_1.2.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/alsa/alsa-plugins_1.2.1.bb b/meta/recipes-multimedia/alsa/alsa-plugins_1.2.1.bb index 659eea672f..8205982fcc 100644 --- a/meta/recipes-multimedia/alsa/alsa-plugins_1.2.1.bb +++ b/meta/recipes-multimedia/alsa/alsa-plugins_1.2.1.bb @@ -36,7 +36,7 @@ PACKAGECONFIG ??= "\ speexdsp \ ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ " -PACKAGECONFIG[aaf] = "--enable-aaf,--disable-aaf,avtp" +PACKAGECONFIG[aaf] = "--enable-aaf,--disable-aaf,libavtp" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" PACKAGECONFIG[libav] = "--enable-libav,--disable-libav,libav" PACKAGECONFIG[maemo-plugin] = "--enable-maemo-plugin,--disable-maemo-plugin" From patchwork Sun Jun 19 19:35:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9359 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 E69DCCCA47C for ; Sun, 19 Jun 2022 19:35:37 +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.web09.22260.1655667330988070407 for ; Sun, 19 Jun 2022 12:35:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ZYq56eQ2; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id y13-20020a17090a154d00b001eaaa3b9b8dso8399078pja.2 for ; Sun, 19 Jun 2022 12:35:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=pnsd9fGlgzfh1lFeAiHnwRvENCH9rGydJbvP8hHC7dA=; b=ZYq56eQ2T5ywKx6Qpq1mr+f9iLd9QBQxjrMRhiqffJF5/PmDjSqQEdCynMgxMWGRv+ 9JNe9wwXfgS+2qajcyzbr69M8CAyq7PaUbroT5I1BbFjUA8B+E3u796bHDEvArnOdDmo UTGmOsFKA4LhRKHVmMILVO49eUcyDoR+gR0rVxc4vNu4NzPa2X73+MDYf9qxD1VJRbTd mTeFnQoFJ9NQFADIlOfeZTxY+beGE+RYMNHHQsWOJcZZvgLi61w7TemMrjI+XnkeZ0X6 E67bx6pKasU1e440MRfShgxy17kZHsXldkEwABhxcC7z2vNRZ+BGU2nrwBDnREOhqbOv lFAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pnsd9fGlgzfh1lFeAiHnwRvENCH9rGydJbvP8hHC7dA=; b=yyFAT59/Q7tfcFfLkU3mTyd2VBtPgHwMMkBJnnYYL13K8oSOi46r8uYOg2n2T2hxQ3 3FjewYmUmuxT+9Vvm0YjtNQh9bPUcWhQVnuEhDVUxgDKTpK+gcrPD1cqUkSKm7Cw7IsF xtdnbGHZapoaZOBNOWR7tFsLRmB4F/nLwL8K+waiXfieBcdSlX5LtxLL694NEP43T4xO xSluEY2+VjdSRKuYrUFf5SDvrZlcbRqRgUPCPrPauQHV0GMRxeTGQOaAx+F/7NxsMyp8 hYEpndhPTDY1nqv2PYR9Z4Rv4rYncC6oXTaxU3+1s0yHOPEoIm/4Nrt1Tx7qD61MDrSL SJgw== X-Gm-Message-State: AJIora+fhn6+WiN5/RTM/nZbgV3U+IWuI0+3UJYIbikdXA5f4xDJVJw9 +oSvvK9dcXgcUrRPqfSXVg+jVnllyysWzxGz X-Google-Smtp-Source: AGRyM1vN7OfD4tYrhEPRoC7Te/u67EBvaxPrZAMcGiW/+xWvDsiZuV+DyNKffTBVidqUn1XAvdmUMg== X-Received: by 2002:a17:902:8b8b:b0:167:4e55:2dac with SMTP id ay11-20020a1709028b8b00b001674e552dacmr20556302plb.132.1655667329981; Sun, 19 Jun 2022 12:35:29 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id e5-20020a170902ed8500b001678dcb4c5asm216994plj.100.2022.06.19.12.35.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:35:29 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 06/12] license.bbclass: Bound beginline and endline in copy_license_files() Date: Sun, 19 Jun 2022 09:35:00 -1000 Message-Id: <27cd074d747c5ef4b475c8a62a8ede2bbe58f996.1655667170.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 19 Jun 2022 19:35:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167068 From: Peter Kjellerstedt Ensure that begin_idx (i.e., beginline - 1) and end_idx (i.e., endline) are positive numbers in copy_license_files(). This makes sure the same lines are copied as populate_lic_qa_checksum() uses when it calculates the checksum. Before, beginline=0 would typically lead to that no lines were copied at all. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie (cherry picked from commit ab3cc3651d08d226675c461da760cda0bb6c0ce0) Signed-off-by: Steve Sakoman --- meta/classes/license.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 6b03221c7f..806b5069fd 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -91,17 +91,17 @@ def copy_license_files(lic_files_paths, destdir): os.link(src, dst) except OSError as err: if err.errno == errno.EXDEV: - # Copy license files if hard-link is not possible even if st_dev is the + # Copy license files if hardlink is not possible even if st_dev is the # same on source and destination (docker container with device-mapper?) canlink = False else: raise - # Only chown if we did hardling, and, we're running under pseudo + # Only chown if we did hardlink and we're running under pseudo if canlink and os.environ.get('PSEUDO_DISABLED') == '0': os.chown(dst,0,0) if not canlink: - begin_idx = int(beginline)-1 if beginline is not None else None - end_idx = int(endline) if endline is not None else None + begin_idx = max(0, int(beginline) - 1) if beginline is not None else None + end_idx = max(0, int(endline)) if endline is not None else None if begin_idx is None and end_idx is None: shutil.copyfile(src, dst) else: From patchwork Sun Jun 19 19:35:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9358 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 E2220CCA480 for ; Sun, 19 Jun 2022 19:35:37 +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.web09.22261.1655667333268457854 for ; Sun, 19 Jun 2022 12:35:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=XbHWjsh/; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id t21so2207183pfq.1 for ; Sun, 19 Jun 2022 12:35:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=rxK3BF3I7eSqbDArfJs2RlG+zGct4LxIlVF+87wBu0c=; b=XbHWjsh/krQXqXQI2wblC3smjwve5rT2yrVjHOOaPlwv+4pD/wJ1I0LXu0apYIYi4B 9JqMx+Wdx09Rhsyz8K8Mfi7bmpwcP/dQYU+nVZksB0p/nM0JDIbvmjJIfgApUM8LPMTw aldC199QHEPZztA0D0B8zJ8QpiAMFdgN5dHyWKjwXyUSls+oMd4e/H9tIUHZ1kIoVXNZ fqU3ptDUthyVOYAx7D2Taw+QfFiiyQ9og3ll9XLeA/lXBqkYYNSCKkBipF9pDcOu9qWt +kyulKCcleIfrSYq6NITW1Rk67yRK1Lt2gjX/zKjZgsyr/zVe7vhDICt9ktx2cZfOcBL KvBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rxK3BF3I7eSqbDArfJs2RlG+zGct4LxIlVF+87wBu0c=; b=jzhn18pXP4lvROss2pgjVXNXKd58hgd8tn3VfGEKmUcITpUZcCbzvt1gqRhqeEJ0vt +xY0MFW5yUM8XyiG5b08v2x8Dhfg41GTxc+kXlViI6A8O7Bf/28SaDCo+FOHn78SHKv9 p6i62VW//OrKwxhgae4ZyFLHgAA0xtXVBydBRyK+rW6BNkxs16bJKC9/S3uOHqGm3cQp 6Nnb+mwsPc5QI3iD4i+lXmxxkVF5cWmh3jKMLx0kBqCjNBiHvNAoU3qrs1yPlfG8cDKY Mez/c5cdfl55x/7yvKSWmXQwZ4uKvTz9rtJKLkhc6JyFE4ahvxbQv1yxGSJMPJmlkLkF VgJA== X-Gm-Message-State: AJIora9oNwemaPxiR/rvd4Z+q+KwQZF5idnaXq2y7LBKn/KYaNq47hLJ WT367puKwiM2BmRRBSb9ZNMqajxfZbhucx1U X-Google-Smtp-Source: AGRyM1ts7WBU9JScpDaoQbGfBOx3GopKXW3hV8J0hqR7qmAyreFRYVErvq6lLJ4fE+8CKXrdd5OOfQ== X-Received: by 2002:a63:6e44:0:b0:40c:73a7:b6c9 with SMTP id j65-20020a636e44000000b0040c73a7b6c9mr8475003pgc.285.1655667332295; Sun, 19 Jun 2022 12:35:32 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id e5-20020a170902ed8500b001678dcb4c5asm216994plj.100.2022.06.19.12.35.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:35:31 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 07/12] rootfs.py: close kernel_abi_ver_file Date: Sun, 19 Jun 2022 09:35:01 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 19 Jun 2022 19:35:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167069 From: Martin Jansa * fixes: oe-core/meta/lib/oe/rootfs.py:331: ResourceWarning: unclosed file <_io.TextIOWrapper name='pkgdata/mach/kernel-depmod/kernel-abiversion' mode='r' encoding='UTF-8'> kernel_ver = open(kernel_abi_ver_file).read().strip(' \n') Signed-off-by: Martin Jansa Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit f9dd8ee063c1132265248457fcd628e1e93727be) Signed-off-by: Steve Sakoman --- meta/lib/oe/rootfs.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 9e9f7f1f08..5391c25af9 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -321,7 +321,9 @@ class Rootfs(object, metaclass=ABCMeta): if not os.path.exists(kernel_abi_ver_file): bb.fatal("No kernel-abiversion file found (%s), cannot run depmod, aborting" % kernel_abi_ver_file) - kernel_ver = open(kernel_abi_ver_file).read().strip(' \n') + with open(kernel_abi_ver_file) as f: + kernel_ver = f.read().strip(' \n') + versioned_modules_dir = os.path.join(self.image_rootfs, modules_dir, kernel_ver) bb.utils.mkdirhier(versioned_modules_dir) From patchwork Sun Jun 19 19:35:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9357 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 DA005CCA47A for ; Sun, 19 Jun 2022 19:35:37 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web10.22004.1655667335458542670 for ; Sun, 19 Jun 2022 12:35:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=hgntNgWc; spf=softfail (domain: sakoman.com, ip: 209.85.216.46, mailfrom: steve@sakoman.com) Received: by mail-pj1-f46.google.com with SMTP id d14so4945648pjs.3 for ; Sun, 19 Jun 2022 12:35:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=uSy3FrZRw8gmLEyii6mTZSygmLEpg8wok+O8ZlFeP5g=; b=hgntNgWcq+zVFPzYzfNcg2B/xM0+pB5B6igzn+Kw4ETjZhqupiYPTYZTfeOgG0eDW3 kLOXjZ4bq/4VUAF2ODzNPxIqehKUrfpiJU0Oe0FNyOiWSTE/fJjmQ3ebc2Zx9StRFmu5 UbBDKXSXluYyFfhMuCZuku2IXlKKg23cdo/3Io+y4uI3emv1w7A6i9o9GcrQCFTU8309 uyE3m4rX9INySySvHhV6GHBAfJS7xWceCqflyACo+kv14zNUpRzLIhvzJcW88AHvB72e C1JlJpjxE0Gt8tAkkINiqo/SSLO60LxtfkgCfeSJql+2yv38/gcTWVX1rZOZGvvL2DD6 CEfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uSy3FrZRw8gmLEyii6mTZSygmLEpg8wok+O8ZlFeP5g=; b=ViNp4g6mSdAKtIlFDRFii5UO67KUGE9RsDyWWhKuhRa6Bv8QFkW/LTQkvV97RnaVjD sN5xuAWViORJ1MmBJw0GCuN7koeg71UnxfndAJLizTBoMf0FJF6Vr79npzHL727xcwW8 y9VsmCDYTIkP9oyaohVfEk3t/8bCtomxvtW+DYpEHoT8Seqw/80mGWN0W1R8hxb7m8+4 GSyYUgC9BQphqW/pLOftlObfkXld8o2mnFcud/o/lmWuAlKthZ4zsbyhCU2MbOdbsxsY BKl8Svx6IswBApoxMqiDxGSZjS0f1FpHdOxPo3kEeJrbMyvk+73uO46rvXleGXrezPx6 khcQ== X-Gm-Message-State: AJIora/1yYAh5tqwPsK1tw52eBuEtdP6vDIc89bagX9NqKHeD1NQkFL8 t9QkPZ7C8uI6NyYZQQKxvOCcnfB7t1WVxJfV X-Google-Smtp-Source: AGRyM1uyuGbRFPUTa/VemuWxVCavsszB8udrsr78PP2eF/UeSVKJVa/+AsbLBvbztGOnsaJi6aiKOw== X-Received: by 2002:a17:903:18d:b0:167:47f3:49 with SMTP id z13-20020a170903018d00b0016747f30049mr20806759plg.95.1655667334392; Sun, 19 Jun 2022 12:35:34 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id e5-20020a170902ed8500b001678dcb4c5asm216994plj.100.2022.06.19.12.35.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:35:33 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 08/12] archiver: use bb.note instead of echo Date: Sun, 19 Jun 2022 09:35:02 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 19 Jun 2022 19:35:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167070 From: Jose Quaresma Signed-off-by: Jose Quaresma Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 6420c8a6a8143f53ccad7ab2d56b2ba06db83099) Signed-off-by: Steve Sakoman --- meta/classes/archiver.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 9ef18ebd3c..80fa6752be 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -578,7 +578,7 @@ python do_dumpdata () { SSTATETASKS += "do_deploy_archives" do_deploy_archives () { - echo "Deploying source archive files from ${ARCHIVER_TOPDIR} to ${DEPLOY_DIR_SRC}." + bbnote "Deploying source archive files from ${ARCHIVER_TOPDIR} to ${DEPLOY_DIR_SRC}." } python do_deploy_archives_setscene () { sstate_setscene(d) From patchwork Sun Jun 19 19:35:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9355 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 D9FB0C43334 for ; Sun, 19 Jun 2022 19:35:37 +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.web08.22297.1655667337600264340 for ; Sun, 19 Jun 2022 12:35:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=EFwOS5aq; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id b10so1066523plg.4 for ; Sun, 19 Jun 2022 12:35:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=vqyFd+0vhx1+6qC9ELhGTeQrmCiBXtHpB8oSrfarIuk=; b=EFwOS5aq6Ya/YqaMNXjhwrjC7oYCASMjS/vMUGh3VI7S/Rl57uOukV8xevtpx1oF4T AtppKWPpPXp+3Eg1FBwA551JOCY9DmtogW2ZvOfhRUJexmKLiBA6wqvTTL/SSrP2uiQ2 g/GPegKZaibcuqRQTufNE8q40yYtMgNgNYKcxA527erez21rWqhwpZ+Tlh1PwRBxf0BM y7aXWqXHpGOlA8hKbebSSGFIKhMNUDzVR94YpPnD8MO3Fr2HAabv5SrClPukoJ4mXObv Pku9Lzobfrg8tteH2hEwQIOmtR9oVmUFQ+jQs7BwMOCPg2ia05TaYmFnzw0PoiEaNsWb Uvog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vqyFd+0vhx1+6qC9ELhGTeQrmCiBXtHpB8oSrfarIuk=; b=QRTxNq5X5XIgd1I1oUfMlTIqGdz89mZY2MI2a3K7NKV/azGdeqEDNMOVdRHHhqxZV6 i8l7fXxRKW9UUVBX/McHSEGW5vZNr8CKOs2azHQaw4KjeEcis8KsDYMyajfgPAPYPQVg kuu2KMbHel0PJthEOlhYPXcidzNhWJr/Cz8fsD2t/rVHrrJnqgIUrXddtd7o5Rhzkdfk t4JQQd2qlZGmeMMLAv/LFtqZVuny1tG/eCcsNKFyY/FeFwzhsX6uSQhiMhZg9Gj2vY3u PqvEBRIaTx0slxWuA/LE2F+3qe25BySuAa0Wp777uSxeueO41YPwqz7cL8/jlPhCdKsa BKsw== X-Gm-Message-State: AJIora/fINW/zZX/TsTzlzUafrY1y20ZjQ3Cnxo/FRWK9KWToH+yGdbJ YYm41kVP9/400FeuTAFPh3l8NxaZr/BvyZyC X-Google-Smtp-Source: AGRyM1t/cNSA4g/ozd1qxRJPZvHkGIAALQ9rH3A6xaWXhuoibZeHfXThyWhDO3jV4kxiJJZ65xcgbw== X-Received: by 2002:a17:902:a704:b0:168:e48d:b9a9 with SMTP id w4-20020a170902a70400b00168e48db9a9mr19972844plq.49.1655667336526; Sun, 19 Jun 2022 12:35:36 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id e5-20020a170902ed8500b001678dcb4c5asm216994plj.100.2022.06.19.12.35.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:35:36 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 09/12] oescripts: change compare logic in OEListPackageconfigTests Date: Sun, 19 Jun 2022 09:35:03 -1000 Message-Id: <9eecfbfc957359b7933f1e1bde3aba1780dde202.1655667170.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 19 Jun 2022 19:35:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167071 From: Mingli Yu When multilib enabled and add layers/meta-openembedded/meta-oe in conf/bblayers.conf, it reports below error when run oe-selftest. $ oe-selftest -r oescripts [snip] [20:36:33-0700] 2022-05-16 03:36:33,494 - oe-selftest - INFO - RESULTS - oescripts.OEListPackageconfigTests.test_packageconfig_flags_option_flags: FAILED (585.37s) [snip] It is because the output of "list-packageconfig-flags.py -f" as below: $ ../scripts/contrib/list-packageconfig-flags.py -f [snip] qt lib32-pinentry lib32-wxwidgets nativesdk-pinentry pinentry pinentry-native wxwidgets wxwidgets-native secret lib32-pinentry nativesdk-pinentry pinentry pinentry-native [snip] But the check logic as below: class OEListPackageconfigTests(OEScriptTests): #oe-core.scripts.List_all_the_PACKAGECONFIG's_flags def check_endlines(self, results, expected_endlines): for line in results.output.splitlines(): for el in expected_endlines: if line.split() == el.split(): expected_endlines.remove(el) break def test_packageconfig_flags_option_flags(self): results = runCmd('%s/contrib/list-packageconfig-flags.py -f' % self.scripts_dir) expected_endlines = [] expected_endlines.append("PACKAGECONFIG FLAG RECIPE NAMES") expected_endlines.append("qt nativesdk-pinentry pinentry pinentry-native") expected_endlines.append("secret nativesdk-pinentry pinentry pinentry-native") self.check_endlines(results, expected_endlines) And the test will fail as line.split() doesn't equal el.split() as line.split() is ['lib32-pinentry', 'lib32-wxwidgets', 'nativesdk-pinentry', 'pinentry', 'pinentry-native', 'wxwidgets', 'wxwidgets-native'] and el.split() is ['nativesdk-pinentry', 'pinentry', 'pinentry-native']. So change the compare logic to fix the gap. Signed-off-by: Mingli Yu Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 239f22847bcae0cb31769adb0a42b5440173a7c5) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/oescripts.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 726daff7c6..fb99be447e 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -133,7 +133,8 @@ class OEListPackageconfigTests(OEScriptTests): def check_endlines(self, results, expected_endlines): for line in results.output.splitlines(): for el in expected_endlines: - if line.split() == el.split(): + if line and line.split()[0] == el.split()[0] and \ + ' '.join(sorted(el.split())) in ' '.join(sorted(line.split())): expected_endlines.remove(el) break From patchwork Sun Jun 19 19:35:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9362 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 DFF9CC433EF for ; Sun, 19 Jun 2022 19:35:47 +0000 (UTC) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mx.groups.io with SMTP id smtpd.web11.11833.1655667339625738286 for ; Sun, 19 Jun 2022 12:35:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ZqYaNW8L; spf=softfail (domain: sakoman.com, ip: 209.85.215.170, mailfrom: steve@sakoman.com) Received: by mail-pg1-f170.google.com with SMTP id l4so8434153pgh.13 for ; Sun, 19 Jun 2022 12:35:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=wcPTENRltBKOctxxp+/M02PgQ18z3NwLJeyz7PaymoE=; b=ZqYaNW8LqoGuCtlG6MSSVV2nJKU1PUjetSYhdaiYqYmTeuchXwYsFOFB3Ag3nrdhqD S41ss8+hkerDq9R2oRd0jEOATEcgpswu9JSAyR6+L7T4eOdxccQav+JS4s/sCzTJDk5P BxxoATLfW/HSdRBTddGLC/ZxCeHKNQSXPPuQJyaGzEdCWSjJkuJsJMO55Wf2o2pwtocF TsEB0i9KFQfgCwldDu1/yurMPjW5PjNJ6WtCRMCFm0Is1iYa6L2JAVr6+JyypfF+J77y RbDDf5ah17EpAlOGUpzs6hQTGZho50aibZzi6VDW88UnIvv0QBlQdIjn/6vwVCELYJ4W aD+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wcPTENRltBKOctxxp+/M02PgQ18z3NwLJeyz7PaymoE=; b=j6qx7fl1zqfInhSgldPZ2s3BZTt4uNVzv7r27RkR2jFYHrgQ+fkhusK93gzGVYa7zJ DE4T04b1+OypdC9NM6swUzHYII3nTIavzwgKZH11wptt3PHOKjHwYJfOjUpUsLMd5ubr cpln6eE0+3wTfVC0m2H5flS5yFrTDlcrZXdRPhzrlToI8LwcUdUdQdBCNOnuTRAVsBOB D21RU1TgjEuul/KpFFuNcISpFF8FdfHfrCX4xvCc7N1d85dKgKRsYs2jziMcTV3F9yWP hJUJVV701gx6S/ewzuzrtL9BYXO6OgDQYaykUCKg7skM8UMYglky7/I2vGraTZSZw81n Ohdw== X-Gm-Message-State: AJIora+Z0IenEQcdzfX3veBL/V5FXsqcSAqWdVO6RCnWVKwcdQ+LBax4 YXAHy/m43zceJ58trZgyosvOoU+a+wbMqXlF X-Google-Smtp-Source: AGRyM1sn54QjS/dh52NN2rV78XtQLwJbLDF9xd3E462tEuanwzypOrmP9cgdLMnWarJNWgXBQA3msg== X-Received: by 2002:a63:fc01:0:b0:403:af21:9729 with SMTP id j1-20020a63fc01000000b00403af219729mr18426756pgi.54.1655667338682; Sun, 19 Jun 2022 12:35:38 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id e5-20020a170902ed8500b001678dcb4c5asm216994plj.100.2022.06.19.12.35.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:35:38 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 10/12] e2fsprogs: add alternatives handling of lsattr as well Date: Sun, 19 Jun 2022 09:35:04 -1000 Message-Id: <28090d32c88d99ea36a03f3bb723838746001e4b.1655667170.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 19 Jun 2022 19:35:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167072 From: Rasmus Villemoes Building busybox with CONFIG_LSATTR=y and installing that in the same filesystem as e2fsprogs breaks: ERROR: ... do_rootfs: Postinstall scriptlets of ['busybox'] have failed. If the intention is to defer them to first boot, then please place them into pkg_postinst_ontarget:${PN} (). Deferring to first boot via 'exit 1' is no longer supported. Fix that by also alternatifying lsattr just as chattr already is. Signed-off-by: Rasmus Villemoes Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 96703961eeb3460e9da26503d7942cc965d1e573) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb index 3e6faf4cb8..b1abf6b858 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb @@ -54,6 +54,7 @@ do_install () { oe_multilib_header ext2fs/ext2_types.h install -d ${D}${base_bindir} mv ${D}${bindir}/chattr ${D}${base_bindir}/chattr.e2fsprogs + mv ${D}${bindir}/lsattr ${D}${base_bindir}/lsattr.e2fsprogs install -v -m 755 ${S}/contrib/populate-extfs.sh ${D}${base_sbindir}/ @@ -102,10 +103,12 @@ FILES_libe2p = "${base_libdir}/libe2p.so.*" FILES_libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*" FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so ${bindir}/compile_et ${bindir}/mk_cmds" -ALTERNATIVE_${PN} = "chattr" +ALTERNATIVE_${PN} = "chattr lsattr" ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr" ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs" +ALTERNATIVE_LINK_NAME[lsattr] = "${base_bindir}/lsattr" +ALTERNATIVE_TARGET[lsattr] = "${base_bindir}/lsattr.e2fsprogs" ALTERNATIVE_${PN}-doc = "fsck.8" ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" From patchwork Sun Jun 19 19:35:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9361 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 D9E94CCA47A for ; Sun, 19 Jun 2022 19:35:47 +0000 (UTC) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mx.groups.io with SMTP id smtpd.web12.22130.1655667341948551715 for ; Sun, 19 Jun 2022 12:35:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=b5sXHXHx; spf=softfail (domain: sakoman.com, ip: 209.85.215.176, mailfrom: steve@sakoman.com) Received: by mail-pg1-f176.google.com with SMTP id r66so2509001pgr.2 for ; Sun, 19 Jun 2022 12:35:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=yc+j+1cdHtCNYlddmGWJ5jvKdLsAmIIvR5DN1pLjbsI=; b=b5sXHXHxnjp3JkVwRML48aW433o7707f9QU7K//ziAxrIzyKW3Mg5T4n8pIGXSTRqO yUXCEu8qbpfVLJngIZq9V/k3azROFHk7CQ6qX7xCdaeHX+QzMbF8liJEountZYgYlpOb o71LZETlM/6cSqeT50CgF4gy1y/tCkgNe3jz0KiX/2EksOur07vZZdAYiQRVI4NDu9zw W6w8suD3NBtflO8u/zTOPzNCXYxtYgoNNZxLNiooGDMJRe1opX4j/E/DkelMLBL8BqZ6 EibtWDfyTHTJ6ykzfbY5Z5JeUz5K9Vu/J6rYWt0gLPVVGPfsaMfKQEmtpHZTyxeKdzVf qnhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yc+j+1cdHtCNYlddmGWJ5jvKdLsAmIIvR5DN1pLjbsI=; b=QlH2/s87wV2kE7Cl/E8efw4PnLfMAxccXB0EJwm8vYjKNhCwpoSf8QjtUiqeF6m9c0 fkEftsxstZedtbLYJE00IYKMgZKj0uZ1MyK4QNmoxYXoN8pIZQfE1wRYT9EtJHFMXA6d tlkqLBUQLKWtK4opsRdZ7jyrMgjcG6WpGe250jGE954QLpwVLQ6UDAd1XYmVzVKSDkLS tnxXs9xuFuEA4AJgeW/MUXXbVUdxk2Y15HPNNCXt+fwKP5nsO/HIX/veEfrUJKOQ9FL8 JAOh95AIDXBTuIUXIu03OVjwHB3qxz9Sel6i9ctq5P81BC47fjcUO3BjRUnMJx0er1qH ROcw== X-Gm-Message-State: AJIora/1+G7VkdRiloZvfGEqOHr7ZyPcr6lnHdJG5HdV70T1oZCyBKYS Jy58TkKTRAfXCFcfuOHTRlfyYoMoCAarGMsp X-Google-Smtp-Source: AGRyM1tSPGSoliYJGl5/ckjyMjlZP8tKcGfEdzVdgB5kQbdDlXAizZ1I8ez27VD2VEY/pLLSJUBf9A== X-Received: by 2002:a63:3fce:0:b0:40c:23a5:2827 with SMTP id m197-20020a633fce000000b0040c23a52827mr15865484pga.314.1655667340965; Sun, 19 Jun 2022 12:35:40 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id e5-20020a170902ed8500b001678dcb4c5asm216994plj.100.2022.06.19.12.35.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:35:40 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 11/12] gcc-source: Fix incorrect task dependencies from ${B} Date: Sun, 19 Jun 2022 09:35:05 -1000 Message-Id: <14aa189c2e47a2c5a4a0099235a2605666651f74.1655667170.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 19 Jun 2022 19:35:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167073 From: Richard Purdie Some tasks may reference ${B} for gcc-source which in general would not exist. It has dependencies on HOST_SYS and TARGET_SYS which are not appropriate for a shared recipe like gcc-source. This causes problems for the archiver and multiconfigs in particlar. Set B to something else to avoid these task hash issues. Acked-by: Jose Quaresma Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit beb2a76c591e985c6fc7ed473abd1bee27f955a2) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/gcc/gcc-common.inc | 2 +- meta/recipes-devtools/gcc/gcc-source.inc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index 629fa26dfe..69a3536965 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc @@ -100,7 +100,7 @@ BINV = "${PV}" #S = "${WORKDIR}/gcc-${PV}" S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" -B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" +B ?= "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" target_includedir ?= "${includedir}" target_libdir ?= "${libdir}" diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc index 03bab97815..224b7778ef 100644 --- a/meta/recipes-devtools/gcc/gcc-source.inc +++ b/meta/recipes-devtools/gcc/gcc-source.inc @@ -18,6 +18,7 @@ INHIBIT_DEFAULT_DEPS = "1" DEPENDS = "" PACKAGES = "" +B = "${WORKDIR}/build" # This needs to be Python to avoid lots of shell variables becoming dependencies. python do_preconfigure () { From patchwork Sun Jun 19 19:35:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9360 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 D9E6CC43334 for ; Sun, 19 Jun 2022 19:35:47 +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.22010.1655667344274818584 for ; Sun, 19 Jun 2022 12:35:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=g1BnSzN8; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id c205so1756353pfc.7 for ; Sun, 19 Jun 2022 12:35:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=1f2NpFwHAU/vX+tBhekGqxELikj9PqXbvYEwAALtMDM=; b=g1BnSzN8FH8Qjjz+iYxNNr8xzIeLR0qkJ0flZRGLsFW+QW5t34Np5+DqtG+RVMP/X7 /cTX6lEjwYVjAjFD0l87t2ojvUQbclE/fno7zH9fjj7bgo2KzicMYNd26asSO7U7gx5S 48wv4cma3DKl2+8W7eU/jpQ99VWtysZuhPZC2JHf/fL7n/nh7rVxaslI3rGDgR+qZdNX Hrn5jrA6mF4+y9Bcpj9OOM/UdkV5vekkEJErVP9mAuEA561iIYB4Q6ckuUYkHHc6ovuS Tio15+vRevS2qCwujBtCFj1AulgLolXgooR75zkJ7geYzaVdnyD0OQol07HU9TZUNCe4 XXew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1f2NpFwHAU/vX+tBhekGqxELikj9PqXbvYEwAALtMDM=; b=472/e1RTtvfvnHHcbNgUMCWDzsqdPaI58RZ6ViMzrRrqut3ic0FHqphLCe0eZhZzks G1MunGUUDU754aKB7yPGp9c5vfJm2bq9pgaKx5Py6h7MMUaDxWkKEHQNfawH9A7+55IP KamGeneEk0HU/ywCKBwzlyYLiVEAYFQImwLkq1OFrEoF0ydFNB/0Jd4muJ+greXBWgVW 2r6QBFgT1RKBqf91riI7EO6a4h1eQVwLpgnak+1AbFsDrTKhxe85kUIeZxqx2NJiPznE dl1ujSadNZkXW+UohJKRPyMr4Q+y18D7GOupV5seZ+v044mAYvbfB/hFhqo7Dz18HIcV 1OKg== X-Gm-Message-State: AJIora/Vpz1kyHdv3aUbcHBtNudIiib/Hc/10622vAR6McPTPKhHH5Rj 1GLyu8VeFV8gFDcighNlACHZOw4NinjlsUIf X-Google-Smtp-Source: AGRyM1vVP4EUiPCANRiquoHhHV67ktT7B7H3t08b2cTXf6/xD2a6k3vPX2n0crWuNfEPBYUQz244JA== X-Received: by 2002:a05:6a00:1946:b0:4fe:309f:d612 with SMTP id s6-20020a056a00194600b004fe309fd612mr21096640pfk.10.1655667343225; Sun, 19 Jun 2022 12:35:43 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id e5-20020a170902ed8500b001678dcb4c5asm216994plj.100.2022.06.19.12.35.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:35:42 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 12/12] archiver: don't use machine variables in shared recipes Date: Sun, 19 Jun 2022 09:35:06 -1000 Message-Id: <135adeb82c9303c26193bb6f6bd3bc696793aa62.1655667170.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 19 Jun 2022 19:35:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167074 From: Jose Quaresma When using multiconfig with the same TMP folder we can have races because the shared recipes like gcc-source run twice. ARCHIVER_OUTDIR = ${ARCHIVER_TOPDIR}/${TARGET_SYS}/${PF}/ which includes TARGET_SYS and between the two different MACHINE values, this changes from 'arm-poky-linux-gnueabi' to 'aarch64-poky-linux'. This leads to the task running twice, once for each multiconfig. To solve this we need to store the shared output in a common place for all machines and in this way the stamps will be the same for each machine so the gcc-source will on run once regardless of the machine used. Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 5abe497aad39a6ce8d72556fcdda1938a0f8c1bc) Signed-off-by: Steve Sakoman --- meta/classes/archiver.bbclass | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 80fa6752be..6ead010fe1 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -54,9 +54,10 @@ ARCHIVER_MODE[mirror] ?= "split" DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/sources" ARCHIVER_TOPDIR ?= "${WORKDIR}/archiver-sources" -ARCHIVER_OUTDIR = "${ARCHIVER_TOPDIR}/${TARGET_SYS}/${PF}/" +ARCHIVER_ARCH = "${TARGET_SYS}" +ARCHIVER_OUTDIR = "${ARCHIVER_TOPDIR}/${ARCHIVER_ARCH}/${PF}/" ARCHIVER_RPMTOPDIR ?= "${WORKDIR}/deploy-sources-rpm" -ARCHIVER_RPMOUTDIR = "${ARCHIVER_RPMTOPDIR}/${TARGET_SYS}/${PF}/" +ARCHIVER_RPMOUTDIR = "${ARCHIVER_RPMTOPDIR}/${ARCHIVER_ARCH}/${PF}/" ARCHIVER_WORKDIR = "${WORKDIR}/archiver-work/" # When producing a combined mirror directory, allow duplicates for the case @@ -100,6 +101,10 @@ python () { bb.debug(1, 'archiver: %s is excluded, covered by gcc-source' % pn) return + # TARGET_SYS in ARCHIVER_ARCH will break the stamp for gcc-source in multiconfig + if pn.startswith('gcc-source'): + d.setVar('ARCHIVER_ARCH', "allarch") + def hasTask(task): return bool(d.getVarFlag(task, "task", False)) and not bool(d.getVarFlag(task, "noexec", False))