From patchwork Sat Sep 12 23:54:51 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98100 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 BD609C88E63 for ; Sat, 12 Sep 2026 23:55:01 +0000 (UTC) Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.16782.1789257299490349853 for ; Sat, 12 Sep 2026 16:54:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=HfFbXgpG; spf=pass (domain: gmail.com, ip: 209.85.215.181, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-cc147d86bebso2457751a12.0 for ; Sat, 12 Sep 2026 16:54:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789257299; x=1789862099; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=fOmGF+M8fADD/CWXnemR/BXYtPfeD5EEqFbU98Y8JcY=; b=HfFbXgpGfyT/rO3hVu99LF8bRZ0TdExcSZFFKim/TSQ2/tZj350G40wCL20nICbxY9 kqKtL6Ro1mmr7kEpmdm01pOx1unui1xW+k+aFdHIomLBQVLa3nw5B94UthPl6bfYWH/i 1YIjm0AsfA6aHA/QDTqwRMzy+hZCeDMCCZV5ybLLJD09ONbpGDvfz6kCSWdhp1yUzrFH F4nQSsuuzmTeIuUVsG1b+gqSE0cv+7+5YE/CptyePZMRHZF8Rc5UERpnHRG0lbdAS7Yy 0P6/4QFUxDLWHpQDejDDAX3OTfHVKic/EZaWusZC50YA3j0tgZmp23tBTAt90CUziV+5 QdKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789257299; x=1789862099; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=fOmGF+M8fADD/CWXnemR/BXYtPfeD5EEqFbU98Y8JcY=; b=W8m+as2fTXGC/GX6vjOIPQTY5wu51NBa9B5YYC9FAH/pIFe//teiOZkrCZrmCxGAf4 /bgokDlLTC4id6YJxyUY3QLkQsLQI7FlflrLajhyiz5O2fV3lQIF4TLS7UkfNhOj6+LJ Sa2cjWRmV5qpozF/HR2Y3dpFXAAO5P9rSc5ec8lCnIukvPWAcqWS6TGU04NLamh60r5x gU46AKEY6Y066FZa3XJ27Ff5YjWTiw+xw0tC3LuSV1UQZlAnsdtFZzEAaKoDky668dif l5S/Ad0/d5XtBN5sWWRUlVx8BJRRM/OHNycoUSR6JlxOVmRbs0dQdTvbZdGMAf83HM7O hUPg== X-Gm-Message-State: AFuF++nYZcrGXHMfjAKZOiyVH2bsmUwJa8o+M+yYkkP7VyM/383h7nCJ i8fe5Y1IetVD7VfYsXwP5q6Vt4UWVx6LI4KhSRkFok/Sni0m9icKw2LnF6srhg== X-Gm-Gg: AYBFou2m7e4hkIYU7lWnHbbPSJMGA/K4EY/PYpiWeCk48rdzVQmd74SajqMT7jLhl2g Qi87qsi6YH8j28YBWaPCkKAbGHS1s2PtPKvfe4Oh+fWo4jF6qFV0HIJ48cwyvGHb4tOGLzHTAS7 cBgCMF1dh1LMnFWf1U6IW2hL8k8sGlW3jfiPiiYIUbJUB/GFOEkxQj9k0ATUGNhu8hQ/Yrt88Td Yg4nIbMEd926+jrc7QXhKNBxJRLs+3+iTu3QRnTjJD4+gLuEbo7LcWu2jXrkCum4k+6byHqOkWR FA4DownzCUUjd6YAkjPCqftcQ7w44HLhO45ndWY5k9i3WD1nRqK8KPFAVvLy+m2Q0kAz+kenbbo tgMg4+QDK0RcmuNUF6N5qoOBqkqP7Wh5sbe56F3/Xl/qkdGMNmlVP2R0rkPLwVO5opYflJa/jGm NfRgpIlPeyU2arCGrBWf+1ODSWeow2n5pgkXDDHQKlLlxfampsXCghZCfi68GF5GZ0XsiYgcW9V bhJhVYuxhwKGsDc0EZqfe765Ct1hmjkL87NxG7e2oykv/OPlph1TVb2Wpujk5Qd7aIB2RlYG3L/ J7isni8j8nZvmzA6KXh43CIWgqUnYHfdiZGL+Ssu5w9U5j6oUohYkfE7Hek+5PXGlnmn5ENQX7m rW2dODL+v/pf5nmKDwna7RqIihy0ZWsFtPq2SfMsYSmxeqCgC1EXUVSa4 X-Received: by 2002:a05:6a21:710c:b0:3d3:aed2:6f20 with SMTP id adf61e73a8af0-3db26f09602mr313459637.20.1789257298738; Sat, 12 Sep 2026 16:54:58 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-33bbeb053a5sm4524372eec.27.2026.09.12.16.54.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2026 16:54:58 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 1/6] openjpeg: fix run-ptest with busybox sed Date: Sat, 12 Sep 2026 16:54:51 -0700 Message-ID: <20260912235456.2358617-1-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 12 Sep 2026 23:55:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/129986 run-ptest piped ctest output through 'sed -u', which busybox sed does not support, so the pipeline produced no output and the ptest image reported "ptests which had no test results: ['openjpeg']". Drop sed and classify ctest result lines in awk directly. This also maps Timeout/Exception/Not Run results to FAIL; previously they were printed as e.g. "Exception:: " and ignored by the ptest parser. Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/openjpeg/openjpeg/run-ptest | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/run-ptest b/meta-oe/recipes-graphics/openjpeg/openjpeg/run-ptest index a161244fbd..dc2ccf6c21 100644 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg/run-ptest +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/run-ptest @@ -1,4 +1,11 @@ #!/bin/sh # Only run unit tests, exclude nonregression and conformance tests that need external data files -ctest -E "(NR-|CONF-|ETS-|testjp2)" -V | sed -u 's/\*\*\*/ /g' | awk '/Test +#/{gsub(/Passed/,"PASS"); gsub(/Failed/,"FAIL"); gsub(/Skipped/,"SKIP"); print $6": "$4; fflush();}' +# ctest result lines look like: " 1/29 Test #1: tte0 ..... Passed 0.01 sec" +# anything other than Passed/Skipped/Disabled (Failed, Timeout, Exception, Not Run) is a FAIL +ctest -E "(NR-|CONF-|ETS-|testjp2)" -V | awk '/Test +#[0-9]+:/ { + if ($0 ~ /Passed/) res = "PASS" + else if ($0 ~ /Skipped|Disabled/) res = "SKIP" + else res = "FAIL" + print res ": " $4; fflush() +}' From patchwork Sat Sep 12 23:54:52 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98101 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 BC70AC88E53 for ; Sat, 12 Sep 2026 23:55:01 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.16610.1789257300398712858 for ; Sat, 12 Sep 2026 16:55:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=XJQvl9j/; spf=pass (domain: gmail.com, ip: 209.85.216.43, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-383b4a3755fso2323396a91.3 for ; Sat, 12 Sep 2026 16:55:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789257300; x=1789862100; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ZtevAu7rGztn7/FmxYo7Z3lUaYljxHIKicbvPEJmHGM=; b=XJQvl9j/qa9HWD2rH26Ows3TnulVpD9AF7TFRjw94iaEcVwEt8XSag+lrr+oKUBbX5 8TCDItwRaNz2O5A0QNKOOEudetbjmRy7N2phY27MJogN54wtHrc9TsmcBXflGQmLg10d krH3utAy9DBaDvYoJMaKltix1yr4sc43EKfvjtkMzsG//v0yUcilUB/rWp6p/p+M4dnq sXmKZcgVwPZ4h0jC/VtC2QtsOUfPtn2XuWcrAkB6SC033//JeqC1uHyAHKYQnhdmWsPi 5LuR725SBG2LJ2R5LvRJcXSBmL6/jAVU0w1CLTvwwhzwzP6iBykLBjeWhoiwD+v4f9+A dSXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789257300; x=1789862100; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=ZtevAu7rGztn7/FmxYo7Z3lUaYljxHIKicbvPEJmHGM=; b=a4ntn/vG8dIjgnMoxB/0joq5VzFGeRdAJKlF/4S9Y+DEjrPxf64/b5aWqK9D/mNsKR +PfYUksYXu3mMTlXhjCCN7QzviFjgrNyXxSCcERPQJXjp6MabDjcKIJYdSV+qxFR8q94 JFp2feNZU6gez/5jBLlsRlXjXhqOmIQ2QcB4fCPpQm6/8XPzpHMMJc0hSZKdCIP4y6nm djnMdU9EiQ11tcrk5zV/t5Aljdxwh5gG/zSkQOeP8QeHKjVdUMb9BbazqB+Tfe8XTW5X 3oCaudSjiDm1dD1AVnzJCuJpoYmFgV+gUL9RjFQe4Q9gt/M2fbWNLxIYBQgvRfrQ74jR Nbbw== X-Gm-Message-State: AFuF++nbNuhwMADV1VooDmw7jWDPpevg09YF0wXe9s+2eV+a+krxSIfx 7HMcAGM4cRh89bVCNGWzlM6jnlLoL9u0daIMANMscA12VBnGsJJKA2B+EZfLBQ== X-Gm-Gg: AYBFou1pts7bakM4adkEbB/SJ2nPyPmaNafSk7GwGxXdofer7wmRn+a6qpNlZnaCDCB eCEYqvOCfsNCRpaBwwST+sjAeYxk6hAZlilQhHhKwfw0wQSel4FojhO5ICLcSFucU1CM6AmfZ74 g2JO7QNYaYnmIJVm6+b1nVT0St7GSq0MO2X6Uj88mBvpmWAKp1i556ZThZfhj4QY61cIjJfEh1E tVh3yTTcZveXypYWa/QdsxHsGEToeKbxRnb8Vg8di0+KUe2RB/YrSzis5BlDKdQmA56MowB0FF6 1m7GYyIqj9i1OmSloNmg2+HewY89ZCCWDcCWg84ShJE/j2A+IEEX8mFnyKU1MACPkwsMGbxkmcp Kwsp1knfAh/w4I1wyFuLotj+d1dUezwjocPd464niT30Ksj0W4hoIZHLtBQJspi4fz1vhiatC+P G91sNzjTYkTy/6ubNTqk1yuegz7co6N1ovK683GiuHVu1bs7VlFjYYqpXSpdKPPxe5jBmYd1xWy Qu1YNmZjvOzWd6kPTgEiX8N+fv3qR1teEJI+W2BSdUZIKr+HdUaaRl5CBk1ywau39bkWZfeXRs7 6kcqHpudObKGmpOAIoaAR1BMJUv5hNYfylkaQ62QzDq+EunV5Aj29Qo3HqxsKpxDXFFj9p4LhY/ g3Rx/VOrPLNRGy3BcZW+EgqOaxjqL0upuwKGxdh9YjEHRIg8g+prcPuPR X-Received: by 2002:a17:90b:5823:b0:398:bdb0:adb7 with SMTP id 98e67ed59e1d1-39d9c0aad8dmr20021694a91.16.1789257299828; Sat, 12 Sep 2026 16:54:59 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-33bbeb053a5sm4524372eec.27.2026.09.12.16.54.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2026 16:54:59 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 2/6] jsoncpp: fix run-ptest with busybox sed Date: Sat, 12 Sep 2026 16:54:52 -0700 Message-ID: <20260912235456.2358617-2-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912235456.2358617-1-khem.raj@oss.qualcomm.com> References: <20260912235456.2358617-1-khem.raj@oss.qualcomm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 12 Sep 2026 23:55:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/129987 run-ptest piped ctest output through 'sed -u', which busybox sed does not support, so the pipeline produced no output and the ptest image reported "ptests which had no test results: ['jsoncpp']". Drop sed and classify ctest result lines in awk directly. This also maps Timeout/Exception/Not Run results to FAIL; previously they were printed as e.g. "Exception:: " and ignored by the ptest parser. Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/jsoncpp/files/run-ptest | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/jsoncpp/files/run-ptest b/meta-oe/recipes-devtools/jsoncpp/files/run-ptest index 2cb892b187..03a97595f9 100644 --- a/meta-oe/recipes-devtools/jsoncpp/files/run-ptest +++ b/meta-oe/recipes-devtools/jsoncpp/files/run-ptest @@ -1,4 +1,11 @@ #!/bin/sh cd src -ctest --force-new-ctest-process | sed -u 's/\*\*\*/ /g' | awk '/Test +#/{gsub(/Passed/,"PASS"); gsub(/Failed/,"FAIL"); gsub(/Skipped/,"SKIP"); print $6": "$4; fflush();}' +# ctest result lines look like: "1/3 Test #1: jsoncpp_test ..... Passed 0.01 sec" +# anything other than Passed/Skipped/Disabled (Failed, Timeout, Exception, Not Run) is a FAIL +ctest --force-new-ctest-process | awk '/Test +#[0-9]+:/ { + if ($0 ~ /Passed/) res = "PASS" + else if ($0 ~ /Skipped|Disabled/) res = "SKIP" + else res = "FAIL" + print res ": " $4; fflush() +}' From patchwork Sat Sep 12 23:54:53 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98104 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 99B30C88E53 for ; Sat, 12 Sep 2026 23:55:11 +0000 (UTC) Received: from mail-pz2-f12.google.com (mail-pz2-f12.google.com [74.125.228.12]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.16783.1789257301420693814 for ; Sat, 12 Sep 2026 16:55:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=WgOVm4Rt; spf=pass (domain: gmail.com, ip: 74.125.228.12, mailfrom: raj.khem@gmail.com) Received: by mail-pz2-f12.google.com with SMTP id 41be03b00d2f7-cc1cea4bfd1so722404a12.0 for ; Sat, 12 Sep 2026 16:55:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789257301; x=1789862101; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=V+TWoow4ypkW/AJTDKPwfQIs/M/k6Hmm8JD6jQ2kb8o=; b=WgOVm4RtCg14FfjgQD3KfYXWaMkI+0HX/RrtXrtI5K6Sk5ntdpwD6aI2z+j8dDtPPP 52c2KHyKf7Ne/K7r4l+UQvwrSI8Hw/PWJ19Rh/hviG+kOG7QisON/Fv+0HWj1sSb0aQa VLZRj3RHHppt1pdzpWR65oPhWbooYlB1zLDcQuYYIoP4ONogkzMI6WpKogsipqf1v9YG 5wZml7eaLloA8XgDcJmecS7Fn7xJWWNFP//s5nE+bnwkBUvC6kZqOY9sDTAmDjfOcFBF IBpXrf3Tr+Y1TwkDKT3e2yt3VY8V7m1sR72QXRghNMBe2jof4XCX/gXLFUdhT34csj/4 Cazw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789257301; x=1789862101; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=V+TWoow4ypkW/AJTDKPwfQIs/M/k6Hmm8JD6jQ2kb8o=; b=YOo73jlEwk2fxnZXVT5kJtISCbB5n7YjBUh54R0A9ubA/gJ6GGJKDJLCCMIk9zYAgf pB44VA3qFyWQNCiR6L+sgNw0aEQpw9GPAOSsqEFOeAd6vC8F1m5ExmLq0BFXU8eHWT0o wS+EHnvmTdXAIQzfrsZ1mzPbXF5gA7sESbZYa27VLx4mrXP04wVyK1PeaBLu/Y5wD0zZ Aa9KtT5J50oZ4Xo2E0rt+5HbfxZ9nnmViB3zYbxaZgf0cigiMig1P3a/GYPudyU73wZ5 TZGJDoaPDq5dIzNsWScCiTrg0nPkPV86We0a+crqG3v3EOkJeSqDbFMiqfRMmh+Z38UK wq2Q== X-Gm-Message-State: AFuF++k/6iW1X/jvijpB/He/R3bln14WiOCASvcCZuNrokCuL4sE7/tB 2FrMv9luSNGxiXjQVJxYX5WKyiIRZl87Sk/Krpy5cLkRw2y7RIk30BFl1zwNIQ== X-Gm-Gg: AYBFou3QyAgJwidqy2/v1FpmRVZQ5dYnlJkl5SMB98Xn3gfbzuPrBKs/HF1Mj0zHCbf ldHzodRL9TvSW+QkhgYwkzbO/bUsd3N/GCWUYqso/pii0KQhjOu1u1Tf6O2mpxjB3w/ydwjZkXo t0Mjv53AW6Is3VXbnVufdheSa+K0KeLrPhKU2gqqhgDftNtsRN7U+TPnK9TdhPBrswn1ipVYD8T TA2m4plCctmbeZbBJKo0camEUV927AXddnPNLa02KjFxbLDSpZ61jDPHh+hqzLbGC60UCN7rIsx SWPqW1IgZ8y9KC4ueSbhaDMSSv5q0I0G6lMV7e/DHprOlPAf3IyoOtBwGD+mg4yWsuX1ukAGcZX kEL6CyX2NAmQSQZngMb1G7E82AvmOolhYiYV6RwdHU9nmSsvsCD8Caaf4JhsOxtl35Ed8RGCEa5 qaElHkR5bhtyU7u2XOFB7XHPaaEOG4C/plmKjTqFwV4u64grumqMhk1PGpf9X49bil94XTQYZSy pnqG6sZyZqvAsxoLgH4j2YDjApxUFioOlD7RMddhgC630BjoTSKycmhpM59/wVu2YFbVVo610c0 nUq6ftgkY0Xzk+pPS5rpTL8DOSy8+I1IcnJWPIiEUDYLA0Lj3Rnf5vKz4R15/Ed+R0IwCpw6p67 fW6vN4H843D0onqFEUnwE55CAm/iemRdYKd7L++aLnNXXCAOI3exUSGDv X-Received: by 2002:a05:6a21:140a:b0:3da:bea4:6219 with SMTP id adf61e73a8af0-3daed49deb8mr20307756637.20.1789257300700; Sat, 12 Sep 2026 16:55:00 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-33bbeb053a5sm4524372eec.27.2026.09.12.16.54.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2026 16:55:00 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 3/6] tbb: fix run-ptest with busybox sed Date: Sat, 12 Sep 2026 16:54:53 -0700 Message-ID: <20260912235456.2358617-3-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912235456.2358617-1-khem.raj@oss.qualcomm.com> References: <20260912235456.2358617-1-khem.raj@oss.qualcomm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 12 Sep 2026 23:55:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/129988 run-ptest piped ctest output through 'sed -u', which busybox sed does not support, so the pipeline produced no output and the ptest image reported "ptests which had no test results: ['tbb']". Drop sed and classify ctest result lines in awk directly. This also maps Timeout/Exception/Not Run results to FAIL; previously they were printed as e.g. "Exception:: " and ignored by the ptest parser. Signed-off-by: Khem Raj --- meta-oe/recipes-support/tbb/files/run-ptest | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/tbb/files/run-ptest b/meta-oe/recipes-support/tbb/files/run-ptest index da46c68550..0d11413201 100755 --- a/meta-oe/recipes-support/tbb/files/run-ptest +++ b/meta-oe/recipes-support/tbb/files/run-ptest @@ -1,3 +1,10 @@ #!/bin/sh -ctest | sed -u 's/\*\*\*/ /g' | awk '/Test +#/{gsub(/Passed/,"PASS"); gsub(/Failed/,"FAIL"); gsub(/Skipped/,"SKIP"); print $6": "$4; fflush();}' +# ctest result lines look like: " 1/142 Test #1: test_tick_count ..... Passed 0.01 sec" +# anything other than Passed/Skipped/Disabled (Failed, Timeout, Exception, Not Run) is a FAIL +ctest | awk '/Test +#[0-9]+:/ { + if ($0 ~ /Passed/) res = "PASS" + else if ($0 ~ /Skipped|Disabled/) res = "SKIP" + else res = "FAIL" + print res ": " $4; fflush() +}' From patchwork Sat Sep 12 23:54:54 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98103 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 80CDFC88E56 for ; Sat, 12 Sep 2026 23:55:11 +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.msgproc02-g2.16611.1789257302853952023 for ; Sat, 12 Sep 2026 16:55:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=RU1aqqBb; spf=pass (domain: gmail.com, ip: 209.85.216.49, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-398e9698a70so2244149a91.0 for ; Sat, 12 Sep 2026 16:55:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789257302; x=1789862102; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=sqgrlRW2ik/xZWSZD8hCXRMhLp4py2p/gOs3RbpbB+s=; b=RU1aqqBbyxxZ5ZICiAYJaN2nOrQjX80VMIrfoRtS8F5qqIwXB6KwlaglkGnKSPxxf3 cYkdRcOOAIVwsx7QDvdus7TY0tEUapHTRPdLT69jI1KTeDSHCgdyK5gE79z7sU3gBRPE 6b8SEoIH3QV6qV93o9pdIGEivjjwyAX1HpJ+7zz0+dHNQkJYVEEYRloRBhmtfsr5GPD2 KZ7odSpcsHXgvn8LJ6RZKGTuloc3Vt1TC4x4L05IDHZqiK3gQrSyMneYXM91knTTj5OX B5Xj8nQUj0rKq9Uju7YC+9yaMF2I77IIB6kpWb4o/SEmp6AQ0hS6+y9sS6wAWM555Kwa 9YEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789257302; x=1789862102; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=sqgrlRW2ik/xZWSZD8hCXRMhLp4py2p/gOs3RbpbB+s=; b=pRvdA98iuqIUpwZl65Itqv6l8uLs/aEH7hRAw7m+1pjoiHMbtqFIp3Ilc3AjnO0JOE o8/oJ2Hkrnf36gsbk/71xYOk+FLbwG/TJgZJe3YPmC85uVhNYVebiyQRDvD23q9pqqTv Zwh5AnLPrv6SMHOsvsepv+1Lxd+IebA5kuveguPJSJQModda9J8kWgqY6eo3I147EI1g dTP6GpvFR4QulFhICG1e5mx9UCx3X5/aQLVv6Udcj4sy6ELOwv6t8znLmNXI61vUOcV7 moa6rT8phfURZXIwcTtMlmILknh+RyUjv4A0b9a6u858QqjnFhDMQVZSmaVcPAYiRQK4 JB9w== X-Gm-Message-State: AFuF++kH5nFOblcbCiHm9qspCPU4HBwOL7KjB96P72/Jem7lba6QHrGV yv2UwmuMZdlzU77mUnStsME4tF+qum4ETTW549b76k/tZJmsh/QwZo36VTtMnw== X-Gm-Gg: AYBFou23Bc5EGtYOT1Qik61O5ls8C7weArAHfFAxsfEhQNowYwVULTH+GvvphUUfDlR tXjuJIQy7UTw4T7Sj2ZDhH6ne0wCYV4Ia/bf2K6n3ht4UZwkcMIRm05hyBVNdCuhurJr4Kehwlo RB9PxZn3Vm97aoK/ex7f7rbLpj5eoccdu6XPLAQ84elObWpbBks/nJkbINSvWXVK76ieV7PTFPI vvpPGU4CBXlp9m0DEWvkGMpA0xdzDf0OsjhkaizuhI+BGsyHCtOzpNWnuCGaem8Dfrr5aIrvvJe Qlnj9JOxTX2uZxhtfdWRb+M1aLNLnxihDShvY3N3KrUQ5YaNuKy32PlwbISdXENdDkUToO8FlPq yyBxp+P3hhfZ4XeRT0Ej0sPZJSHq9N9kPsChSsBwwZ6LXuAAH0gbS2lLDhT/p3Iodluo2IXNPoL h0BL//RgjLu8ZOt+RmaBQdjI6JAuSXWW5iSFMepAo5H7qXs2FqRUxyiDPKtxzWRhywbI2eMABE1 WNQdT0LXMPU+wMdKJEmA/GPTx8MPUsCFJ5gxi9fMgIsPhYl+3X86jJFfm/5Nbzjio3iyJVAmo1g CWJ+OWrtjQowqjWcdoVkIB2mznDtNOjFCNxh2o/Wsk8hSFS88VKecGDIvfKY5pwH7pIRJf/A1DT 35rD6NCwppG74T2QEB8bxQTpN4vGkd1IMeV+IdeTbcaTBtqJTc/y/Kw8h4VlpETiypi8= X-Received: by 2002:a17:90b:384f:b0:39d:8794:5564 with SMTP id 98e67ed59e1d1-39d9c1c016bmr18889265a91.12.1789257302070; Sat, 12 Sep 2026 16:55:02 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-33bbeb053a5sm4524372eec.27.2026.09.12.16.55.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2026 16:55:01 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 4/6] mariadb: fix AES CBC/CTR/GCM with OpenSSL 4.0 Date: Sat, 12 Sep 2026 16:54:54 -0700 Message-ID: <20260912235456.2358617-4-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912235456.2358617-1-khem.raj@oss.qualcomm.com> References: <20260912235456.2358617-1-khem.raj@oss.qualcomm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 12 Sep 2026 23:55:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/129989 The aes and mf_iocache unit tests (mariadb-ptest) fail with OpenSSL 4.0 for every AES mode that uses an IV, while ECB keeps working. MyCTX in mysys_ssl/my_crypt.cc keeps the EVP_CIPHER_CTX in a stack buffer and initializes it with memset() + EVP_CIPHER_CTX_reset(). OpenSSL 3.x reset() ended in its legacy path with ctx->iv_len = -1, but OpenSSL 4.0 removed that path and returns early when no cipher is set, leaving iv_len at 0. EVP_CipherInit_ex() then hands IV length 0 to the provider, which fails with "ossl_cipher_generic_initiv: invalid iv length", so AES_ENCRYPT(), encrypted temporary files etc. break. Backport the proposed upstream fix, which allocates the context with EVP_CIPHER_CTX_new()/EVP_CIPHER_CTX_free() and drops the stack buffer hack together with check_openssl_compatibility(). Upstream: https://jira.mariadb.org/browse/MDEV-40287 https://github.com/MariaDB/server/pull/5652 Signed-off-by: Khem Raj --- meta-oe/recipes-dbs/mysql/mariadb.inc | 1 + ...NCRYPT-and-KDF-return-NULL-with-Open.patch | 290 ++++++++++++++++++ 2 files changed, 291 insertions(+) create mode 100644 meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-40287-AES_ENCRYPT-and-KDF-return-NULL-with-Open.patch diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index c10b0ac9a5..1cf90c8f93 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -26,6 +26,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://0001-support-reproducible-builds.patch \ file://0001-storage-mroonga-CMakeLists.txt-fix-reproducible-buil.patch \ file://c21bb11be28ae9b2432b2a661bf38a197cf9514d.patch \ + file://0001-MDEV-40287-AES_ENCRYPT-and-KDF-return-NULL-with-Open.patch \ " SRC_URI[sha256sum] = "5ab7883db519bfcebfdd2aac09bc5544a12ce328f39edd46d0bf01690615ef6c" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-40287-AES_ENCRYPT-and-KDF-return-NULL-with-Open.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-40287-AES_ENCRYPT-and-KDF-return-NULL-with-Open.patch new file mode 100644 index 0000000000..af9c596962 --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-40287-AES_ENCRYPT-and-KDF-return-NULL-with-Open.patch @@ -0,0 +1,290 @@ +From c66dc27030154edf175e049473159c789abb9a43 Mon Sep 17 00:00:00 2001 +From: Vladislav Vaintroub +Date: Wed, 9 Sep 2026 01:44:02 +0200 +Subject: [PATCH] MDEV-40287 AES_ENCRYPT() and KDF() return NULL with OpenSSL + 4.0 + +MyCTX used an EVP_CIPHER_CTX in a stack buffer instead of allocating it +with EVP_CIPHER_CTX_new(). OpenSSL 4.0 rejects a context that was not +created that way for ciphers that use an IV: EVP_CipherInit_ex() fails +with "invalid iv length", so AES_ENCRYPT() and KDF() in CBC/CTR/GCM +modes return NULL. ECB has no IV and still works, which is why only the +non-ECB modes broke. + +Fix: +Allocate the context with EVP_CIPHER_CTX_new()/EVP_CIPHER_CTX_free(). +Also remove check_openssl_compatibility() and the EVP_CIPHER_CTX_SIZE +and EVP_CIPHER_CTX_init macros. + +Verified against OpenSSL 4.0.1: the mysys aes-t test fails on the +CBC/CTR/GCM cases with the stack buffer and passes with +EVP_CIPHER_CTX_new(). + +No visible performance degradation: the extra allocation costs +~12 ns/call (WolfSSL) and ~30 ns (OpenSSL) on Windows at a 30-byte +payload, nothing at 16 KB, and nothing on Linux/glibc; sysbench OLTP +over encrypted tables and redo log is unchanged. + +Assisted-by: Claude:claude-opus-4-8 + +[Squashed with the "fixup!" commit 36c6e66b29bb from the same PR, which +destroys the context in my_aes_crypt_init() when init() fails so the +heap allocated EVP_CIPHER_CTX is not leaked. Rebased to 11.4.12.] + +Upstream-Status: Submitted [https://github.com/MariaDB/server/pull/5652] +Signed-off-by: Khem Raj +--- +diff -urN a/include/ssl_compat.h b/include/ssl_compat.h +--- a/include/ssl_compat.h ++++ b/include/ssl_compat.h +@@ -24,12 +24,9 @@ + #define HAVE_OPENSSL11 1 + #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) + #define ERR_remove_state(X) ERR_clear_error() +-#define EVP_CIPHER_CTX_SIZE 200 + #define EVP_MD_CTX_SIZE 80 + #undef EVP_MD_CTX_init + #define EVP_MD_CTX_init(X) do { memset((X), 0, EVP_MD_CTX_SIZE); EVP_MD_CTX_reset(X); } while(0) +-#undef EVP_CIPHER_CTX_init +-#define EVP_CIPHER_CTX_init(X) do { memset((X), 0, EVP_CIPHER_CTX_SIZE); EVP_CIPHER_CTX_reset(X); } while(0) + + /* + Macros below are deprecated. OpenSSL 1.1 may define them or not, +@@ -83,7 +80,6 @@ + #endif + + #define EVP_CIPHER_CTX_encrypting(ctx) ((ctx)->encrypt) +-#define EVP_CIPHER_CTX_SIZE sizeof(EVP_CIPHER_CTX) + + #ifndef HAVE_WOLFSSL + #define OPENSSL_init_ssl(X,Y) SSL_library_init() +@@ -97,13 +93,3 @@ + #ifndef TLS1_3_VERSION + #define SSL_CTX_set_ciphersuites(X,Y) 0 + #endif +- +-#ifdef __cplusplus +-extern "C" { +-#endif /* __cplusplus */ +- +-int check_openssl_compatibility(); +- +-#ifdef __cplusplus +-} +-#endif +diff -urN a/mysys_ssl/CMakeLists.txt b/mysys_ssl/CMakeLists.txt +--- a/mysys_ssl/CMakeLists.txt ++++ b/mysys_ssl/CMakeLists.txt +@@ -28,7 +28,6 @@ + my_sha384.cc + my_sha512.cc + my_md5.cc +- openssl.c + ) + + SET(MYSYS_SSL_SOURCES +diff -urN a/mysys_ssl/my_crypt.cc b/mysys_ssl/my_crypt.cc +--- a/mysys_ssl/my_crypt.cc ++++ b/mysys_ssl/my_crypt.cc +@@ -27,29 +27,18 @@ + + #include + #include +-#include +- +-#define CTX_ALIGN 16 + + class MyCTX + { + public: +- char ctx_buf[EVP_CIPHER_CTX_SIZE + CTX_ALIGN]; + EVP_CIPHER_CTX* ctx; + MyCTX() + { +-#if CTX_ALIGN > 0 +- uintptr_t p= ((uintptr_t)ctx_buf + (CTX_ALIGN - 1)) & ~(CTX_ALIGN - 1); +- ctx = reinterpret_cast(p); +-#else +- ctx = (EVP_CIPHER_CTX*)ctx_buf; +-#endif +- +- EVP_CIPHER_CTX_init(ctx); ++ ctx= EVP_CIPHER_CTX_new(); + } + virtual ~MyCTX() + { +- EVP_CIPHER_CTX_reset(ctx); ++ EVP_CIPHER_CTX_free(ctx); + ERR_remove_state(0); + } + +@@ -57,6 +46,8 @@ + uint klen, const uchar *iv, uint ivlen) + { + compile_time_assert(MY_AES_CTX_SIZE >= sizeof(MyCTX)); ++ if (unlikely(!ctx)) ++ return MY_AES_OPENSSL_ERROR; + if (unlikely(!cipher)) + return MY_AES_BAD_KEYSIZE; + +@@ -115,9 +106,11 @@ + DBUG_ASSERT(ivlen == 0 || ivlen == sizeof(oiv)); + + int res= MyCTX::init(cipher, encrypt, key, klen, iv, ivlen); ++ if (res) ++ return res; + + EVP_CIPHER_CTX_set_padding(ctx, 0); +- return res; ++ return MY_AES_OK; + } + + /** Update last partial source block, stored in source_tail array. */ +@@ -213,10 +206,12 @@ + { + compile_time_assert(MY_AES_CTX_SIZE >= sizeof(MyCTX_gcm)); + int res= MyCTX::init(cipher, encrypt, key, klen, iv, ivlen); ++ if (res) ++ return res; + int real_ivlen= EVP_CIPHER_CTX_iv_length(ctx); + aad= iv + real_ivlen; + aadlen= ivlen - real_ivlen; +- return res; ++ return MY_AES_OK; + } + + int update(const uchar *src, uint slen, uchar *dst, uint *dlen) override +@@ -298,8 +293,11 @@ + new (ctx) MyCTX_nopad(); + else + new (ctx) MyCTX(); +- return ((MyCTX*)ctx)->init(ciphers[mode](klen), flags & 1, +- key, klen, iv, ivlen); ++ int res= ((MyCTX*)ctx)->init(ciphers[mode](klen), flags & 1, ++ key, klen, iv, ivlen); ++ if (res) ++ ((MyCTX*)ctx)->~MyCTX(); ++ return res; + } + + int my_aes_crypt_update(void *ctx, const uchar *src, uint slen, +diff -urN a/mysys_ssl/openssl.c b/mysys_ssl/openssl.c +--- a/mysys_ssl/openssl.c ++++ /dev/null +@@ -1,98 +0,0 @@ +-/* +- Copyright (c) 2017, MariaDB Corporation. +- +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; version 2 of the License. +- +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. +- +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +- +-#include +-#include +-#include +- +-/* +- The check is only done for OpenSSL 1.1.x. +- It could run for OpenSSL 1.0.x but it doesn't make much sense +- and it hits this bug: +- https://bugs.launchpad.net/ubuntu/+source/openssl/+bug/1594748 +-*/ +- +-#ifndef HAVE_OPENSSL11 +-int check_openssl_compatibility() +-{ +- return 0; +-} +-#else +-#include +- +-static uint testing; +-static size_t alloc_size, alloc_count; +- +-static void *coc_malloc(size_t size +-#ifndef LIBRESSL_VERSION_NUMBER +- , const char *f __attribute__((unused)), +- int l __attribute__((unused)) +-#endif +-) +-{ +- if (unlikely(testing)) +- { +- alloc_size+= size; +- alloc_count++; +- } +- return malloc(size); +-} +- +-static void *coc_realloc(void *addr, size_t num +-#ifndef LIBRESSL_VERSION_NUMBER +- , const char *file __attribute__((unused)), +- int line __attribute__((unused)) +-#endif +-) +-{ +- return realloc(addr, num); +-} +- +-static void coc_free(void *addr +-#ifndef LIBRESSL_VERSION_NUMBER +- , const char *file __attribute__((unused)), +- int line __attribute__((unused)) +-#endif +-) +-{ +- free(addr); +-} +- +-int check_openssl_compatibility() +-{ +- EVP_CIPHER_CTX *evp_ctx; +- EVP_MD_CTX *md5_ctx; +- +- if (!CRYPTO_set_mem_functions(coc_malloc, coc_realloc, coc_free)) +- return 0; +- +- testing= 1; +- alloc_size= alloc_count= 0; +- evp_ctx= EVP_CIPHER_CTX_new(); +- EVP_CIPHER_CTX_free(evp_ctx); +- if (alloc_count != 1 || !alloc_size || alloc_size > EVP_CIPHER_CTX_SIZE) +- return 1; +- +- alloc_size= alloc_count= 0; +- md5_ctx= EVP_MD_CTX_new(); +- EVP_MD_CTX_free(md5_ctx); +- if (alloc_count != 1 || !alloc_size || alloc_size > EVP_MD_CTX_SIZE) +- return 1; +- +- testing= 0; +- return 0; +-} +-#endif +diff -urN a/sql/mysqld.cc b/sql/mysqld.cc +--- a/sql/mysqld.cc ++++ b/sql/mysqld.cc +@@ -3948,14 +3948,6 @@ + exit(1); + } + +-#ifdef HAVE_OPENSSL +- if (check_openssl_compatibility()) +- { +- sql_print_error("Incompatible OpenSSL version. Cannot continue..."); +- exit(1); +- } +-#endif +- + if (init_thread_environment() || mysql_init_variables()) + exit(1); + From patchwork Sat Sep 12 23:54:55 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98102 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 8D626C88E63 for ; Sat, 12 Sep 2026 23:55:11 +0000 (UTC) Received: from mail-pz2-f12.google.com (mail-pz2-f12.google.com [74.125.228.12]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.16612.1789257303914448397 for ; Sat, 12 Sep 2026 16:55:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=lEfBMe+G; spf=pass (domain: gmail.com, ip: 74.125.228.12, mailfrom: raj.khem@gmail.com) Received: by mail-pz2-f12.google.com with SMTP id 41be03b00d2f7-cc1cea48edcso510830a12.2 for ; Sat, 12 Sep 2026 16:55:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789257303; x=1789862103; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=MNfcTdrzUQk/Dn2jIhcDnzPspd26NOi5/9a0EHv7KXI=; b=lEfBMe+GMrH8Srl2sfdWBoZs3iuUpEo/m4lxmjwQJQYy6x2+rq+Xh+SKc2fnO2uerw eYNirqJuLf6S03x55xDZdWcZpNNyFEeNqtdXZtH3BfCDvOWLM2jduj05S0foCVRO0DPg JIpLWZcwgFDH49SKbm8OjCISI2nOOLAMOyg8gW/WrUxX/DGRWLgZUyLeLkuNSp5BwzzU r7ai/iy6o98NafSQdmIw6XA1gLyDcg0WPHyllhbGXjc1K+OlPN0CIKrN6CJvZBnnUZjy kiaqZbzW+QxW+r42CWfGz/juQxQb8hDw/tjAVT4zC9TV9PvV8fdldPgHiBIUI0/dSW/j erBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789257303; x=1789862103; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=MNfcTdrzUQk/Dn2jIhcDnzPspd26NOi5/9a0EHv7KXI=; b=Tf+85mEO581bkzJSfW8Kyqi7x9593nG9+miQtBsHEiWLQrLo5gqbwBhIxxMjXdwZz0 m8ILIgHHsbLxvW5wBYgWZ3c8VwsxmxLeu+PyZ0Dh5n6ar6F9NhKLc2dcvhAmXfZSlyj3 OcBMKazb7iqsfW/osgYJpooJ07fq3wsegnK+TrjOaNVCQsb7aW9dhUXl6V6VWsIJyiWR yRzziW4qaPbImm9ZNLAxDg3EgNt8xOP8vBsECcQ1YTGEOCCyUOmo+r/lZNTmcM/OQ4wr zXD0jcR16xz0tn0f1ctvdWJmkVb6xtDNpOWgnaZ91Ejwxn3ORyBjqh7pGS9uM3OqkYJQ gpqA== X-Gm-Message-State: AFuF++mQ0ZJscxVek/6+b/avHzI4id7hhsAluYZBTyYmZOVv+oFCHTyo 1IPz1Rf4KZywt3euCqYxprXrydRCeuJ+DyZXXmRWq0BoE1JC2n2G7dSMQZMcTQ== X-Gm-Gg: AYBFou2hIjqCM7O8JFLc+bqYSQl7zAf7LcXXjNkzx5j8O9CQEMXLVwp249YvWvxp+Mx Ik3AXmjZ9f1UJlcHxX4pJlkezC2Vsj0kMpKfyDxX5qkRaZYE+is7fiRytqZwMMIHfWInuZGNzEO y+r5W5zJ1Ub3zjNNazUfdvSURB/JQDXlaNj2QhCIRZ/PpTFqRPuxZwIqZe3J96ig3H70OMAXRiq BZfkC9ykrtJZud29xjDI7CPl+QUhaJXvSm+ApBP8pgAjx2lCcnakryVRqUnFcTWkSkNgFjM8tBY HS/nklwRLnKNSEr+9XXYWW4eS+2SAf3V2mqCTeXgc++55MyspApWjZcP2jmUS68eaNlWk2EwxQo PHPUWflwWbZtnywawnaPUTmiqjolcJSXoaiU+itGV5+A/FeMGlRfRXyZ4r5H2/0qRTLTrAAcL3V e8iUSCuF/OTMQxME/w7iONH1SLfsFoc0P06KdoI/aXWAUFYHyl3Prw4uE/Fq/wayOGCpwlTLjzP SO0HggKYENdFQ4KA0Zi65YF/kY2ZEVNZZXYoNTmByjey94b38UDPHwTS2idaHheR0Z0g0fVIH5a bmb9rxUWpkgI3Rl1urKfcUW3YdBCyxkwpJnV6s5KTy3obQpSK+lSTHHm+QkPLjYWcmONsNBvjl2 pVrjxMlrgMXEv4NgsuThhpmKXxXQHAHppIbdTa433+fqbTESNzjvHicWd X-Received: by 2002:a05:6300:220c:b0:3d0:57c3:65f4 with SMTP id adf61e73a8af0-3db0e0ad192mr8471434637.5.1789257303232; Sat, 12 Sep 2026 16:55:03 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-33bbeb053a5sm4524372eec.27.2026.09.12.16.55.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2026 16:55:02 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj , Khem Raj Subject: [meta-oe][PATCH 5/6] redis: Do not build the test modules during cross compile Date: Sat, 12 Sep 2026 16:54:55 -0700 Message-ID: <20260912235456.2358617-5-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912235456.2358617-1-khem.raj@oss.qualcomm.com> References: <20260912235456.2358617-1-khem.raj@oss.qualcomm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 12 Sep 2026 23:55:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/129990 src/Makefile's `all` target carries a module_tests prerequisite, which recurses into tests/modules. That Makefile pins the compiler to whatever gcc is in PATH: # This is a hack to override the default CC. When running with SANITIZER=memory # tough we want to keep the compiler as clang as MSan is not supported for gcc ifeq ($(uname_S),Linux) ifneq ($(SANITIZER),memory) LD = gcc CC = gcc endif endif while still taking CFLAGS/LDFLAGS from the environment, so a cross build compiles and links all 47 test modules with the build host's gcc using the target compiler flags. With the gcc toolchain those flags include -fcanon-prefix-map (DEBUG_PREFIX_MAP_EXTRA in meta/classes/toolchain/gcc.bbclass), which only exists in GCC >= 13. The cross compiler always has it, the build host's gcc may not, and the build then fails: | gcc -I../../src -O2 -g -fcanon-prefix-map \ -ffile-prefix-map=.../sources/redis-8.10.1=/usr/src/debug/redis/8.10.1 \ ... -std=gnu11 -O2 -fPIC -c commandfilter.c -o commandfilter.xo | gcc: error: unrecognized command-line option '-fcanon-prefix-map'; did you mean '-fmacro-prefix-map='? The modules are test-only artifacts: nothing links or installs them, and only the tcl suite that `make test` drives from the build tree consumes them. Drop them from `all` so no host compiler takes part in the cross build at all; `test` keeps its own module_tests prerequisite. This has to happen in the Makefile rather than by naming narrower goals in do_compile, because `install: all` re-runs the phony target on its own. With the patch applied the only compiler left in log.do_compile is ${TARGET_PREFIX}gcc, where 47 host gcc compile and 47 host gcc link invocations used to be. Signed-off-by: Khem Raj --- ...-not-build-the-test-modules-from-all.patch | 58 +++++++++++++++++++ .../recipes-extended/redis/redis_8.10.1.bb | 1 + 2 files changed, 59 insertions(+) create mode 100644 meta-oe/recipes-extended/redis/redis-8.10.1/0006-src-Makefile-do-not-build-the-test-modules-from-all.patch diff --git a/meta-oe/recipes-extended/redis/redis-8.10.1/0006-src-Makefile-do-not-build-the-test-modules-from-all.patch b/meta-oe/recipes-extended/redis/redis-8.10.1/0006-src-Makefile-do-not-build-the-test-modules-from-all.patch new file mode 100644 index 0000000000..2070faaf75 --- /dev/null +++ b/meta-oe/recipes-extended/redis/redis-8.10.1/0006-src-Makefile-do-not-build-the-test-modules-from-all.patch @@ -0,0 +1,58 @@ +From: Khem Raj +Date: Fri, 12 Sep 2026 09:10:00 -0700 +Subject: [PATCH] src/Makefile: do not build the test modules from `all` + +`all` carries a module_tests prerequisite, which recurses into +../tests/modules. That Makefile deliberately pins the compiler to the +one found in PATH: + + # This is a hack to override the default CC. When running with SANITIZER=memory + # tough we want to keep the compiler as clang as MSan is not supported for gcc + ifeq ($(uname_S),Linux) + ifneq ($(SANITIZER),memory) + LD = gcc + CC = gcc + endif + endif + +but it keeps taking CFLAGS/LDFLAGS from the environment. In a cross +build that combination compiles and links the 47 test modules with the +*build host* gcc while handing it the *target* compiler flags: + + gcc -I../../src -O2 -g -fcanon-prefix-map \ + -ffile-prefix-map=.../sources/redis-8.10.1=/usr/src/debug/redis/8.10.1 \ + ... -fPIC -c commandfilter.c -o commandfilter.xo + gcc: error: unrecognized command-line option '-fcanon-prefix-map'; + did you mean '-fmacro-prefix-map='? + +-fcanon-prefix-map only exists in GCC >= 13, and the target toolchain's +support for it says nothing about the build host's, so the build breaks +on any host with an older gcc. + +The modules are test-only artifacts: nothing links or installs them, +and they are consumed solely by the tcl suite that `make test` drives +from the build tree. Drop them from `all` (`test` keeps its own +module_tests prerequisite) so no host compiler is involved in the +cross build at all. This has to happen in the Makefile rather than by +picking narrower goals in the caller, because `install: all` re-runs +the phony module_tests target on its own. + +Upstream-Status: Inappropriate [oe-specific] +Signed-off-by: Khem Raj +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 5cb4f67..4fb643b 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -410,7 +410,7 @@ REDIS_CHECK_RDB_NAME=redis-check-rdb$(PROG_SUFFIX) + REDIS_CHECK_AOF_NAME=redis-check-aof$(PROG_SUFFIX) + ALL_SOURCES=$(sort $(patsubst %.o,%.c,$(REDIS_SERVER_OBJ) $(REDIS_VEC_SETS_OBJ) $(REDIS_CLI_OBJ) $(REDIS_BENCHMARK_OBJ))) + +-all: $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME) $(TLS_MODULE) module_tests ++all: $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME) $(TLS_MODULE) + @echo "" + @echo "Hint: It's a good idea to run 'make test' ;)" + @echo "" diff --git a/meta-oe/recipes-extended/redis/redis_8.10.1.bb b/meta-oe/recipes-extended/redis/redis_8.10.1.bb index d0220d228b..40e92dc318 100644 --- a/meta-oe/recipes-extended/redis/redis_8.10.1.bb +++ b/meta-oe/recipes-extended/redis/redis_8.10.1.bb @@ -15,6 +15,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://0003-hack-to-force-use-of-libc-malloc.patch \ file://0004-src-Do-not-reset-FINAL_LIBS.patch \ file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \ + file://0006-src-Makefile-do-not-build-the-test-modules-from-all.patch \ " SRC_URI[sha256sum] = "60166c95ab7aedaa9dfe516de685be0a4dd87be95ded59ba429df14c13f1b663" From patchwork Sat Sep 12 23:54:56 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98105 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 A5DD7C88E65 for ; Sat, 12 Sep 2026 23:55:11 +0000 (UTC) Received: from mail-pj2-f13.google.com (mail-pj2-f13.google.com [74.125.227.141]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.16784.1789257305222790044 for ; Sat, 12 Sep 2026 16:55:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=PWeJixc6; spf=pass (domain: gmail.com, ip: 74.125.227.141, mailfrom: raj.khem@gmail.com) Received: by mail-pj2-f13.google.com with SMTP id 98e67ed59e1d1-39b2ad83dc6so1019762a91.0 for ; Sat, 12 Sep 2026 16:55:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789257304; x=1789862104; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=EktRN6VI0yma8XlEpRPIyUzNb7Pxa2/t8vMR3ufsNeg=; b=PWeJixc6FosXHxfWz/RMYRsDw9L2Vhh8ljnZ2WfWA2WvcK6vl4SDShDvUcE71H0W9t Ldw+aRKwnxGObAejOxc/tBEu+nTxSXgjkrxqkwrCfzF6BAnDF+EW98am3vfPemTPX1Ce tNMfLW83oTAUEAmFCKZYvMr2C32cHZ0EQqeze2+hIViIq5m2/+ITsgp0GvnMuKqrhxVn WR2DpVdnHj4+q0ScB8xs5n5wOP7PBg1bgCnYVfJqhTO2hduPxSwHiq8K6l5InVTQ8WpQ cAeraWjTxdjycZw8823XxLBXnDXgwRLPMTR8OkI5gPdIYy1iMPwsDsXK6GZqcd1+QUZt MEJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789257304; x=1789862104; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=EktRN6VI0yma8XlEpRPIyUzNb7Pxa2/t8vMR3ufsNeg=; b=ecvck0t8jlVbxa2v+9KwSoqxImqnCal6ZHTU4t6L1MxUzkhrBLwK8Du/w5qsL54eTh OdD/BfVuT1pTKmbV5+H1lxpMIsE7moScyctvLrjazw77Cl9jGGPsmFQoPulPYOfRbhK3 WjIUurRMZT+/CH9DVzLql5fKuNh4unkXFIq+6yzlvL/9EFurM7bQIjdPVDz2DD31mEyO uHZU2LV0q36+N+s5RpOixpXQwVosguwsr7zCs3D1ZXbyogeN2fqoxAl9rGPJlxzpyPlT 4JfNmrYIiNoK6vRl+zMntKJ6BDDl5Auln7dJHbd9XXivNm6vi+NpEKR+l7AaGTbu2HnH FNdQ== X-Gm-Message-State: AFuF++lfgM227m8TdONVN0tcOniiL/ImyrwFKRhJG8QBkYfQN7BLRYo3 TU+JCAi+vU9jURmaAb3ZN3FP9u3F5CRg4oZ9esAHurzoFZ0WILuyJ2Ad/63iDQ== X-Gm-Gg: AYBFou2cB7SyO0I7T7EoxMc3396zrsaObrX2ZQljR9HXC1dQcUnfDQ3NIut77uMyCE8 BrxzIEWaiDd/Is4d7+xH7EK39IyPEXwUSdCz1lNQq43Sda27Z6ForUw3EIQKDWJ8AcP2aLpUJfV dkjs5OlwyH3R32xHAmUccLEjaYd6J8xtbcuvpLNJ0z1hltXGX/YLyqU1lcRlrzLIDXNL1Q0aAnj My7ytNErkW8uonqjavWut//SoLyMblmmkTed4SMfQA3VAwqcN9I+/lE6x9XnWyn+Ey9bYXHPg43 6gyuNe+eNx4S4cWEDX9XQ6jOEN7lwAd9hmrnJ6xbRYq6iV3f9akEtiP/qOszGh4BIQJfuxVzVbY 62NuP/6XU1vcu2G4J7f0lUyy7F+EXCb7dj7MEDmSV87Hnb4/oVAguKuJ6FlBtI0q/DaOQufYgeN b+A7V036j5/IhewwHAts2zz/ennVQgdYcrZ/SpoNehkOZIBqOoRcbgbe1PG3Rmlj0ZtNxOIk3tl ch/PsTP6jQPL07IZBhfiuLEslkw4jlFw1i6jedGLbG2IccpWz8huZL/eUZaS9VdNIamO7td7Zcr 0649bROtg8rqrs4w4cVd1+JewNObVNJitZAoBofA+WaGgEq3ilAMJl6fvlH8flFXbrFfOjQGZNU 5TSrTvHsxRSGRnVAOnLLYdcsOjh4ldDkD3ScUjzfH3jusAWAseqZ5/MjZ X-Received: by 2002:a17:90b:28d0:b0:398:9bd4:d18 with SMTP id 98e67ed59e1d1-39d9c3f2ba7mr20812399a91.23.1789257304567; Sat, 12 Sep 2026 16:55:04 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-33bbeb053a5sm4524372eec.27.2026.09.12.16.55.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2026 16:55:03 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj , Khem Raj Subject: [meta-oe][PATCH 6/6] bpftrace: Keep -fcanon-prefix-map away from the build host gcc Date: Sat, 12 Sep 2026 16:54:56 -0700 Message-ID: <20260912235456.2358617-6-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912235456.2358617-1-khem.raj@oss.qualcomm.com> References: <20260912235456.2358617-1-khem.raj@oss.qualcomm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 12 Sep 2026 23:55:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/129991 cmake/BuildBPF.cmake compiles the BPF data source with the plain gcc it finds in PATH (find_program(GCC gcc)) rather than with the cross compiler, because the BTF encoding step needs gcc plus pahole. The recipe exports DEBUG_PREFIX_MAP and 0001-cmake-BuildBPF.cmake-introduce-DEBUG_PREFIX_MAP.patch hands it to that command so the embedded objects do not carry build paths. DEBUG_PREFIX_MAP also picks up DEBUG_PREFIX_MAP_EXTRA, which is -fcanon-prefix-map for the gcc toolchain (meta/classes/toolchain/gcc.bbclass). That option only exists in GCC >= 13: the cross compiler always has it, the build host's gcc may not, and the ptest enabled build then fails with gcc: error: unrecognized command-line option '-fcanon-prefix-map'; did you mean '-fmacro-prefix-map='? Drop it, the way frr and kernel-selftest already do for the same reason. The four -ffile-prefix-map= rewrites are all this needs: with the extra removed tests/data/data_source.o still contains no build paths, only /usr/src/debug/bpftrace/0.26.1. Signed-off-by: Khem Raj --- .../recipes-devtools/bpftrace/bpftrace_0.26.1.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.26.1.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.26.1.bb index 836f4d2483..a2f6a93f66 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.26.1.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.26.1.bb @@ -28,6 +28,17 @@ inherit bash-completion cmake ptest pkgconfig export DEBUG_PREFIX_MAP +# cmake/BuildBPF.cmake compiles the BPF data source with the plain gcc it finds +# in PATH, i.e. the build host's compiler (see its own commentary for why it has +# to be gcc), and 0001-cmake-BuildBPF.cmake-introduce-DEBUG_PREFIX_MAP.patch +# hands it DEBUG_PREFIX_MAP so the embedded objects do not leak build paths. +# -fcanon-prefix-map, which DEBUG_PREFIX_MAP_EXTRA adds for the gcc toolchain, +# only exists in GCC >= 13: the target compiler always has it, the build host's +# gcc may not, and then the build dies with +# gcc: error: unrecognized command-line option '-fcanon-prefix-map' +# The -ffile-prefix-map= rewrites are all this needs, so drop the extra. +DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map" + PACKAGECONFIG ?= " \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)} \