From patchwork Wed Jun 14 14:04:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25634 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 228FFEB64DC for ; Wed, 14 Jun 2023 14:05:16 +0000 (UTC) Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) by mx.groups.io with SMTP id smtpd.web11.13054.1686751512451550303 for ; Wed, 14 Jun 2023 07:05:12 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=e6IdtwCH; spf=softfail (domain: sakoman.com, ip: 209.85.167.182, mailfrom: steve@sakoman.com) Received: by mail-oi1-f182.google.com with SMTP id 5614622812f47-39ce64700cbso2219132b6e.0 for ; Wed, 14 Jun 2023 07:05:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686751511; x=1689343511; 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=QNPjcm2amAA9/mQB69KW+5tetJpo7JTIN9qOMJEN2Y4=; b=e6IdtwCHcOJqNB3Td6oQXpvFY0EKxxs4umJ0z7h9enNsRiegZLTnS0EyyrIZLEYksJ YnsUfdOAzFJEj6RMbFU2+hHKyThS5ByogLnJotmx0KPVGNFMXiiz5bZ75m43kkAl46dd pFZY22MJzumZiwi0CH8nTIkWdCIALDqtTt9mr2KvaJ7hOmqsB8OasudFRUV5CzcGhrwD xWwAQTC1hegSACLugsdPURjveEcFNmThwPs6CQ1DMoGKx5rkFvTd+WT7bK47Fht7Iku0 ecYqN8+1c6GbGxFuCp8PAqQF2ecBoQYeUE/olOGn62jnoKOwdBYF6VlnjX71nUddfDGi KQQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686751511; x=1689343511; 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=QNPjcm2amAA9/mQB69KW+5tetJpo7JTIN9qOMJEN2Y4=; b=cj2raXZcAXZ0KaoRGg30n8F4F/Re5FYphN2S84Tr6CCQj0yEWW/FWNv4vCziZ/Fp+k 8QAawjc9XD9MF9/4Tt8F5h5lRffXtNVDqKiXr8ouJ0UIL+4e6so2Z/CAdhDYcFLV9GK+ bpQjuLDu3vNTRJ96ohBTrIkmD03bTGDDD2WIId7F4PXn0uc8x/A/mQRl9JTXG2dg4BsI yoJvKKWJr7bjrATqYZeuuk7hFFNLNyLTB1FWOBUGgHoM8omkZ/5R/XhN0fnSH1rVLuTV ZmWUSzbFyl/Pr07V+csmJ/+LSRZVp0uCQSCVU/HB34CfFZjZd/TQ1t9kHjamcZVrd6zM aVag== X-Gm-Message-State: AC+VfDyDvFJcH/tpiIOnhsqLL1FzSyjn3RW2xtYfykecl4fnuv2f1TOc wsZc4dMLpYbPt+xkjDKw7dd6KJNXykYebCNVMRI= X-Google-Smtp-Source: ACHHUZ7Pt1oDaWlxg2HjjZbykhQ9H893TLmWZWpYE4POwnJ2gmeNQ3ZP9KwO0uOYQUtz+ypjVuL0dw== X-Received: by 2002:a05:6808:2196:b0:396:cd:829c with SMTP id be22-20020a056808219600b0039600cd829cmr13585222oib.3.1686751511223; Wed, 14 Jun 2023 07:05:11 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 187-20020a6306c4000000b005439aaf0301sm703757pgg.64.2023.06.14.07.05.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 07:05:10 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 1/5] libwebp: Fix CVE-2023-1999 Date: Wed, 14 Jun 2023 04:04:52 -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 ; Wed, 14 Jun 2023 14:05:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182809 From: Nikhil R Add patch to fix CVE-2023-1999 Link: https://github.com/webmproject/libwebp/commit/a486d800b60d0af4cc0836bf7ed8f21e12974129 Signed-off-by: Nikhil R Signed-off-by: Steve Sakoman --- .../webp/files/CVE-2023-1999.patch | 55 +++++++++++++++++++ meta/recipes-multimedia/webp/libwebp_1.1.0.bb | 4 ++ 2 files changed, 59 insertions(+) create mode 100644 meta/recipes-multimedia/webp/files/CVE-2023-1999.patch diff --git a/meta/recipes-multimedia/webp/files/CVE-2023-1999.patch b/meta/recipes-multimedia/webp/files/CVE-2023-1999.patch new file mode 100644 index 0000000000..d293ab93ab --- /dev/null +++ b/meta/recipes-multimedia/webp/files/CVE-2023-1999.patch @@ -0,0 +1,55 @@ +From a486d800b60d0af4cc0836bf7ed8f21e12974129 Mon Sep 17 00:00:00 2001 +From: James Zern +Date: Wed, 22 Feb 2023 22:15:47 -0800 +Subject: [PATCH] EncodeAlphaInternal: clear result->bw on error + +This avoids a double free should the function fail prior to +VP8BitWriterInit() and a previous trial result's buffer carried over. +Previously in ApplyFiltersAndEncode() trial.bw (with a previous +iteration's buffer) would be freed, followed by best.bw pointing to the +same buffer. + +Since: +187d379d add a fallback to ALPHA_NO_COMPRESSION + +In addition, check the return value of VP8BitWriterInit() in this +function. + +Bug: webp:603 +Change-Id: Ic258381ee26c8c16bc211d157c8153831c8c6910 + +CVE: CVE-2023-1999 +Upstream-Status: Backport [https://github.com/webmproject/libwebp/commit/a486d800b60d0af4cc0836bf7ed8f21e12974129] +Signed-off-by: Nikhil R +--- + src/enc/alpha_enc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/enc/alpha_enc.c b/src/enc/alpha_enc.c +index f7c02690e3..7d205586fe 100644 +--- a/src/enc/alpha_enc.c ++++ b/src/enc/alpha_enc.c +@@ -13,6 +13,7 @@ + + #include + #include ++#include + + #include "src/enc/vp8i_enc.h" + #include "src/dsp/dsp.h" +@@ -148,6 +149,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height, + } + } else { + VP8LBitWriterWipeOut(&tmp_bw); ++ memset(&result->bw, 0, sizeof(result->bw)); + return 0; + } + } +@@ -162,7 +164,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height, + header = method | (filter << 2); + if (reduce_levels) header |= ALPHA_PREPROCESSED_LEVELS << 4; + +- VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size); ++ if (!VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size)) ok = 0; + ok = ok && VP8BitWriterAppend(&result->bw, &header, ALPHA_HEADER_LEN); + ok = ok && VP8BitWriterAppend(&result->bw, output, output_size); diff --git a/meta/recipes-multimedia/webp/libwebp_1.1.0.bb b/meta/recipes-multimedia/webp/libwebp_1.1.0.bb index 68e5ae2b3c..f449ae750b 100644 --- a/meta/recipes-multimedia/webp/libwebp_1.1.0.bb +++ b/meta/recipes-multimedia/webp/libwebp_1.1.0.bb @@ -19,6 +19,10 @@ SRC_URI[sha256sum] = "98a052268cc4d5ece27f76572a7f50293f439c17a98e67c4ea0c7ed6f5 UPSTREAM_CHECK_URI = "http://downloads.webmproject.org/releases/webp/index.html" +SRC_URI += " \ + file://CVE-2023-1999.patch \ +" + EXTRA_OECONF = " \ --disable-wic \ --enable-libwebpmux \ From patchwork Wed Jun 14 14:04:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25635 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 1B6CFEB64D8 for ; Wed, 14 Jun 2023 14:05:16 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web11.13055.1686751513764345951 for ; Wed, 14 Jun 2023 07:05:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=l8SKYLVN; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-652426346bbso5230884b3a.3 for ; Wed, 14 Jun 2023 07:05:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686751513; x=1689343513; 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=bpVZf3lpteyHltvKEjFugbQr5EgAqmQPo5T6LKcodBI=; b=l8SKYLVNjm+fAAVZx+ld2ofNvMT6eK/D1+iocv6fI8GQsYwDSd8l7HKSlq6kq6U9TC o50zJMubvkB0UDoBDoKaGC2Ua+pvWDRUcPUpIs4pCCuyV8bqZ1PrSoIBfSXnfGxjC4WU G6hAS/DfzTriyqYoEyKqVR9O2UnX6Da5mfuWmYLz3/HPdz9CImW39rexCLEGg20g0cdc dVCXlcjS0/ojOMj3a2HEuR1sXMXbDIsBs8jHKGpaCbjNyH7iva9+uj4HXRn8QSbHgdei evmNnYIgAoUA+WQwe7hl7D109twPv9rQXYMRpda+Ucc7/ywfBPGi1zQgQ1aWeFcP0ay8 SxDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686751513; x=1689343513; 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=bpVZf3lpteyHltvKEjFugbQr5EgAqmQPo5T6LKcodBI=; b=FjY2lk1Xh9H8JwTJ3q+Pe2K9qLvKsV5+G/U83CawZSZzO/phH5/mO4iTiZ8zECUs9p xkumflPC330DUpwvbu32N3TEeM+uY1WDczppjrazqQ2ZKrLlWWvtaMDhTeUNsyZ6YqmA ELbZFXW46kVZAe6ylyW+Ll12bOT40yZGIwRnlrC/tUzELWPqF7q7G9mqjcFV6p41T5gV 22avDAC6clfvM6o6v7qp/hyUXqNluMcOr+KsZ8AxJgArIM2S6iYqOQJBhKYESLqiYlNM HU0uGvw0cze4NfwCiSekJ4Mw/8FE2/lKE8XwtbIn4JRU8tuVFxhuJUrivDLr0OvdSiVf /b9A== X-Gm-Message-State: AC+VfDwbU4h57/K6FqV9huOozqI1pwsUFuF5r4v7KKcJ6WjAnegEQofN Vlf6E0sKJTdBK4fEQaAVTmD31LvRSYZdUNNvx3Q= X-Google-Smtp-Source: ACHHUZ6kHlnU1RRbr19gaTmcU7WR6Hu3Z16sbr2OJ8WOI2LsNQIq6k/dsV7pJQhEhE/eqFWUc5NoJg== X-Received: by 2002:a05:6a21:32a6:b0:117:a86:6c7a with SMTP id yt38-20020a056a2132a600b001170a866c7amr1754810pzb.12.1686751512821; Wed, 14 Jun 2023 07:05:12 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 187-20020a6306c4000000b005439aaf0301sm703757pgg.64.2023.06.14.07.05.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 07:05:12 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 2/5] vim: upgrade 9.0.1429 -> 9.0.1527 Date: Wed, 14 Jun 2023 04:04:53 -1000 Message-Id: <51a6a2f7917f18f67879ea9559084393ab68520b.1686751371.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 ; Wed, 14 Jun 2023 14:05:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182810 From: Randy MacLeod Fixes: https://nvd.nist.gov/vuln/detail/CVE-2023-2426 caf642c25 patch 9.0.1499: using uninitialized memory with fuzzy matching Signed-off-by: Randy MacLeod Signed-off-by: Alexandre Belloni (cherry picked from commit 4f9a8df5aca99d0a5c2d2346b27ce7be08e7896c) Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 94eabfa197..800ee40f92 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -19,8 +19,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".1429" -SRCREV = "1a08a3e2a584889f19b84a27672134649b73da58" +PV .= ".1527" +SRCREV = "c28e7a2b2f23dbd246a1ad7ad7aaa6f7ab2e5887" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Wed Jun 14 14:04:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25638 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 01EBDEB64D9 for ; Wed, 14 Jun 2023 14:05:26 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web11.13056.1686751516225544666 for ; Wed, 14 Jun 2023 07:05:16 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=3Ef1UzSb; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-6537d2a8c20so5341848b3a.2 for ; Wed, 14 Jun 2023 07:05:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686751515; x=1689343515; 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=tkilat2ezKURTJLY7B6LgaXpImKUN6pa/wRD2f+RO0g=; b=3Ef1UzSbOj72Ii2gCE7GuQ4XXSSiWxpp34giqx7XWR/tva+crnsZfdM0BPpAgJAhpI zdICZGd9v1zRlbEElBCnaYpSuVObCE7iAPqKMZaGmXVbkW7skMc/vP4+H/12OTYpZIX+ GoEjMNv8vIMW3axiSWNAXmOpKMoASBSeZExu6sHZrukLj+TocPHYNcxA2NGP9GhsC1xA uiGc/bwiUf3RQu5pYmnPT4zz4Ek0rvmahd+LgvO+J+axqHwERA16A2/kAfUxsMYE8f+B dW03Wr9BwLl2yRr2cRYRlbj8Y49td8hkJ9EGFwCUgcdpcJuwiFRZ/EkB6UoaNPVnzwgs ClkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686751515; x=1689343515; 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=tkilat2ezKURTJLY7B6LgaXpImKUN6pa/wRD2f+RO0g=; b=fr4Hi3SgMBeLWAwF8IQbRUeT6itoScio9VFS8OScrsyrs2Idm5m1j3+BzFRRme9dKH vAsXRKE1RklooagVZgwD0ARnAFLQ/uM/PwPbcsOddv6KzDV5NHwwEqkjZEKNsctgsaCe tZSigB0UcjwVq6SW2Ty8lXwTcxGJ4nuQILWy09KZETsRDrHgy1A4mABr6IEiHg/c6Zpx WobQQxfS8uctgXT1bt4C94QVHJhWN2T5pVTouLdz48C7oW3kgZhCLDTbjyhnPgiCjt2C DNZrjDVQcbxbdmSBLTkY/8/a/TWGrhWApV1CHxMzc1GIAbbk3WoZntZjKnGjFFZoFqGQ vn3g== X-Gm-Message-State: AC+VfDyWkXwk+VCLW0RJpqP3YA/DzRw7zfVFBHAZ3JmOhhFZpfI+xBW4 mmnMoLJTyJHJwRxEhat4PrmqTjafDZr92Rq5BZQ= X-Google-Smtp-Source: ACHHUZ7sd0UFpqG+i+GNdDl3l+QiEAxC0uql2UulcvOOwJKrC2TZE9m1v/3rRE36AuwDbrpALSjcmw== X-Received: by 2002:a05:6a00:886:b0:64f:aea5:7b49 with SMTP id q6-20020a056a00088600b0064faea57b49mr2244901pfj.17.1686751514542; Wed, 14 Jun 2023 07:05:14 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 187-20020a6306c4000000b005439aaf0301sm703757pgg.64.2023.06.14.07.05.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 07:05:14 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 3/5] systemd-systemctl: fix instance template WantedBy symlink construction Date: Wed, 14 Jun 2023 04:04:54 -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 ; Wed, 14 Jun 2023 14:05:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182811 From: Martin Siegumfeldt Fix issue of the below instance template systemd service dependency [Install] WantedBy=svc-wants@%i.service creating the symlink (instance "a" example) /etc/systemd/system/svc-wants@%i.service.wants/svc-wanted-by@a.service which should be /etc/systemd/system/svc-wants@a.service.wants/svc-wanted-by@a.service as implemented by this change. The functionality appears regressed just after "thud" baseline when the logic was refactored from shell script into python (commit 925e30cb104ece7bfa48b78144e758a46dc9ec3f) (From OE-Core rev: 308397f0bb3d6f3d4e9ec2c6a10823184049c9b5) Signed-off-by: Martin Siegumfeldt Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman (cherry picked from commit 372b29c8ad270d4d430c26a4e614976c7029afaf) Signed-off-by: Steve Sakoman --- .../systemd/systemd-systemctl/systemctl | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-systemctl/systemctl b/meta/recipes-core/systemd/systemd-systemctl/systemctl index 6aa2e20465..577c373181 100755 --- a/meta/recipes-core/systemd/systemd-systemctl/systemctl +++ b/meta/recipes-core/systemd/systemd-systemctl/systemctl @@ -182,12 +182,19 @@ class SystemdUnit(): raise SystemdUnitNotFoundError(self.root, unit) - def _process_deps(self, config, service, location, prop, dirstem): + def _process_deps(self, config, service, location, prop, dirstem, instance): systemdir = self.root / SYSCONFDIR / "systemd" / "system" target = ROOT / location.relative_to(self.root) try: for dependent in config.get('Install', prop): + # determine whether or not dependent is a template with an actual + # instance (i.e. a '@%i') + dependent_is_template = re.match(r"[^@]+@(?P[^\.]*)\.", dependent) + if dependent_is_template: + # if so, replace with the actual instance to achieve + # svc-wants@a.service.wants/svc-wanted-by@a.service + dependent = re.sub(dependent_is_template.group('instance'), instance, dependent, 1) wants = systemdir / "{}.{}".format(dependent, dirstem) / service add_link(wants, target) @@ -227,8 +234,8 @@ class SystemdUnit(): else: service = self.unit - self._process_deps(config, service, path, 'WantedBy', 'wants') - self._process_deps(config, service, path, 'RequiredBy', 'requires') + self._process_deps(config, service, path, 'WantedBy', 'wants', instance) + self._process_deps(config, service, path, 'RequiredBy', 'requires', instance) try: for also in config.get('Install', 'Also'): From patchwork Wed Jun 14 14:04:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25636 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 055C6C3DA41 for ; Wed, 14 Jun 2023 14:05:26 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web11.13058.1686751517926052802 for ; Wed, 14 Jun 2023 07:05:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=MQE2BYVU; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-54fcef0204aso708054a12.2 for ; Wed, 14 Jun 2023 07:05:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686751517; x=1689343517; 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=hqIwKZrT9DxBR3e/OusAxcRPrCJgZt2TxJtbrXytIeM=; b=MQE2BYVUF094YztiJv2xwbndMDYG6yIDFsJXWBNOXipukgEZDuJdX2lLxiWEcCAw/t sG/6LCB305zzRGL/umVe7rWrTXJfm9GzKIM2QscIngA/AIe2eDTlQl806J8AbtHlDU6l oaXWEH9jCoRvAcGiXgh6FXTmHo7+5DigijCLGe2FtOlp55HVYhFnD2sHjbxEQhnO7SHP 1TR6Haq+L9qUZxYZdGZrgugpdFU7JRW8G+qzep7pm59qD0bPEQyf4Q3LBHanPTStnSB5 yrjnc6Ov4Q48WXWIsVo/nZpysEX+yT6ztXKGRmDwqODMNF97cPuKjNm4pc8SaB1wcjax 0hCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686751517; x=1689343517; 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=hqIwKZrT9DxBR3e/OusAxcRPrCJgZt2TxJtbrXytIeM=; b=aLukaF6yyBOrV5atJyaeAF/Xl9DixsmSQjI3CXNYatZzsHHDsUZvPUe7VZwwgaxbAb AkxKRvg6YSTuKoiLsGO9YY8RdhkKsYF4QTP5PmQV7bIWYkMI5Ikn4G+NnxlfQmLCa+Yg nT+WSucNTUDXWCEJNFChVwVCSGJIkNLTU5Qv1EFaaRm5UvzpsBTQ2XlqGfJK/LG+9Qib 9EldL8XithiwbjrKVFiEbSFN08WPkgzGLZY85Wjg9Vl+l+zC8vn4ptLA6lqaVxU0WlY1 d2ViIdrErj13V/BIVscoTPLunUmjP2b1+w2DdMaBTVWcFgWgOpUNrTBOyewVvEV92eee wb3A== X-Gm-Message-State: AC+VfDzp1LSs1ujzNeBAtjA62G4AeRxgaJgJhQYPyEfC4NAC62ThtYB0 KT1sMPah6pXdQye6hX/ikApZb+ncJMI68+h7408= X-Google-Smtp-Source: ACHHUZ6XStIfMCt+bnHuP+yLtU4WHqoqu/VFYk7cwFxvutHOWTueKFg4NZLTYftNTUGC9d5UrTFd5A== X-Received: by 2002:a17:90b:1e06:b0:256:d262:e686 with SMTP id pg6-20020a17090b1e0600b00256d262e686mr1683608pjb.19.1686751516830; Wed, 14 Jun 2023 07:05:16 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 187-20020a6306c4000000b005439aaf0301sm703757pgg.64.2023.06.14.07.05.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 07:05:16 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 4/5] e2fsprogs: fix ptest bug for second running Date: Wed, 14 Jun 2023 04:04:55 -1000 Message-Id: <7ff9bca99806c4f3b44b450ec7d6b06486908ea9.1686751371.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 ; Wed, 14 Jun 2023 14:05:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182812 From: Qiu Tingting At second running, there are four new failed case: d_loaddump f_bigalloc_badinode f_bigalloc_orphan_list f_dup_resize The test_data.tmp is necessary, but it is deleted by run-ptest. So it should be restored after testing. Signed-off-by: Qiu Tingting Signed-off-by: Alexandre Belloni (cherry picked from commit d0d08dd9a8a179e25b9cfcbac696c1d212a1910c) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest | 1 + meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb | 3 +++ 2 files changed, 4 insertions(+) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest b/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest index c97c0377e9..279923db8e 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest @@ -8,3 +8,4 @@ rm -f *.tmp rm -f *.ok rm -f *.failed rm -f *.log +cp ../data/test_data.tmp ./ diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb index b1abf6b858..565c433866 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb @@ -144,4 +144,7 @@ do_install_ptest() { install -d ${D}${PTEST_PATH}/lib install -m 0644 ${B}/lib/config.h ${D}${PTEST_PATH}/lib/ + + install -d ${D}${PTEST_PATH}/data + install -m 0644 ${B}/tests/test_data.tmp ${D}${PTEST_PATH}/data/ } From patchwork Wed Jun 14 14:04:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25637 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 0191FEB64D8 for ; Wed, 14 Jun 2023 14:05:26 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mx.groups.io with SMTP id smtpd.web11.13059.1686751521336742015 for ; Wed, 14 Jun 2023 07:05:21 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=SohS3ZOq; spf=softfail (domain: sakoman.com, ip: 209.85.210.173, mailfrom: steve@sakoman.com) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-662f0feafb2so4966086b3a.1 for ; Wed, 14 Jun 2023 07:05:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686751520; x=1689343520; 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=VYWWdLXot/0eN5YOBYg6QhABqVI2NiL0tyrDSu4JO4w=; b=SohS3ZOqejUZaKqPG163GLJxlclGYwR6WWFxsOu+wkD9pg9i0WrA+HycUB3NVJfO/c H+zgkXxikIhE7fuYPXqdBV6pTWzGBV7I62RQdGAYEAAhRU2kRAPbLoXMrq3CT6AnY+PZ OF4N3q9sv84w6Qxf7nCR09D54q19i/dXANR6goWgfbPXWSMirEX4nQ/Jbl5/eeKEMizt zEdfVupLw9y8gGlSUKTdNE5ZR4jT96tYMyIp5UYxjRNOc2k1evDRz5uljD4O/BFwVq7U TcMRktF2MR5U5x8kyjywEv3/CKwcB1ohqnHMJF4Nch1dgGwuasMZzjEmpuT5fAnhcDyP Gfag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686751520; x=1689343520; 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=VYWWdLXot/0eN5YOBYg6QhABqVI2NiL0tyrDSu4JO4w=; b=IdeNQrcrjLGqTv3y2UJFnIR6qMLo2UpueEJ+Ua+mIKxKMcGAi8kuukBTau2CGeoZ5T KXbeFkbEVRqHDKT5BseKoJhkJtb8B1DOOb/HfbbF02/guaLiejl/+POJpnZphWR+eYiv liY0568tqtJyKredDLceMa5qND/dJxaAL48fE8P41rKdAbhiKARFkNzKgvDOA8Wgjms2 /UoA+4Z+VLti3ua+nURxZ9Qy1BEnFCDeXFHNov+8aRoMNGum8mqInEkTW1pqzg/0t1s+ c6I9rMsQydF4XMa6rUKYKptQB8XmOtNHU0lsKQRMSIQ9aL7lHg7jOxTZA/jvRSVozrPa bclQ== X-Gm-Message-State: AC+VfDyTAsajksdYzlweUzIA0t84Q3E71Pg3nTJ/fD3C/zJBeq4YMAzh 2ehtEE5T5ep5tc/DW/QiEEqWcF3C4dG5pa9eAmk= X-Google-Smtp-Source: ACHHUZ4iSyHxCXb5YPwutUfQ1EyYRO+GGAZxIOsMSgj8uJ0OusIA+gcgXUavGmwv5Bwl8HAMC96FCw== X-Received: by 2002:a05:6a20:9147:b0:106:9266:4448 with SMTP id x7-20020a056a20914700b0010692664448mr2590776pzc.16.1686751520273; Wed, 14 Jun 2023 07:05:20 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 187-20020a6306c4000000b005439aaf0301sm703757pgg.64.2023.06.14.07.05.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 07:05:19 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 5/5] selftest/reproducible: Allow native/cross reuse in test Date: Wed, 14 Jun 2023 04:04:56 -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 ; Wed, 14 Jun 2023 14:05:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182813 From: Richard Purdie We don't compare reproducibility of the native/cross components, only the target ones. With the long build times of rust-native, the test now takes crazy lengths of time so this tweak should allow us to reuse native/cross artefacts from sstate whilst still testing the target output is reproducible. Signed-off-by: Richard Purdie (cherry picked from commit b494d83c639a877cefeb7cbab6d37195e492f059) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/reproducible.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index adaabee47b..be4cdcc429 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -188,7 +188,7 @@ class ReproducibleTests(OESelftestTestCase): def setUpLocal(self): super().setUpLocal() - needed_vars = ['TOPDIR', 'TARGET_PREFIX', 'BB_NUMBER_THREADS'] + needed_vars = ['TOPDIR', 'TARGET_PREFIX', 'BB_NUMBER_THREADS', 'BB_HASHSERVE'] bb_vars = get_bb_vars(needed_vars) for v in needed_vars: setattr(self, v.lower(), bb_vars[v]) @@ -259,7 +259,7 @@ class ReproducibleTests(OESelftestTestCase): # mirror, forcing a complete build from scratch config += textwrap.dedent('''\ SSTATE_DIR = "${TMPDIR}/sstate" - SSTATE_MIRRORS = "" + SSTATE_MIRRORS = "file://.*/.*-native.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH file://.*/.*-cross.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH" ''') self.logger.info("Building %s (sstate%s allowed)..." % (name, '' if use_sstate else ' NOT'))