From patchwork Fri Mar 17 22:42:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21153 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 4B40EC6FD1D for ; Fri, 17 Mar 2023 22:42:49 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web10.436.1679092966108295371 for ; Fri, 17 Mar 2023 15:42:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=edVXehvM; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id qe8-20020a17090b4f8800b0023f07253a2cso6774900pjb.3 for ; Fri, 17 Mar 2023 15:42:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679092965; 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=YpRk0nQR8bg5mEVUDtLsh2ENMPBNhIdNOlX8dtFmhBA=; b=edVXehvMOW6DUqJ453nt+5RSBEJO0bi2bTTUjepeqDwe74rNs6fVkiG432E/BpVRlt m07BF/b6DsU3+URglWDACIGNiW3lHZYdLMFOkHzGshpPXqz9JceeCX9QFsiMOvUm2Q5i EtHKjdl3w/5BZr3e2fuVYwBTpc4iZNN2K8gLrpvNc4Ly1pe56lAEmDfew4nmesRtfg/N eblKGR3aISwaQ1WL8ItXTyU5Gv2cKNYCYDqDhbcIZ2EBIcfVkXZrEJRWsnHWh12mzJ/3 FqPbE4ACNE5cM3wQZ3MKU5YigTLnaKCycXyz9Xq3HQky5T6dVR3IPD4tB5xC144jFqZl M7xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679092965; 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=YpRk0nQR8bg5mEVUDtLsh2ENMPBNhIdNOlX8dtFmhBA=; b=6HdJcvjF0XJ1fztO6fXFPh++WCIRliVVqJwkOo1Q+Kp2YhpVYmDZOM55Fx+aY8Mc5O 6N3ajr8imy3IBmFmiXiWvoN3O+Qy8BVlLZYc95vzaCLMRGFzcq4G9bdG0N85xHmbHXcV FKrkvbgCG6oNPo8DQxjcvMQw7yACH+aG9iDv690KNuR88NQHZV/V81z/2W09o9OyLKiR KfHT4dcXizDSr7IqmiEpjlCO6JdE6xhdWNPfR5Py2GVptYrwCCsRDNWpnWws4jiq8RRt RJ125sfY8qi22CG8TYkUsd62v+ZJUT/1YvV8dmZONI/tRPU/YexoZEEQ4O5piP0Ek1Ge zNKA== X-Gm-Message-State: AO0yUKVp9exxAOYy2pnBtLZF7mICZDtOPfOJuSF0JMbtz1aNoeFIHIzX /yCqsktOgU/SF8IsuijF+CkWhtHK+b/35RSnnds= X-Google-Smtp-Source: AK7set8XzgoafhcrE/5T2OdKCuD2LSTorw4y47x9YAJNm3n/I2n3Y1eBApCk42twydEPhxKuMg2dEQ== X-Received: by 2002:a17:902:f684:b0:1a1:9cc3:fb01 with SMTP id l4-20020a170902f68400b001a19cc3fb01mr6303978plg.38.1679092965177; Fri, 17 Mar 2023 15:42: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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.42.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:42:44 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 01/21] pkgconf: fix CVE-2023-24056 Date: Fri, 17 Mar 2023 12:42:15 -1000 Message-Id: <5c156d8c06267b7a733aca11c53c2905e03e4a58.1679092796.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 ; Fri, 17 Mar 2023 22:42:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178762 From: Hongxu Jia Backport from https://gitea.treehouse.systems/ariadne/pkgconf/commit/628b2b2bafa5d3a2017193ddf375093e70666059 Signed-off-by: Hongxu Jia Signed-off-by: Steve Sakoman --- ...nd-stop-string-processing-on-truncat.patch | 75 +++++++++++++++++++ .../recipes-devtools/pkgconf/pkgconf_1.8.0.bb | 1 + 2 files changed, 76 insertions(+) create mode 100644 meta/recipes-devtools/pkgconf/pkgconf/0001-tuple-test-for-and-stop-string-processing-on-truncat.patch diff --git a/meta/recipes-devtools/pkgconf/pkgconf/0001-tuple-test-for-and-stop-string-processing-on-truncat.patch b/meta/recipes-devtools/pkgconf/pkgconf/0001-tuple-test-for-and-stop-string-processing-on-truncat.patch new file mode 100644 index 0000000000..c6ec7c94e1 --- /dev/null +++ b/meta/recipes-devtools/pkgconf/pkgconf/0001-tuple-test-for-and-stop-string-processing-on-truncat.patch @@ -0,0 +1,75 @@ +From 9368831d360c0e47df55d1bb25c3517269320c5f Mon Sep 17 00:00:00 2001 +From: Ariadne Conill +Date: Wed, 15 Mar 2023 16:12:43 +0800 +Subject: [PATCH] tuple: test for, and stop string processing, on truncation + +otherwise a buffer overflow occurs. +this has been a bug in pkgconf since the beginning, it seems. +instead of disclosing the bug correctly, a "hotshot" developer +decided to blog about it instead. sigh. + +https://nullprogram.com/blog/2023/01/18/ + +Upstream-Status: Backport [https://gitea.treehouse.systems/ariadne/pkgconf/commit/628b2b2bafa5d3a2017193ddf375093e70666059] +CVE: CVE-2023-24056 +Signed-off-by: Hongxu Jia +--- + libpkgconf/tuple.c | 28 +++++++++++++++++++++++----- + 1 file changed, 23 insertions(+), 5 deletions(-) + +diff --git a/libpkgconf/tuple.c b/libpkgconf/tuple.c +index 2d550d8..b831070 100644 +--- a/libpkgconf/tuple.c ++++ b/libpkgconf/tuple.c +@@ -293,12 +293,21 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const + } + } + ++ size_t remain = PKGCONF_BUFSIZE - (bptr - buf); + ptr += (pptr - ptr); + kv = pkgconf_tuple_find_global(client, varname); + if (kv != NULL) + { +- strncpy(bptr, kv, PKGCONF_BUFSIZE - (bptr - buf)); +- bptr += strlen(kv); ++ size_t nlen = pkgconf_strlcpy(bptr, kv, remain); ++ if (nlen > remain) ++ { ++ pkgconf_warn(client, "warning: truncating very long variable to 64KB\n"); ++ ++ bptr = buf + (PKGCONF_BUFSIZE - 1); ++ break; ++ } ++ ++ bptr += nlen; + } + else + { +@@ -306,12 +315,21 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const + + if (kv != NULL) + { ++ size_t nlen; ++ + parsekv = pkgconf_tuple_parse(client, vars, kv); ++ nlen = pkgconf_strlcpy(bptr, parsekv, remain); ++ free(parsekv); + +- strncpy(bptr, parsekv, PKGCONF_BUFSIZE - (bptr - buf)); +- bptr += strlen(parsekv); ++ if (nlen > remain) ++ { ++ pkgconf_warn(client, "warning: truncating very long variable to 64KB\n"); + +- free(parsekv); ++ bptr = buf + (PKGCONF_BUFSIZE - 1); ++ break; ++ } ++ ++ bptr += nlen; + } + } + } +-- +2.27.0 + diff --git a/meta/recipes-devtools/pkgconf/pkgconf_1.8.0.bb b/meta/recipes-devtools/pkgconf/pkgconf_1.8.0.bb index 887e15e28c..cad0a0fa4f 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf_1.8.0.bb +++ b/meta/recipes-devtools/pkgconf/pkgconf_1.8.0.bb @@ -16,6 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2214222ec1a820bd6cc75167a56925e0" SRC_URI = "\ https://distfiles.dereferenced.org/pkgconf/pkgconf-${PV}.tar.xz \ + file://0001-tuple-test-for-and-stop-string-processing-on-truncat.patch \ file://pkg-config-wrapper \ file://pkg-config-native.in \ file://pkg-config-esdk.in \ From patchwork Fri Mar 17 22:42:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21154 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 54DACC76196 for ; Fri, 17 Mar 2023 22:42:49 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web10.437.1679092967976679208 for ; Fri, 17 Mar 2023 15:42:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=HGQSm4Ey; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id om3-20020a17090b3a8300b0023efab0e3bfso10572962pjb.3 for ; Fri, 17 Mar 2023 15:42:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679092967; 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=HxWrJVAiRi75K2COtbRA+oMaLTUL7yK74e6AcQOXJwU=; b=HGQSm4EyfZopffCBw+40WvUtLllGpd6LUsu17uZ5owfUJXMWbNjVgoxsi/LowgCvgX xMKQua0iCytZWquGsVDYHJpcwnghra4mxQ8ip8Q+UqbPbNqmkAwaNoaNQ9m0GdwSO5mv kQTDGtHfkE3+oVWn5syIPlC1LeDPCw6M9zYAmxqDhZBfHJ5WqyAu3IBWAFvK3Yn5EU1i pHn1EfycjsWCXHYEkXRRMP0Zx9u2IsWxGxbCdtYGdgykwBw1MHW9kv02vwB6Z6hbSBSz kM2WVMwhz95Qoz5IElkSHPxfkStL/cq72ZdwA78djuxj/01HDoTXUU9Cjys4QMZfAt9K Jdjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679092967; 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=HxWrJVAiRi75K2COtbRA+oMaLTUL7yK74e6AcQOXJwU=; b=Vzxx2SsaZ65BOZoxq8SgXbu4zHX3a5yaIlKzWaLYw6MvkBaG/u5ImpilslkEh00NHF JyTrA16Br3MN8DgzFAVZDjtZ+fu89UxiUx/4bBsB7hnmnMUXbBPfjD5nO+5QDm2W1+wa +lbe3ta2Hj0bRXf+5iP2LeHfQ4eV38/9/h3Q3xknTKUXP+gXLUOWd22BOGmpRvo4sniB zsD7QQxUUCIEDaubFxX4wXtkZiq7N+LXf+WVoVhm7TVNn5U1+C/qSn3Fmxo42iso40eA hEkq8bwxsKPi3EPSS1icVHoWpXhprB8veIrcGbTsKNPcahKEaTQTSb69OVswNK6gNcoR R6iA== X-Gm-Message-State: AO0yUKXr3mZpe1n+PL+Za1ws+IZhLDPAiUgK8xJ0RS98gfxi503tKtF7 tNmoQaUxYfOvwvxkMI/Lomsc6/9vNoFy6HkCU30= X-Google-Smtp-Source: AK7set/nIT9Xx94f/7zvWA14Mhm82BSLyn8SVwixi2NjIccqtUwmGV0yLuwonHNYYaOW/khW8IYZyg== X-Received: by 2002:a17:902:ecd0:b0:19f:3e33:b845 with SMTP id a16-20020a170902ecd000b0019f3e33b845mr10362127plh.26.1679092966992; Fri, 17 Mar 2023 15:42:46 -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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.42.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:42:46 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 02/21] python3: fix CVE-2023-24329 Date: Fri, 17 Mar 2023 12:42:16 -1000 Message-Id: <37defd828cc6a8267139928730d766167905d21a.1679092796.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 ; Fri, 17 Mar 2023 22:42:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178763 From: Joe Slater Backport fix from cpython 3.11 branch. Signed-off-by: Joe Slater Signed-off-by: Steve Sakoman --- .../python/python3/cve-2023-24329.patch | 50 +++++++++++++++++++ .../recipes-devtools/python/python3_3.10.9.bb | 1 + 2 files changed, 51 insertions(+) create mode 100644 meta/recipes-devtools/python/python3/cve-2023-24329.patch diff --git a/meta/recipes-devtools/python/python3/cve-2023-24329.patch b/meta/recipes-devtools/python/python3/cve-2023-24329.patch new file mode 100644 index 0000000000..d47425d239 --- /dev/null +++ b/meta/recipes-devtools/python/python3/cve-2023-24329.patch @@ -0,0 +1,50 @@ +From 72d356e3584ebfb8e813a8e9f2cd3dccf233c0d9 Mon Sep 17 00:00:00 2001 +From: "Miss Islington (bot)" + <31488909+miss-islington@users.noreply.github.com> +Date: Sun, 13 Nov 2022 11:00:25 -0800 +Subject: [PATCH] gh-99418: Make urllib.parse.urlparse enforce that a scheme + must begin with an alphabetical ASCII character. (GH-99421) + +Prevent urllib.parse.urlparse from accepting schemes that don't begin with an alphabetical ASCII character. + +RFC 3986 defines a scheme like this: `scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )` +RFC 2234 defines an ALPHA like this: `ALPHA = %x41-5A / %x61-7A` + +The WHATWG URL spec defines a scheme like this: +`"A URL-scheme string must be one ASCII alpha, followed by zero or more of ASCII alphanumeric, U+002B (+), U+002D (-), and U+002E (.)."` +(cherry picked from commit 439b9cfaf43080e91c4ad69f312f21fa098befc7) + +Co-authored-by: Ben Kallus <49924171+kenballus@users.noreply.github.com> +--- end original header --- + +CVE: CVE-2023-24329 + +Upstream-Status: Backport [see below] + +Taken from https://github.com/python/cpython.git +commit 72d356e3584ebfb8e813a8e9f2cd3dccf233c0d9 + +CVE fix extracted; test case and update to NEWS abandoned. +Defuzzed. + +Signed-off-by: Joe Slater +--- + Lib/urllib/parse.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py +index 26ddf30..1c53acb 100644 +--- a/Lib/urllib/parse.py ++++ b/Lib/urllib/parse.py +@@ -469,7 +469,7 @@ def urlsplit(url, scheme='', allow_fragments=True): + clear_cache() + netloc = query = fragment = '' + i = url.find(':') +- if i > 0: ++ if i > 0 and url[0].isascii() and url[0].isalpha(): + for c in url[:i]: + if c not in scheme_chars: + break +-- +2.25.1 + diff --git a/meta/recipes-devtools/python/python3_3.10.9.bb b/meta/recipes-devtools/python/python3_3.10.9.bb index d6b7a618c1..867958c0fb 100644 --- a/meta/recipes-devtools/python/python3_3.10.9.bb +++ b/meta/recipes-devtools/python/python3_3.10.9.bb @@ -35,6 +35,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch \ file://deterministic_imports.patch \ file://0001-Avoid-shebang-overflow-on-python-config.py.patch \ + file://cve-2023-24329.patch \ " SRC_URI:append:class-native = " \ From patchwork Fri Mar 17 22:42:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21160 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 309F8C6FD1D for ; Fri, 17 Mar 2023 22:42:59 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web10.437.1679092967976679208 for ; Fri, 17 Mar 2023 15:42:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=vhkjyeGR; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id om3-20020a17090b3a8300b0023efab0e3bfso10573039pjb.3 for ; Fri, 17 Mar 2023 15:42:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679092969; 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=tpTI0uabQXxOlDPx+uYBsScMza6+sPhplfO6KBdXSi8=; b=vhkjyeGRm+z53R2V6Zic+SSD9oet2FBuBwuyrPOvPK4N9CA9ZcJQCP9R9dY5Ht9sOH Pmebufok287hmz7QUKa1WVKN3V5YGbJm1DtWJ/43mcJevXv1+3i6/QVmUX3WHT7eAL0X mZI4CX7Nw6tCTA4Eljs+NmWvZdMJQSaxqSYJ7DDlshRqaKw1tKaLWrQd0UsLbs/DlJT5 46RE2at9GfsVxaWbVGP3fWr/Bn0IdHhx35lW8t3fygAXmVQ2D7iZLOswTJ4uT2ozGDUX Elp6Edu1K2Xe7aZa6TMUXuJMsA5DS/R4j2AoOd9uU6/HzaPS/DooHha/eIoO1NL52br0 u8fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679092969; 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=tpTI0uabQXxOlDPx+uYBsScMza6+sPhplfO6KBdXSi8=; b=MUEYDw/6/TL0fVebpueBpFVF8iWuuO+aI8Py9vl0HhFMStBriZD3+Y+JoY+xV+EIew 65M0QcJeLHWUzg5MEv0Dr4mgd4oFu8ObsYPbRLBGpN1axOCiBDr+X/5ESREYwea5paFO r9QBGWkhy93p6nHs68WgzmJhbNWnhIE9pb5VxWBCi7f98qPKo4UY7W8AWI9YLlRsZZUb 2Lq8Md5N/vMZIpzO+Vn/7FZc7wpW6/SHPDVBGuixCr7XT8ajG98Hx+ViPnsKZl+7OWw9 aJrVLl9i2W8G1QMp4Ss2SeXfjiV7rGRJQMFaGpY2uCRddP/PkSUX8ZutsoL5EmHozwGg h3Cw== X-Gm-Message-State: AO0yUKWlleG2VjggIRlXCeCSfJzO49UysAA73DdRUGfO/bGLGjWSfo9z lodhsH5oTadISBaluCW0u8FohYW/TfiBpO8Tq/0= X-Google-Smtp-Source: AK7set8GHqm9pn10UTD6Si800HtNE+rbpUdDrXUZZbJdpk+gn3vd+1k+5mU4HJs6TIz154B0SitHBg== X-Received: by 2002:a17:902:ec8d:b0:1a1:9020:f9c7 with SMTP id x13-20020a170902ec8d00b001a19020f9c7mr9244564plg.44.1679092968709; Fri, 17 Mar 2023 15:42: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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.42.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:42:48 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 03/21] python3-git: fix indent error Date: Fri, 17 Mar 2023 12:42:17 -1000 Message-Id: <48633d8920210e55e0b9ee3004f0502f9f0eec48.1679092796.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 ; Fri, 17 Mar 2023 22:42:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178764 From: Kai Kang It fails to import anything from git/remote.py: File "/path_to/python3-git-native/3.1.27-r0/GitPython-3.1.27/git/remote.py", line 700 url = Git.polish_url(url) ^ IndentationError: unexpected indent Signed-off-by: Kai Kang Signed-off-by: Steve Sakoman --- .../0001-python3-git-CVE-2022-24439-fix-from-PR-1521.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-git/0001-python3-git-CVE-2022-24439-fix-from-PR-1521.patch b/meta/recipes-devtools/python/python3-git/0001-python3-git-CVE-2022-24439-fix-from-PR-1521.patch index e3e66ec450..a017369f37 100644 --- a/meta/recipes-devtools/python/python3-git/0001-python3-git-CVE-2022-24439-fix-from-PR-1521.patch +++ b/meta/recipes-devtools/python/python3-git/0001-python3-git-CVE-2022-24439-fix-from-PR-1521.patch @@ -291,7 +291,7 @@ index 59681bc..cea6b99 100644 scmd = 'add' kwargs['insert_kwargs_after'] = scmd - repo.git.remote(scmd, name, Git.polish_url(url), **kwargs) -+ url = Git.polish_url(url) ++ url = Git.polish_url(url) + if not allow_unsafe_protocols: + Git.check_unsafe_protocols(url) + repo.git.remote(scmd, "--", name, url, **kwargs) From patchwork Fri Mar 17 22:42:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21159 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 5837FC7619A for ; Fri, 17 Mar 2023 22:42:59 +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.467.1679092971314275220 for ; Fri, 17 Mar 2023 15:42:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=yqgk5MfH; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id c18so6802789ple.11 for ; Fri, 17 Mar 2023 15:42:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679092970; 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=C+8Pxdf9CnwGOxycVdbc98ZghM7KC6uU4KWiDMVJ64U=; b=yqgk5MfHsT5x8gZ47uMN/xgFt0maluhKNdX6OjA39DpqMp83XRVnRU8sVFxz75/ouN lD9Y/t2//0MPigvF7OqH4s+7hQYpD9oz79hUisUd+x+3hnRKNY+Zelizyd+h+TiNNzll UFeEZl39gO/nBR6+jFb4mDaC991EtNjN8wZKAgXSj9g8DpxeY24hXboZ0g9/3jZSBmTg rvKen5Lw+HKfWUcriqUclsrXh4hLsDsMV4u3qgJgfTaDoGmw9I9Ihf4nZaGhQIpxNnrW 3iGyQ3+ooR73LGzYq1p4gVqH/pRclJzUh9Pi/AA50TMjmx9Ui6UiK7JO/ZidC1KEhutB wQ8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679092970; 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=C+8Pxdf9CnwGOxycVdbc98ZghM7KC6uU4KWiDMVJ64U=; b=Prph7leyGNMJiM7BVemGZVV5vD5Fbu4U9nzOCgPI/X6SNwtcFQqHvywspNSPEanUZx +7ZgvB55PSwakHcZEtfiYIt5WjV+olSjexMLs5BRUjB8gSykzF09P/wjOpcqkewHyvId mc6zkg3L8h+q33cXEevKrd91dZjplWANVdH6n6MOOWy0+lCSbfsb5PwdYmfUCNXTzio2 VkSrqilhYM3GAGnG9OYHpiO7VvtwZulMqLgWYmVMEi/QkvVlOpjWtLnKQuhdLyGBpL/0 eqMphMyznj4TJ1Mlz1aGjvDCNIdvzgZ3/DQTaD47BEo32gD8XTCXebGw4HMQDOmnbkpV vbzw== X-Gm-Message-State: AO0yUKVLwXMIWYArTMRtFVIvud/XLDa5cFSVhdHuAa4ox++gIIon+EW0 OuNx3VzdXXeIHShnzYepdDwLBhLef9UQFXa57ZQ= X-Google-Smtp-Source: AK7set+sjaqwCUUR0rziUU5VqbCMJ9l0xoau/hprP9fasFykwTbZBfnA/FlF+QNn4ng+Q4ZEdsfKlw== X-Received: by 2002:a17:903:186:b0:19e:6d83:8277 with SMTP id z6-20020a170903018600b0019e6d838277mr10625084plg.51.1679092970421; Fri, 17 Mar 2023 15:42: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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.42.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:42:50 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 04/21] vim: upgrade to 9.0.1403 Date: Fri, 17 Mar 2023 12:42:18 -1000 Message-Id: <2d9a183467def574bf3c4a2e2f9bc59965797f6e.1679092796.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 ; Fri, 17 Mar 2023 22:42:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178765 From: Ross Burton This incorporates fixes for CVE-2023-1127, CVE-2023-1170, CVE-2023-1175. Also remove runtime/doc/uganda.txt from the license checksum: the Vim license is also in the top-level LICENSE file so this is redundant. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 71111e6b62d37c5e6853d7940dec2993df127a35) Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index da586a5699..40ad44486d 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -10,8 +10,7 @@ DEPENDS = "ncurses gettext-native" RSUGGESTS:${PN} = "diffutils" LICENSE = "Vim" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6b30ea4fa660c483b619924bc709ef99 \ - file://runtime/doc/uganda.txt;md5=001ef779f422a0e9106d428c84495b4d" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6b30ea4fa660c483b619924bc709ef99" SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://disable_acl_header_check.patch \ @@ -20,8 +19,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".1293" -SRCREV = "0caaf1e46511f7a92e036f05e6aa9d5992540117" +PV .= ".1403" +SRCREV = "e764d1b4219e6615a04df1c3a6a5c0210a0a7dac" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Fri Mar 17 22:42:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21158 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 3644BC761A6 for ; Fri, 17 Mar 2023 22:42:59 +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.467.1679092971314275220 for ; Fri, 17 Mar 2023 15:42:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=4a5Kiah3; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id c18so6802852ple.11 for ; Fri, 17 Mar 2023 15:42:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679092972; 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=yui+zA39xyg61Yo1h7pkEKWqZ19kVosKBsvHkZ+S+wI=; b=4a5Kiah35wzRMatnNPcgNJaw8ejn5xUE8Hu2voIT5CNfoHAg41IrCYqmlo3gr38loL wvMk7GddhYYzgoCOQC8EeICMLLH72p1C0LZ02t0NIHsNvANJlUZKUXg31XTaxk2vjSsB 4SJZuRJIktGx3jO4Rc5t6R/44QyAEnNUFmU7dkLHiSsiMyRuiEn9iS6/+KYl84snhDp5 yYgYj2d4T3pwMFm0zLN1LhTqThNu/Hin23s1Nmg5CIOvXAA8pngkPp2Ep1MHNUBioo3s gpIgHblSwpSYsn3L2cS0dju8YlgY1lupUhdIej8WDclJW8looTKcKQnBVMHbR6JbSpEc IMqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679092972; 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=yui+zA39xyg61Yo1h7pkEKWqZ19kVosKBsvHkZ+S+wI=; b=JsubpOX8Z68/kIWAa6WSCw+k8ilxy9lMGiZ64Ix/gTtsboLZTEWKiHtKJcohmFJlNB Slwa4V/sdrNPBAYRaLcEDz30o0tT24as6ltmOOzshHKvIbXUvJ8Zgou0+XIMUppEt1Xn VwedQmygnJ9kZB9bbYDCxWpSaXGZQ8MDPdClY/HrXQxuiKsw9llgsJhn7WvvS+XNd4JT NcTDVMUePwwwPCcKirBnNT2YUSFTMA/ulhFIx5yXhcvD8J1JpJyy6aSygBMITyy9R6VO uSRfYu6sbQIX8DWDvzuGFdbfkKRNBD0LC094H67tsebaaEdLjglR8dmY1ztG2iwY4Wgo cjvA== X-Gm-Message-State: AO0yUKXAnnlDgQt+VnOFCY1TwTd1oFvoNkRnYR2qJzZm6pPZJsS322Nj QRLCHAojN6E2uVlGW9uujgVUxeyxTZzCkKOQwnE= X-Google-Smtp-Source: AK7set9NVdAo1yQ6i5zAgy1JPrZTAAB6f9QXZrgLyoRLuN9Ki+CT0fvm6JlrGN+2PpvW8YEyYZkcxg== X-Received: by 2002:a17:902:e749:b0:1a0:45f6:d7ce with SMTP id p9-20020a170902e74900b001a045f6d7cemr9734342plf.32.1679092972158; Fri, 17 Mar 2023 15:42: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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.42.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:42:51 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 05/21] vim: set modified-by to the recipe MAINTAINER Date: Fri, 17 Mar 2023 12:42:19 -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 ; Fri, 17 Mar 2023 22:42:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178766 From: Ross Burton Clause II.3 of the Vim license states that any distribution of Vim that has been extended or modified must _at least_ indicate in the :version output that this is the case. Handily, Vim has a --with-modified-by argument to add a line in that text, so use MAINTAINER. This is the distribution maintainer contact, by default it is OE-Core Developers . Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit acc007e23445aa53182e13902dd9509c39dd5645) Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 40ad44486d..42a2ba46b8 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -81,6 +81,7 @@ EXTRA_OECONF = " \ --disable-netbeans \ --disable-desktop-database-update \ --with-tlib=ncurses \ + --with-modified-by='${MAINTAINER}' \ ac_cv_small_wchar_t=no \ ac_cv_path_GLIB_COMPILE_RESOURCES=no \ vim_cv_getcwd_broken=no \ From patchwork Fri Mar 17 22:42:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21156 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 27D72C76195 for ; Fri, 17 Mar 2023 22:42:59 +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.web11.470.1679092974810280827 for ; Fri, 17 Mar 2023 15:42:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=O1lpGeJM; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id p13-20020a17090a284d00b0023d2e945aebso9051424pjf.0 for ; Fri, 17 Mar 2023 15:42:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679092974; 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=XHJ96AVAl9HEUR+01m7Sx9tx0/uMboAIABbmWQPK+g4=; b=O1lpGeJMtP7XeoRz9ru07DywBfexB25oss9ahm6gMxc31QEsWQVVlVUSkDDn7DauWt QsDXlgLdesvdBO19eqnwlYKMiDegO2ZYI6UxSbz5cS6J5kduKowOCEVBtmIQy/IuK28S IZeYQ01FT7zaFfV9D/y9V7rLMX2Ek4TtXa3hX+t4VVF8tBM6Sx1eJiRvCCJkBgL8m48/ 8uydb4NmCfyRCNV3IOEPldlSkU+EKCjZ1EU6I6AqgkOnpXu0D0wM1pmx7b8KV9jx7Kdh 1pgjiyLbt82RgeD42oTbG7PrgkrBkAtNmrqqUsPAZqzC6K1tRIAuxT0VhTIxYGqH4+eL +sKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679092974; 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=XHJ96AVAl9HEUR+01m7Sx9tx0/uMboAIABbmWQPK+g4=; b=ZM75lx7TM7TFiO3fFrnVz41YvZGFLp9y+hZ9J3aUZLD1mDiSrwyRYjlQ7T9TS47MJR rjh+GeMYBXiabIgdk6UWTD6c+5IUIbGEctbVrHKpaSxm0KPwPriWuZF2rC1oK1FhfhtT +9ColLglkqSQFvSUChDtJ0mugASdIycyCd+R37ex98MXE1NZwuJLivP5duqdtLghcQkS y5AhL43nLQOyOyL6W93I1Zq6B3TgC8CzkHsOuhl1aeLX/VyW7BTrV854O3T4UYW+zbZS uh0os9irMTRLgiCAh+f2jlLa0FpUuUBL6mZr0Pp2a/7UmuQgj1K50XeS8vtwNqECGT2f QAQw== X-Gm-Message-State: AO0yUKUzuOh4FCpZo/N8Ytm3LDcg9XH7DTofU/snzufAI05YAc6MvGLH URIlrv5qdgdgtpAvUpYbc/ghu3iUX2A39s1uvWs= X-Google-Smtp-Source: AK7set/DAJ3QHyeePEEnqhV1xSn+xNJSL2F2N1axks9Z5gzkLfOmeiSjURdbu3hvLkILGHQYE3iYrA== X-Received: by 2002:a17:902:ecc9:b0:19e:5cc3:828f with SMTP id a9-20020a170902ecc900b0019e5cc3828fmr10681408plh.27.1679092973880; Fri, 17 Mar 2023 15:42:53 -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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.42.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:42:53 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 06/21] mdadm: Fix testcase 06wrmostly Date: Fri, 17 Mar 2023 12:42:20 -1000 Message-Id: <9c73484cb12f39662a8f10027a55c63b95373066.1679092796.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 ; Fri, 17 Mar 2023 22:42:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178767 From: Mingli Yu Backport patch [1] to fix the failure of the 06wrmostly test. [1] https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=41edf6f45895193f4a523cb0a08d639c9ff9ccc9 Signed-off-by: Mingli Yu Signed-off-by: Steve Sakoman --- ...-Fix-optional-write-behind-parameter.patch | 45 +++++++++++++++++++ meta/recipes-extended/mdadm/mdadm_4.2.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta/recipes-extended/mdadm/files/0001-mdadm-Fix-optional-write-behind-parameter.patch diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-Fix-optional-write-behind-parameter.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-Fix-optional-write-behind-parameter.patch new file mode 100644 index 0000000000..186d1e76f2 --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0001-mdadm-Fix-optional-write-behind-parameter.patch @@ -0,0 +1,45 @@ +From 41edf6f45895193f4a523cb0a08d639c9ff9ccc9 Mon Sep 17 00:00:00 2001 +From: Logan Gunthorpe +Date: Wed, 22 Jun 2022 14:25:12 -0600 +Subject: [PATCH] mdadm: Fix optional --write-behind parameter + +The commit noted below changed the behaviour of --write-behind to +require an argument. This broke the 06wrmostly test with the error: + + mdadm: Invalid value for maximum outstanding write-behind writes: (null). + Must be between 0 and 16383. + +To fix this, check if optarg is NULL before parising it, as the origial +code did. + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=41edf6f45895193f4a523cb0a08d639c9ff9ccc9] + +Fixes: 60815698c0ac ("Refactor parse_num and use it to parse optarg.") +Cc: Mateusz Grzonka +Signed-off-by: Logan Gunthorpe +Acked-by: Mariusz Tkaczyk +Signed-off-by: Jes Sorensen +Signed-off-by: Mingli Yu +--- + mdadm.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/mdadm.c b/mdadm.c +index d0c5e6de..56722ed9 100644 +--- a/mdadm.c ++++ b/mdadm.c +@@ -1201,8 +1201,9 @@ int main(int argc, char *argv[]) + case O(BUILD, WriteBehind): + case O(CREATE, WriteBehind): + s.write_behind = DEFAULT_MAX_WRITE_BEHIND; +- if (parse_num(&s.write_behind, optarg) != 0 || +- s.write_behind < 0 || s.write_behind > 16383) { ++ if (optarg && ++ (parse_num(&s.write_behind, optarg) != 0 || ++ s.write_behind < 0 || s.write_behind > 16383)) { + pr_err("Invalid value for maximum outstanding write-behind writes: %s.\n\tMust be between 0 and 16383.\n", + optarg); + exit(2); +-- +2.25.1 + diff --git a/meta/recipes-extended/mdadm/mdadm_4.2.bb b/meta/recipes-extended/mdadm/mdadm_4.2.bb index 19035caaec..be08d512d7 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.2.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.2.bb @@ -24,6 +24,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://0001-mdadm-skip-test-11spare-migration.patch \ file://0001-Fix-parsing-of-r-in-monitor-manager-mode.patch \ file://0001-Makefile-install-mdcheck.patch \ + file://0001-mdadm-Fix-optional-write-behind-parameter.patch \ " SRC_URI[sha256sum] = "461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d" From patchwork Fri Mar 17 22:42:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21157 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 24580C7618E for ; Fri, 17 Mar 2023 22:42:59 +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.441.1679092976451188233 for ; Fri, 17 Mar 2023 15:42:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=6KFuetR3; spf=softfail (domain: sakoman.com, ip: 209.85.216.46, mailfrom: steve@sakoman.com) Received: by mail-pj1-f46.google.com with SMTP id lr16-20020a17090b4b9000b0023f187954acso6780065pjb.2 for ; Fri, 17 Mar 2023 15:42:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679092975; 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=wqvFbKKYjVJ0bXrUl0/8eL7oCIAu/uzUa3Nx7VFDUI4=; b=6KFuetR3NpgIYJpDbtW5z19WvlArfB1PkCaS/zQAgGQJx8exL/Lfqdu3SI5GNpGEJJ p9qv0tM1PAefD5C2nNub0sJ2ttNH+OPceWH5+5ErCnHOX3mOe1BbMud4lrmVHRQ/lnM7 dZI2l0sHZb7DMqZtoBNbBYBZ5Td2OzxiMxOvxZKNz6rxhtZpVnr8ERuIzWM2GWopU7Vf ecazZzJgwBmMEMHsxDBehRUHt5d7VqJGNw8tW4ROQHe2RMcBdpou7M2VLyEy6jqz7X1i gcMWtg8Uw84Q1bx9klU5lmt3swRt4d+OD4q5Mv3dmqDXGkbk+rjPauCXu3a1NFUAYfhz dI6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679092975; 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=wqvFbKKYjVJ0bXrUl0/8eL7oCIAu/uzUa3Nx7VFDUI4=; b=evCvhJbb3cEWUloOnd9e4wHQoN34hv1B/Qzmsi++BWeCeYwnyMZ8q3iOWdMbehpe0h nbxUcF71jT4UhTmKCf3Njp8dmKQ5jrGz/qGiMzuOgY/eEsTnbNYO3RbxuPYwsCe7AD5g kPbojvdDgkP6p2LTC9RvGX5191ZA6sdkXIWBpY/AtzQHVFAlzLJLk/+g/2XclEDNAZju QdnU3gpLlf0yteCWFHSh14cszW3ue887q7NIl184Se8f+h3QNPUj+MkbkstwkXZV71yo U9Y5kUcTYIpSovu8c1LX/5MGUk6UPh17jJaDEe/YtdAAII5sF/xj/PJpfAgzouKeJ/py Batw== X-Gm-Message-State: AO0yUKVJV5CcJLORVdCz872yg+wY+79WD2vDcekb+UJ16grfu1fcdWo7 lTH6Ehr5Eg2SWvh+XPqg8Gv2IL9ImrdPgf5URD0= X-Google-Smtp-Source: AK7set+1DFZeRxJBoyecbmJmSmX/8xUf5/ecOliEI6DtzgudTrwqXTnTGPeKlo+KcFFBmzSrduQ1VA== X-Received: by 2002:a17:902:fa48:b0:1a0:7655:2153 with SMTP id lb8-20020a170902fa4800b001a076552153mr7230330plb.41.1679092975566; Fri, 17 Mar 2023 15:42:55 -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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.42.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:42:55 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 07/21] mdadm: fix tests/02lineargrow Date: Fri, 17 Mar 2023 12:42:21 -1000 Message-Id: <3c2d554f141eb64785e86c8d1e5d85c65caaf322.1679092796.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 ; Fri, 17 Mar 2023 22:42:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178768 From: Mingli Yu Backport patch [1] to fix tests/02lineargrow. [1] https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=a2c832465fc75202e244327b2081231dfa974617 Signed-off-by: Mingli Yu Signed-off-by: Steve Sakoman --- ...ow-clear-the-superblock-at-every-ite.patch | 33 +++++++++++++++++++ meta/recipes-extended/mdadm/mdadm_4.2.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-extended/mdadm/files/0001-tests-02lineargrow-clear-the-superblock-at-every-ite.patch diff --git a/meta/recipes-extended/mdadm/files/0001-tests-02lineargrow-clear-the-superblock-at-every-ite.patch b/meta/recipes-extended/mdadm/files/0001-tests-02lineargrow-clear-the-superblock-at-every-ite.patch new file mode 100644 index 0000000000..1a7104b76d --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0001-tests-02lineargrow-clear-the-superblock-at-every-ite.patch @@ -0,0 +1,33 @@ +From a2c832465fc75202e244327b2081231dfa974617 Mon Sep 17 00:00:00 2001 +From: Sudhakar Panneerselvam +Date: Wed, 22 Jun 2022 14:25:16 -0600 +Subject: [PATCH] tests/02lineargrow: clear the superblock at every iteration + +This fixes 02lineargrow test as prior metadata causes --add operation +to misbehave. + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=a2c832465fc75202e244327b2081231dfa974617] + +Signed-off-by: Sudhakar Panneerselvam +Signed-off-by: Himanshu Madhani +Signed-off-by: Logan Gunthorpe +Signed-off-by: Jes Sorensen +Signed-off-by: Mingli Yu +--- + tests/02lineargrow | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/02lineargrow b/tests/02lineargrow +index e05c219d..595bf9f2 100644 +--- a/tests/02lineargrow ++++ b/tests/02lineargrow +@@ -20,4 +20,6 @@ do + testdev $md0 3 $sz 1 + + mdadm -S $md0 ++ mdadm --zero /dev/loop2 ++ mdadm --zero /dev/loop3 + done +-- +2.25.1 + diff --git a/meta/recipes-extended/mdadm/mdadm_4.2.bb b/meta/recipes-extended/mdadm/mdadm_4.2.bb index be08d512d7..120c7f582b 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.2.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.2.bb @@ -25,6 +25,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://0001-Fix-parsing-of-r-in-monitor-manager-mode.patch \ file://0001-Makefile-install-mdcheck.patch \ file://0001-mdadm-Fix-optional-write-behind-parameter.patch \ + file://0001-tests-02lineargrow-clear-the-superblock-at-every-ite.patch \ " SRC_URI[sha256sum] = "461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d" From patchwork Fri Mar 17 22:42:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21161 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 34F99C76196 for ; Fri, 17 Mar 2023 22:42:59 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web11.472.1679092978364824548 for ; Fri, 17 Mar 2023 15:42:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Br4IpAoX; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id x11so4906977pja.5 for ; Fri, 17 Mar 2023 15:42:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679092977; 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=2if5wzruXV7TuxnPsCQs4o3KiONu8ZiLc2WBeWALK9s=; b=Br4IpAoXVkz+5uMvo+uXynJRezSmxDS45WteLtIODPJ3x4GJiH5rdXW7Eovl5QM7N+ bFYh4xopk4mzmPbrAh0QuvtFEJm4CMtHfCSC4AzR3JXPQ8JYzfJjVEjT7O/DVniu/Qcr yYYaIrrF7vL7XjZMdWYb0SnhRD02kbQ2j3CUZ+kYiFnlFrUbjTq1zxC83uI6nHpLGTu+ Gh8BE7axbgspR5O2FBfXLKvIK1RgydrNK6bBT4DGkEYDJv87rJvfZ0djtY+erc+z5q7F G3RGdw/1IHns5w/ccZ31YpFVxL1tE1kHPD+Xj/nL5hJOvX63OAVRwqbTf8Jc5smTxPFp JUlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679092977; 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=2if5wzruXV7TuxnPsCQs4o3KiONu8ZiLc2WBeWALK9s=; b=Kmlv3r1XLJ7IxRXhP08Qe1Uu3C52M3d+IhCaafdFnI3O6nKH/1ucZoE9twU2HuZehX spcLrrp5zgAhvfPgETQt+rTKKmE+ARMFzfXrsCru0Ab/0rWzSKjQqNoiWACTy26QCraN ikHLD6ZRoh8wQHqiArKZe+JRFydZqCixJ115xRZMV6zNm0fn0H6FzK3XbP8wl45aayt0 S3jCqbI7xsMXRZ2aMDoYZx1rvYmdtwKykkRl5eswF3SzxFAqJrENKOpaB/ZFMSvvbk5m 9KUESiMQlclrcUPNwXlJ5ilqU0vu3RLNe6ZGZTO0H7FNUcnEUXRDAp85XWNyDIBLAZQ/ Vq4Q== X-Gm-Message-State: AO0yUKWwa7uKwoxNKnIjVaF4ynQFqwUa9tmXpSK8SxUNnoJ0QxyPSo95 IeRU4CpWi1rceLjlFQSORXJUB8S9pd7j9lSb+1E= X-Google-Smtp-Source: AK7set+wXLn/njB+ko6BFjTc45zjBbu7LCH0TYPnZNVFtXChiNPYIc9QnFvWC9uyhwtCFnlDzBUPlQ== X-Received: by 2002:a17:902:ced2:b0:1a1:98a9:4069 with SMTP id d18-20020a170902ced200b001a198a94069mr8374532plg.9.1679092977297; Fri, 17 Mar 2023 15:42:57 -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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.42.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:42:57 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 08/21] mdadm: Fix raid0 tests Date: Fri, 17 Mar 2023 12:42:22 -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 ; Fri, 17 Mar 2023 22:42:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178769 From: Mingli Yu Backport patches to fix raid0 tests: tests/00raid0 tests/00readonly tests/03r0assem tests/04r0update tests/04update-metadata Signed-off-by: Mingli Yu Signed-off-by: Steve Sakoman --- ...d-a-test-that-validates-raid0-with-l.patch | 41 +++++++ ...-Run-udevadm-settle-before-setting-r.patch | 39 +++++++ ...metadata-avoid-passing-chunk-size-to.patch | 41 +++++++ ...ts-fix-raid0-tests-for-0.90-metadata.patch | 102 ++++++++++++++++++ meta/recipes-extended/mdadm/mdadm_4.2.bb | 4 + 5 files changed, 227 insertions(+) create mode 100644 meta/recipes-extended/mdadm/files/0001-tests-00raid0-add-a-test-that-validates-raid0-with-l.patch create mode 100644 meta/recipes-extended/mdadm/files/0001-tests-00readonly-Run-udevadm-settle-before-setting-r.patch create mode 100644 meta/recipes-extended/mdadm/files/0001-tests-04update-metadata-avoid-passing-chunk-size-to.patch create mode 100644 meta/recipes-extended/mdadm/files/0001-tests-fix-raid0-tests-for-0.90-metadata.patch diff --git a/meta/recipes-extended/mdadm/files/0001-tests-00raid0-add-a-test-that-validates-raid0-with-l.patch b/meta/recipes-extended/mdadm/files/0001-tests-00raid0-add-a-test-that-validates-raid0-with-l.patch new file mode 100644 index 0000000000..1c95834a7e --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0001-tests-00raid0-add-a-test-that-validates-raid0-with-l.patch @@ -0,0 +1,41 @@ +From 7539254342bc591717b0051734cc6c09c1b88640 Mon Sep 17 00:00:00 2001 +From: Sudhakar Panneerselvam +Date: Wed, 22 Jun 2022 14:25:13 -0600 +Subject: [PATCH] tests/00raid0: add a test that validates raid0 with layout + fails for 0.9 + +329dfc28debb disallows the creation of raid0 with layouts for 0.9 +metadata. This test confirms the new behavior. + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=7539254342bc591717b0051734cc6c09c1b88640] + +Signed-off-by: Sudhakar Panneerselvam +Signed-off-by: Himanshu Madhani +Signed-off-by: Logan Gunthorpe +Signed-off-by: Jes Sorensen +Signed-off-by: Mingli Yu +--- + tests/00raid0 | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/tests/00raid0 b/tests/00raid0 +index 8bc18985..e6b21cc4 100644 +--- a/tests/00raid0 ++++ b/tests/00raid0 +@@ -6,11 +6,9 @@ check raid0 + testdev $md0 3 $mdsize2_l 512 + mdadm -S $md0 + +-# now with version-0.90 superblock ++# verify raid0 with layouts fail for 0.90 + mdadm -CR $md0 -e0.90 -l0 -n4 $dev0 $dev1 $dev2 $dev3 +-check raid0 +-testdev $md0 4 $mdsize0 512 +-mdadm -S $md0 ++check opposite_result + + # now with no superblock + mdadm -B $md0 -l0 -n5 $dev0 $dev1 $dev2 $dev3 $dev4 +-- +2.25.1 + diff --git a/meta/recipes-extended/mdadm/files/0001-tests-00readonly-Run-udevadm-settle-before-setting-r.patch b/meta/recipes-extended/mdadm/files/0001-tests-00readonly-Run-udevadm-settle-before-setting-r.patch new file mode 100644 index 0000000000..c621c082e8 --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0001-tests-00readonly-Run-udevadm-settle-before-setting-r.patch @@ -0,0 +1,39 @@ +From 39b381252c32275079344d30de18b76fda4bba26 Mon Sep 17 00:00:00 2001 +From: Logan Gunthorpe +Date: Wed, 27 Jul 2022 15:52:45 -0600 +Subject: [PATCH] tests/00readonly: Run udevadm settle before setting ro + +In some recent kernel versions, 00readonly fails with: + + mdadm: failed to set readonly for /dev/md0: Device or resource busy + ERROR: array is not read-only! + +This was traced down to a race condition with udev holding a reference +to the block device at the same time as trying to set it read only. + +To fix this, call udevadm settle before setting the array read only. + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=39b381252c32275079344d30de18b76fda4bba26] + +Signed-off-by: Logan Gunthorpe +Signed-off-by: Jes Sorensen +Signed-off-by: Mingli Yu +--- + tests/00readonly | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/00readonly b/tests/00readonly +index 39202487..afe243b3 100644 +--- a/tests/00readonly ++++ b/tests/00readonly +@@ -12,6 +12,7 @@ do + $dev1 $dev2 $dev3 $dev4 --assume-clean + check nosync + check $level ++ udevadm settle + mdadm -ro $md0 + check readonly + state=$(cat /sys/block/md0/md/array_state) +-- +2.25.1 + diff --git a/meta/recipes-extended/mdadm/files/0001-tests-04update-metadata-avoid-passing-chunk-size-to.patch b/meta/recipes-extended/mdadm/files/0001-tests-04update-metadata-avoid-passing-chunk-size-to.patch new file mode 100644 index 0000000000..9098fb2540 --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0001-tests-04update-metadata-avoid-passing-chunk-size-to.patch @@ -0,0 +1,41 @@ +From de045db607b1ac4b70fc2a8878463e029c2ab1dc Mon Sep 17 00:00:00 2001 +From: Sudhakar Panneerselvam +Date: Wed, 22 Jun 2022 14:25:15 -0600 +Subject: [PATCH] tests/04update-metadata: avoid passing chunk size to raid1 + +'04update-metadata' test fails with error, "specifying chunk size is +forbidden for this level" added by commit, 5b30a34aa4b5e. Hence, +correcting the test to ignore passing chunk size to raid1. + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=de045db607b1ac4b70fc2a8878463e029c2ab1dc] + +Signed-off-by: Sudhakar Panneerselvam +Signed-off-by: Himanshu Madhani +[logang@deltatee.com: fix if/then style and dropped unrelated hunk] +Signed-off-by: Logan Gunthorpe +Signed-off-by: Jes Sorensen +Signed-off-by: Mingli Yu +--- + tests/04update-metadata | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/tests/04update-metadata b/tests/04update-metadata +index 08c14af7..2b72a303 100644 +--- a/tests/04update-metadata ++++ b/tests/04update-metadata +@@ -11,7 +11,11 @@ dlist="$dev0 $dev1 $dev2 $dev3" + for ls in linear/4 raid1/1 raid5/3 raid6/2 + do + s=${ls#*/} l=${ls%/*} +- mdadm -CR --assume-clean -e 0.90 $md0 --level $l -n 4 -c 64 $dlist ++ if [[ $l == 'raid1' ]]; then ++ mdadm -CR --assume-clean -e 0.90 $md0 --level $l -n 4 $dlist ++ else ++ mdadm -CR --assume-clean -e 0.90 $md0 --level $l -n 4 -c 64 $dlist ++ fi + testdev $md0 $s 19904 64 + mdadm -S $md0 + mdadm -A $md0 --update=metadata $dlist +-- +2.25.1 + diff --git a/meta/recipes-extended/mdadm/files/0001-tests-fix-raid0-tests-for-0.90-metadata.patch b/meta/recipes-extended/mdadm/files/0001-tests-fix-raid0-tests-for-0.90-metadata.patch new file mode 100644 index 0000000000..d2e7d8ee50 --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0001-tests-fix-raid0-tests-for-0.90-metadata.patch @@ -0,0 +1,102 @@ +From 14c2161edb77d7294199e8aa7daa9f9d1d0ad5d7 Mon Sep 17 00:00:00 2001 +From: Sudhakar Panneerselvam +Date: Wed, 22 Jun 2022 14:25:14 -0600 +Subject: [PATCH] tests: fix raid0 tests for 0.90 metadata + +Some of the test cases fail because raid0 creation fails with the error, +"0.90 metadata does not support layouts for RAID0" added by commit, +329dfc28debb. Fix some of the test cases by switching from raid0 to +linear level for 0.9 metadata where possible. + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=14c2161edb77d7294199e8aa7daa9f9d1d0ad5d7] + +Signed-off-by: Sudhakar Panneerselvam +Signed-off-by: Himanshu Madhani +Signed-off-by: Logan Gunthorpe +Signed-off-by: Jes Sorensen +Signed-off-by: Mingli Yu +--- + tests/00raid0 | 4 ++-- + tests/00readonly | 4 ++++ + tests/03r0assem | 6 +++--- + tests/04r0update | 4 ++-- + tests/04update-metadata | 2 +- + 5 files changed, 12 insertions(+), 8 deletions(-) + +diff --git a/tests/00raid0 b/tests/00raid0 +index e6b21cc4..9b8896cb 100644 +--- a/tests/00raid0 ++++ b/tests/00raid0 +@@ -20,8 +20,8 @@ mdadm -S $md0 + # now same again with different chunk size + for chunk in 4 32 256 + do +- mdadm -CR $md0 -e0.90 -l raid0 --chunk $chunk -n3 $dev0 $dev1 $dev2 +- check raid0 ++ mdadm -CR $md0 -e0.90 -l linear --chunk $chunk -n3 $dev0 $dev1 $dev2 ++ check linear + testdev $md0 3 $mdsize0 $chunk + mdadm -S $md0 + +diff --git a/tests/00readonly b/tests/00readonly +index 28b0fa13..39202487 100644 +--- a/tests/00readonly ++++ b/tests/00readonly +@@ -4,6 +4,10 @@ for metadata in 0.9 1.0 1.1 1.2 + do + for level in linear raid0 raid1 raid4 raid5 raid6 raid10 + do ++ if [[ $metadata == "0.9" && $level == "raid0" ]]; ++ then ++ continue ++ fi + mdadm -CR $md0 -l $level -n 4 --metadata=$metadata \ + $dev1 $dev2 $dev3 $dev4 --assume-clean + check nosync +diff --git a/tests/03r0assem b/tests/03r0assem +index 6744e322..44df0645 100644 +--- a/tests/03r0assem ++++ b/tests/03r0assem +@@ -68,9 +68,9 @@ mdadm -S $md2 + ### Now for version 0... + + mdadm --zero-superblock $dev0 $dev1 $dev2 +-mdadm -CR $md2 -l0 --metadata=0.90 -n3 $dev0 $dev1 $dev2 +-check raid0 +-tst="testdev $md2 3 $mdsize0 512" ++mdadm -CR $md2 -llinear --metadata=0.90 -n3 $dev0 $dev1 $dev2 ++check linear ++tst="testdev $md2 3 $mdsize0 1" + $tst + + uuid=`mdadm -Db $md2 | sed 's/.*UUID=//'` +diff --git a/tests/04r0update b/tests/04r0update +index 73ee3b9f..b95efb06 100644 +--- a/tests/04r0update ++++ b/tests/04r0update +@@ -1,7 +1,7 @@ + + # create a raid0, re-assemble with a different super-minor +-mdadm -CR -e 0.90 $md0 -l0 -n3 $dev0 $dev1 $dev2 +-testdev $md0 3 $mdsize0 512 ++mdadm -CR -e 0.90 $md0 -llinear -n3 $dev0 $dev1 $dev2 ++testdev $md0 3 $mdsize0 1 + minor1=`mdadm -E $dev0 | sed -n -e 's/.*Preferred Minor : //p'` + mdadm -S /dev/md0 + +diff --git a/tests/04update-metadata b/tests/04update-metadata +index 232fc1ff..08c14af7 100644 +--- a/tests/04update-metadata ++++ b/tests/04update-metadata +@@ -8,7 +8,7 @@ set -xe + + dlist="$dev0 $dev1 $dev2 $dev3" + +-for ls in raid0/4 linear/4 raid1/1 raid5/3 raid6/2 ++for ls in linear/4 raid1/1 raid5/3 raid6/2 + do + s=${ls#*/} l=${ls%/*} + mdadm -CR --assume-clean -e 0.90 $md0 --level $l -n 4 -c 64 $dlist +-- +2.25.1 + diff --git a/meta/recipes-extended/mdadm/mdadm_4.2.bb b/meta/recipes-extended/mdadm/mdadm_4.2.bb index 120c7f582b..4aa3737562 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.2.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.2.bb @@ -26,6 +26,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://0001-Makefile-install-mdcheck.patch \ file://0001-mdadm-Fix-optional-write-behind-parameter.patch \ file://0001-tests-02lineargrow-clear-the-superblock-at-every-ite.patch \ + file://0001-tests-00raid0-add-a-test-that-validates-raid0-with-l.patch \ + file://0001-tests-fix-raid0-tests-for-0.90-metadata.patch \ + file://0001-tests-00readonly-Run-udevadm-settle-before-setting-r.patch \ + file://0001-tests-04update-metadata-avoid-passing-chunk-size-to.patch \ " SRC_URI[sha256sum] = "461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d" From patchwork Fri Mar 17 22:42:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21163 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 238A1C76195 for ; Fri, 17 Mar 2023 22:43:09 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web10.442.1679092979918327429 for ; Fri, 17 Mar 2023 15:42:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=0Pe7Ax6M; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id iw3so6821574plb.6 for ; Fri, 17 Mar 2023 15:42:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679092979; 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=6/e7goVCBZe5tAOisoEyuC9KNBcsdphy1izUkJXytxw=; b=0Pe7Ax6M8Hb6VskSfm+rsWCcZ9iYrpUk8p/q6nyFD/XrrVvvrzwh0eSMLvz+udKiLu RVF9wYhUqhTciA8sXrvP/ZyuBDEPe/yPQfun6DPSmUtOmqGnfY8HbF9jkWINL3v3P8fe whfZHwVUFoAGpI2KttaZIeiVuc9OGuxig4hWdd1YzAO8JZP9gcEAJ9ICi497esS/G2nu tH2xFyTbySK1ZH+rB+cKF3lZF8FsSO9vi6awCuvFUuHWhFmcv5zd2L4qr4Vaw4Gut9bY yx+ly37dqLvtSQuxHFNyTj9XFpxPJiDzTItygeJu0TglHlGp3Vn8PR9ZHkbCgikQvrUN ki8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679092979; 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=6/e7goVCBZe5tAOisoEyuC9KNBcsdphy1izUkJXytxw=; b=P9MDEY/QVWGcAlDC9xG9h3Q5+QfXpe5XuEXzEU9q28lmzG4QxCWB3TmhRyzAyMmvX5 gln0oCfljHX0bXZDoOlOdjhtRtpfk4TPVuMdaq/PbqPZxbmrdB+Mxk6Ydz24hAvBzSAC ERPPo+wkqAsMpt7GA5wUnw3yZXlzELKaq3Rfqkcp2VbVXQoD1Zc7lU6K3FKcIFjiFuX2 MCpKXNmw5q3+r1kOjQHvkSWLzOuT8n7doeqRwnXWGba3SppKwZ5OtWJq1OHqlpdrVOly Brk4TmLgn9i5gJjdfKAZzA4iSemkxhSkuvJXYfiFan2qK1c4LWEq1WmO9bZWpld24OUc UsXg== X-Gm-Message-State: AO0yUKXbhTy5VVzM2eI6aG76B2kDsR6eU8LXlL2poUmOfMKeESU1958S wllsYQp6rUMu95e8GVOEhThndq/ebh2b1XHR520= X-Google-Smtp-Source: AK7set8bAoNmQ80vN4j+BwyeBMvCN/Ec4cQpocFEZi/POWF0HNl7soOe7Az1/Mmpx0NtRIui3yauyg== X-Received: by 2002:a17:902:e5cf:b0:1a0:69e6:bb43 with SMTP id u15-20020a170902e5cf00b001a069e6bb43mr11369147plf.52.1679092979049; Fri, 17 Mar 2023 15:42:59 -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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.42.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:42:58 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 09/21] staging: Separate out different multiconfig manifests Date: Fri, 17 Mar 2023 12:42:23 -1000 Message-Id: <29f7390add28d3a6fb6854bc750d1db3d969f027.1679092796.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 ; Fri, 17 Mar 2023 22:43:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178770 From: Richard Purdie """ require conf/multilib.conf MACHINE = "qemuarm64" MULTILIBS = "multilib:lib32" DEFAULTTUNE:virtclass-multilib-lib32 = "armv7athf-neon" bitbake gcc-cross-canadian-arm """ and then inspecting the lib32* manifest files under recipe-sysroot-native shows them referencing lib32-recipe-sysroot instead of recipe-sysroot as used by gcc-cross-canadian recipes. To fix this separate out the manifest by multilib. It is caching mechanism to optimise disk usage so this doesn't break anything, just separated out some files. Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni (cherry picked from commit 891d3faa3ed3d1cc231da58e5fa1325f05d5ade5) Signed-off-by: Steve Sakoman --- meta/classes/staging.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index bf8ca58b0b..885bd347e0 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -269,6 +269,9 @@ python extend_recipe_sysroot() { pn = d.getVar("PN") stagingdir = d.getVar("STAGING_DIR") sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests" + mlprefix = d.getVar("MLPREFIX") + if mlprefix: + sharedmanifests = sharedmanifests + "/" + mlprefix recipesysroot = d.getVar("RECIPE_SYSROOT") recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE") From patchwork Fri Mar 17 22:42:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21162 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 32E3AC76196 for ; Fri, 17 Mar 2023 22:43:09 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web10.444.1679092981863320864 for ; Fri, 17 Mar 2023 15:43:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=7K+EoLW5; spf=softfail (domain: sakoman.com, ip: 209.85.216.54, mailfrom: steve@sakoman.com) Received: by mail-pj1-f54.google.com with SMTP id o6-20020a17090a9f8600b0023f32869993so6787165pjp.1 for ; Fri, 17 Mar 2023 15:43:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679092981; 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=hcfKNmS9JWM+wKixkJbBMy2YQCe7XU7YiJePK5jKoBg=; b=7K+EoLW5/NqzGSgbTYcoHc+wefN0DkJ6DeXk0w9WM27dXpPGutnRkp7YV2UPbB6E1V 9IJRsDO7t5eNYeY0AYIJuV3Mpeyt7m38T5iqzr5f0d2gqmNTSsoyhcOXnrSIJkBP/ERy z+vVFRy31+TXuLKhpcb6bJGgZZ5qG4RDqdrgZsfxd5piGDpJmyfgMhlQs3zoQU/Fq7F8 85wpkRmPOrac/UFPVeGUopmaEdqS0MsmSEJZAhjKT9IFZwie1i00XAS2hdPPqYvQxiY1 b6GT6zUi+pX9y6NoMCMfKkcw+mK45jfhXJT5sJHA31TCAD11nrWfYZSyIGjDQzEQOZ2D sBqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679092981; 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=hcfKNmS9JWM+wKixkJbBMy2YQCe7XU7YiJePK5jKoBg=; b=KyWvN2jRxtFlZpFE8YLM+3UHkx412VXAwAJACha22TUyyKBOK4e4YegUVQtOCnOD74 krhMQ9yMrOzVrzdMwmaMKJoQT0o6+OYeIaWgSXKmUMvvQ3DkG1PoUB0cR+9mGx6/Gnoa scYEddygom7jkdFb5PrVynTaHH9/DSQ0WV371eYcsa/siHiWa3z7qn+yjUxqDzTBbSs1 565M52Bb6VNP/1mCcayYx68yJ+MMO9yuFJ1vn/sK+kdfbtSv85G3dPVgr6FbVfnzN6l7 LsRGWtrDDK0ZWcKMi5+uiB5nIv9PXlzCvrkPv8uuSy5mCZ3B3VEY+Yekbi3DMbsznCfp KY3A== X-Gm-Message-State: AO0yUKWYwO0uooj9PwLB36qCrA423pba+0vPNePJi3IVNHHQpNxrbLy1 EeGUbZNAHILw8jxXkZCcib4TMh22AX/v92TCOm8= X-Google-Smtp-Source: AK7set9A85vvDjLhxdOPyHFcss6lVrGW9OpIDcMOyE4m22moFfvMAlyyUcv8PgF9hmVNGeNlS+BMKw== X-Received: by 2002:a17:902:ce8e:b0:19c:f698:8564 with SMTP id f14-20020a170902ce8e00b0019cf6988564mr10413140plg.17.1679092980846; Fri, 17 Mar 2023 15:43: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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.43.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:43:00 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 10/21] staging/multilib: Fix manifest corruption Date: Fri, 17 Mar 2023 12:42:24 -1000 Message-Id: <0aa703c06bf101114836ac701bbb524302c0753a.1679092796.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 ; Fri, 17 Mar 2023 22:43:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178771 From: Richard Purdie The previous fix wasn't enough to address all the possible ways the manifests might be ordered. Rework the previous fix so it is tied to the multilib cross-canadian code which is causing the problem. RECIPE_SYSROOT_MANIFEST_SUBDIR is not documented as I'd hope nobody ever needs to use this outside the core multilib code. Signed-off-by: Richard Purdie (cherry picked from commit beab42e00713880cd95a04729c892f8662fbcbed) Signed-off-by: Steve Sakoman --- meta/classes/multilib.bbclass | 1 + meta/classes/staging.bbclass | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 5859ca8d21..a0be559970 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -45,6 +45,7 @@ python multilib_virtclass_handler () { e.data.setVar("RECIPE_SYSROOT", "${WORKDIR}/recipe-sysroot") e.data.setVar("STAGING_DIR_TARGET", "${WORKDIR}/recipe-sysroot") e.data.setVar("STAGING_DIR_HOST", "${WORKDIR}/recipe-sysroot") + e.data.setVar("RECIPE_SYSROOT_MANIFEST_SUBDIR", "nativesdk-" + variant) e.data.setVar("MLPREFIX", variant + "-") override = ":virtclass-multilib-" + variant e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 885bd347e0..044873c9ae 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -269,9 +269,10 @@ python extend_recipe_sysroot() { pn = d.getVar("PN") stagingdir = d.getVar("STAGING_DIR") sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests" - mlprefix = d.getVar("MLPREFIX") - if mlprefix: - sharedmanifests = sharedmanifests + "/" + mlprefix + # only needed by multilib cross-canadian since it redefines RECIPE_SYSROOT + manifestprefix = d.getVar("RECIPE_SYSROOT_MANIFEST_SUBDIR") + if manifestprefix: + sharedmanifests = sharedmanifests + "/" + manifestprefix recipesysroot = d.getVar("RECIPE_SYSROOT") recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE") From patchwork Fri Mar 17 22:42:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21167 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 34900C7619A for ; Fri, 17 Mar 2023 22:43:09 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web10.448.1679092983394495070 for ; Fri, 17 Mar 2023 15:43:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=a2GA9Ir+; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id o11so6842299ple.1 for ; Fri, 17 Mar 2023 15:43:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679092982; 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=v4daizuM18z2yeix3M+QKNJjgogZqnSQtT+iP8Bo5Ro=; b=a2GA9Ir+byTEVNXcoTZO0CoHYVr4++b2ZyQ+Ae+3avJusPY7OYL97G23kp5PhLpmKH EGLdc2jHedAWGSDrTeykQHsSRTttkSQD7W4gjOIUg+hAalJhTQR3kBujThQbAesthB0X UFLYyD56nqmHdWvS1Xu1OoLwfvb3y9lj5I1o6DMFJ/4uCP+EvEqkZRxePv6WdN7h/YjR +Enr+7lOO2hSyXGRKBtxq5lPqbM6PGpTAgqpTp/2ZA+FtigNUBVui2NYUB5SxSHthWKl 6H6hY6u110iPzm1mrKhYYCvctHse3oi/wbdDWockT5gwBqki0kPqWQy8uP2ALOmPacZ7 tCUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679092982; 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=v4daizuM18z2yeix3M+QKNJjgogZqnSQtT+iP8Bo5Ro=; b=bxaPFuaaNEsM9VeZK0/QKwhhxnV9oxix0cqEdj7jyxKIVDan4+M8iTc/2hBMxtmk02 XJVmAWyW4OXotsxTdQ/Pl4KI0WAAZF7+n7BV9j0rIrH9+bHCQ5gPaN/9JhRBf3king7U ugT0wKEzvlKAKoGm26SVYquRsHO3clVTfrLQM83l06VIr1yvGMsgTRsJ2P5XmqUb1qnN hEjTUotZDnXjwJg6zAylqbZrSCGHPloINvmoUKRjBJ1z81zpW+QcCbqk6Jjh7EkbPAFr 2iAUqzWWoMxlOoUJw1em7sUEpil3zrX0OXu6bAPx2mpA85LyQAm3UeM72dZE+E+9VHqA vb3g== X-Gm-Message-State: AO0yUKW3XUWR8prqlALqrRaJHXZ7XrIBOkG8eSsWR5uy9vH13LTDaxua 8oyl8wmWeJYQVqIJuGbu7k+zzXkBb37v71TrgvQ= X-Google-Smtp-Source: AK7set+bRQEebM3+UH25fpZpdWZb8kX/ZJ9qaWWLb2B4/pu3YbMM+5ODlQC2du5ZjnkomibDc8mwvQ== X-Received: by 2002:a17:903:32c9:b0:196:595b:2580 with SMTP id i9-20020a17090332c900b00196595b2580mr10830637plr.0.1679092982521; Fri, 17 Mar 2023 15:43: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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.43.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:43:02 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 11/21] glibc: Add missing binutils dependency Date: Fri, 17 Mar 2023 12:42:25 -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 ; Fri, 17 Mar 2023 22:43:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178772 From: Richard Purdie glibc has it's dependencies handled more manually due to it's place in the toolchain bootstrap. It depends upon the compiler and indirectly through that to binutils. This did mean that if binutils changes and the compiler does not, sstate and hash equivalence could mean that glibc wouldn't rebuild. Add a direct dependency on binutils that if it changes, it forces glibc to rebuild, as it should. Signed-off-by: Richard Purdie (cherry picked from commit c4a7b3decff636292f5e76e95406a22b6fe4a994) Signed-off-by: Steve Sakoman --- meta/recipes-core/glibc/glibc.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index fdd241d973..3b940b8ab2 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc @@ -1,7 +1,9 @@ require glibc-common.inc require glibc-ld.inc -DEPENDS = "virtual/${TARGET_PREFIX}gcc libgcc-initial linux-libc-headers" +DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}binutils${BUSUFFIX} libgcc-initial linux-libc-headers" +BUSUFFIX= "" +BUSUFFIX:class-nativesdk = "-crosssdk" PROVIDES = "virtual/libc" PROVIDES += "virtual/libintl virtual/libiconv" From patchwork Fri Mar 17 22:42:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21166 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 1DB94C74A5B for ; Fri, 17 Mar 2023 22:43:09 +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.476.1679092985161719013 for ; Fri, 17 Mar 2023 15:43:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=kHcpflQo; spf=softfail (domain: sakoman.com, ip: 209.85.214.172, mailfrom: steve@sakoman.com) Received: by mail-pl1-f172.google.com with SMTP id k2so6813825pll.8 for ; Fri, 17 Mar 2023 15:43:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679092984; 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=ftPcUGI+ZrZi3iXXb0d46DkLgV/pCs9XLybapFBW9eU=; b=kHcpflQoTlw5pTuiGfOQPxrw0ru9KvkmxwWRzudays/1k950d5Hqq67UkMWO0zqJgy XSUBn6t6DPZpxq9LYh+80vxAeQmhzygR/A8i3Pvyd/CmpiBMlKSmdmKx5JEQHheWqSEC Et7jvHeeP4vUAJCroh/QMw7Lr/B3uMY/OcTmrY2Y7Es3EYqV8QDzaj5xlOeB2PUQ2a+/ 5wWPMi6q2rqDezzn1SLMb6luap/6bAMGdKp/m5YUk8mp+x1aR2lyzTU46UERRLMBoGYy n2tkBn1KaApB6y0tM+RlpOyyl63kSjNqGLOjOO9wgQ8rAVJw38owMoDDjOq1AzyAXyvH olkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679092984; 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=ftPcUGI+ZrZi3iXXb0d46DkLgV/pCs9XLybapFBW9eU=; b=U3R8+E47sF0d8AqYK8v2BkXhA4ax72Wh3ZvZbwIj6p4cJ4E3dR+4T1V70dXA6fxskn sS36faYy+MG8rk+OXe02VtsWfkbovnByKKVgNoiVuZn4pM29qwk3daMCRYuhr38aEkri IEjpXtapUlC5EysJ2NA+Ul+qSCQAyeegMjh33DLgF3ortfKEOv+mOFU8nOWOFEmeG614 TPPTM1ghynT5xrXJcSTcIYqZ0g6+3t3gq4xBYS/ZxXBdOSnJZTU1H7CKmD/a1rCA70nc P2AQ49JFnPBhHt59yZ4TQJl5TJiS/BnLh7upplXywy0UNJUjd79ym9267KJnVYD3GujI 3YAA== X-Gm-Message-State: AO0yUKWuiMm7g+c0XiyJqqs6O+FXnqkAWRe5N9b1l/W50LpSQe7RntP6 5WE/Dob21QONMn8+t9uYimnW2cdVWc8cuSmIwB8= X-Google-Smtp-Source: AK7set/6ZvogAONany58eQGs8yqNdS+EVATHcxq9JkMXJBJuUQ7v1J+lqz6z3W1GEFLDskXY3jOjeg== X-Received: by 2002:a17:903:7cb:b0:19c:fc41:2dfd with SMTP id ko11-20020a17090307cb00b0019cfc412dfdmr7816741plb.29.1679092984145; Fri, 17 Mar 2023 15:43:04 -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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.43.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:43:03 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 12/21] selftest/runtime_test/virgl: Disable for all Rocky Linux Date: Fri, 17 Mar 2023 12:42:26 -1000 Message-Id: <0f317a0533f20580e77a0d6d0b636c05b3230b1e.1679092796.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 ; Fri, 17 Mar 2023 22:43:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178773 From: Michael Halstead RHEL compatible kernels do not support vgem so we disable virgl headless testing. Signed-off-by: Michael Halstead Signed-off-by: Richard Purdie (cherry picked from commit 78bc1ba2361249ec845d1b9e28d429a37dd83910) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/runtime_test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index 858f12ec90..29e82881d1 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -252,7 +252,8 @@ class TestImage(OESelftestTestCase): import subprocess, os distro = oe.lsb.distro_identifier() - if distro and (distro in ['debian-9', 'debian-10', 'centos-7', 'centos-8', 'ubuntu-16.04', 'ubuntu-18.04'] or distro.startswith('almalinux')): + if distro and (distro in ['debian-9', 'debian-10', 'centos-7', 'centos-8', 'ubuntu-16.04', 'ubuntu-18.04'] or + distro.startswith('almalinux') or distro.startswith('rocky')): self.skipTest('virgl headless cannot be tested with %s' %(distro)) render_hint = """If /dev/dri/renderD* is absent due to lack of suitable GPU, 'modprobe vgem' will create one suitable for mesa llvmpipe software renderer.""" From patchwork Fri Mar 17 22:42:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21164 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 2385BC6FD1D for ; Fri, 17 Mar 2023 22:43:09 +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.478.1679092986955304937 for ; Fri, 17 Mar 2023 15:43:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=3qIj+UhF; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id v21so6808620ple.9 for ; Fri, 17 Mar 2023 15:43:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679092986; 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=OZbJkY1Y/7N4G1U/awNmY6LRciK7vtX3k2r2iQ6CJ8M=; b=3qIj+UhFQMLYVG+tjyzvQUH+dxtXIxr4VdlMll2IgkTZuOqvJEv1D1SEuZEE3PH118 y6ihbv8fFDKFZm8uphLCtJ1U3bZ3RI/JG4oVvLhdwhA10bwKbf94kiFjdse8juVZHnbs JARstlJhY8dtL2vL/9CdVinYaavwtBUQZNe2c1JQvaxeiN7IWIc5ekrtSHgR4sp8yKAQ 9negFqoUhUirph6YXkvC7a1k1gh6Z8L9A41hBikmBrwm6QULJ9uKpaVV1fxhi+6zdCDs j3FYJLSx+tP6ksfpQwjIJt0Y9T/+0Fguo6Me7L0j+zpEoTuFoqYe8RDmGHuX/rtVj6Bp 8fUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679092986; 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=OZbJkY1Y/7N4G1U/awNmY6LRciK7vtX3k2r2iQ6CJ8M=; b=16uQNoR7NWJbfK97GAX7BM1zdljBfQsBf6dTAcF1O9oa/oD6+RQO6EqjQOvsoqTivv bx3Kaq3AK/W1HlDA30Zu7kUODYe206WSJrKGh1ppBhIRnZFRd4zv5tLeeFGIGpuPWWX3 nTdLrZS93dOeWqBa9/R+ri1/AIAk8CDZaZqlMjIp+Avyc9YBuBjcO0PN9SVlv6F9R2mp nVJh9W6ssPmUGlh6QusgLGtokbLlsX54iMBcXPLPoPR5jQy9TsmtTIsl2lvcscQ6Rf4d 2k2XmcUOKyPzmiD8XCDEs51o4Q0K/KwBrHBe/XuKOlwYknvUlcKtmcYwoIpJsGDU7VPh yu/Q== X-Gm-Message-State: AO0yUKWxXQ1nW3rD4fA8z+lXb16Bpjv/qsxzGFAbYCJFNJ5DQgIA/tBY 71aoW9uLo5U24I+H7ZSHN60UwfPfvF0Ws13q2hg= X-Google-Smtp-Source: AK7set+4yYWtwc5hW+RZHJXzuhmjpyEp1E/v5VRsXR4QGMq4ux5fH6kgtruuqgxJHxPqAecvXwHGIw== X-Received: by 2002:a17:903:187:b0:19a:f02c:a05b with SMTP id z7-20020a170903018700b0019af02ca05bmr10587121plg.3.1679092985931; Fri, 17 Mar 2023 15:43: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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.43.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:43:05 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 13/21] selftest/recipetool: Stop test corrupting tinfoil class Date: Fri, 17 Mar 2023 12:42:27 -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 ; Fri, 17 Mar 2023 22:43:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178774 From: Richard Purdie Running recipetool.RecipetoolTests.test_recipetool_handle_license_vars followed by wic.Wic2.test_biosplusefi_plugin_qemu would show a failure of: File "/media/build/poky/meta/lib/oeqa/utils/commands.py", line 351, in runqemu qemu = oeqa.targetcontrol.QemuTarget(recipedata, targetlogger, image_fstype) File "/media/build/poky/meta/lib/oeqa/targetcontrol.py", line 116, in __init__ use_kvm = oe.types.qemu_use_kvm(d.getVar('QEMU_USE_KVM'), d.getVar('TARGET_ARCH')) File "/media/build/poky/meta/lib/oe/types.py", line 182, in qemu_use_kvm if kvm and boolean(kvm): File "/media/build/poky/meta/lib/oe/types.py", line 128, in boolean raise ValueError("Invalid boolean value '%s'" % value) ValueError: Invalid boolean value '/media/build/poky/meta/files/common-licenses' which made no sense until you realise the recipetool test is corrupting the tinfoil class. Work on a copy instead to avoid this. Signed-off-by: Richard Purdie (cherry picked from commit 7fe76fe17f67c1bbd108d02836692fed20d24771) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/recipetool.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py index 510dae6bad..db8790b57b 100644 --- a/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/meta/lib/oeqa/selftest/cases/recipetool.py @@ -579,7 +579,10 @@ class RecipetoolTests(RecipetoolBase): commonlicdir = get_bb_var('COMMON_LICENSE_DIR') - d = bb.tinfoil.TinfoilDataStoreConnector + class DataConnectorCopy(bb.tinfoil.TinfoilDataStoreConnector): + pass + + d = DataConnectorCopy d.getVar = Mock(return_value=commonlicdir) srctree = tempfile.mkdtemp(prefix='recipetoolqa') From patchwork Fri Mar 17 22:42: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: 21165 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 2B988C7618E for ; Fri, 17 Mar 2023 22:43:09 +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.454.1679092988586651486 for ; Fri, 17 Mar 2023 15:43:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=yN/cYtKP; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id h12-20020a17090aea8c00b0023d1311fab3so6788795pjz.1 for ; Fri, 17 Mar 2023 15:43:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679092988; 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=X/WHw+1GrJT008LHZgharZ7jYRSXiQSnTSrnXAUiifY=; b=yN/cYtKPx1hjt8QuT+6iLOonFzlj2V8Q0ukuV9GherMBGvg8oq1WH6nLa+DgBbsLgN OnA6zwPTIY/sGmwcBeq4meTdaxneDUDlyzOMDoy254RX0M7Xm839RNvxMXUMuLOdJpCK XjuCB/D3cgGvYg0Mpx9cNAYn78JW92BA6QWfY9vNdn+Q0WgGhQsrxm7Q64SAcyBkek/W YrKe9Mt0K0b0TmZohEKdD6fdEDWdO9yE+4uMlzwAd+WVJpc3mnCuZ3YAapEfVHD7CwD/ tJDOSugblB1xhhTDyI3jI22VVhQaRwWY4bQcXoHaKfSLkq/GY/UWF0NVz/VA7U8o5uV3 YKzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679092988; 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=X/WHw+1GrJT008LHZgharZ7jYRSXiQSnTSrnXAUiifY=; b=LezFs2vGkpFxdv+uCG4ijG67pqGE7WnGRN2gO+pqRHzuElq7GxteTFB811tpRDbGsW 6GZsR28eA4eqM2IIst9apstYBhZ12odIqdiNtitCAJ53FjfWkBJk68qSdSqKJHz1jtk3 ZX+vp9aMP334P6tXFBQ9OwU3WmfssaN3fRZL6aRh+rrV21n56K+adEKbsRlvT0bTk2Lc Sseqdp8HFfRpWRoSHTaDiSvXNqdQjpCR09E8w6fn1Z1HMgFmEgi65+59T2HVjG9LQcW4 GwsXT6sZXiRAIfmglWI27TvII5278EMiQM1N9hNHNnytd4HDCX8NqLGtBvRT9XtJvBO5 RZCw== X-Gm-Message-State: AO0yUKVuQWCvI6Ow5AJDkq1Fq1m8FEcurll1JFQGlBGwD14rJltgjiRs 2oVtqoVq2qBkDJY2z9JpATCegly2vYyqgPGlEDY= X-Google-Smtp-Source: AK7set/h/LlSBpPuOkdtNZnqdbytGHRkS7u5rJjvGfiKv/WVxqs3Q8fCmFF2xgUSIpFHPXFm+ARV5w== X-Received: by 2002:a17:902:ceca:b0:1a1:86c9:e30b with SMTP id d10-20020a170902ceca00b001a186c9e30bmr10203477plg.53.1679092987790; Fri, 17 Mar 2023 15:43: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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.43.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:43:07 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 14/21] cups: use BUILDROOT instead of DESTDIR Date: Fri, 17 Mar 2023 12:42:28 -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 ; Fri, 17 Mar 2023 22:43:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178775 From: Trevor Woerner The cups documentation is clear that the correct way to install into an alternate root directory is to use the BUILDROOT variable. From INSTALL.md: Use the `BUILDROOT` variable to install to an alternate root directory: make BUILDROOT=/some/other/root/directory install DESTDIR works, but we should use the mechanism the project specifically created for this purpose. Signed-off-by: Trevor Woerner Signed-off-by: Alexandre Belloni (cherry picked from commit f8fc70674e0ea5df46969a06da62f8ed135cae4e) Signed-off-by: Steve Sakoman --- meta/recipes-extended/cups/cups.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 4592980766..cf06c9f1b8 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -67,7 +67,7 @@ EXTRA_OECONF = " \ EXTRA_AUTORECONF += "--exclude=autoheader" do_install () { - oe_runmake "DESTDIR=${D}" install + oe_runmake "BUILDROOT=${D}" install # Remove /var/run from package as cupsd will populate it on startup rm -fr ${D}/${localstatedir}/run From patchwork Fri Mar 17 22:42: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: 21170 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 25E1AC74A5B for ; Fri, 17 Mar 2023 22:43:19 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web11.466.1679092964067638986 for ; Fri, 17 Mar 2023 15:43:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=T6yYu4x4; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id j3-20020a17090adc8300b0023d09aea4a6so10702419pjv.5 for ; Fri, 17 Mar 2023 15:43:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679092989; 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=jz24XVCm6K/zhtLvnkLpTl1fFzh3MArpCY1+bgsFfCc=; b=T6yYu4x4AC7Pf6fyY04/u1YXFI7VjolGx/W/ma0iLp3EVg/GhlWOajLuNXVplMbo5S tYXnpxDhNBVPwjxf2cUU0vz5BCLObVDu93QD3OIf4NUnxmGqheX0i/wuNnVEH9yWskk5 KXIuxtkye3uwkjO0chE1hKPHr/VQjyb1n3xVqgVRGa31r30rPranxafAvjLDzceIGQOF /CkjPyIbCxmZXMECiY8gMC5PvE4RxkBlEHeVVwfQwVxgwhewQ9X/p6gAqfjout47SMAd AzeahMZoXrT8RhMr1eCAuoBAGvQCywORhvTK6Kq1Jhut3RIR7uBSSy8XiVEmXLQZ+Uc+ 0Aeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679092989; 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=jz24XVCm6K/zhtLvnkLpTl1fFzh3MArpCY1+bgsFfCc=; b=FXapRe+zhZwlsBf90Qvl9BwxSEZg6WMvR8/kabZ7d5Odm6wGHCd04Y9xW6gOMPEZ04 MtopvGj84/TWfHgnN3MVcjsJj0HmL70RjTyMRCPnMtJ3+J3GS7HQ7otHFnO2TvPej4h+ ZPEPrPPMKCx0JVr7RjdD4VLFSMLRb0ziUdtrrVETi0IwJ1McaC5GgJ3LXS+XDMNSTi0F rSxdZQU8vWZP+HNrNcYAFapT8rwLfylOjdDBVG63cvtY+LAjaRsZfEjaFeaf4evilvtX jk9E8i5u6qVje/dx5KZuJB3u6JJcOa9z2nidKdeQ8xQ9qJxwLlGYQLndZTAP15D4J409 u9Yw== X-Gm-Message-State: AO0yUKUkohzTp70Qu2J0Ceo5c7bGFU+xtDHk+rHwWw6170NyGKY7RIui +8QVDsvtxLKCcViF+izLvjqbvVOsNwNgS9nBvxg= X-Google-Smtp-Source: AK7set+H/zpZeISXuSddeLCOzy3bGdLJWGtziw7I93uN4oSi38ZsW7dJucbeIljaxODK2ruLButGMQ== X-Received: by 2002:a17:903:41d1:b0:1a1:97b5:c660 with SMTP id u17-20020a17090341d100b001a197b5c660mr5303747ple.20.1679092989529; Fri, 17 Mar 2023 15:43:09 -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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.43.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:43:09 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 15/21] cups: check PACKAGECONFIG for pam feature Date: Fri, 17 Mar 2023 12:42:29 -1000 Message-Id: <7b23927a72a1f8b91802f5b2ca10f2cea239bd47.1679092796.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 ; Fri, 17 Mar 2023 22:43:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178776 From: Trevor Woerner The cups' PACKAGECONFIG is populated based on DISTRO_FEATURES, but a user is free to enable or disable PACKAGECONFIGs at will. In theory it is possible that pam is enabled globally in DISTRO_FEATURES but disabled in cups' PACKAGECONFIG. Checking the PACKAGECONFIG to determine whether or not pam is enabled would be a safer check rather than relying on DISTRO_FEATURES. Signed-off-by: Trevor Woerner Signed-off-by: Alexandre Belloni (cherry picked from commit a053dd177ddc99ced11e68914079be0ffe261262) Signed-off-by: Steve Sakoman --- meta/recipes-extended/cups/cups.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index cf06c9f1b8..714be4b26c 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -75,7 +75,7 @@ do_install () { rmdir ${D}/${libexecdir}/${BPN}/driver # Fix the pam configuration file permissions - if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then + if ${@bb.utils.contains('PACKAGECONFIG', 'pam', 'true', 'false', d)}; then chmod 0644 ${D}${sysconfdir}/pam.d/cups fi From patchwork Fri Mar 17 22:42:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21168 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 31061C76195 for ; Fri, 17 Mar 2023 22:43:19 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web11.482.1679092992169800602 for ; Fri, 17 Mar 2023 15:43:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=GWOa8P9X; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id e15-20020a17090ac20f00b0023d1b009f52so10722051pjt.2 for ; Fri, 17 Mar 2023 15:43:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679092991; 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=6sbqHlBFBOVI9T7GahVIo91tdzf0CiFDRR14OpJ4O+I=; b=GWOa8P9XA0InjWYmwhZ3Rnr/2q6Ky2LtASiXGOODZ+1YHaRuXItgAeXFcriJie5IOB BBF8Vm7x/mWyAprpgmS+tw8UIpvPENRkG3/l3NJOaUwiESElWpzqh+1IdHoVpjhNyMQW j7U0qtCkqnU6lT1JUndkGP2/00sWsLe3VZj30BNYe/gkjalooa01AEWNX8QvTxsmsCAg vKfe0/KVmz7KvTEsdr/8Wf8W73lyvtrrWaPf4920Hq3yjyDyws66wmyikkF1yY5oL33u /NhPN+oA/5Hbn9h70fevMvtqCB4HEG9Nl4AykRuY/XNkRCm/UxzijAwkRmdcP4euaMUr mIEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679092991; 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=6sbqHlBFBOVI9T7GahVIo91tdzf0CiFDRR14OpJ4O+I=; b=MeQIKxGvjKeMPa0yTjwjmqF7nSduuUaq800TeMc0lp49avbb1AmSmHwr1ERp9SUrCu mp6fhvy72MgVi6DPXNCpMsAHDZGIy7uLyOqik7rP5SMB/ZWmNlIttUhmE480EWzN2PJF ysg0q5NmPibtD+VXfLqbPpBfwJMt0TBSNuZ566CFgAEXAniu8sSenGYagXr0EH+pnuhh VNoP45G8cf0ZZqmuHClgx3jQ4TK8jV++m2i3XlykJN4Ql/3e7p9D4ZRL5FFdQu5PwgcA LPHUQ5BTw5Z9lmcXb7zPf8S3YXDvg8mGMTxubPOesisU0Tb4euR7UOXE/hAHkH3J/+uI SYPQ== X-Gm-Message-State: AO0yUKXXkgMDOpotMDaOOu8PPRkqQasJ/z8VmlJNJcRcz0Q2NTlETNTf rIbWsR3KcjBzxHwZNeGhZXKpLnZdb7ldcOBIAVc= X-Google-Smtp-Source: AK7set+LNzYwYI9Q3LgogaBl7EFjHFM0A5ilWYp7h9oEYSaBQyweqgnj4fveiEhvwZHLIuBkIhCK6Q== X-Received: by 2002:a17:903:4111:b0:19a:b6bf:1df6 with SMTP id r17-20020a170903411100b0019ab6bf1df6mr7827549pld.20.1679092991280; Fri, 17 Mar 2023 15:43:11 -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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.43.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:43:11 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 16/21] cups: add/fix web interface packaging Date: Fri, 17 Mar 2023 12:42:30 -1000 Message-Id: <18194378508beda1ca1fee84e10351b5bf0d86a5.1679092796.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 ; Fri, 17 Mar 2023 22:43:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178777 From: Trevor Woerner cups includes a web server. Users can surf to port 631 (default) of a machine running cups to (potentially, based on configuration, default off) view jobs, add printers, and perform other forms of administration. The location of the various resources that are used by the built-in web server (e.g. index.html) are installed under ${datadir}/doc/cups. By default these artifacts would be included in the ${PN}-doc package. The comments in this recipe, however, would suggest an attempt was made to have them added to ${PN}; albeit unsuccessfully. These resources add roughly 1.8M to an image. Since cups does include a configuration option to disable the web interface (--enable-webif), add a PACKAGECONFIG (default off) to allow the user to decide whether or not they would like the web interface configured and its pieces added to the image. Enabling this PACKAGECONFIG both enables the web interface to be configured and built into cups, and also adds (by way of a recommendation) the web interface package to the image. Considering that the previous intention was not working, defaulting this option to off preserves the existing behaviour. Previously in order to have the web interface data included in an image, a user would have needed to explicitly add the ${PN}-doc package to their image. Signed-off-by: Trevor Woerner Signed-off-by: Alexandre Belloni (cherry picked from commit 2c9bd267ec532cd86a4a1be1d4e499e2aae89aba) Signed-off-by: Steve Sakoman --- meta/recipes-extended/cups/cups.inc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 714be4b26c..0acc5c575e 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -48,6 +48,7 @@ PACKAGECONFIG[gnutls] = "--with-tls=gnutls,--with-tls=no,gnutls" PACKAGECONFIG[pam] = "--enable-pam --with-pam-module=unix, --disable-pam, libpam" PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--without-systemd,systemd" PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd" +PACKAGECONFIG[webif] = "--enable-webif,--disable-webif" EXTRA_OECONF = " \ --enable-dbus \ @@ -93,7 +94,7 @@ do_install () { fi } -PACKAGES =+ "${PN}-lib ${PN}-libimage" +PACKAGES =+ "${PN}-lib ${PN}-libimage ${PN}-webif" RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}" FILES:${PN} += "${libexecdir}/cups/" @@ -102,13 +103,10 @@ FILES:${PN}-lib = "${libdir}/libcups.so.*" FILES:${PN}-libimage = "${libdir}/libcupsimage.so.*" -#package the html for the webgui inside the main packages (~1MB uncompressed) +# put the html for the web interface into its own PACKAGE +FILES:${PN}-webif += "${datadir}/doc/cups/ ${datadir}/icons/" +RRECOMMENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'webif', '${PN}-webif', '', d)}" -FILES:${PN} += "${datadir}/doc/cups/images \ - ${datadir}/doc/cups/*html \ - ${datadir}/doc/cups/*.css \ - ${datadir}/icons/ \ - " CONFFILES:${PN} += "${sysconfdir}/cups/cupsd.conf" MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config" From patchwork Fri Mar 17 22:42: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: 21169 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 310ABC7619A for ; Fri, 17 Mar 2023 22:43:19 +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.web10.456.1679092993906425052 for ; Fri, 17 Mar 2023 15:43:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=8Kn04ARb; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id h8so6804481plf.10 for ; Fri, 17 Mar 2023 15:43:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679092993; 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=GBb+6kiTDi9AqINTl6VXGr8O1iipEyt/3xUAqiDcOl4=; b=8Kn04ARbFilffOuPql9xsYMoVFkQZ5TWjbMLUBud/XgWKaFP6ZjkPJlk7LB1gmjD7m wLz1Ml37TYE71XK96gX63LOgQIt/cBRMtBtrZP7qy1zJSjSQi3AL+YKuZqEimMKq/lcI JxWTYr15YCGVqXrrc0lxVZfweg/VDPDfBh7CXdrMjFB74DKw/1KdXS29XsgZjrLQFeSD NLWOfKX0kbpEvvusvTfgnTMplYLTh696pT1bLruad7yG2Wdtew2JYUX3l77pTvAs9Hpk tzbjtWbEF0HTIuODXWoYhNG6GvOLXlgDbMzU9VUi/yymro4K6IeocIJlO7hkXffDPDqA 9W/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679092993; 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=GBb+6kiTDi9AqINTl6VXGr8O1iipEyt/3xUAqiDcOl4=; b=RIxpSWcBUqlisx8olc7CxSuMp/H4+5NRV5XqC+HdekkWjI5qJau987iR3daSXRr85Q txi6OoqyAxUldQi4XL8B5TThmM2W4pt59EVJtGdxOjcq00KicRkXgJ1vgNymIlaNtG+f nV1ZQi1g9SSoqSZfy6WZEx0iuiSZAx1inx1vyHhHVhZGdCXBvz50HSvkAgA1+eGH/K5J Iosj5ekHJr1YNVPxigo3ZzbcWlxIQ9x/1sXdhqAbSuxf/0ZlRFY2Cvua1N8sxwMGjzZB dIKfy0ZWh4IHW61jYfOJMs8kTo4vGXF0CCS9PfPND5Pa4exsVRyyNdqI+b30DiOCwvfW 7Usg== X-Gm-Message-State: AO0yUKX0z4X0eQgD7NWtBydbcV9H5ojp78CW67EF+zgEcFKuLmD2E3tg T4k6wPKE7ndYcMFNENeFgsn4GkkPkwpVAI5Pht8= X-Google-Smtp-Source: AK7set9D/BR2Z+ukA9WX6QWGvTT5iOrlF0MYzGqX+/pAkq5QIixOVeH+MHoYc4X+WppDxXiwhSbkuA== X-Received: by 2002:a17:902:fa0d:b0:1a1:7bd7:cbfa with SMTP id la13-20020a170902fa0d00b001a17bd7cbfamr8269678plb.13.1679092993004; Fri, 17 Mar 2023 15:43:13 -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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.43.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:43:12 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 17/21] buildtools-tarball: Handle spaces within user $PATH Date: Fri, 17 Mar 2023 12:42: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 ; Fri, 17 Mar 2023 22:43:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178778 From: Kenfe-Mickael Laventure The environment-setup script generated by the recipe was not quoting the user existing PATH when updating it causing the export command to fail. Add necessary double quotes around $PATH. Signed-off-by: Kenfe-Mickael Laventure Signed-off-by: Alexandre Belloni (cherry picked from commit 2d4c032bf3187aaa953a0c33a999074e695f54bb) Signed-off-by: Steve Sakoman --- meta/recipes-core/meta/buildtools-tarball.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 34f7773398..70d740b4e0 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -67,7 +67,7 @@ create_sdk_files:append () { # Generate new (mini) sdk-environment-setup file script=${1:-${SDK_OUTPUT}/${SDKPATH}/environment-setup-${SDK_SYS}} touch $script - echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${sbindir_nativesdk}:${SDKPATHNATIVE}${base_bindir_nativesdk}:${SDKPATHNATIVE}${base_sbindir_nativesdk}:$PATH' >> $script + echo 'export PATH="${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${sbindir_nativesdk}:${SDKPATHNATIVE}${base_bindir_nativesdk}:${SDKPATHNATIVE}${base_sbindir_nativesdk}:$PATH"' >> $script echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script if [ -e "${SDK_OUTPUT}${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt" ]; then echo 'export GIT_SSL_CAINFO="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script From patchwork Fri Mar 17 22:42: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: 21172 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 24943C7618E for ; Fri, 17 Mar 2023 22:43:19 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web11.490.1679092995562204261 for ; Fri, 17 Mar 2023 15:43:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=zMYwDf84; spf=softfail (domain: sakoman.com, ip: 209.85.216.42, mailfrom: steve@sakoman.com) Received: by mail-pj1-f42.google.com with SMTP id fy10-20020a17090b020a00b0023b4bcf0727so6810318pjb.0 for ; Fri, 17 Mar 2023 15:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679092995; 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=VDytXyTxdNBbPlibTP//Uz+TJUuWVxcTU9HByr7TLkw=; b=zMYwDf8440vW63ZIGiMVuJRIuCqOnUn+pMcmSD+M8Xfm09oKo2c0HnFX0BfLvBom1P 6w63S/jglx4nliMrN8wtsCwBpi2DTDTyri5ZRWZnp4ll/7p6c32DHDgXi6y2S/FvgBHi 4dfEg3CrZtfgCl6elNt13yAQvK0r1Hp0FqAiqHew8128gIMcpYv4Sn2+Pm7sA2D5Gv63 CEn7L5WpgghJWUTA1M8CWlq3xYDypKzxIns3X/GxFjufSVEyDKeRlGi3o4yFrYrB7Tc5 N1L7dWEqbIy8bPuUVdI85adNIaqUqTfZKdjNYhrBoUErAdI5gTjof0wwMiEKnbHprmQL ujcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679092995; 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=VDytXyTxdNBbPlibTP//Uz+TJUuWVxcTU9HByr7TLkw=; b=pfAJHHmvLwyrk6wLaSRId+/6EE/qSCnJmMyB9tL8M2BBZO04+EQAaEVLPbV8730sR5 Ow19cC0ja5icEFo1t6W1k11/2qEM7g354bljwtp8e+HvmMd6+39EjGPaPgC9OIO0ZXMw 7JXGHwDrIMGQiD+YWBu767Qni7+qAZuxQksM6YAmonxhFUK7gDXe1d95GawSQlS0KxeV D1NpjxUVa/fws1KyS+a7CfW+O9V5wT3BZQvKlpk4WlagBmasMfKkbcBsYKvQUIpbhPxk 7wrbnAz0Wfy8KUPe2P0GS0eZpeHKuNkNVMMjocK20h3aF9RXnFAgx8bAVzLdzQiR6Ybi v2ng== X-Gm-Message-State: AO0yUKXyQ60j1vF2cLtWEgBFJg8PyAmN8u7ePGxLmXbGLM+VITfpTdk8 SXwbuDejngXAIsLddd31oph4vUZz/ghPIi6/k1c= X-Google-Smtp-Source: AK7set+Zzt0fo7cUn8R1/L30CWPoJM8r5bZrJB7dP8PJx/ZwGRx6ps0p8ehbT+xL4k5poENaWM/e+w== X-Received: by 2002:a17:903:2449:b0:19f:3cdc:56dc with SMTP id l9-20020a170903244900b0019f3cdc56dcmr10086833pls.33.1679092994683; Fri, 17 Mar 2023 15:43:14 -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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.43.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:43:14 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 18/21] toolchain-scripts: Handle spaces within user $PATH Date: Fri, 17 Mar 2023 12:42:32 -1000 Message-Id: <64dd672193b43b1364acc73918a54abaa93645e4.1679092796.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 ; Fri, 17 Mar 2023 22:43:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178779 From: Kenfe-Mickael Laventure The environment-setup script generated by the recipe was not quoting the user existing PATH when updating it causing the export command to fail. Add necessary double quotes around $PATH. Signed-off-by: Kenfe-Mickael Laventure Signed-off-by: Alexandre Belloni (cherry picked from commit 42177ff2d45ee70ad00917bb6fbabca49dae4f59) Signed-off-by: Steve Sakoman --- meta/classes/toolchain-scripts.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index d2562b5d38..d735d434e6 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass @@ -47,7 +47,7 @@ toolchain_create_sdk_env_script () { for i in ${CANADIANEXTRAOS}; do EXTRAPATH="$EXTRAPATH:$sdkpathnative$bindir/${TARGET_ARCH}${TARGET_VENDOR}-$i" done - echo "export PATH=$sdkpathnative$bindir:$sdkpathnative$sbindir:$sdkpathnative$base_bindir:$sdkpathnative$base_sbindir:$sdkpathnative$bindir/../${HOST_SYS}/bin:$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH':$PATH' >> $script + echo "export PATH=$sdkpathnative$bindir:$sdkpathnative$sbindir:$sdkpathnative$base_bindir:$sdkpathnative$base_sbindir:$sdkpathnative$bindir/../${HOST_SYS}/bin:$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH':"$PATH"' >> $script echo 'export PKG_CONFIG_SYSROOT_DIR=$SDKTARGETSYSROOT' >> $script echo 'export PKG_CONFIG_PATH=$SDKTARGETSYSROOT'"$libdir"'/pkgconfig:$SDKTARGETSYSROOT'"$prefix"'/share/pkgconfig' >> $script echo 'export CONFIG_SITE=${SDKPATH}/site-config-'"${multimach_target_sys}" >> $script From patchwork Fri Mar 17 22:42: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: 21171 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 248B6C6FD1D for ; Fri, 17 Mar 2023 22:43:19 +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.457.1679092997215324331 for ; Fri, 17 Mar 2023 15:43:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=rzcRbV78; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id l9-20020a17090a3f0900b0023d32684e7fso9027349pjc.1 for ; Fri, 17 Mar 2023 15:43:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679092996; 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=NHoh3L6ahCiMtBdgE7dNHosEp4qAEDkO+zZIqzeAxUY=; b=rzcRbV78YKXekFZkvhnsnv3/dwuLkKmEVvx9/6d0Xr3y3SseQM7jDJ9Qg1QcIYlMnL jm4V9o2bF6iCI/UjAmVblLeamDcAqVcc7W9JDNxAZSP6fCADKjzi28UupHcS3V1BwTfy bo5L4QGaRnLe0q+iavxWQ2IA1BNOzNoOyej0AKgyUGrIr4FVnaZQdZXfdSquWn6m4k6N X/cqKILJ4U/rO0puSwSQEOs371HX5X5zZFGOHW4R+LVSjzMsB6bq1EH//B/w5OgcKlJO NJBGtib+m6g2KAdCSGNlhVyDaRYgoZobZJQciCSK+Qq2+5xa9jS6Kwxyi3LC2tfzE8NR ec6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679092996; 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=NHoh3L6ahCiMtBdgE7dNHosEp4qAEDkO+zZIqzeAxUY=; b=pK+iL79l07cX0ryKo+Z9hEpIfWhDAaukcuX00Gzo1EzdqT5FIWiqur94MM5Rt4Y0oF L2peUHJFCtCGfPquXGwKJoe+Gphs2UDzsfdj4lFXHAeey0/uxTgs+XW7WEbfp0ALEL0S QF2Ywe/+kvOne27kD3BONtVshQo2fmM9IF2ZgZBqc0VPbX2ozGA6mrH5i5ygP73n/luK VU21T1CnMA7Wb4ShIECIiJZpe0liaN03qD3BPhJLUKriWb3LVU6bEzeOC1j/rgOw0Zla 21livhlrcGCIRHXlg97bdCYfpOX+acJbhNTuCkHbcsy2pZl2oonWjW79M20dZ03f6I5n +gyA== X-Gm-Message-State: AO0yUKXVd/gZoBU/hfWH9TmMVVKnPwtRrEhnl5oppBbvC3X/d8Tvq+II a/5nQsE2ISjSIctr3+yc2C7yqdCchFvKIFfqJis= X-Google-Smtp-Source: AK7set8ePD/2yDwHhKgfpqkVPRAEdhiv0ph4mmGu4SnaACCLNR0szT+Y1kMkNtqML14bRtpEO4vWhg== X-Received: by 2002:a17:903:74d:b0:1a1:a7b6:e31e with SMTP id kl13-20020a170903074d00b001a1a7b6e31emr3220507plb.7.1679092996391; Fri, 17 Mar 2023 15:43:16 -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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.43.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:43:16 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 19/21] populate_sdk_ext: Handle spaces within user $PATH Date: Fri, 17 Mar 2023 12:42:33 -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 ; Fri, 17 Mar 2023 22:43:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178780 From: Kenfe-Mickael Laventure The script generated by the sdk_ext_postinst function was not quoting the user existing PATH when updating it causing the export command to fail. Add necessary double quotes around $PATH. Signed-off-by: Kenfe-Mickael Laventure Signed-off-by: Alexandre Belloni (cherry picked from commit 00e96bf250eaaded839caf465dbc0af5b604aed7) Signed-off-by: Steve Sakoman --- meta/classes/populate_sdk_ext.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 0fd30478dc..a673af7e7b 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -714,7 +714,7 @@ sdk_ext_postinst() { # A bit of another hack, but we need this in the path only for devtool # so put it at the end of $PATH. - echo "export PATH=$target_sdk_dir/sysroots/${SDK_SYS}${bindir_nativesdk}:\$PATH" >> $env_setup_script + echo "export PATH=\"$target_sdk_dir/sysroots/${SDK_SYS}${bindir_nativesdk}:\$PATH\"" >> $env_setup_script echo "printf 'SDK environment now set up; additionally you may now run devtool to perform development tasks.\nRun devtool --help for further details.\n'" >> $env_setup_script From patchwork Fri Mar 17 22:42:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21173 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 242B3C7618E for ; Fri, 17 Mar 2023 22:43:29 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.web10.459.1679092999317572707 for ; Fri, 17 Mar 2023 15:43:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=uCYFNmVm; spf=softfail (domain: sakoman.com, ip: 209.85.216.43, mailfrom: steve@sakoman.com) Received: by mail-pj1-f43.google.com with SMTP id y2so6827985pjg.3 for ; Fri, 17 Mar 2023 15:43:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679092998; 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=coBCwh3NNriX0hs+wRG9AWNzTV8VdwkI3D6aEYj4EDU=; b=uCYFNmVmeR3oAX/PbSTk7r0LJMgl9As7dutqHH2VyyNR3AF4nSlRI1Ujib5tu1xuse cHz5tdLGYZhLIndfHMgiGpqe20W+zf5shQEG7lTK9fInApzf4bDVXPyWOnr29ixLTLPr NRsZjJyqng6rDVQoyT0V8wvuF2RzImQczV5+ZHsk0bMcJw7Ens4QTRlPK/omNrQFH5KP +KhvkMFlzvEj2s9RH5jVjglucpZKgq3tjdXghVG88mAlxwxorWQGP/5vTTOVhDh5xyEx cLDH2BfK85/JHqL3CnyeYfTU3TvuTwnxBPuDpdWqwJmd/3/Wm2zGnL6onRo1hEJpZvY/ ZRjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679092998; 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=coBCwh3NNriX0hs+wRG9AWNzTV8VdwkI3D6aEYj4EDU=; b=CddXVphjw/2NST86I6HUnvXMuUOBuqZfFa0AIrIh7CfhTDJw7lDOhiC9v6XHXpE3tV I38JDAx9uBzseTrtwj2c5PXA0Q0pilAsWcGQHqa9bQ6VN4SBwAicx0ncmbHhYDsWVTZU 67AdxVk2ocIF00UEWEIs5q216luPW8+pqMsjbDc/ISz2Sv+FOLd8vPdL93uvCvQy1A6a VRigxHrBbi+CpoAvZxIkLf3tHtI9hmSlfXZ1QdUlHDLFezOsnxGd0cagnOpIL4gSrofG GXUhmwqRX5JlZYTEPxYKK5AUcixVHWKmYS4la9r20oEkicxsovRe5sZjBTcLSTU1V715 MSKQ== X-Gm-Message-State: AO0yUKWID9MwG2aA3jLmVpdNC9lp8vLkF2Pa1ocE47kKizP7RSTOMIvG 3jcreosrj2Cx39gV06/l96FbDnrbE0fP9uLO/Gg= X-Google-Smtp-Source: AK7set+8VApyIjo6ImfZolax9VercpgCOifzSMKeAI/qvqN5O5Ykcl51AEnODDALQ3OxdYh17oItSw== X-Received: by 2002:a17:903:1c9:b0:1a1:7b8d:670a with SMTP id e9-20020a17090301c900b001a17b8d670amr10239609plh.21.1679092998393; Fri, 17 Mar 2023 15:43:18 -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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.43.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:43:18 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 20/21] dhcpcd: Fix install conflict when enable multilib. Date: Fri, 17 Mar 2023 12:42:34 -1000 Message-Id: <800ea13091216a59e21718fa0fada45b45bdca2c.1679092796.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 ; Fri, 17 Mar 2023 22:43:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178781 From: Wang Mingyu Error: Transaction test error: file /usr/share/man/man8/dhcpcd.8 conflicts between attempted installs of dhcpcd-doc-9.4.1-r0.cortexa57 and lib32-dhcpcd-doc-9.4.1-r0.armv7ahf_neon The differences between the two files are as follows: @@ -821,7 +821,7 @@ If you always use the same options, put them here. .It Pa /usr/libexec/dhcpcd-run-hooks Bourne shell script that is run to configure or de-configure an interface. -.It Pa /usr/lib64/dhcpcd/dev +.It Pa /usr/lib/dhcpcd/dev Linux .Pa /dev management modules. Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit 65ca2c4b7349a4f7dcfcc580d926a99c673deb60) Signed-off-by: Steve Sakoman --- .../dhcpcd/dhcpcd_9.4.1.bb | 1 + ...-conflict-error-when-enable-multilib.patch | 46 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb index 39e689d2f6..579fa95df7 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb @@ -19,6 +19,7 @@ SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch \ file://dhcpcd.service \ file://dhcpcd@.service \ + file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \ " SRC_URI[sha256sum] = "819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c" diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch b/meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch new file mode 100644 index 0000000000..12998aada4 --- /dev/null +++ b/meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch @@ -0,0 +1,46 @@ +From 4915a7e52fcea8fe283a842890a1e726b1e26b10 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Fri, 10 Mar 2023 03:48:46 +0000 +Subject: [PATCH] dhcpcd.8: Fix conflict error when enable multilib. + +Error: Transaction test error: + file /usr/share/man/man8/dhcpcd.8 conflicts between attempted + installs of dhcpcd-doc-9.4.1-r0.cortexa57 and + lib32-dhcpcd-doc-9.4.1-r0.armv7ahf_neon + +The differences between the two files are as follows: +@@ -821,7 +821,7 @@ + If you always use the same options, put them here. + .It Pa /usr/libexec/dhcpcd-run-hooks + Bourne shell script that is run to configure or de-configure an interface. +-.It Pa /usr/lib64/dhcpcd/dev ++.It Pa /usr/lib/dhcpcd/dev + Linux + .Pa /dev + management modules. + +It is just a man file, there is no necessary to manage multiple +versions. + +Upstream-Status: Inappropriate [oe specific] +Signed-off-by: Lei Maohui +--- + src/dhcpcd.8.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in +index bc6b3b5..791f2ba 100644 +--- a/src/dhcpcd.8.in ++++ b/src/dhcpcd.8.in +@@ -821,7 +821,7 @@ Configuration file for dhcpcd. + If you always use the same options, put them here. + .It Pa @SCRIPT@ + Bourne shell script that is run to configure or de-configure an interface. +-.It Pa @LIBDIR@/dhcpcd/dev ++.It Pa /usr//dhcpcd/dev + Linux + .Pa /dev + management modules. +-- +2.34.1 + From patchwork Fri Mar 17 22:42: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: 21174 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 1DC80C6FD1D for ; Fri, 17 Mar 2023 22:43:29 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web11.495.1679093001555243155 for ; Fri, 17 Mar 2023 15:43:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=xzT0PT8p; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id bc12so6219614plb.0 for ; Fri, 17 Mar 2023 15:43:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679093001; 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=fjA7poPXi78Xq776K31BaqBi+vHlmIg54HrfH7uRCbk=; b=xzT0PT8pLQRgWD8mClBCapYy854OVoQdZq5/gz367ukc47xrxOT/wIbByGZC1ij6U0 EgreA+SWzcgqKp6sipJYiGoNY6I+C+xDdl4cL+Vor74xTnWJzgwT0xg44Wne97macKXX et3aad8h7x9LwcYF7Y6L2xH/SgNCcxHjL+ZOu4BwGUFxoN91RS5pW9knhm4uA2jUfvyL SIxUIklr6Q5QpYM6BJBVf0u1NPd+UCPHteX6d6hVF/NHxX+1gyAZR1Y4Mtsk2y/eIe0W qwwxT/I7QbAINggDPTtgNNqJWLiuj76KiJtMBF3THf/NPAQP+vOC4e18ffZ3OUfpsKS6 Ju1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679093001; 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=fjA7poPXi78Xq776K31BaqBi+vHlmIg54HrfH7uRCbk=; b=XVnSMSUyCmWpBO5rbvV6fFfynyE6B9wafmn1oyyI6IXwzlVIPOLNojI5/QGmayfSf1 KcN3EFDehkWDpliFdODu5KXJfqIlRhkqTttsiOIqJb8LW3z3DmGmwQYmwLBeuv8Pf5Bf xY1rSw49poC2baOY9roLtWzFGg8iJ/VUlNEUp8e04MVtG8WGenk8TBk9cpKTq1zBtviP kkZn84aLHqto4Vnl31JpzPNoQRvwHSj4BzlZMrwzn/DJ4Viacp6Me8WVAFvfrP764uMc 2nfyTxbhv0LvCHMUcmQAVT6Hbp4q/e+lafrAzmPKNUrW0hal7z61bWJ5Rifto/58qA/F kPYg== X-Gm-Message-State: AO0yUKVek5/59IBl/h0b4Ey2D9VwPz4NRyH9tjPtd/jSAAaiDKivsTsW wT5Zm7upk6v5/WatF+fNHnCnF55fMRvxQcdxWO0= X-Google-Smtp-Source: AK7set+duqEDc9M/HOtUoFnEnU8dQH4whgqaboeMA6rKQCMepuMsrd0LXMnRwJ7z5dbCWSGYeSVRHA== X-Received: by 2002:a17:902:c94f:b0:19e:73df:b0e9 with SMTP id i15-20020a170902c94f00b0019e73dfb0e9mr10599573pla.21.1679093000637; Fri, 17 Mar 2023 15:43:20 -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 jb13-20020a170903258d00b001a19040435bsm2027152plb.100.2023.03.17.15.43.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:43:20 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 21/21] base-files: Drop localhost.localdomain from hosts file Date: Fri, 17 Mar 2023 12:42:35 -1000 Message-Id: <7df46e003ea76cf7d5b7263f23bd6e6a781bd22c.1679092796.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 ; Fri, 17 Mar 2023 22:43:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178782 From: Richard Purdie This was likely something we took inspiration from elsewhere with. It was added in: https://git.openembedded.org/openembedded/commit/packages/netbase/netbase/hosts?id=c8e5702127e507e82e6f68a4b8c546803accea9d in 2005. Debian added this entry around 2004 and discussed and dropped it in 2005: https://lists.debian.org/debian-devel/2005/10/msg00559.html resulting in: https://salsa.debian.org/installer-team/netcfg/-/commit/3c15ee521b2b8f47b34ccc7f610523cd284f2221 We should drop this for some of the reasons in those threads, it doesn't seem to be doing anything too helpful and isn't what most applications expect. Signed-off-by: Richard Purdie (cherry picked from commit e730d005fa8aec07f9ae25c58d4566eaa92a6997) Signed-off-by: Steve Sakoman --- meta/recipes-core/base-files/base-files/hosts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/base-files/base-files/hosts b/meta/recipes-core/base-files/base-files/hosts index b94f414d5c..10a5b6c704 100644 --- a/meta/recipes-core/base-files/base-files/hosts +++ b/meta/recipes-core/base-files/base-files/hosts @@ -1,4 +1,4 @@ -127.0.0.1 localhost.localdomain localhost +127.0.0.1 localhost # The following lines are desirable for IPv6 capable hosts ::1 localhost ip6-localhost ip6-loopback