From patchwork Sun Nov 13 14:12:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15421 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 5B0D6C43219 for ; Sun, 13 Nov 2022 14:13:04 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web12.2804.1668348779511320811 for ; Sun, 13 Nov 2022 06:12:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=nV8eaZaM; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id v3so8163969pgh.4 for ; Sun, 13 Nov 2022 06:12:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=n3R5mdUVRU53L42CEvo9CTWz9S2/0sVXNWYopblK1mo=; b=nV8eaZaMuEjfYXKZ2UIJJmqFHGYuw2Hy3q/fknz+hfNj/mHEF1Zxet5lCZj0d68cwv V/5Icb68BcFT7Xx9uciMVTzPF76syNDHNL736QW90UhFXboOqJZLShrIKPQEUJs2nT8E 7RDWvjgGmMdB3IMolkh7OlyTV7NYSdIUZEzXicYOqJJKHY61PYIDnEMIPE5yAdYMY9s8 c+Hx/CkIHT5iNXF5RAR35bCOLAU6qwejRY72Ef66XFSBpH/g6k6RkGKUp4nP37PzeKpl NvPvRDRd7bmvK1NfOl4CEWDuwuGsd66FDZ/snu9m9slensKb/mGJI2RYc56NKnzgNH/T u81A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n3R5mdUVRU53L42CEvo9CTWz9S2/0sVXNWYopblK1mo=; b=zgLubO89fS2Q4Br3Z9O4BsOs0rLNy5wUhPBXdRPjruZnC9036Fi0aSu6Cp+khE8ges YEqK+L/b+MxvYd/XaElqMjFlFFPQaUExP6ibUewxTwLgf6jK393n2VG4ep1oOomQiZPI ARPPkAA/WDBRW+Mb06J3viLFMNuawNzBHyGGRmBtRfCqVMO4K7yXkLsOVFBLYcmKRceG 4jPZH2xqHx+f9TPxN60JPOZJCM2PIOzTAOdmmM73KQtS4U2b6bJnJgu6HJXEu5W2ZxPw wmE9pws6Ytbw39QEpsFgk5cnbm339XHl4qAboEttDTxXBVBY+MAMa3mQtsPGzAwfOhq1 mTrQ== X-Gm-Message-State: ANoB5pkJld/tYHq77GPGOaiCumYYLbClv5BZBUJ1lK6OzcuM6xJUPa3+ t5xqTZ12Wc+dlWtBfYBeZfEGaJ6otW9+r5yM X-Google-Smtp-Source: AA0mqf4N7lvt5n/JiqrwqiRo1GaqiNxDaDOEVaCPSydI9tZdjg1DfoTk3INgQK2upHxlMmEj2UXMFQ== X-Received: by 2002:a63:2264:0:b0:438:a46b:63f2 with SMTP id t36-20020a632264000000b00438a46b63f2mr8727507pgm.572.1668348778350; Sun, 13 Nov 2022 06:12:58 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id w34-20020a634762000000b0046b2ebb0a52sm4198771pgk.17.2022.11.13.06.12.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Nov 2022 06:12:57 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 1/9] pixman: backport fix for CVE-2022-44638 Date: Sun, 13 Nov 2022 04:12:39 -1000 Message-Id: <1d2e131d9ba55626354264d454b2808e84751600.1668348622.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 13 Nov 2022 14:13:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173195 From: Ross Burton Signed-off-by: Ross Burton Signed-off-by: Steve Sakoman (cherry picked from commit 23df4760ebc153c484d467e51b414910c570a6f8) Signed-off-by: Steve Sakoman --- .../xorg-lib/pixman/CVE-2022-44638.patch | 33 +++++++++++++++++++ .../xorg-lib/pixman_0.40.0.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-graphics/xorg-lib/pixman/CVE-2022-44638.patch diff --git a/meta/recipes-graphics/xorg-lib/pixman/CVE-2022-44638.patch b/meta/recipes-graphics/xorg-lib/pixman/CVE-2022-44638.patch new file mode 100644 index 0000000000..d226766d49 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/pixman/CVE-2022-44638.patch @@ -0,0 +1,33 @@ +CVE: CVE-2022-44638 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From a1f88e842e0216a5b4df1ab023caebe33c101395 Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Wed, 2 Nov 2022 12:07:32 -0400 +Subject: [PATCH] Avoid integer overflow leading to out-of-bounds write + +Thanks to Maddie Stone and Google's Project Zero for discovering this +issue, providing a proof-of-concept, and a great analysis. + +Closes: https://gitlab.freedesktop.org/pixman/pixman/-/issues/63 +--- + pixman/pixman-trap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pixman/pixman-trap.c b/pixman/pixman-trap.c +index 91766fd..7560405 100644 +--- a/pixman/pixman-trap.c ++++ b/pixman/pixman-trap.c +@@ -74,7 +74,7 @@ pixman_sample_floor_y (pixman_fixed_t y, + + if (f < Y_FRAC_FIRST (n)) + { +- if (pixman_fixed_to_int (i) == 0x8000) ++ if (pixman_fixed_to_int (i) == 0xffff8000) + { + f = 0; /* saturate */ + } +-- +GitLab + diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb b/meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb index ccfe277746..c56733eefd 100644 --- a/meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb +++ b/meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb @@ -9,6 +9,7 @@ DEPENDS = "zlib" SRC_URI = "https://www.cairographics.org/releases/${BP}.tar.gz \ file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ + file://CVE-2022-44638.patch \ " SRC_URI[md5sum] = "73858c0862dd9896fb5f62ae267084a4" SRC_URI[sha256sum] = "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc" From patchwork Sun Nov 13 14:12:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15419 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 4C50EC4332F for ; Sun, 13 Nov 2022 14:13:04 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web09.2866.1668348781875536035 for ; Sun, 13 Nov 2022 06:13:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Nc8cLnYb; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id 6so8156796pgm.6 for ; Sun, 13 Nov 2022 06:13:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=3k7Gln+Eco6WitLRUSFQkqSqg03Mgw2R/VYOqcZeYNc=; b=Nc8cLnYbRSHX5ZkSzcluB1Vl9ctkkJryqLbIvPuCbfPO0cy0lNGQgyO2PMRU6KewlB 1wQ0AR58gpFVYk3Pp6/9dapMfLyV1mmAPZV3z5107R/Dm1oh4GuLVA9kT846UYR/adCS hgELcZQrsOd3tJqyVl1BOggPn81vnOk22EGpeeGr/udS1nZlLLtKfK0pQyw3teBjdb3c YUv+/hJz5A3XsIn/eUtDcrUu97ABVqqntEHOti9pmHCf/ls1aeNY5lig4jscjZYWV1fD kodfmHzzbjMDN8N7lpkYg6hAJiMxFdD+qgj9dVgr83Su4Uhh5NS9od5h6WpRYGmXCgSN UpCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3k7Gln+Eco6WitLRUSFQkqSqg03Mgw2R/VYOqcZeYNc=; b=7wYwxdMPfk7j98Y4szs/IzMYfqQHoysZCvn2B42WRhtx5ZE1SFS0WxIKP33cFLRFC9 0mtHZvPqBhHii5ySbhbN8aHFs0livjpQ5AoEmPClyKLbHPUK457ZY4ANSZgJZuKE2W1H lcsvpIXdpRM88FK91zpOGp2ZctTjtC3Ecuugu/IEN/z2YJ0LSM2nA/HDLT98gJtJXdTX N36vUtoVLMwZounskw7rJezDjTlOqi12meK26pv7kfMYlx3pR2J+jWclhPwA06Klotx2 o9amQGOv7UUyHOpLcOFDQtKz939pICK1mNKyvMlw1kcZ7LubRROm27we4tSW8FzcKhlg QjnA== X-Gm-Message-State: ANoB5pmLFevfqXOvvcpxpnVCKt4RpFicM0Ut6I+IW7j9+D4Qq/bF8SYb trYWVW52A1b4KK/K0wv+2TWWj9RtT3kPKLD7 X-Google-Smtp-Source: AA0mqf6VQE0aF3YQgfSiZ0bt94c1b/c32IuU1ZCY0ZzAD8Zjvwr49/5/jt0hLnp/PyN/OYycxVoCgw== X-Received: by 2002:a63:1e05:0:b0:434:911a:301 with SMTP id e5-20020a631e05000000b00434911a0301mr8880299pge.50.1668348780555; Sun, 13 Nov 2022 06:13:00 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id w34-20020a634762000000b0046b2ebb0a52sm4198771pgk.17.2022.11.13.06.12.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Nov 2022 06:13:00 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 2/9] QEMU: CVE-2022-3165 VNC: integer underflow in vnc_client_cut_text_ext leads to CPU exhaustion Date: Sun, 13 Nov 2022 04:12:40 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 13 Nov 2022 14:13:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173196 From: Hitendra Prajapati Upstream-Status: Backport from https://gitlab.com/qemu-project/qemu/-/commit/d307040b18 Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- meta/recipes-devtools/qemu/qemu.inc | 2 +- .../qemu/qemu/CVE-2022-3165.patch | 61 +++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2022-3165.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 19431ee6dd..6a49dc53e9 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -13,7 +13,6 @@ inherit pkgconfig ptest python3-dir LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f" - SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://powerpc_rom.bin \ file://run-ptest \ @@ -92,6 +91,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0019-target-ppc-Implement-Vector-Mask-Move-insns.patch \ file://0020-target-ppc-move-xs-n-madd-am-ds-p-xs-n-msub-am-ds-p-.patch \ file://0021-target-ppc-implement-xs-n-maddqp-o-xs-n-msubqp-o.patch \ + file://CVE-2022-3165.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2022-3165.patch b/meta/recipes-devtools/qemu/qemu/CVE-2022-3165.patch new file mode 100644 index 0000000000..a7d061eb99 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2022-3165.patch @@ -0,0 +1,61 @@ +From a15f7d9913d050fb72a79bbbefa5c2329d92e71d Mon Sep 17 00:00:00 2001 +From: Hitendra Prajapati +Date: Tue, 8 Nov 2022 17:10:00 +0530 +Subject: [PATCH] CVE-2022-3165 + +Upstream-Status: Backport [https://gitlab.com/qemu-project/qemu/-/commit/d307040b18] +CVE: CVE-2022-3165 +Signed-off-by: Hitendra Prajapati + +ui/vnc-clipboard: fix integer underflow in vnc_client_cut_text_ext + +Extended ClientCutText messages start with a 4-byte header. If len < 4, +an integer underflow occurs in vnc_client_cut_text_ext. The result is +used to decompress data in a while loop in inflate_buffer, leading to +CPU consumption and denial of service. Prevent this by checking dlen in +protocol_client_msg. + +Fixes: CVE-2022-3165 + +("ui/vnc: clipboard support") +Reported-by: default avatarTangPeng +Signed-off-by: Mauro Matteo Cascella's avatarMauro Matteo Cascella +Message-Id: <20220925204511.1103214-1-mcascell@redhat.com> +Signed-off-by: Gerd Hoffmann's avatarGerd Hoffmann +--- + ui/vnc.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/ui/vnc.c b/ui/vnc.c +index af02522e8..a14b6861b 100644 +--- a/ui/vnc.c ++++ b/ui/vnc.c +@@ -2442,8 +2442,8 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) + if (len == 1) { + return 8; + } ++ uint32_t dlen = abs(read_s32(data, 4)); + if (len == 8) { +- uint32_t dlen = abs(read_s32(data, 4)); + if (dlen > (1 << 20)) { + error_report("vnc: client_cut_text msg payload has %u bytes" + " which exceeds our limit of 1MB.", dlen); +@@ -2456,8 +2456,13 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) + } + + if (read_s32(data, 4) < 0) { +- vnc_client_cut_text_ext(vs, abs(read_s32(data, 4)), +- read_u32(data, 8), data + 12); ++ if (dlen < 4) { ++ error_report("vnc: malformed payload (header less than 4 bytes)" ++ " in extended clipboard pseudo-encoding."); ++ vnc_client_error(vs); ++ break; ++ } ++ vnc_client_cut_text_ext(vs, dlen, read_u32(data, 8), data + 12); + break; + } + vnc_client_cut_text(vs, read_u32(data, 4), data + 8); +-- +2.25.1 + From patchwork Sun Nov 13 14:12:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15418 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 4B16AC433FE for ; Sun, 13 Nov 2022 14:13:04 +0000 (UTC) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by mx.groups.io with SMTP id smtpd.web11.2797.1668348784024046338 for ; Sun, 13 Nov 2022 06:13:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=N7YxbWhI; spf=softfail (domain: sakoman.com, ip: 209.85.216.51, mailfrom: steve@sakoman.com) Received: by mail-pj1-f51.google.com with SMTP id d59-20020a17090a6f4100b00213202d77e1so11581647pjk.2 for ; Sun, 13 Nov 2022 06:13:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=VE4x+/t9qsVAlL3KXRHXNQwts6Uo0rNFVGBWucWI3TM=; b=N7YxbWhIIZ2Ttw2yQDtdHANqXSXss+SW3sdXRxcMs8HsMlPV5AQwMyxqBFKSFfPPp+ ddeUYEWMajHrvC6ICz84Rnznp67N+Zl4J07hzaaEwQPXAErFAYpla8AAWB+jHuBydY0E JaJ7X8w36ViOzGrLgs3Mt7HjJGB6pMvtF6CrQFXWFFk/lXFpDhjXIX6W0bBrLCUwrLVD SOYM/KjSD8dg7Pg27sg5hMUTp5bpDHi4gtV4X1eAxod8NwxoH3nmAs6yiHGm/yTpMxG6 xmO3ikbQ3X48qAoNonKiTaETv+TpiPcYdgdims76IxjxwsXFxQGoE21h/APr2mO2oka4 sYXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VE4x+/t9qsVAlL3KXRHXNQwts6Uo0rNFVGBWucWI3TM=; b=AZO9a++1md1+lzMXASFc7FVyz/kjGFNsaIB3bLF/p7AXxh7K7m2aSTT9ohdStJTtB5 MioKJiM1nOICWypgjccia9m+IFHMXKDcb6ebmmFFSXOGHYeuK82TWyGgkkzmAA57qdFP bjeIgSKCBvjuUO94juStL3uA/oJi1Ey+yXPDz+yCeKAGATpMD5t+gUtL5Y/z/o4sLm7L g7w7NFVDW/B9d8/adLFagbNFN+avChLghk3qaCFL/lGYkavZu9dUQXNh2VeJoM3yj5t7 a0IvRhh0SEPbHsyvlN50sII7pbTWFCw8dp7A19gHkH8ZVP6e0W/ugTsLQMQwlggZUWUc oMlA== X-Gm-Message-State: ANoB5pnOvdaEdWb3YtePcUtCP78ldNLkG+09w2RsQHz2qCnn+CQs+7/1 qLFBwg7NTFnI8EMaJCEVlOKVzRlAl/+hAeGU X-Google-Smtp-Source: AA0mqf4F1e4Mp592WiG3VLZp0jgPiVhYvkiB/GEh80J63SDaQPJ7ZzrexkQg9JrbLXF8SUAZFxkSZw== X-Received: by 2002:a17:90a:898f:b0:210:6c69:6345 with SMTP id v15-20020a17090a898f00b002106c696345mr10185457pjn.50.1668348782875; Sun, 13 Nov 2022 06:13:02 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id w34-20020a634762000000b0046b2ebb0a52sm4198771pgk.17.2022.11.13.06.13.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Nov 2022 06:13:02 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 3/9] python3-mako: backport fix for CVE-2022-40023 Date: Sun, 13 Nov 2022 04:12:41 -1000 Message-Id: <34727812b54fd52f85806f4f95702286d551b5fd.1668348622.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 13 Nov 2022 14:13:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173197 From: Narpat Mali Sqlalchemy mako before 1.2.2 is vulnerable to Regular expression Denial of Service when using the Lexer class to parse. This also affects babelplugin and linguaplugin. Reference: https://nvd.nist.gov/vuln/detail/CVE-2022-40023 Reference to Upstream Patch: https://github.com/sqlalchemy/mako/commit/925760291d6efec64fda6e9dd1fd9cfbd5be068c Signed-off-by: Narpat Mali Signed-off-by: Steve Sakoman --- .../python/python3-mako/CVE-2022-40023.patch | 119 ++++++++++++++++++ .../python/python3-mako_1.1.6.bb | 2 + 2 files changed, 121 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-mako/CVE-2022-40023.patch diff --git a/meta/recipes-devtools/python/python3-mako/CVE-2022-40023.patch b/meta/recipes-devtools/python/python3-mako/CVE-2022-40023.patch new file mode 100644 index 0000000000..66690e74b4 --- /dev/null +++ b/meta/recipes-devtools/python/python3-mako/CVE-2022-40023.patch @@ -0,0 +1,119 @@ +From 925760291d6efec64fda6e9dd1fd9cfbd5be068c Mon Sep 17 00:00:00 2001 +From: Mike Bayer +Date: Mon, 29 Aug 2022 12:28:52 -0400 +Subject: [PATCH] fix tag regexp to match quoted groups correctly + +Fixed issue in lexer where the regexp used to match tags would not +correctly interpret quoted sections individually. While this parsing issue +still produced the same expected tag structure later on, the mis-handling +of quoted sections was also subject to a regexp crash if a tag had a large +number of quotes within its quoted sections. + +Fixes: #366 +Change-Id: I74e0d71ff7f419970711a7cd51adcf1bb90a44c0 + +Upstream-Status: Backport [https://github.com/sqlalchemy/mako/commit/925760291d6efec64fda6e9dd1fd9cfbd5be068c] + +Signed-off-by: + +--- + doc/build/unreleased/366.rst | 9 +++++++++ + mako/lexer.py | 12 ++++++++---- + test/test_lexer.py | 21 +++++++++++++++++---- + 3 files changed, 34 insertions(+), 8 deletions(-) + create mode 100644 doc/build/unreleased/366.rst + +--- /dev/null ++++ Mako-1.1.6/doc/build/unreleased/366.rst +@@ -0,0 +1,9 @@ ++.. change:: ++ :tags: bug, lexer ++ :tickets: 366 ++ ++ Fixed issue in lexer where the regexp used to match tags would not ++ correctly interpret quoted sections individually. While this parsing issue ++ still produced the same expected tag structure later on, the mis-handling ++ of quoted sections was also subject to a regexp crash if a tag had a large ++ number of quotes within its quoted sections. +\ No newline at end of file +--- Mako-1.1.6.orig/mako/lexer.py ++++ Mako-1.1.6/mako/lexer.py +@@ -295,20 +295,24 @@ class Lexer(object): + return self.template + + def match_tag_start(self): +- match = self.match( +- r""" ++ reg = r""" + \<% # opening tag + + ([\w\.\:]+) # keyword + +- ((?:\s+\w+|\s*=\s*|".*?"|'.*?')*) # attrname, = \ ++ ((?:\s+\w+|\s*=\s*|"[^"]*?"|'[^']*?'|\s*,\s*)*) # attrname, = \ + # sign, string expression ++ # comma is for backwards compat ++ # identified in #366 + + \s* # more whitespace + + (/)?> # closing + +- """, ++ """ ++ ++ match = self.match( ++ reg, + re.I | re.S | re.X, + ) + +--- Mako-1.1.6.orig/test/test_lexer.py ++++ Mako-1.1.6/test/test_lexer.py +@@ -1,5 +1,7 @@ + import re + ++import pytest ++ + from mako import compat + from mako import exceptions + from mako import parsetree +@@ -146,6 +148,10 @@ class LexerTest(TemplateTest): + """ + self.assertRaises(exceptions.CompileException, Lexer(template).parse) + ++ def test_tag_many_quotes(self): ++ template = "<%0" + '"' * 3000 ++ assert_raises(exceptions.SyntaxException, Lexer(template).parse) ++ + def test_unmatched_tag(self): + template = """ + <%namespace name="bar"> +@@ -432,9 +438,16 @@ class LexerTest(TemplateTest): + ), + ) + +- def test_pagetag(self): +- template = """ +- <%page cached="True", args="a, b"/> ++ @pytest.mark.parametrize("comma,numchars", [(",", 48), ("", 47)]) ++ def test_pagetag(self, comma, numchars): ++ # note that the comma here looks like: ++ # <%page cached="True", args="a, b"/> ++ # that's what this test has looked like for decades, however, the ++ # comma there is not actually the right syntax. When issue #366 ++ # was fixed, the reg was altered to accommodate for this comma to allow ++ # backwards compat ++ template = f""" ++ <%page cached="True"{comma} args="a, b"/> + + some template + """ +@@ -453,7 +466,7 @@ class LexerTest(TemplateTest): + + some template + """, +- (2, 48), ++ (2, numchars), + ), + ], + ), diff --git a/meta/recipes-devtools/python/python3-mako_1.1.6.bb b/meta/recipes-devtools/python/python3-mako_1.1.6.bb index 71e5d96ba1..4e4f33f5dc 100644 --- a/meta/recipes-devtools/python/python3-mako_1.1.6.bb +++ b/meta/recipes-devtools/python/python3-mako_1.1.6.bb @@ -6,6 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=943eb67718222db21d44a4ef1836675f" PYPI_PACKAGE = "Mako" +SRC_URI += "file://CVE-2022-40023.patch" + inherit pypi python_setuptools_build_meta SRC_URI[sha256sum] = "4e9e345a41924a954251b95b4b28e14a301145b544901332e658907a7464b6b2" From patchwork Sun Nov 13 14:12:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15423 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 46F16C4332F for ; Sun, 13 Nov 2022 14:13:14 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web08.2795.1668348786792166517 for ; Sun, 13 Nov 2022 06:13:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=t4ANZ9Qe; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id b62so8196481pgc.0 for ; Sun, 13 Nov 2022 06:13:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=/2+16qmXPWSgMVy2e933A7/14TTCQyzEH8Az5xQAZpg=; b=t4ANZ9QeWU+WHQJz7WR36PYjNAHWV8TSh3dNHqq9PYRKnKyBl9fUtEYHfJd7EtsWlk ++iGn21flC/E+nqoDUkbAyF9zpMgF2N5Grp2TlHUhmM+5h+ZS/3gcPiqs3dd5+mHBBpC +LzQ2ejCc88SUz+aIeqotq16IhT6EuJfT7Tz3ib6iq66YNwo18qmK1lPOF13orHoBDqh d4VUBh9EuC8CgS/3FQ5it9zRLQP3LvrwKhLV9QN2gQUiL0ZkPMjZGFBUhv0iVK/x6hLA 73TfFuUIO1jvCnjzrjVmHWk6gfbSqXFxxmtWiJyGC+fWFzqCFNhztvT4jv475y8N47nm xUCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/2+16qmXPWSgMVy2e933A7/14TTCQyzEH8Az5xQAZpg=; b=rTs/+8sWLvi15yaoJQc9lgY3VEN8AmYJfeigwCD2PshV6epZdop1rpn1rDWQil+N9P wMWCQaJLxEVX+SPrFmK/2am/EtdJfCMPPqvwZoSe2utEBK9nDqJkkjgV3sCTHvpoS55p M10+25YWsM0LjPQnpEqxlvxWUtK/hJGaXiYy/6MPYWeUrG0J+7fLuyVmA7HZrqvUQNGz 9CFxLSx0MfscJmvIvNktt6sX8hoaAH/A1hJFZlhKPDUfMsxOrsxtYrOAckdj7vCL1kM6 Kif4SfGLQozRzMj2JcEriAZY2DLD8VozRm+2cMvOLpZCpcMSxQX76e40ouzd945/f8jE AzSg== X-Gm-Message-State: ANoB5pmlCBVFF5/ZlwR5l/itYZxCCuZdbSfeTETNoqbhMt+0s5cFIIa9 v4Fuwji3RmRDDUpnM8DB7mV60rSpCMsEcie7 X-Google-Smtp-Source: AA0mqf7qGE5V+KnOg5OT3VQNICfL3vNrQcKqSilzL/UbaGJhgVoYpKXsNdMAirYBLtymRJg5adZBAA== X-Received: by 2002:a05:6a00:3007:b0:56b:e15a:7215 with SMTP id ay7-20020a056a00300700b0056be15a7215mr10236447pfb.27.1668348785414; Sun, 13 Nov 2022 06:13:05 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id w34-20020a634762000000b0046b2ebb0a52sm4198771pgk.17.2022.11.13.06.13.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Nov 2022 06:13:04 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 4/9] lttng-modules: upgrade 2.13.4 -> 2.13.5 Date: Sun, 13 Nov 2022 04:12:42 -1000 Message-Id: <43d9e154880909face6d3fc76c7e2d4310c17e7c.1668348622.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 13 Nov 2022 14:13:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173198 From: Alexander Kanavin 2022-08-19 (National Potato Day) LTTng modules 2.13.5 * Fix: incorrect stub prototypes when CONFIG_HAVE_SYSCALL_TRACEPOINTS=n * fix: mm/tracing: add 'accounted' entry into output of allocation tracepoints (v6.0) * fix: block: remove bdevname (v6.0) * fix: fs/jbd2: Fix the documentation of the jbd2_write_superblock() callers (v6.0) * fix: tie compaction probe build to CONFIG_COMPACTION * fix: net: skb: introduce kfree_skb_reason() (v5.15.58..v5.16) * fix: workqueue: Fix type of cpu in trace event (v5.19) * fix: fs: Remove flags parameter from aops->write_begin (v5.19) * fix: mm/page_alloc: fix tracepoint mm_page_alloc_zone_locked() (v5.19) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit 335c60e76b341014bd69eaac0a4b281036a94916) Signed-off-by: Steve Sakoman --- .../lttng-modules/0001-fix-compaction.patch | 68 ---------- ...c-fix-tracepoint-mm_page_alloc_zone_.patch | 106 --------------- ...oduce-kfree_skb_reason-v5.15.58.v5.1.patch | 53 -------- ...ags-parameter-from-aops-write_begin-.patch | 76 ----------- ...Fix-type-of-cpu-in-trace-event-v5.19.patch | 124 ------------------ ...ules_2.13.4.bb => lttng-modules_2.13.5.bb} | 7 +- 6 files changed, 1 insertion(+), 433 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-compaction.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch rename meta/recipes-kernel/lttng/{lttng-modules_2.13.4.bb => lttng-modules_2.13.5.bb} (78%) diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-compaction.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-compaction.patch deleted file mode 100644 index 21e27ffc5e..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-compaction.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 8e42c4821fb5f5cb816b6ddf73d9a13ba3298a63 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -Date: Wed, 10 Aug 2022 11:07:14 -0400 -Subject: [PATCH] fix: tie compaction probe build to CONFIG_COMPACTION - -The definition of 'struct compact_control' in 'mm/internal.h' depends on -CONFIG_COMPACTION being defined. Only build the compaction probe when -this configuration option is enabled. - -Thanks to Bruce Ashfield for reporting this -issue. - -Upstream-Status: Backport [https://review.lttng.org/c/lttng-modules/+/8660] - -Change-Id: I81e77aa9c1bf10452c152d432fe5224df0db42c9 -Signed-off-by: Michael Jeanson ---- - src/probes/Kbuild | 34 ++++++++++++++++++---------------- - 1 file changed, 18 insertions(+), 16 deletions(-) - -diff --git a/src/probes/Kbuild b/src/probes/Kbuild -index 2908cf75..3e556b8e 100644 ---- a/src/probes/Kbuild -+++ b/src/probes/Kbuild -@@ -167,22 +167,24 @@ ifneq ($(CONFIG_BTRFS_FS),) - endif # $(wildcard $(btrfs_dep)) - endif # CONFIG_BTRFS_FS - --# A dependency on internal header 'mm/internal.h' was introduced in v5.18 --compaction_dep = $(srctree)/mm/internal.h --compaction_dep_wildcard = $(wildcard $(compaction_dep)) --compaction_dep_check = $(shell \ --if [ \( $(VERSION) -ge 6 \ -- -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) -a \ -- -z "$(compaction_dep_wildcard)" ] ; then \ -- echo "warn" ; \ --else \ -- echo "ok" ; \ --fi ;) --ifeq ($(compaction_dep_check),ok) -- obj-$(CONFIG_LTTNG) += lttng-probe-compaction.o --else -- $(warning Files $(compaction_dep) not found. Probe "compaction" is disabled. Use full kernel source tree to enable it.) --endif # $(wildcard $(compaction_dep)) -+ifneq ($(CONFIG_COMPACTION),) -+ # A dependency on internal header 'mm/internal.h' was introduced in v5.18 -+ compaction_dep = $(srctree)/mm/internal.h -+ compaction_dep_wildcard = $(wildcard $(compaction_dep)) -+ compaction_dep_check = $(shell \ -+ if [ \( $(VERSION) -ge 6 \ -+ -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) -a \ -+ -z "$(compaction_dep_wildcard)" ] ; then \ -+ echo "warn" ; \ -+ else \ -+ echo "ok" ; \ -+ fi ;) -+ ifeq ($(compaction_dep_check),ok) -+ obj-$(CONFIG_LTTNG) += lttng-probe-compaction.o -+ else -+ $(warning Files $(compaction_dep) not found. Probe "compaction" is disabled. Use full kernel source tree to enable it.) -+ endif # $(wildcard $(compaction_dep)) -+endif # CONFIG_COMPACTION - - ifneq ($(CONFIG_EXT4_FS),) - ext4_dep = $(srctree)/fs/ext4/*.h --- -2.34.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch deleted file mode 100644 index 62376806c8..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 8d5da4d2a3d7d9173208f4e8dc7a709f0bfc9820 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -Date: Wed, 8 Jun 2022 12:56:36 -0400 -Subject: [PATCH 1/3] fix: mm/page_alloc: fix tracepoint - mm_page_alloc_zone_locked() (v5.19) - -See upstream commit : - - commit 10e0f7530205799e7e971aba699a7cb3a47456de - Author: Wonhyuk Yang - Date: Thu May 19 14:08:54 2022 -0700 - - mm/page_alloc: fix tracepoint mm_page_alloc_zone_locked() - - Currently, trace point mm_page_alloc_zone_locked() doesn't show correct - information. - - First, when alloc_flag has ALLOC_HARDER/ALLOC_CMA, page can be allocated - from MIGRATE_HIGHATOMIC/MIGRATE_CMA. Nevertheless, tracepoint use - requested migration type not MIGRATE_HIGHATOMIC and MIGRATE_CMA. - - Second, after commit 44042b4498728 ("mm/page_alloc: allow high-order pages - to be stored on the per-cpu lists") percpu-list can store high order - pages. But trace point determine whether it is a refiil of percpu-list by - comparing requested order and 0. - - To handle these problems, make mm_page_alloc_zone_locked() only be called - by __rmqueue_smallest with correct migration type. With a new argument - called percpu_refill, it can show roughly whether it is a refill of - percpu-list. - -Upstream-Status: Backport - -Change-Id: I2e4a57393757f12b9c5a4566c4d1102ee2474a09 -Signed-off-by: Michael Jeanson -Signed-off-by: Mathieu Desnoyers ---- - include/instrumentation/events/kmem.h | 45 +++++++++++++++++++++++++++ - 1 file changed, 45 insertions(+) - -diff --git a/include/instrumentation/events/kmem.h b/include/instrumentation/events/kmem.h -index 29c0fb7f..8c19e962 100644 ---- a/include/instrumentation/events/kmem.h -+++ b/include/instrumentation/events/kmem.h -@@ -218,6 +218,50 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc, kmem_mm_page_alloc, - ) - ) - -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,19,0)) -+LTTNG_TRACEPOINT_EVENT_CLASS(kmem_mm_page, -+ -+ TP_PROTO(struct page *page, unsigned int order, int migratetype, -+ int percpu_refill), -+ -+ TP_ARGS(page, order, migratetype, percpu_refill), -+ -+ TP_FIELDS( -+ ctf_integer_hex(struct page *, page, page) -+ ctf_integer(unsigned long, pfn, -+ page ? page_to_pfn(page) : -1UL) -+ ctf_integer(unsigned int, order, order) -+ ctf_integer(int, migratetype, migratetype) -+ ctf_integer(int, percpu_refill, percpu_refill) -+ ) -+) -+ -+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_mm_page, mm_page_alloc_zone_locked, -+ -+ kmem_mm_page_alloc_zone_locked, -+ -+ TP_PROTO(struct page *page, unsigned int order, int migratetype, -+ int percpu_refill), -+ -+ TP_ARGS(page, order, migratetype, percpu_refill) -+) -+ -+LTTNG_TRACEPOINT_EVENT_MAP(mm_page_pcpu_drain, -+ -+ kmem_mm_page_pcpu_drain, -+ -+ TP_PROTO(struct page *page, unsigned int order, int migratetype), -+ -+ TP_ARGS(page, order, migratetype), -+ -+ TP_FIELDS( -+ ctf_integer(unsigned long, pfn, -+ page ? page_to_pfn(page) : -1UL) -+ ctf_integer(unsigned int, order, order) -+ ctf_integer(int, migratetype, migratetype) -+ ) -+) -+#else - LTTNG_TRACEPOINT_EVENT_CLASS(kmem_mm_page, - - TP_PROTO(struct page *page, unsigned int order, int migratetype), -@@ -250,6 +294,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_mm_page, mm_page_pcpu_drain, - - TP_ARGS(page, order, migratetype) - ) -+#endif - - #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,19,2) \ - || LTTNG_KERNEL_RANGE(3,14,36, 3,15,0) \ --- -2.19.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch deleted file mode 100644 index ca6abea9c0..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch +++ /dev/null @@ -1,53 +0,0 @@ -From d8254360c7f2ff9b3f945e9668d89c0b56b9bd91 Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers -Date: Fri, 29 Jul 2022 15:37:43 -0400 -Subject: [PATCH] fix: net: skb: introduce kfree_skb_reason() (v5.15.58..v5.16) - -See upstream commit : - - commit c504e5c2f9648a1e5c2be01e8c3f59d394192bd3 - Author: Menglong Dong - Date: Sun Jan 9 14:36:26 2022 +0800 - - net: skb: introduce kfree_skb_reason() - - Introduce the interface kfree_skb_reason(), which is able to pass - the reason why the skb is dropped to 'kfree_skb' tracepoint. - - Add the 'reason' field to 'trace_kfree_skb', therefor user can get - more detail information about abnormal skb with 'drop_monitor' or - eBPF. - - All drop reasons are defined in the enum 'skb_drop_reason', and - they will be print as string in 'kfree_skb' tracepoint in format - of 'reason: XXX'. - - ( Maybe the reasons should be defined in a uapi header file, so that - user space can use them? ) - -Upstream-Status: Backport - -Signed-off-by: Mathieu Desnoyers -Change-Id: Ib3c039207739dad10f097cf76474e0822e351273 ---- - include/instrumentation/events/skb.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/include/instrumentation/events/skb.h b/include/instrumentation/events/skb.h -index 237e54ad..186732ea 100644 ---- a/include/instrumentation/events/skb.h -+++ b/include/instrumentation/events/skb.h -@@ -13,7 +13,9 @@ - /* - * Tracepoint for free an sk_buff: - */ --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0) \ -+ || LTTNG_KERNEL_RANGE(5,15,58, 5,16,0)) -+ - LTTNG_TRACEPOINT_ENUM(skb_drop_reason, - TP_ENUM_VALUES( - ctf_enum_value("NOT_SPECIFIED", SKB_DROP_REASON_NOT_SPECIFIED) --- -2.17.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch b/meta/recipes-kernel/lttng/lttng-modules/0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch deleted file mode 100644 index 84c97d5f90..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch +++ /dev/null @@ -1,76 +0,0 @@ -From b5d1c38665cd69d7d1c94231fe0609da5c8afbc3 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -Date: Wed, 8 Jun 2022 13:07:59 -0400 -Subject: [PATCH 2/3] fix: fs: Remove flags parameter from aops->write_begin - (v5.19) - -See upstream commit : - - commit 9d6b0cd7579844761ed68926eb3073bab1dca87b - Author: Matthew Wilcox (Oracle) - Date: Tue Feb 22 14:31:43 2022 -0500 - - fs: Remove flags parameter from aops->write_begin - - There are no more aop flags left, so remove the parameter. - -Upstream-Status: Backport - -Change-Id: I82725b93e13d749f52a631b2ac60df81a5e839f8 -Signed-off-by: Michael Jeanson -Signed-off-by: Mathieu Desnoyers ---- - include/instrumentation/events/ext4.h | 30 +++++++++++++++++++++++++++ - 1 file changed, 30 insertions(+) - -diff --git a/include/instrumentation/events/ext4.h b/include/instrumentation/events/ext4.h -index 513762c0..222416ec 100644 ---- a/include/instrumentation/events/ext4.h -+++ b/include/instrumentation/events/ext4.h -@@ -122,6 +122,35 @@ LTTNG_TRACEPOINT_EVENT(ext4_begin_ordered_truncate, - ) - ) - -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,19,0)) -+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_begin, -+ -+ TP_PROTO(struct inode *inode, loff_t pos, unsigned int len), -+ -+ TP_ARGS(inode, pos, len), -+ -+ TP_FIELDS( -+ ctf_integer(dev_t, dev, inode->i_sb->s_dev) -+ ctf_integer(ino_t, ino, inode->i_ino) -+ ctf_integer(loff_t, pos, pos) -+ ctf_integer(unsigned int, len, len) -+ ) -+) -+ -+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_begin, ext4_write_begin, -+ -+ TP_PROTO(struct inode *inode, loff_t pos, unsigned int len), -+ -+ TP_ARGS(inode, pos, len) -+) -+ -+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_begin, ext4_da_write_begin, -+ -+ TP_PROTO(struct inode *inode, loff_t pos, unsigned int len), -+ -+ TP_ARGS(inode, pos, len) -+) -+#else - LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_begin, - - TP_PROTO(struct inode *inode, loff_t pos, unsigned int len, -@@ -153,6 +182,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_begin, ext4_da_write_begin, - - TP_ARGS(inode, pos, len, flags) - ) -+#endif - - LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_end, - TP_PROTO(struct inode *inode, loff_t pos, unsigned int len, --- -2.19.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch b/meta/recipes-kernel/lttng/lttng-modules/0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch deleted file mode 100644 index 63f9c40d92..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 526f13c844cd29f89bd3e924867d9ddfe3c40ade Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -Date: Wed, 15 Jun 2022 12:07:16 -0400 -Subject: [PATCH 3/3] fix: workqueue: Fix type of cpu in trace event (v5.19) - -See upstream commit : - - commit 873a400938b31a1e443c4d94b560b78300787540 - Author: Wonhyuk Yang - Date: Wed May 4 11:32:03 2022 +0900 - - workqueue: Fix type of cpu in trace event - - The trace event "workqueue_queue_work" use unsigned int type for - req_cpu, cpu. This casue confusing cpu number like below log. - - $ cat /sys/kernel/debug/tracing/trace - cat-317 [001] ...: workqueue_queue_work: ... req_cpu=8192 cpu=4294967295 - - So, change unsigned type to signed type in the trace event. After - applying this patch, cpu number will be printed as -1 instead of - 4294967295 as folllows. - - $ cat /sys/kernel/debug/tracing/trace - cat-1338 [002] ...: workqueue_queue_work: ... req_cpu=8192 cpu=-1 - -Upstream-Status: Backport - -Change-Id: I478083c350b6ec314d87e9159dc5b342b96daed7 -Signed-off-by: Michael Jeanson -Signed-off-by: Mathieu Desnoyers ---- - include/instrumentation/events/workqueue.h | 49 ++++++++++++++++++++-- - 1 file changed, 46 insertions(+), 3 deletions(-) - -diff --git a/include/instrumentation/events/workqueue.h b/include/instrumentation/events/workqueue.h -index 023b65a8..5693cf89 100644 ---- a/include/instrumentation/events/workqueue.h -+++ b/include/instrumentation/events/workqueue.h -@@ -28,10 +28,35 @@ LTTNG_TRACEPOINT_EVENT_CLASS(workqueue_work, - ) - ) - -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,19,0)) - /** - * workqueue_queue_work - called when a work gets queued - * @req_cpu: the requested cpu -- * @cwq: pointer to struct cpu_workqueue_struct -+ * @pwq: pointer to struct pool_workqueue -+ * @work: pointer to struct work_struct -+ * -+ * This event occurs when a work is queued immediately or once a -+ * delayed work is actually queued on a workqueue (ie: once the delay -+ * has been reached). -+ */ -+LTTNG_TRACEPOINT_EVENT(workqueue_queue_work, -+ -+ TP_PROTO(int req_cpu, struct pool_workqueue *pwq, -+ struct work_struct *work), -+ -+ TP_ARGS(req_cpu, pwq, work), -+ -+ TP_FIELDS( -+ ctf_integer_hex(void *, work, work) -+ ctf_integer_hex(void *, function, work->func) -+ ctf_integer(int, req_cpu, req_cpu) -+ ) -+) -+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,9,0)) -+/** -+ * workqueue_queue_work - called when a work gets queued -+ * @req_cpu: the requested cpu -+ * @pwq: pointer to struct pool_workqueue - * @work: pointer to struct work_struct - * - * This event occurs when a work is queued immediately or once a -@@ -40,17 +65,34 @@ LTTNG_TRACEPOINT_EVENT_CLASS(workqueue_work, - */ - LTTNG_TRACEPOINT_EVENT(workqueue_queue_work, - --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,9,0)) - TP_PROTO(unsigned int req_cpu, struct pool_workqueue *pwq, - struct work_struct *work), - - TP_ARGS(req_cpu, pwq, work), -+ -+ TP_FIELDS( -+ ctf_integer_hex(void *, work, work) -+ ctf_integer_hex(void *, function, work->func) -+ ctf_integer(unsigned int, req_cpu, req_cpu) -+ ) -+) - #else -+/** -+ * workqueue_queue_work - called when a work gets queued -+ * @req_cpu: the requested cpu -+ * @cwq: pointer to struct cpu_workqueue_struct -+ * @work: pointer to struct work_struct -+ * -+ * This event occurs when a work is queued immediately or once a -+ * delayed work is actually queued on a workqueue (ie: once the delay -+ * has been reached). -+ */ -+LTTNG_TRACEPOINT_EVENT(workqueue_queue_work, -+ - TP_PROTO(unsigned int req_cpu, struct cpu_workqueue_struct *cwq, - struct work_struct *work), - - TP_ARGS(req_cpu, cwq, work), --#endif - - TP_FIELDS( - ctf_integer_hex(void *, work, work) -@@ -58,6 +100,7 @@ LTTNG_TRACEPOINT_EVENT(workqueue_queue_work, - ctf_integer(unsigned int, req_cpu, req_cpu) - ) - ) -+#endif - - /** - * workqueue_activate_work - called when a work gets activated --- -2.19.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.5.bb similarity index 78% rename from meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb rename to meta/recipes-kernel/lttng/lttng-modules_2.13.5.bb index ad4063bed3..307fb912cf 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.5.bb @@ -11,11 +11,6 @@ include lttng-platforms.inc SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0009-Rename-genhd-wrapper-to-blkdev.patch \ - file://0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch \ - file://0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch \ - file://0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch \ - file://0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch \ - file://0001-fix-compaction.patch \ file://0001-fix-adjust-range-v5.10.137-in-block-probe.patch \ file://0001-wrapper-powerpc64-fix-kernel-crash-caused-by-do_get_.patch \ " @@ -23,7 +18,7 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ # Use :append here so that the patch is applied also when using devupstream SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch" -SRC_URI[sha256sum] = "6159d00e4e1d59546eec8d4a67e1aa39c1084ceb5e5afeb666eab4b8a5b5a9ee" +SRC_URI[sha256sum] = "eceb3428d80e85a9f008425beb9526195c9f7f02b302f28add56df53aef3e708" export INSTALL_MOD_DIR="kernel/lttng-modules" From patchwork Sun Nov 13 14:12:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15425 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 58360C4321E for ; Sun, 13 Nov 2022 14:13:14 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web08.2795.1668348786792166517 for ; Sun, 13 Nov 2022 06:13:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=MqFWXWeK; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id b62so8196524pgc.0 for ; Sun, 13 Nov 2022 06:13:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=ERXAnz2QpNpSVSB/oMF0se4GfG3/Q8TlLcnTdX3OqZA=; b=MqFWXWeKQCGRyfdMMTDW851TtLlIG5E7sVDAGwGksP55Jnbsx+lA6rIcje53UCapNm U6lUPZufLIc2RpL4eethucoSq27MtY5nud5IMD93H2EKvYqCMaFbdFcV6sgh/j9Q6kSw yYyB4+uM8M7BQWb+WRwDn2dhsM+v7TiBpi6LlxhxE8K6xnPoNpIBv4rN6gZKc5NhCg7R Q5D+U+9jirfsRftRWotS2qUCAvPolutG2TROVBaK65011/jrpMgcDzZMZMvGVsq5s4QZ Oa0snekLihbipi8r8sjzRCwF/qedsHDByeUkbN/Ubj55AtA9OHR6drrYegm+g5hCL9sw CsTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ERXAnz2QpNpSVSB/oMF0se4GfG3/Q8TlLcnTdX3OqZA=; b=m4H/UjB8F9FNHM35V/ARNUtxYgq32Yu9PEjgiFvhcg4msYBsAYor0wE4LEI7nIBTLB 9lPOZx5i0lOJpN2BDsM4TBWDdz4AgO88O1JHKkzbA6UiRXwJHIX1w2YPfpAXvEvd+UMT 8ufWMrxmoRyVSnlOuzJkRCqgIIaF8MeDTnw5L/DfeKMLBjtWzVnONOYC8bEdGZcWQ8cn zqAOzkDx0hNPEMDK8SGfAghjOusz6bPEODp69JHPzztxGABU5XZJTVa0AwOcqmPCVlgN 5I+yv4CdEPrLpY3l/Qpsfukj3T4kgrn5d0FMvC9EvBJ2OP8Er9pqeAbGzr1XRb3hep8q zX5A== X-Gm-Message-State: ANoB5pmkTi8JSvcK9/mn0K5uRfg3dkovhKwLxy4biFbUxzaKkBkXDSAa lAihkDMC5rdY9m0LEXwDaPeZz6rQciATbGPP X-Google-Smtp-Source: AA0mqf5JlBKbMwAcbHd736J9HsIIRqaY/zreiBWmAZVJSIvoNhQw924t74KwKmzraaaQQGadzhTUNQ== X-Received: by 2002:aa7:90cf:0:b0:563:4643:db33 with SMTP id k15-20020aa790cf000000b005634643db33mr10302587pfk.22.1668348787786; Sun, 13 Nov 2022 06:13:07 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id w34-20020a634762000000b0046b2ebb0a52sm4198771pgk.17.2022.11.13.06.13.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Nov 2022 06:13:07 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 5/9] quilt: backport a patch to address grep 3.8 failures Date: Sun, 13 Nov 2022 04:12:43 -1000 Message-Id: <97e522c83965777eb5faa1098ddee921e1c7fe79.1668348622.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 13 Nov 2022 14:13:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173199 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit b5001af5c711a373bd2f1ea108c8b597dd40faca) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/quilt/quilt.inc | 1 + .../quilt/quilt/fix-grep-3.8.patch | 144 ++++++++++++++++++ 2 files changed, 145 insertions(+) create mode 100644 meta/recipes-devtools/quilt/quilt/fix-grep-3.8.patch diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index 07611e6d85..ec69705093 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc @@ -12,6 +12,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \ file://Makefile \ file://test.sh \ file://0001-tests-Allow-different-output-from-mv.patch \ + file://fix-grep-3.8.patch \ " SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch" diff --git a/meta/recipes-devtools/quilt/quilt/fix-grep-3.8.patch b/meta/recipes-devtools/quilt/quilt/fix-grep-3.8.patch new file mode 100644 index 0000000000..68a4b4c195 --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt/fix-grep-3.8.patch @@ -0,0 +1,144 @@ +From f73f8d7f71de2878d3f92881a5fcb8eafd78cb5f Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Fri, 9 Sep 2022 10:10:37 +0200 +Subject: Avoid warnings with grep 3.8 + +GNU grep version 3.8 became more strict about needless quoting in +patterns. We have one occurrence of that in quilt, where "/" +characters are being quoted by default. There are cases where they +indeed need to be quoted (typically when used in a sed s/// command) +but most of the time they do not, and this results in the following +warning: + +grep: warning: stray \ before / + +So rename quote_bre() to quote_sed_re(), and introduce +quote_grep_re() which does not quote "/". + +Signed-off-by: Jean Delvare +Upstream-Status: Backport [https://git.savannah.nongnu.org/cgit/quilt.git/commit/?id=f73f8d7f71de2878d3f92881a5fcb8eafd78cb5f] +Signed-off-by: Alexander Kanavin +--- + quilt/diff.in | 2 +- + quilt/patches.in | 2 +- + quilt/scripts/patchfns.in | 20 +++++++++++++------- + quilt/upgrade.in | 4 ++-- + 4 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/quilt/diff.in b/quilt/diff.in +index e90dc33..07788ff 100644 +--- a/quilt/diff.in ++++ b/quilt/diff.in +@@ -255,7 +255,7 @@ then + # Add all files in the snapshot into the file list (they may all + # have changed). + files=( $(find $QUILT_PC/$snap_subdir -type f \ +- | sed -e "s/^$(quote_bre $QUILT_PC/$snap_subdir/)//" \ ++ | sed -e "s/^$(quote_sed_re $QUILT_PC/$snap_subdir/)//" \ + | sort) ) + printf "%s\n" "${files[@]}" >&4 + unset files +diff --git a/quilt/patches.in b/quilt/patches.in +index bb17a46..eac45a9 100644 +--- a/quilt/patches.in ++++ b/quilt/patches.in +@@ -60,7 +60,7 @@ scan_unapplied() + # Quote each file name only once + for file in "${opt_files[@]}" + do +- files_bre[${#files_bre[@]}]=$(quote_bre "$file") ++ files_bre[${#files_bre[@]}]=$(quote_grep_re "$file") + done + + # "Or" all files in a single pattern +diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in +index c2d5f9d..1bd7233 100644 +--- a/quilt/scripts/patchfns.in ++++ b/quilt/scripts/patchfns.in +@@ -78,8 +78,14 @@ array_join() + done + } + +-# Quote a string for use in a basic regular expression. +-quote_bre() ++# Quote a string for use in a regular expression for a grep pattern. ++quote_grep_re() ++{ ++ echo "$1" | sed -e 's:\([][^$.*\\]\):\\\1:g' ++} ++ ++# Quote a string for use in a regular expression for a sed s/// command. ++quote_sed_re() + { + echo "$1" | sed -e 's:\([][^$/.*\\]\):\\\1:g' + } +@@ -215,7 +221,7 @@ patch_in_series() + + if [ -e "$SERIES" ] + then +- grep -q "^$(quote_bre $patch)\([ \t]\|$\)" "$SERIES" ++ grep -q "^$(quote_grep_re $patch)\([ \t]\|$\)" "$SERIES" + else + return 1 + fi +@@ -365,7 +371,7 @@ is_applied() + { + local patch=$1 + [ -e $DB ] || return 1 +- grep -q "^$(quote_bre $patch)\$" $DB ++ grep -q "^$(quote_grep_re $patch)\$" $DB + } + + applied_patches() +@@ -465,7 +471,7 @@ remove_from_db() + local tmpfile + if tmpfile=$(gen_tempfile) + then +- grep -v "^$(quote_bre $patch)\$" $DB > $tmpfile ++ grep -v "^$(quote_grep_re $patch)\$" $DB > $tmpfile + cat $tmpfile > $DB + rm -f $tmpfile + [ -s $DB ] || rm -f $DB +@@ -520,7 +526,7 @@ find_patch() + fi + + local patch=${1#$SUBDIR_DOWN$QUILT_PATCHES/} +- local bre=$(quote_bre "$patch") ++ local bre=$(quote_sed_re "$patch") + set -- $(sed -e "/^$bre\(\|\.patch\|\.diff\?\)\(\|\.gz\|\.bz2\|\.xz\|\.lzma\|\.lz\)\([ "$'\t'"]\|$\)/!d" \ + -e 's/[ '$'\t''].*//' "$SERIES") + if [ $# -eq 1 ] +@@ -631,7 +637,7 @@ files_in_patch() + then + find "$path" -type f \ + -a ! -path "$(quote_glob "$path")/.timestamp" | +- sed -e "s/$(quote_bre "$path")\///" ++ sed -e "s/$(quote_sed_re "$path")\///" + fi + } + +diff --git a/quilt/upgrade.in b/quilt/upgrade.in +index dbf7d05..866aa33 100644 +--- a/quilt/upgrade.in ++++ b/quilt/upgrade.in +@@ -74,7 +74,7 @@ printf $"Converting meta-data to version %s\n" "$DB_VERSION" + + for patch in $(applied_patches) + do +- proper_name="$(grep "^$(quote_bre $patch)"'\(\|\.patch\|\.diff?\)\(\|\.gz\|\.bz2\)\([ \t]\|$\)' $SERIES)" ++ proper_name="$(grep "^$(quote_grep_re $patch)"'\(\|\.patch\|\.diff?\)\(\|\.gz\|\.bz2\)\([ \t]\|$\)' $SERIES)" + proper_name=${proper_name#$QUILT_PATCHES/} + proper_name=${proper_name%% *} + if [ -z "$proper_name" ] +@@ -84,7 +84,7 @@ do + fi + + if [ "$patch" != "$proper_name" -a -d $QUILT_PC/$patch ] \ +- && grep -q "^$(quote_bre $patch)\$" \ ++ && grep -q "^$(quote_grep_re $patch)\$" \ + $QUILT_PC/applied-patches + then + mv $QUILT_PC/$patch $QUILT_PC/$proper_name \ +-- +cgit v1.1 + From patchwork Sun Nov 13 14:12:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15422 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 46F58C43217 for ; Sun, 13 Nov 2022 14:13:14 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web12.2804.1668348779511320811 for ; Sun, 13 Nov 2022 06:13:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=HHHq6rao; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id v3so8164224pgh.4 for ; Sun, 13 Nov 2022 06:13:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=mpJfuI4s21/vx0yeMdf+dEkCsnBrKSSZLAjrShsO6tI=; b=HHHq6raonYGkeOqNQD5usP5yS98nukviMc+ZI98oMbrfDVBThYM2LHOSQdy02JLNFl P7lkM3CD3N9Mh0me2F4NUTAx3RNPUYMw0repdvo0HVxUQnlCOtrvgPV21oyu9eVQiAAT 1HqcMlKKCijekU7Rr12B6p+Ssfa6dOhgBzWhhxs+adrUw3HIkcGWiP43K6BzlbNWXZT2 GzuBdc3XoWZ4ZxL6RpSkGbPdNTgCbrutN+3jwdNazzSKf5bxKP5EU6RXlEWwIJkXYgJT VGANgTdPNLix7jDDBhKDa9yBMmp5fcG/8zBlOI9B5nck6lov2kABiD7JmsJxOelBunrw 1TSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mpJfuI4s21/vx0yeMdf+dEkCsnBrKSSZLAjrShsO6tI=; b=MVaqqOI0cKi6alIRbyGXoAUfj3J8Q/yyjwKMxMpUWM8dcqT5ejYKRC8SbnB8judpKz grb/7Av0CgCB3eWqQapVNOGZVrK4CLqb2+K2dzDWIPHonJYjtpxjri8hciWalLr4trch 6MWUdp8DUxgJP5wFJBDP4FGgdcCXCIsOIfpEdk9StSD7SwY75keQRbNot7zkJnCYEDfH UgWwSZisX97vSFTG9vKagaA1Smr0vMclJME06e95xMUtW1bZ8736V7sDX5WeK6QKPztu BHnIX3cvm0DzmAIlv6ucL8u48vB8Vz462RA9TFR65Eketrdsw5to7DVjYJPu5QOhqjQx JwZA== X-Gm-Message-State: ANoB5pmeJ5vQD4zKfvGo3NUalF8Y/KNPe8p5jVtKqWuP6popE0TMdVUJ HRGOUFW5QGEzsmVk8mxXrS8XNADmJW1/IDzn X-Google-Smtp-Source: AA0mqf5CX7KeBObY6cqvaBDwMJpus+b3LwEjuRDNdnc6kWp4OVOYK0+91iM1ZD0EHrRcfJDlmzDDmQ== X-Received: by 2002:a63:5d5f:0:b0:46f:fea7:4816 with SMTP id o31-20020a635d5f000000b0046ffea74816mr8598802pgm.532.1668348790144; Sun, 13 Nov 2022 06:13:10 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id w34-20020a634762000000b0046b2ebb0a52sm4198771pgk.17.2022.11.13.06.13.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Nov 2022 06:13:09 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 6/9] sanity: check for GNU tar specifically Date: Sun, 13 Nov 2022 04:12:44 -1000 Message-Id: <238993097826461a0f8bc2545c9383d8cfc0beea.1668348622.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 13 Nov 2022 14:13:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173200 From: Ross Burton We need the system tar to be GNU tar, as we reply on --xattrs. Some distributions may be using libarchive's tar binary, which is definitely not as featureful, so check for this and abort early with a clear message instead of later with mysterious errors. Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni (cherry picked from commit 7dd2b1cd1bb10e67485dab8600c0787df6c2eee7) Signed-off-by: Steve Sakoman --- meta/classes/sanity.bbclass | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 5c97effb96..f2b2e4dfaf 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -498,6 +498,14 @@ def check_tar_version(sanity_data): version = result.split()[3] if bb.utils.vercmp_string_op(version, "1.28", "<"): return "Your version of tar is older than 1.28 and does not have the support needed to enable reproducible builds. Please install a newer version of tar (you could use the project's buildtools-tarball from our last release or use scripts/install-buildtools).\n" + + try: + result = subprocess.check_output(["tar", "--help"], stderr=subprocess.STDOUT).decode('utf-8') + if "--xattrs" not in result: + return "Your tar doesn't support --xattrs, please use GNU tar.\n" + except subprocess.CalledProcessError as e: + return "Unable to execute tar --help, exit code %d\n%s\n" % (e.returncode, e.output) + return None # We use git parameters and functionality only found in 1.7.8 or later From patchwork Sun Nov 13 14:12:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15424 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 47E34C43219 for ; Sun, 13 Nov 2022 14:13:14 +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.web12.2808.1668348793237890809 for ; Sun, 13 Nov 2022 06:13:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=76C+0Xv5; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id b11so8246547pjp.2 for ; Sun, 13 Nov 2022 06:13:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=2ayAqys1jT5OjUCAaSvNVAmM61IFwwIAZa/nuPFXyg8=; b=76C+0Xv5R1R+pIPgvaFqnreHP7kDxOLGO7yNIY3+s0cbCq9aWGvNT7dwzbtweEFbLI msvG/283VPbq8/5iltF3eCJfIWXjZZjjmVPHl3HX5Kb2efNaB3hD+UMbv1fqQGpQo4mx wVC9XG3d3CBLu4VNhLqdrcf9+sTUVNcJW4u/ZLIKIakuuDxuvUkLzfsVND94upX6ZMDM aCrj6VXuYt8MGIEIu5VAfdv4sgeWWDTSpyTNAfAdALHQQsBMop9EXapMVa7fx2dT1VTN DDjU4LyGPFHmef7FssJvla0p3Yraa6Bl3Lv0efnc5/pQ4VTAE2XOR3D5wLDAJGrcjEnc vIRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2ayAqys1jT5OjUCAaSvNVAmM61IFwwIAZa/nuPFXyg8=; b=L8Ots0LOOn4p3wIZuBV4/cR0czl55tNylgBngdqX5lQWMCiNiNiTGs78fVXFJGk2FR es8vODMOaUp6o+UZxdS9+TV/KvCPAtlXa4w59j2O7PVAN7LPnfcxx6e/Z20j4meDgXKS cnK2qT/aNu7RYtXzZOs3kqZgUv9DR6Fw/XCYsrlx1JYCv+yJRiLfrAGNVjLJRoCxPV9x rDLkaWTGcTWDVyT6Wh/eHV/fMFXheSKvgN+ZhFUIqYIlRv3xKSQxx/rly50WDIrXOpO7 vRF8eB4XQ/lXiwlPzYdIcvPhAuxMxbzduOy+hoMpHuIXGzXXfY2VL0icN7iiIet0Ag3S Op8g== X-Gm-Message-State: ANoB5plZxiWp8ITW+jgLfZQhx1O6nFPD2hqkw9cc7XMzLailxr07Hi/R TJvmjC+OU/suKE80mGoH55hqBwxhR/dPvr1p X-Google-Smtp-Source: AA0mqf6oOYiP0oEBnkP4uEhWGVl0vo8P7EPAZcWSUCSiR0qYfCEAt8ieAuyOyP1RnGO5/AcwzOZtjw== X-Received: by 2002:a17:90a:5aa3:b0:20a:dba9:ebe2 with SMTP id n32-20020a17090a5aa300b0020adba9ebe2mr10336659pji.136.1668348792250; Sun, 13 Nov 2022 06:13:12 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id w34-20020a634762000000b0046b2ebb0a52sm4198771pgk.17.2022.11.13.06.13.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Nov 2022 06:13:11 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 7/9] wic: swap partitions are not added to fstab Date: Sun, 13 Nov 2022 04:12:45 -1000 Message-Id: <397676b3ad152b209916b152f1b77e772a2af14b.1668348622.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 13 Nov 2022 14:13:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173201 From: ciarancourtney - Regression in 7aa678ce804c21dc1dc51b9be442671bc33c4041 Signed-off-by: Ciaran Courtney Signed-off-by: Alexandre Belloni (cherry picked from commit f1243572ad6b6303fe562e4eb7a9826fd51ea3c3) Signed-off-by: Steve Sakoman --- scripts/lib/wic/plugins/imager/direct.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index 685d19b30f..165fc2979f 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -117,7 +117,7 @@ class DirectPlugin(ImagerPlugin): updated = False for part in self.parts: if not part.realnum or not part.mountpoint \ - or part.mountpoint == "/" or not part.mountpoint.startswith('/'): + or part.mountpoint == "/" or not (part.mountpoint.startswith('/') or part.mountpoint == "swap"): continue if part.use_uuid: From patchwork Sun Nov 13 14:12:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15427 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 42062C43217 for ; Sun, 13 Nov 2022 14:13:24 +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.web12.2808.1668348793237890809 for ; Sun, 13 Nov 2022 06:13:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=v9+yTrO8; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id b11so8246599pjp.2 for ; Sun, 13 Nov 2022 06:13:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=YEo2GNXU784ShN/7+QJQchzGWcqlli6QQkx0oRHlQUU=; b=v9+yTrO8XOO3TmpypRMOcAybNjMPMih2MzagifpcVVZnXCAOhAx8/rEuID0d1u6X87 GCgkUK9T4l1TOg9EWtdpmnTN06t5NkcbMXAypb9NUOmDcOluyJpRkDDgzT0CXGnhONSk Hm7NPa/xeINE1PiO2bA3Cs92Dc93tXGX2WMQQng3OGYbGD+0O6C/Uvjs6UUKNSPhzP1I bYHiEglDIr+NLy4w241gHQCzNM23dXdknsA5DZoj/DGDuTbEKCEAUPnZfTa15l1nmKbW TjBzwTzuvDws2V1PT4Fnhb8H4C4vCa8f4mJoo/dI09+vHlewM3RbPSNYfqRagfPuzjxb 2kxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YEo2GNXU784ShN/7+QJQchzGWcqlli6QQkx0oRHlQUU=; b=Gt7WshyJOZPKLm8caOsJbRMN8SIqKp/5MoDfVPt7Crms/jkVR7ym3hOAxs3LDqceHA neOllGe3/TuHpfAP+rhoodmlkOSnjoYI8uW6hYNsnBLUP8PdqF69g8sbQKk0CKEpwzyT YgIjBl147flrcy3XWP+7G3BgBEZRqjSZL8npFpzdpGQc8ETLUj6mVGloe0QtZBiURDjo 8eyJ2X22JqfdH3j1WCBYifSSWshvYeCwQQqGrgMAMJC8F4Gx2HLZIYMELX9341+WcDQu eUyjvU2BAsuXpNDgkh6+U/ujqTIPyZ/Gw/mLpk/EsWo4O04EPqNyAQLgqnaI5RgXvctb HLsA== X-Gm-Message-State: ANoB5plf5rTSaC1eo09bve/pfrWQwquhUewrUL3e8sYxBkjfooLXWLKO MnrLPRWR5hRewmKASlLzYF/NFp1y/cT3OXhk X-Google-Smtp-Source: AA0mqf4fHMN8KCGsqWP46mY7dBkI/cWIEK/lDPOrD02nRJoyCjU+pQWT+HHvhGHpkxQe6jMuPLMUAg== X-Received: by 2002:a17:90a:51:b0:213:fbf3:f3 with SMTP id 17-20020a17090a005100b00213fbf300f3mr10293791pjb.203.1668348794605; Sun, 13 Nov 2022 06:13:14 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id w34-20020a634762000000b0046b2ebb0a52sm4198771pgk.17.2022.11.13.06.13.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Nov 2022 06:13:13 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 8/9] create-spdx.bbclass: remove unused SPDX_INCLUDE_PACKAGED Date: Sun, 13 Nov 2022 04:12:46 -1000 Message-Id: <742c83402203ecc6ef9298b8a717e7a06cd2bd30.1668348622.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 13 Nov 2022 14:13:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173202 From: Michael Opdenacker [YOCTO #14948] Signed-off-by: Michael Opdenacker Signed-off-by: Alexandre Belloni (cherry picked from commit 89f1abd5e00807cf179ddf658f74d48119523b0c) Signed-off-by: Steve Sakoman --- meta/classes/create-spdx.bbclass | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/classes/create-spdx.bbclass b/meta/classes/create-spdx.bbclass index d0bfcc7de6..e405bd0cfa 100644 --- a/meta/classes/create-spdx.bbclass +++ b/meta/classes/create-spdx.bbclass @@ -19,7 +19,6 @@ SPDX_TOOL_VERSION ??= "1.0" SPDXRUNTIMEDEPLOY = "${SPDXDIR}/runtime-deploy" SPDX_INCLUDE_SOURCES ??= "0" -SPDX_INCLUDE_PACKAGED ??= "0" SPDX_ARCHIVE_SOURCES ??= "0" SPDX_ARCHIVE_PACKAGED ??= "0" @@ -423,7 +422,6 @@ python do_create_spdx() { deploy_dir_spdx = Path(d.getVar("DEPLOY_DIR_SPDX")) spdx_workdir = Path(d.getVar("SPDXWORK")) - include_packaged = d.getVar("SPDX_INCLUDE_PACKAGED") == "1" include_sources = d.getVar("SPDX_INCLUDE_SOURCES") == "1" archive_sources = d.getVar("SPDX_ARCHIVE_SOURCES") == "1" archive_packaged = d.getVar("SPDX_ARCHIVE_PACKAGED") == "1" From patchwork Sun Nov 13 14:12:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15426 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 3CC44C4332F for ; Sun, 13 Nov 2022 14:13:24 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web11.2802.1668348797758512347 for ; Sun, 13 Nov 2022 06:13:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=1kJh5RdW; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id f3so1748228pgc.2 for ; Sun, 13 Nov 2022 06:13:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=xgFpGZ3Te5RqE1A7psiXjPNMiYQbYjTzSzXPN1mfgbU=; b=1kJh5RdWm2/DPQjgOmqMjnpP4Ureiql05P/Yr4QRRtOtOozVxQ190UqSMfW7DzziGu ieMSn/NxHFKtD3iV/75VzemWbCHhWNBH3DoKoC4mid7KSu7ky6Z8vYwvXEOHcC7EWbPG 4reEX3dGxSU3GZNxTiRFej+S+D+p4EwBKk7G0hN0YZJbvLrnmapblsbt8dmjLzo5cAOi 4h29maciVk+joSha67F0JhD0Kn4MxlNLpdyyYg1iVzGTjf1Rl40kIYqDOCzBMH8R0i/9 VM4YLMhogQr8PinJAdR0nE4b0n+71OtPr+ZInyWmraAr05x3RAy3Zh3PxsZZt3gz9w3O MaYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xgFpGZ3Te5RqE1A7psiXjPNMiYQbYjTzSzXPN1mfgbU=; b=CAj2skMqYbMQ0WbRlWnU3TwCqrkGW1tKJGLkcOcQLD764dOO75n0aDjr97xykOxRpr iXVKJzcw8pAjyE7IZ+DGAUxSdPDXs5MPLET4R9On9WH1T2nUbwqtR33Qd4x3BAj4OhMM /AcYTfdZvUCdxE8UrtWiWBHF6V0b8keP0ZVRa3okUsdCabhbGEQ22LVaBs5BG8Ro/6ma h6wHnYWRrrmhGOkvXe0USftA7Shr4ZF5ipQEqi23vMTL01zAUGXC9gh62rlRf81mTsE/ SWwRzuhe1QGxKPMyvoLLTxAzcVenvXcjMifyp7HlHcTV/mvKvVe0C6rDLJr1wPu7vbhi NbFw== X-Gm-Message-State: ANoB5pkxqPkR4qo5QBk1rgQZOB+OqPQKrU/NlwKIa8tE5OaT7+PGYkjD 28pXpK5zF5vXGm6M/HAaHmFPjTU/DqXzkJR7 X-Google-Smtp-Source: AA0mqf6+WzsfpJ6K9D8+/zi+eTD0RCW2uvlOk65hiy16V6GwK9zRR1fGFgp+0ukVXdgIduTKA3GJgw== X-Received: by 2002:a63:5023:0:b0:429:8266:b617 with SMTP id e35-20020a635023000000b004298266b617mr8919923pgb.136.1668348796700; Sun, 13 Nov 2022 06:13:16 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id w34-20020a634762000000b0046b2ebb0a52sm4198771pgk.17.2022.11.13.06.13.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Nov 2022 06:13:16 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 9/9] qemu: add io_uring PACKAGECONFIG Date: Sun, 13 Nov 2022 04:12:47 -1000 Message-Id: <3243b069db7629d15e4b8c25b4133f824d18520c.1668348622.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 13 Nov 2022 14:13:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173203 From: Ross Burton io_uring is enabled or disabled depending on whether liburing is available, so add a PACKAGECONFIG to make this explicit, disabled by default. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit daee79639c39ac6278855b35e0ddf71e52dd13f8) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/qemu/qemu.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 6a49dc53e9..cc9681fb4b 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -210,6 +210,7 @@ PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer epoxy gtk+" PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2" PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr --enable-cap-ng,--disable-virtfs,libcap-ng attr," PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio," +PACKAGECONFIG[uring] = "--enable-linux-io-uring,--disable-linux-io-uring,liburing" PACKAGECONFIG[xfs] = "--enable-xfsctl,--disable-xfsctl,xfsprogs," PACKAGECONFIG[xen] = "--enable-xen,--disable-xen,xen-tools,xen-tools-libxenstore xen-tools-libxenctrl xen-tools-libxenguest" PACKAGECONFIG[vnc-sasl] = "--enable-vnc --enable-vnc-sasl,--disable-vnc-sasl,cyrus-sasl,"