From patchwork Wed Jul 2 14:25:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 66126 X-Patchwork-Delegate: steve@sakoman.com 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 5B30DC83F05 for ; Wed, 2 Jul 2025 14:25:35 +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.web11.25252.1751466330704208306 for ; Wed, 02 Jul 2025 07:25:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=bGeMucFo; spf=softfail (domain: sakoman.com, ip: 209.85.216.43, mailfrom: steve@sakoman.com) Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-313154270bbso4753794a91.2 for ; Wed, 02 Jul 2025 07:25:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1751466330; x=1752071130; darn=lists.openembedded.org; 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=jDf5OZPHec+BveeuSeuRGoZtDRFi9Snih3XUg+rV3Ns=; b=bGeMucFoXlxLkCMDlhmYXrk8W215Blf8z5sgTqXhf0ryehfR3Pqd9hcFPvSOsJeRJx 0YTrmnJU6qNnm2NLCyGMB1qt66mdmID0445nSg7CihgM51ow0k9Uk8NDaRKG/woeQNPH DDGa5UNNvCU9GrdxkYZly3x+7fk80HS+AP0AO2AlD67tGaa+2+DJ0Jor7vEw4MDVHQ01 NYDhImP2FmiTdn8iR/VlIB+lM3Kvaws1fFt6tsqX5Bpy7DAt3EW7he1jXWG5Fpu2QVFn Z+oe57WBaqEAwJyg2y4f1xF2o/0HkQq6nrEppkkfiZ8jmcbtXdxCnXiFRvB9Cpt5Lfw+ NI9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751466330; x=1752071130; 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=jDf5OZPHec+BveeuSeuRGoZtDRFi9Snih3XUg+rV3Ns=; b=rvaiF3B+VFTvcVlpmapQixtUnXTw0+Qni5jodyDBajjo1ijs+c7aLiLZXsETpFJNpi BOgIqkUSl8UuMvLmV76zc6s5wFWyJWCc4c+bCnaxEo9aF/vZh2z9/R0mPNCAXsS4XM3H NVT4FVa63GxoSxBPzRZqfwsYpZhrYpyj+E/34ATmTvbSevgYgTSN3rLpwVTcnQ8wqQKg n93/DEF1a0o3wiBelUJn07vwFT9faqbHvbKVAK60/3tFmIKaDy4nh+NhRSlhS0ugNrF2 B5vCCkf9P7TiU3yi5a3SOQPCRB4Jw5gD1fDUvfaGhiOmxjfKFiD4HKgEjuLQ262MOIyA i0cw== X-Gm-Message-State: AOJu0YwYgXNQ7TBMdcig3tuItrQVcZ5/5VKids7QMKKqoxC/dfZjOrjM j6z+QzXa/9T1XJ77HsmUA7igLXmPYNuPWKq5e+0FAdNzkR6hYDJdE4cP2DXIiB/qS6+D72wIAG4 fDBV+ X-Gm-Gg: ASbGnct1rf7nutdRQy4h6RUNQEZ08eDgNYUSPD/d4qtsu+BtMnslpiSZlbcfKrNri8/ FTP08/I0+adEhhlRftae0xnR3uzAY6yIi/fxhzIc0DtJQCuiv4G2y/Er2fZ0a8ENJrQswxxRcOc Kaks6ofkUtLM0Q8SOjxgmP8I05AN3ztJozqt9HGtj7/HXZqaWOvgRbdvXaR1FLaokVQ56BMjcYD 7jtV0tcXBA6zqQqRriKw0Y6JpZKIcu61RV4N47/0RGmxEpZJrEzX7Gvi9M1RhZ3bVnLrjEiDLK/ fPEzOdcrwlf/n5ohE3s05AMapPNset2FrVS5a0On2t31CAax8HXwYg== X-Google-Smtp-Source: AGHT+IH2mRORp+mHAgOflE4z4nIIYGi3GMHkgkDSpCm/pxElDA8b06yF1COrB1kdPNVJD1F29sBxpA== X-Received: by 2002:a17:90b:1847:b0:312:1d2d:18e2 with SMTP id 98e67ed59e1d1-31a90bddbcemr4795155a91.20.1751466329871; Wed, 02 Jul 2025 07:25:29 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:acee:7642:9516:37b7]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-318c15232c9sm14871637a91.45.2025.07.02.07.25.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 07:25:29 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 1/9] go: fix CVE-2025-4673 Date: Wed, 2 Jul 2025 07:25:15 -0700 Message-ID: <72279bbc1ff2d85563c5245195435f078c5d1a68.1751466215.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 02 Jul 2025 14:25:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219834 From: Praveen Kumar Proxy-Authorization and Proxy-Authenticate headers persisted on cross-origin redirects potentially leaking sensitive information. Reference: https://nvd.nist.gov/vuln/detail/CVE-2025-4673 Upstream-patch: https://github.com/golang/go/commit/b897e97c36cb62629a458bc681723ca733404e32 Signed-off-by: Praveen Kumar Signed-off-by: Steve Sakoman --- meta/recipes-devtools/go/go-1.22.12.inc | 1 + .../go/go/CVE-2025-4673.patch | 68 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 meta/recipes-devtools/go/go/CVE-2025-4673.patch diff --git a/meta/recipes-devtools/go/go-1.22.12.inc b/meta/recipes-devtools/go/go-1.22.12.inc index b154aa3984..af09cb52cd 100644 --- a/meta/recipes-devtools/go/go-1.22.12.inc +++ b/meta/recipes-devtools/go/go-1.22.12.inc @@ -16,5 +16,6 @@ SRC_URI += "\ file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ file://CVE-2025-22870.patch \ file://CVE-2025-22871.patch \ + file://CVE-2025-4673.patch \ " SRC_URI[main.sha256sum] = "012a7e1f37f362c0918c1dfa3334458ac2da1628c4b9cf4d9ca02db986e17d71" diff --git a/meta/recipes-devtools/go/go/CVE-2025-4673.patch b/meta/recipes-devtools/go/go/CVE-2025-4673.patch new file mode 100644 index 0000000000..5ca4fec3dc --- /dev/null +++ b/meta/recipes-devtools/go/go/CVE-2025-4673.patch @@ -0,0 +1,68 @@ +From b897e97c36cb62629a458bc681723ca733404e32 Mon Sep 17 00:00:00 2001 +From: Neal Patel +Date: Wed, 21 May 2025 14:11:44 -0400 +Subject: [PATCH] net/http: strip sensitive proxy headers from redirect + requests + +Similarly to Authentication entries, Proxy-Authentication entries should be stripped to ensure sensitive information is not leaked on redirects outside of the original domain. + +https://fetch.spec.whatwg.org/#authentication-entries + +Thanks to Takeshi Kaneko (GMO Cybersecurity by Ierae, Inc.) for reporting this issue. + +Updates golang/go#73816 +Fixes golang/go#73905 +Fixes CVE-2025-4673 + +Change-Id: I1615f31977a2fd014fbc12aae43f82692315a6d0 +Reviewed-on: https://go-review.googlesource.com/c/go/+/679255 +LUCI-TryBot-Result: Go LUCI +Reviewed-by: Michael Knyszek + +CVE: CVE-2025-4673 + +Upstream-Status: Backport [https://github.com/golang/go/commit/b897e97c36cb62629a458bc681723ca733404e32] + +Signed-off-by: Praveen Kumar +--- + src/net/http/client.go | 3 ++- + src/net/http/client_test.go | 3 +++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/net/http/client.go b/src/net/http/client.go +index 23f4d81..e07616b 100644 +--- a/src/net/http/client.go ++++ b/src/net/http/client.go +@@ -805,7 +805,8 @@ func (c *Client) makeHeadersCopier(ireq *Request) func(req *Request, stripSensit + for k, vv := range ireqhdr { + sensitive := false + switch CanonicalHeaderKey(k) { +- case "Authorization", "Www-Authenticate", "Cookie", "Cookie2": ++ case "Authorization", "Www-Authenticate", "Cookie", "Cookie2", ++ "Proxy-Authorization", "Proxy-Authenticate": + sensitive = true + } + if !(sensitive && stripSensitiveHeaders) { +diff --git a/src/net/http/client_test.go b/src/net/http/client_test.go +index 641d7ff..97150bd 100644 +--- a/src/net/http/client_test.go ++++ b/src/net/http/client_test.go +@@ -1541,6 +1541,8 @@ func testClientStripHeadersOnRepeatedRedirect(t *testing.T, mode testMode) { + if r.Host+r.URL.Path != "a.example.com/" { + if h := r.Header.Get("Authorization"); h != "" { + t.Errorf("on request to %v%v, Authorization=%q, want no header", r.Host, r.URL.Path, h) ++ } else if h := r.Header.Get("Proxy-Authorization"); h != "" { ++ t.Errorf("on request to %v%v, Proxy-Authorization=%q, want no header", r.Host, r.URL.Path, h) + } + } + // Follow a chain of redirects from a to b and back to a. +@@ -1569,6 +1571,7 @@ func testClientStripHeadersOnRepeatedRedirect(t *testing.T, mode testMode) { + req, _ := NewRequest("GET", proto+"://a.example.com/", nil) + req.Header.Add("Cookie", "foo=bar") + req.Header.Add("Authorization", "secretpassword") ++ req.Header.Add("Proxy-Authorization", "secretpassword") + res, err := c.Do(req) + if err != nil { + t.Fatal(err) +-- +2.40.0 From patchwork Wed Jul 2 14:25:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 66128 X-Patchwork-Delegate: steve@sakoman.com 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 6D631C83F07 for ; Wed, 2 Jul 2025 14:25:35 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web11.25253.1751466332353358278 for ; Wed, 02 Jul 2025 07:25:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=YUSd1QaE; spf=softfail (domain: sakoman.com, ip: 209.85.216.54, mailfrom: steve@sakoman.com) Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-3134c67a173so4210363a91.1 for ; Wed, 02 Jul 2025 07:25:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1751466331; x=1752071131; darn=lists.openembedded.org; 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=Frmi6foTxI3OhbIanExunZWMzlMPBT4wBZgDIKw73gI=; b=YUSd1QaEdihIksQd6CN5uIbJ9x2tel0kpdevaywoXCA+9pXkNdC/X/BiANQPBQUnzL OQvspWuI/xcv6sJXrhdiMliW/rF29SE2YIT9CxyWiHIP77efi/ii48YWbT00bKV6g2HP sER7Q5rnHwf+Lve7kpPtVnix/7ceQMC6XKQ1bq9JndnLHeAVGAU4uapmRjB0te7Da3FR AdywtTNZqXgf3laTv7RZavocRSXbqakjgyIlybwJ1AOcHW6tEXvGUzZ14026ek0gOje3 n96enLQXmD+CaETgdFcUx6GVBY28iO0QEXmsLkvS+fEOWojsejsIas3fHd5h7sKc9xMM 9CLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751466331; x=1752071131; 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=Frmi6foTxI3OhbIanExunZWMzlMPBT4wBZgDIKw73gI=; b=eiNoXXKVjg4bwCBi+XZtb7T8S8V+xnYWqJYxr5+qhnK4Vy7ehl0vsX1vQI02cU+HvM LOngaDFp7vuxS6tEXzuqQDrnlxXHRraFwteByphXxodPV1h4Cl9Ti4nwYdaZ0atr9ctO 3Fn4UM4yaW72BVfDftEE8oRqSjtCeaAeTIKTmaetAQLPSPbLks2yCJ++f5E5t42nQEPa txu1WcchRfb71JtoNKzSemZJZb4l5ZCOvWNoY4m4vgDdcp77FlSRyHpReqO4WLgBk9Z0 xtBGFuj3v1WJ91sTKsspDmZJBrANdctx0OhMJ2acaADVJ3WQYokYk07Ao6g2wbz2mKZO 7LcQ== X-Gm-Message-State: AOJu0YzrQLU1cq02cABpb6do+rgYd688mL5pZL5T8r01AIKWK+IzsLv8 qSHeDb1XvhOE+JukPtXOXuArMcUKCVNP2l30zCe9AwbUL/CtP/06e9q2orgsjwt+5tyCdmD+mjv +emwU X-Gm-Gg: ASbGncuzmf2RUATmsSM6D+H4BOcaLhJkj2BnNITXUFEG59mv/KrtG7+o9E7qgD38Evq nAaEwIvpAtRDr1/Y0FgMIMZ0Pc46XgJIBGTuJx7VQs+ZBupOvrsS5hr+HHgji+QnoOBMzuQxHWA kVdQMKfyuvoMx0W3tVlZ6rGxqUUpN/9T7/BLPskWtx3i3jIgIvyn6sG0VPio0WDZM4ZfedkDUR4 wMNZ8t1tteuIt+BLMnEUvc2lrAissO0+opA2WBUgMB0Fn2lbuHA3RAVENIzNWmxzOhOF+ZafRnf Z3Q4T9MScE3rLxhyOqYl7bWLLaR48JmKxJtQvpjB7sYwsIf07VkHdA== X-Google-Smtp-Source: AGHT+IEfVQD/HEdrX2LFMGHN3hvBHdbFpM42yTWRXZtuoRV7nWvBalzMINztS4CSQME5Ol3aw01RkA== X-Received: by 2002:a17:90b:17d0:b0:312:1d2d:18df with SMTP id 98e67ed59e1d1-31a90befbe0mr3525645a91.23.1751466331438; Wed, 02 Jul 2025 07:25:31 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:acee:7642:9516:37b7]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-318c15232c9sm14871637a91.45.2025.07.02.07.25.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 07:25:31 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 2/9] libarchive: fix CVE-2025-5914 Date: Wed, 2 Jul 2025 07:25:16 -0700 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 02 Jul 2025 14:25:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219835 From: Colin Pinnell McAllister Adds patch to backport fix for CVE-2025-5914. Signed-off-by: Colin Pinnell McAllister Signed-off-by: Steve Sakoman --- .../libarchive/libarchive/CVE-2025-5914.patch | 46 +++++++++++++++++++ .../libarchive/libarchive_3.7.9.bb | 1 + 2 files changed, 47 insertions(+) create mode 100644 meta/recipes-extended/libarchive/libarchive/CVE-2025-5914.patch diff --git a/meta/recipes-extended/libarchive/libarchive/CVE-2025-5914.patch b/meta/recipes-extended/libarchive/libarchive/CVE-2025-5914.patch new file mode 100644 index 0000000000..4d95dba209 --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/CVE-2025-5914.patch @@ -0,0 +1,46 @@ +From 72a83b2885c31254687702e3a8429e3e0523221c Mon Sep 17 00:00:00 2001 +From: Tobias Stoeckmann +Date: Sun, 11 May 2025 02:17:19 +0200 +Subject: [PATCH] rar: Fix double free with over 4 billion nodes (#2598) + +If a system is capable of handling 4 billion nodes in memory, a double +free could occur because of an unsigned integer overflow leading to a +realloc call with size argument of 0. Eventually, the client will +release that memory again, triggering a double free. + +Signed-off-by: Tobias Stoeckmann + +CVE: CVE-2025-5914 +Upstream-Status: Backport [https://github.com/libarchive/libarchive/commit/09685126fcec664e2b8ca595e1fc371bd494d209] +Signed-off-by: Colin Pinnell McAllister +--- + libarchive/archive_read_support_format_rar.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c +index 9d155c66..9eb3c848 100644 +--- a/libarchive/archive_read_support_format_rar.c ++++ b/libarchive/archive_read_support_format_rar.c +@@ -335,8 +335,8 @@ struct rar + int found_first_header; + char has_endarc_header; + struct data_block_offsets *dbo; +- unsigned int cursor; +- unsigned int nodes; ++ size_t cursor; ++ size_t nodes; + char filename_must_match; + + /* LZSS members */ +@@ -1186,7 +1186,7 @@ archive_read_format_rar_seek_data(struct archive_read *a, int64_t offset, + int whence) + { + int64_t client_offset, ret; +- unsigned int i; ++ size_t i; + struct rar *rar = (struct rar *)(a->format->data); + + if (rar->compression_method == COMPRESS_METHOD_STORE) +-- +2.49.0 + diff --git a/meta/recipes-extended/libarchive/libarchive_3.7.9.bb b/meta/recipes-extended/libarchive/libarchive_3.7.9.bb index 4dd6794bb1..5bbdb86e07 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.7.9.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.7.9.bb @@ -31,6 +31,7 @@ EXTRA_OECONF += "--enable-largefile --without-iconv" SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ file://configurehack.patch \ + file://CVE-2025-5914.patch \ " UPSTREAM_CHECK_URI = "http://libarchive.org/" From patchwork Wed Jul 2 14:25:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 66125 X-Patchwork-Delegate: steve@sakoman.com 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 53B42C83F04 for ; Wed, 2 Jul 2025 14:25:35 +0000 (UTC) Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by mx.groups.io with SMTP id smtpd.web11.25254.1751466334138047704 for ; Wed, 02 Jul 2025 07:25:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=1d8qVpBc; spf=softfail (domain: sakoman.com, ip: 209.85.216.68, mailfrom: steve@sakoman.com) Received: by mail-pj1-f68.google.com with SMTP id 98e67ed59e1d1-3141b84bf65so6699982a91.1 for ; Wed, 02 Jul 2025 07:25:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1751466333; x=1752071133; darn=lists.openembedded.org; 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=JGldChNBtiB6rK18keyE9RSA7MfzrB4poFcO2i7FUFA=; b=1d8qVpBcFaICgxyOSNZJrN/g5VK02Eu02RmbELvddPfbPliHxjWzyyiUMd6D5N+TYd 9vK+ubIzRI/7P/212huldVNe+nzy/YT08MTZ8bdMtX6mTg1CzS2oa3kiUdmAi481SeAI M9ptOCK0A3rZHxGauumIWRK1rEpKBj3HzE2oIyMBNexBfUcopkImHgmWvD0dUFylwgiE ZLsTnJ7mt7h73qdaZHqmy22kS07C4FAIM6TqoOfOpxBpRDEk8KrVeBEsECfTeeiGXenp irUFTFHawmib4tksYhG+SIeB2f4cE4h0WPAyiGDvpyyiimTmJUXv4BvCBBfudDdp6krl AqUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751466333; x=1752071133; 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=JGldChNBtiB6rK18keyE9RSA7MfzrB4poFcO2i7FUFA=; b=AHZayJCdGQbTbCThLmrxtStBKj9CLwG6Zcmxt6JKsC2/FxPM2kzxKRL3wBTwJZFovK ZUgEoRKxvHETj/fv5SaPnaa+EyuNrY//D5fbQzDNUy8h6OHfnkxkhQibmxc1kWZXfFJp E2CMK+eCshxntflm6RINeTLa1suwHqg8WWcLtkJ8YxpdB5BgcVmY9UCl/y47uz8VJ53J WDN0kZtDmgVqnDjnTwGCEGMJUD4a7AZX35ZwEhXVFeUnNgih9b3aWS9rxi7vcbJvMWuU iA2baIAEI3fNkmGP2iRbmDxRuJ3+6Yy0XXkYEfA7ZYQ4NkvgYY3EfUYksB6q/hEhZua7 wGfA== X-Gm-Message-State: AOJu0YwqTp/er3WPPF2PGNGxL49mch6RGbL7i4qKaVzMiBbKF8/XCS0B u1Adnp8S93cJUOpKX6qk6i3QnYWsoJ9kZ0ZJbTTzvJtwnEDM8S7HsqrEXGoMFq3x948a32/Ofqi hmN5PUlc= X-Gm-Gg: ASbGncvWe92ZdRnjWFTvb1yePoexP6Xyo+e9M065j7LqVvj+4hseZ0uC++Hdd8wnfax J03HAWHQZtYWYmZOgnqHNx5kvb2kVxzMaqdxUyA/StY5j6hSrXsgQcmOfjNfk4UkhvVdYSpj5rO GgfoGFArURYZCydM+yq6g2KsYPMYON+Yoe+kw2oFn8tJ+FArkmB6pJPDcTas20tOgzqASr305XF k7/kIsaM/gO5hzYCAn7759cwSpFWGNFpd5skjltETYpAMY7I6YkEbpgwzbiM1bD+c4zk90s/MD8 UUW/JZAcSBwsZYk6qCQH5RAANq+N+AoqJ63rZGZBhtj0kQqv0CStpQ== X-Google-Smtp-Source: AGHT+IHZhjtk9wCHop0jUt9eFb4zSwjBKj8LC5afXTLPngf6rhs4BXBykAEMy9iq39RXIjMjbRDTvg== X-Received: by 2002:a17:90b:4cd1:b0:312:959:dc3f with SMTP id 98e67ed59e1d1-31a90afc696mr4721359a91.3.1751466333117; Wed, 02 Jul 2025 07:25:33 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:acee:7642:9516:37b7]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-318c15232c9sm14871637a91.45.2025.07.02.07.25.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 07:25:32 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 3/9] busybox: fix CVE-2022-48174 Date: Wed, 2 Jul 2025 07:25:17 -0700 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 02 Jul 2025 14:25:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219836 From: Victor Giraud shell: avoid segfault on ${0::0/0~09J}. Closes 15216 CVE: CVE-2022-48174 Upstream-Status: Backport [https://git.launchpad.net/ubuntu/+source/busybox/commit/?id=ca2afcbf42017d998ce3d6726f5ff5072a3fa853] Signed-off-by: Victor Giraud Signed-off-by: Bruno Vernay Signed-off-by: Steve Sakoman --- .../busybox/busybox/CVE-2022-48174.patch | 80 +++++++++++++++++++ meta/recipes-core/busybox/busybox_1.36.1.bb | 1 + 2 files changed, 81 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox/CVE-2022-48174.patch diff --git a/meta/recipes-core/busybox/busybox/CVE-2022-48174.patch b/meta/recipes-core/busybox/busybox/CVE-2022-48174.patch new file mode 100644 index 0000000000..8d53f2ef90 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/CVE-2022-48174.patch @@ -0,0 +1,80 @@ +From ca2afcbf42017d998ce3d6726f5ff5072a3fa853 Mon Sep 17 00:00:00 2001 +From: Octavio Galland +Date: Tue, 13 Aug 2024 10:42:58 -0300 +Subject: shell: avoid segfault on ${0::0/0~09J}. Closes 15216 + +CVE: CVE-2022-48174 +Upstream-Status: Backport +Signed-off-by: Victor Giraud + +--- + shell/math.c | 39 +++++++++++++++++++++++++++++++++++---- + 1 file changed, 35 insertions(+), 4 deletions(-) + +diff --git a/shell/math.c b/shell/math.c +index 76d22c9b..727c2946 100644 +--- a/shell/math.c ++++ b/shell/math.c +@@ -577,6 +577,28 @@ static arith_t strto_arith_t(const char *nptr, char **endptr) + # endif + #endif + ++//TODO: much better estimation than expr_len/2? Such as: ++//static unsigned estimate_nums_and_names(const char *expr) ++//{ ++// unsigned count = 0; ++// while (*(expr = skip_whitespace(expr)) != '\0') { ++// const char *p; ++// if (isdigit(*expr)) { ++// while (isdigit(*++expr)) ++// continue; ++// count++; ++// continue; ++// } ++// p = endofname(expr); ++// if (p != expr) { ++// expr = p; ++// count++; ++// continue; ++// } ++// } ++// return count; ++//} ++ + static arith_t + evaluate_string(arith_state_t *math_state, const char *expr) + { +@@ -584,10 +606,12 @@ evaluate_string(arith_state_t *math_state, const char *expr) + const char *errmsg; + const char *start_expr = expr = skip_whitespace(expr); + unsigned expr_len = strlen(expr) + 2; +- /* Stack of integers */ +- /* The proof that there can be no more than strlen(startbuf)/2+1 +- * integers in any given correct or incorrect expression +- * is left as an exercise to the reader. */ ++ /* Stack of integers/names */ ++ /* There can be no more than strlen(startbuf)/2+1 ++ * integers/names in any given correct or incorrect expression. ++ * (modulo "09v09v09v09v09v" case, ++ * but we have code to detect that early) ++ */ + var_or_num_t *const numstack = alloca((expr_len / 2) * sizeof(numstack[0])); + var_or_num_t *numstackptr = numstack; + /* Stack of operator tokens */ +@@ -652,6 +676,13 @@ evaluate_string(arith_state_t *math_state, const char *expr) + numstackptr->var = NULL; + errno = 0; + numstackptr->val = strto_arith_t(expr, (char**) &expr); ++ /* A number can't be followed by another number, or a variable name. ++ * We'd catch this later anyway, but this would require numstack[] ++ * to be twice as deep to handle strings where _every_ char is ++ * a new number or name. Example: 09v09v09v09v09v09v09v09v09v ++ */ ++ if (isalnum(*expr) || *expr == '_') ++ goto err; + //bb_error_msg("val:%lld", numstackptr->val); + if (errno) + numstackptr->val = 0; /* bash compat */ +-- +cgit v1.2.3 + diff --git a/meta/recipes-core/busybox/busybox_1.36.1.bb b/meta/recipes-core/busybox/busybox_1.36.1.bb index 42dd5f71eb..69e9555766 100644 --- a/meta/recipes-core/busybox/busybox_1.36.1.bb +++ b/meta/recipes-core/busybox/busybox_1.36.1.bb @@ -57,6 +57,7 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0002-awk-fix-ternary-operator-and-precedence-of.patch \ file://0001-awk.c-fix-CVE-2023-42366-bug-15874.patch \ file://0001-cut-Fix-s-flag-to-omit-blank-lines.patch \ + file://CVE-2022-48174.patch \ " SRC_URI:append:libc-musl = " file://musl.cfg " # TODO http://lists.busybox.net/pipermail/busybox/2023-January/090078.html From patchwork Wed Jul 2 14:25:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 66130 X-Patchwork-Delegate: steve@sakoman.com 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 6E404C83F05 for ; Wed, 2 Jul 2025 14:25:45 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web11.25255.1751466335386163419 for ; Wed, 02 Jul 2025 07:25:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=MxwuVS1v; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-31393526d0dso4521372a91.0 for ; Wed, 02 Jul 2025 07:25:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1751466335; x=1752071135; darn=lists.openembedded.org; 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=bPOOOo1XxYzhb0KdzQVuypwvyMqGAKHoexrPOv/+jNs=; b=MxwuVS1vTejHWQnE6I0pLgq68LYZ1f8qXQH4/ZNTSo3F1SRocP08fx4bVONel4kLV0 H7iQfys4KjyJf3wHWmIn9eq/OkU8MVuUuSF7LLeYaDDofT+gN9hTpOPB0SvZ0RIX4coO YTUG357DOrGLeVf5TSzr2E6Ym6PllHc1xr3HdkLjkvqqSpCEtzf3DJP7R4aKT6Zbspu3 xucbsu/aGAg2B/BgEcuFMhGWWhKk4J36E8sKqUw/ppf8CaPniySSUP+qRWiuh4SHeGGp G+OoyjJlnK89OzPM4EPWY8hRm1NTYaehCNQDg/mD3YHUdTlG0Vcu57DmUV3xQS9GRJl3 FZRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751466335; x=1752071135; 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=bPOOOo1XxYzhb0KdzQVuypwvyMqGAKHoexrPOv/+jNs=; b=YI4IIKU+zZh1j2/CeT3V7zQznGjvPzjwDvkK6uOQ4Cgx4B5APvofH13tHfwxkDgygI bQLmpwMeQDfeLWvUXD8q7LubCWfFGK7RO1jjjrvDM06YedOm+cckbSun4uzstwGOuLs2 Q0uKjN4xdh5GCb93E2GkRBIPK0e6e2MQy6r1ZWvO305/P/qxQfOT/9edHTPWQg/Wc3Fw PSxbcfWmwGLRXmP72GbT3cTp4hdUtWmgxQk+M9NWGBL47b8tRjjF/Jk0G7TQRo0g19nN 8JVtYj0RemUzwwG9Rp4DwcISu0AtcA1ctpt9Al/2Afux3SxRVebFAAmQYNBMIUZBXBFR xKRg== X-Gm-Message-State: AOJu0YxtLgb3UgB9hmscxl/oInv/9nBO0N67bxTg5bdNwlRDg2ralwZ9 5qZldZV5v3hFwX2hSGaG2Sj7U2/GF8Fyx9L8gbBsc3OBKHSTHTt17lb5lSAZZ8fM+I5anrZqL0/ r10S9 X-Gm-Gg: ASbGncuZkvwEOonxczNMFoiZ25eHwHReBg7F8Z8nWxpMFW4SoF69/Un2r6IIa6JHC7O fyUEJBEuitvsNbkTL3zJAq1vOg5ScFF4V769m/4X9bQdSi8tr3vQLuPhzudDJqfKBbVeKdIw88t vWqS+7g+7SnVUQXj7gdiObksKgiWGpz2liVIJwGqhA52xEhGuzpPRCxj5c47/9FE+UXq0AWtyrh +9xyxJ2eQ+19JyaIT1SpEMp4GH61zQS0VaVa82gX9snJElXTm/urKzrpOaL17dQw9ucUSw1qmY1 PN3c56WVgsuVl1NneTttOSKc/tdXYfK2FbEICYK8533WVSLsjiDZpg== X-Google-Smtp-Source: AGHT+IEy4Kc5xust10mbLhFkD0fg78TGk9PeTUcTOcNQ4cXXq/QJskAG4lHLN9is5afhuOoakxJFFA== X-Received: by 2002:a17:90b:5405:b0:313:28e7:af14 with SMTP id 98e67ed59e1d1-31a90bcae32mr4305557a91.19.1751466334468; Wed, 02 Jul 2025 07:25:34 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:acee:7642:9516:37b7]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-318c15232c9sm14871637a91.45.2025.07.02.07.25.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 07:25:34 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 4/9] gnupg: update 2.4.5 -> 2.4.8 Date: Wed, 2 Jul 2025 07:25:18 -0700 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 02 Jul 2025 14:25:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219837 From: Roland Kovacs This release includes fix for CVE-2025-30258. Support for --enable-gpg-is-gpg2 config option has been partially removed in version 2.4.6. Changelog: https://dev.gnupg.org/T7428 CVE: CVE-2025-30258 Signed-off-by: Roland Kovacs Signed-off-by: Steve Sakoman --- .../gnupg/{gnupg_2.4.5.bb => gnupg_2.4.8.bb} | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) rename meta/recipes-support/gnupg/{gnupg_2.4.5.bb => gnupg_2.4.8.bb} (91%) diff --git a/meta/recipes-support/gnupg/gnupg_2.4.5.bb b/meta/recipes-support/gnupg/gnupg_2.4.8.bb similarity index 91% rename from meta/recipes-support/gnupg/gnupg_2.4.5.bb rename to meta/recipes-support/gnupg/gnupg_2.4.8.bb index 97b5d8856c..9c5de263c5 100644 --- a/meta/recipes-support/gnupg/gnupg_2.4.5.bb +++ b/meta/recipes-support/gnupg/gnupg_2.4.8.bb @@ -23,7 +23,7 @@ SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for- file://relocate.patch" SRC_URI:append:class-nativesdk = " file://relocate.patch" -SRC_URI[sha256sum] = "f68f7d75d06cb1635c336d34d844af97436c3f64ea14bcb7c869782f96f44277" +SRC_URI[sha256sum] = "b58c80d79b04d3243ff49c1c3fc6b5f83138eb3784689563bcdd060595318616" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \ @@ -31,7 +31,6 @@ EXTRA_OECONF = "--disable-ldap \ --with-bzip2=${STAGING_LIBDIR}/.. \ --with-readline=${STAGING_LIBDIR}/.. \ --with-mailprog=${sbindir}/sendmail \ - --enable-gpg-is-gpg2 \ --disable-tests \ " # yat2m can be found from recipe-sysroot-native non-deterministically with different versioning otherwise @@ -41,7 +40,6 @@ CACHED_CONFIGUREVARS += "ac_cv_path_YAT2M=./yat2m" PACKAGES =+ "${PN}-gpg" FILES:${PN}-gpg = " \ ${bindir}/gpg \ - ${bindir}/gpg2 \ ${bindir}/gpg-agent \ " @@ -61,11 +59,6 @@ do_configure:prepend () { rm -f ${S}/m4/libgcrypt.m4 } -do_install:append() { - ln -sf gpg2 ${D}${bindir}/gpg - ln -sf gpgv2 ${D}${bindir}/gpgv -} - do_install:append:class-native() { create_wrappers ${STAGING_BINDIR_NATIVE} } @@ -75,7 +68,7 @@ do_install:append:class-nativesdk() { } create_wrappers() { - for i in gpg2 gpgconf gpg-agent gpg-connect-agent; do + for i in gpg gpgconf gpg-agent gpg-connect-agent; do create_wrapper ${D}${bindir}/$i GNUPG_BINDIR=$1 done } From patchwork Wed Jul 2 14:25:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 66133 X-Patchwork-Delegate: steve@sakoman.com 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 749A4C83F04 for ; Wed, 2 Jul 2025 14:25:45 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web10.25143.1751466337019482750 for ; Wed, 02 Jul 2025 07:25:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=SP+t1KgQ; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-315cd33fa79so4655237a91.3 for ; Wed, 02 Jul 2025 07:25:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1751466336; x=1752071136; darn=lists.openembedded.org; 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=rmS5HMVYWkDjLmd9S/DEkxMeUQR4iJJ/lBx8Kt6R6AY=; b=SP+t1KgQ5FIdrNdBaWN2nKX2d+Ce/5/7bJ349IvUZGB6rfxqq/GmKqUmxLQlB4Jqs2 foIY7KNpZ7vamo5VHP1bTJtUSBFOKTjcsrMbEESIkdFis4Mez/aPwIX3r0JG/EZl+Kcc 5wzWxOrMPv97wiPR/VnFoolIjMOL5eR3yPxM2liHt4zhMaLb+0gw1UdhR/CInLPdcayJ qAzUfeQcer8Sq/JVolowV6WMDKu2WI5HM6rz+QvFbZvkM/m9ONqRarQWPFHH730k20bF 3OASmN5yb3JYAvWH7Raq/K42hI+s8p4lqSUf01pj9DaeEQPU1x8mlSNznfKY216DL1wX CdEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751466336; x=1752071136; 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=rmS5HMVYWkDjLmd9S/DEkxMeUQR4iJJ/lBx8Kt6R6AY=; b=KXMTbBO2VnpAlHvNtm83f9mwMn4xo5v5xg1kQhkz8xy0Sz61LzZakyyP5BPvhQ90u4 MsXSy2StF0K1XY8q6TLHYMoTJmU2c5SckT3Oq5izNOSCoGOID8uG1R9i4uGEqghfLF9h TzlWs/s+KXNAAZ91oe5MFegTdMRMskefaUaFrbKvRAh1whyI7XQWnEln05E3tBc5QD4s G7PDvxa7VxOkWm76YafVADlWV1A0voErf/lW4S81nQblGMvu4iLYVyFJPEhhd7/KVM32 6HDDa2UIfKWJgAazCFDdwI9WY7UqXnIKRZAN3DILDLMUqWS/VYPaDiL8VE658YnkBti1 ALfQ== X-Gm-Message-State: AOJu0YxqPUzKtOvKwro24sfDsZcyzYYJAngICg0v64wO3bw6G3ZRdW9p LrOV/Xi2cHJYzXXg+saqrZRFInmn5mE5qeq26+z9h05WSAWPZ9jNkqejPNPmPzHGP+MnhoGPJWH AUmir X-Gm-Gg: ASbGnctXtmgNk8OLSUuWDnK7lbbbayq13MMqwXTK0qu7J67KyImMQGcIYP+goJwMusS a6b+34VD0dny2Z1M/ESWXs/Iz0AnlJrWP0lkZz5vbFkOfDOTqIVdN8kPoE8Mg2kzQxU7mAuFUyQ PciW7DPx1QsvOYZZiAEc0dFK5E27gRkaYCtzVkchSNnrPmtDfdTRhXAaFDQEEB1mVYzftImebGv SDu9JfxSdWC7iWlSfceTb26CWPc/8oOGgJ9Vl76xd0h7o2Y1vObnMh2BrmI6Zt/WaQrGg24VQas jdKZuTYNDhOZqzW58V0FtKcHx0f3E7q0XNDVhAacLRHFjLx+3E+/Tg== X-Google-Smtp-Source: AGHT+IGA2GlCrvkVqv/ii7miATWDqiDQYoqQUVChxPF4awFxrkKiOiIsjp7Q1RNN+UwT8QTfBfUwUg== X-Received: by 2002:a17:90b:3d47:b0:311:baa0:89ca with SMTP id 98e67ed59e1d1-31a90c304b9mr4164788a91.34.1751466336031; Wed, 02 Jul 2025 07:25:36 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:acee:7642:9516:37b7]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-318c15232c9sm14871637a91.45.2025.07.02.07.25.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 07:25:35 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 5/9] ltp: backport patch to fix compilation error for x86_64 Date: Wed, 2 Jul 2025 07:25:19 -0700 Message-ID: <2ba2e0020b5e461473b19c3362d3fad184bd1f5a.1751466215.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 02 Jul 2025 14:25:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219838 From: Preeti Sachan When the input compiler enables AVX, stack realignment requirements causes gcc to fail to omit %rbp use, due to which the test fails to clobber %rbp in inline asm. Disable AVX to build the test on x86_64 so that the test continues working. Fix compilation with gcc v13.4+. Cherry picked from oe-core, master branch. Signed-off-by: Preeti Sachan Signed-off-by: Steve Sakoman --- ...cve-2015-3290-Disable-AVX-for-x86_64.patch | 42 +++++++++++++++++++ meta/recipes-extended/ltp/ltp_20240129.bb | 1 + 2 files changed, 43 insertions(+) create mode 100644 meta/recipes-extended/ltp/ltp/0001-cve-2015-3290-Disable-AVX-for-x86_64.patch diff --git a/meta/recipes-extended/ltp/ltp/0001-cve-2015-3290-Disable-AVX-for-x86_64.patch b/meta/recipes-extended/ltp/ltp/0001-cve-2015-3290-Disable-AVX-for-x86_64.patch new file mode 100644 index 0000000000..c6fae88eb9 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-cve-2015-3290-Disable-AVX-for-x86_64.patch @@ -0,0 +1,42 @@ +From 28d823a63ee29f5d72c2aba781a06a7e2651cadc Mon Sep 17 00:00:00 2001 +From: Siddhesh Poyarekar +Date: Mon, 7 Apr 2025 06:24:47 -0400 +Subject: [PATCH] cve-2015-3290: Disable AVX for x86_64 + +When the input compiler enables AVX, stack realignment requirements +causes gcc to fail to omit %rbp use, due to which the test fails to +clobber %rbp in inline asm. Disable AVX to build the test on x86_64 so +that the test continues working. + +Link: https://lore.kernel.org/ltp/20250407102448.2605506-2-siddhesh@gotplt.org/ + +Upstream-Status: Backport [https://github.com/linux-test-project/ltp/commit/28d823a63ee29f5d72c2aba781a06a7e2651cadc] + +Reviewed-by: Martin Doucha +Reviewed-by: Petr Vorel +Signed-off-by: Siddhesh Poyarekar + +--- + testcases/cve/Makefile | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/testcases/cve/Makefile b/testcases/cve/Makefile +index 01b9b9ccb..98c38e908 100644 +--- a/testcases/cve/Makefile ++++ b/testcases/cve/Makefile +@@ -22,6 +22,12 @@ ifneq (,$(filter $(HOST_CPU),x86 x86_64)) + meltdown: CFLAGS += -msse2 + endif + ++# The test needs to clobber %rbp, which requires frame pointer omission. Also ++# for x86_64, disable AVX since that could sometimes require a stack ++# realignment, which gets in the way of frame pointer omission. + cve-2015-3290: CFLAGS += -pthread -fomit-frame-pointer ++ifeq ($(HOST_CPU),x86_64) ++cve-2015-3290: CFLAGS += -mno-avx ++endif + + include $(top_srcdir)/include/mk/generic_leaf_target.mk +-- +2.37.3 + diff --git a/meta/recipes-extended/ltp/ltp_20240129.bb b/meta/recipes-extended/ltp/ltp_20240129.bb index f8e6d3987e..18c6439283 100644 --- a/meta/recipes-extended/ltp/ltp_20240129.bb +++ b/meta/recipes-extended/ltp/ltp_20240129.bb @@ -30,6 +30,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=ht file://0001-Remove-OOM-tests-from-runtest-mm.patch \ file://0001-scenario_groups-default-remove-connectors.patch \ file://0001-sched_stress-Use-time_t-instead-of-long-for-type.patch \ + file://0001-cve-2015-3290-Disable-AVX-for-x86_64.patch \ " S = "${WORKDIR}/git" From patchwork Wed Jul 2 14:25:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 66131 X-Patchwork-Delegate: steve@sakoman.com 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 7A9E4C83F07 for ; Wed, 2 Jul 2025 14:25:45 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web10.25146.1751466338639877696 for ; Wed, 02 Jul 2025 07:25:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=RbOQGe+n; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-3134c67a173so4210585a91.1 for ; Wed, 02 Jul 2025 07:25:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1751466338; x=1752071138; darn=lists.openembedded.org; 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=D3MZzpAwGmz02TYzaVkTTXNvw+Fe3E/HQT7Wn19cUnQ=; b=RbOQGe+nwUmIzaa/y6w6UFC/JMG01MS13cwxkKjpwVdDEByWQUKSgQOQrj61iNI6eS XMaL58TUYL40QpBNz8fOIjCOPmj5ajjjauw6lqrSGtoHwXsofjNRbCtx0XzsIRcf/lzx CR5XcX1E8sZKJQWiHfKIi1sdsTr/mYcpneOquMsPxvWrr/30OvCCdAS93vvLj1BDTKGD Xb2R8kyJexm4evNMH0sDsGkDGwgfibc8XCOqiWYc/jpn4Y/8iadci9zYHuPJthdTroZw XRFSREgdZfyQBjqSvnj2TgqLd44nP39/rS2uHNHuDGiLwrqx8NMg7AhDnok3/mDQJWc2 zymw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751466338; x=1752071138; 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=D3MZzpAwGmz02TYzaVkTTXNvw+Fe3E/HQT7Wn19cUnQ=; b=kGC8YPTUUOQw+wW7so6leiXsLrQLwhZsPdy5trdIoauSD+TLIeErGPdFCr2jpc/FlI kc8jCHZjpS8OgEiGsUU+JqoZqmb2R/RJfl/1VaBJ7xQzYZBQ8/1moi5AKVIZfbf1MLO6 yhVw/3Hfnn6dER4yutDiaW9HbkgEzpKaOXJnGARl9yYRQVJoNBxpEWyLHCBG/4wl+k01 Lw7KTnzHHd5UAEr12w7vcU9eLGCNHSZddPS1Q2DZ/dJ+cPMBy8ZSb2kReeWxTiU8/xW4 YScEhzS/1YlSQQCYhWK1y8WIVImBuvFSG1on0rOeBlzAw0xS/gYkf6VChuJ8tWGhmiik Y2zA== X-Gm-Message-State: AOJu0YznwI1jew7+QgnfIOG7Nn9QnQJ2Wc9K5aCQ1sqZFkKE6TUyWplh B7rnJpiEepQoPLiD2xJUudc+mgDnYT/ry6l7vVoIHlZb+u0J0yhxb3R3wFX8tAJ1PAZhbF4QJFz 0B4re X-Gm-Gg: ASbGncuCmsR0O+CLKQty4Apa+uc8679Hso2nAaYzMRGia5K2+cw15dN2j7Ng+FQa2Z8 a8mBPrbn9UXZj2YoSrxQLPWYrv66VXKWIJUX0rgi9EEhyYYt4XWsw1CkAcHvTBgffxpJJ1peiXo pzo9HRTvqET4V5SASOjfGY8wynzxsc3lAxwveAYPCRqTQYP43QdwMtePVQfl0qGARDR498gzV1d loN9ngcFw6CWVtscNrA7uXA2yYKJlfB5W9sRTbmZEC1O3uj6U5koiuVhTCUHPHDgmoRl22Isz8S 9bnUZnEEftqdu85AuO31uGHxJ4LwGxZ7sOco/qr9MaqmOfKPwcSMJw== X-Google-Smtp-Source: AGHT+IFwafDswI8Zqc4a171nmiI9HvZxaKHT00c84hPJTDO/b94uaxR5gqNt6yR46DvdCu8CUyfJNg== X-Received: by 2002:a17:90b:4fd0:b0:312:e51c:af67 with SMTP id 98e67ed59e1d1-31a90b1a2b8mr4744080a91.1.1751466337540; Wed, 02 Jul 2025 07:25:37 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:acee:7642:9516:37b7]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-318c15232c9sm14871637a91.45.2025.07.02.07.25.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 07:25:37 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 6/9] package: export debugsources in PKGDESTWORK as json Date: Wed, 2 Jul 2025 07:25:20 -0700 Message-ID: <234263cf43f63c5e37b69f14bdb0dba2405b2cf8.1751466215.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 02 Jul 2025 14:25:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219839 From: Daniel Turull The source information used during packaging can be use from other tasks to have more detailed information on the files used during the compilation and improve SPDX accuracy. Source files used during compilation are store as compressed zstd json in pkgdata/debugsources/$PN-debugsources.json.zstd Format: { binary1: [src1, src2, ...], binary2: [src1, src2, ...] } I checked the sstate size, and it slightly increases using core-image-full-cmdline: without patch: 2456792 KB sstate-cache/ with patch: 2460028 KB sstate-cache/ (4236 KB or 0.17%) (From OE-Core rev: c507dcb8a8780a42bfe68b1ebaff0909b4236e6b) Adaptations to match spdx in scarthgap: change BP to PF CC: Mathieu Dubois-Briand CC: Richard Purdie Signed-off-by: Daniel Turull Signed-off-by: Steve Sakoman --- meta/conf/bitbake.conf | 2 ++ meta/lib/oe/package.py | 46 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 78f15b76ae..acf4e2d153 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -989,5 +989,7 @@ oe.sstatesig.find_sstate_manifest[vardepsexclude] = "BBEXTENDCURR BBEXTENDVARIAN oe.utils.get_multilib_datastore[vardepsexclude] = "DEFAULTTUNE_MULTILIB_ORIGINAL OVERRIDES" oe.path.format_display[vardepsexclude] = "TOPDIR" oe.utils.get_bb_number_threads[vardepsexclude] = "BB_NUMBER_THREADS" +oe.package.save_debugsources_info[vardepsexclude] = "BB_NUMBER_THREADS" +oe.package.read_debugsources_info[vardepsexclude] = "BB_NUMBER_THREADS" oe.packagedata.emit_pkgdata[vardepsexclude] = "BB_NUMBER_THREADS" oe.packagedata.read_subpkgdata_extended[vardepsexclude] = "BB_NUMBER_THREADS" diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index af0923a63f..ba0d326781 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -1038,6 +1038,49 @@ def copydebugsources(debugsrcdir, sources, d): if os.path.exists(p) and not os.listdir(p): os.rmdir(p) +def save_debugsources_info(debugsrcdir, sources_raw, d): + import json + import bb.compress.zstd + if debugsrcdir and sources_raw: + debugsources_file = d.expand("${PKGDESTWORK}/debugsources/${PN}-debugsources.json.zstd") + debugsources_dir = os.path.dirname(debugsources_file) + if not os.path.isdir(debugsources_dir): + bb.utils.mkdirhier(debugsources_dir) + bb.utils.remove(debugsources_file) + + workdir = d.getVar("WORKDIR") + pn = d.getVar('PN') + + # Kernel sources are in a different directory and are special case + # we format the sources as expected by spdx by replacing /usr/src/kernel/ + # into BP/ + kernel_src = d.getVar('KERNEL_SRC_PATH') + pf = d.getVar('PF') + sources_dict = {} + for file, src_files in sources_raw: + file_clean = file.replace(f"{workdir}/package/","") + sources_clean = [ + src.replace(f"{debugsrcdir}/{pn}/", "") + if not kernel_src else src.replace(f"{kernel_src}/", f"{pf}/") + for src in src_files + if not any(keyword in src for keyword in ("", "")) and not src.endswith("/") + ] + sources_dict[file_clean] = sorted(sources_clean) + num_threads = int(d.getVar("BB_NUMBER_THREADS")) + with bb.compress.zstd.open(debugsources_file, "wt", encoding="utf-8", num_threads=num_threads) as f: + json.dump(sources_dict, f, sort_keys=True) + +def read_debugsources_info(d): + import json + import bb.compress.zstd + try: + fn = d.expand("${PKGDESTWORK}/debugsources/${PN}-debugsources.json.zstd") + num_threads = int(d.getVar("BB_NUMBER_THREADS")) + with bb.compress.zstd.open(fn, "rt", encoding="utf-8", num_threads=num_threads) as f: + return json.load(f) + except FileNotFoundError: + bb.debug(1, f"File not found: {fn}") + return None def process_split_and_strip_files(d): cpath = oe.cachedpath.CachedPath() @@ -1269,6 +1312,9 @@ def process_split_and_strip_files(d): # Process the dv["srcdir"] if requested... # This copies and places the referenced sources for later debugging... copydebugsources(dv["srcdir"], sources, d) + + # Save source info to be accessible to other tasks + save_debugsources_info(dv["srcdir"], results, d) # # End of debug splitting # From patchwork Wed Jul 2 14:25:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 66132 X-Patchwork-Delegate: steve@sakoman.com 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 88CFBC83F09 for ; Wed, 2 Jul 2025 14:25:45 +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.web11.25258.1751466340046525481 for ; Wed, 02 Jul 2025 07:25:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=dZ6m/zc8; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-b34a78bb6e7so3392536a12.3 for ; Wed, 02 Jul 2025 07:25:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1751466339; x=1752071139; darn=lists.openembedded.org; 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=GFLitUiX8TRnyEE0mFqT3Wp1j/yMzeOHIs/CIxKXlt8=; b=dZ6m/zc8X5/aV8DOSy2z63BvvPgB12S+ywO5BAgWq5o2e0x8LlekwoWAJuYCzpEhT0 VwiQH1OaLr5KShge69/XO1nJDb1fxsMXFRvrxUKJjyt+ivUHpBkBKKarDgPoBYRJKLtd zmk5gRX5HiDmqcwjICnR/OzJiZr8ZO1Poellc8uZ21DKK9Q0vTyDmpiRx/KiljBSzsYT FxAz29TVDpeGuGHCcZDaL2/m1e+jJO4GpdiiLucAzKzfJAEXCDSoWFHrjlAymm9Y6ZSY cP00mqhRQAfrrZrxKLUopkt6P4iupvyppZC9waK/6oFeeQTmY9vw19euxTgaHPL8S29e dTPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751466339; x=1752071139; 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=GFLitUiX8TRnyEE0mFqT3Wp1j/yMzeOHIs/CIxKXlt8=; b=s7SfPJlWxVK4WIuzScq50TOVRZqmLnOyK3QkUHcQK620nTgtTX8R4C5haioJrjUKIK ybHNr5Je0MBCXVPqlsTbSd/RUYlaVgIW5ir1sebtlhCHR210X3q1owA0ZYqm5xDMHWBq d4JT9w05ZutNFzzPq1qqr6UOHgCPuoU74QQJhjVMb+eJP0GX2s8GIPatOm4cVV5Hz9RP ATrtn6SP4/cxDF9gwNGu3D1o3OF2/bTxz+MQblqERWfXpHtCegn9p+0nCIcn+a2ta8tX rlzU0OBDnV0Akx+2E5tt2/UJPuLYJRRgJtwHb6DKpObLRLeXPUSRmhHKWR3eaGmrSISJ i34Q== X-Gm-Message-State: AOJu0YxjIktQCBOH43KzQUHloghmvAoxTKhPMp/hsL2/Toiquzg8p+5J ciIZgoyS6eztxv6HDGAMfi0x/QO5zIdWQVkcA0YoFhr4D2PQimkJvJVqNZlZoNcBvHTQ+oV4qbh Q+SqY X-Gm-Gg: ASbGnct7fvm47uvEV66md8sQBxotpSvkyoi4n3UUxvRO3hj0hZ/QUK+58vb+W69Vxqw S9wFa2RIyZHy7uAeMkSEr4AnIZRu0zeKeCXuDb0qrkONt1KYugUaTE+Y0SafiysUOqtip9Jm1By 8jcnf523Y8J+KrSfyy7ePBDCl32xpqjY/r3cHtPIx1KpV4MFIEm+repJ2wnLU1/jtvu2otsvTsb aSdE6G6rC+wD3M6v1jOc5oCPjHiUToNvk7n/8t8s6XuGhkSyL/ARju3aXxgNsHVv1bBj4x484L4 FV8ViZ9Pu84Lv/jl/sOw0XTmAvUROvYmrIICAkYb7HJF5OBXrd8MbQ== X-Google-Smtp-Source: AGHT+IHm15karWLnb7rdpPynMmTULaG6Vj5+YbtIU+7inQGsrgRE/VD59M5oeo25Fu8TuygItWjvIQ== X-Received: by 2002:a17:90b:54d0:b0:311:fde5:c4be with SMTP id 98e67ed59e1d1-31a90c352d5mr4752233a91.35.1751466339045; Wed, 02 Jul 2025 07:25:39 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:acee:7642:9516:37b7]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-318c15232c9sm14871637a91.45.2025.07.02.07.25.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 07:25:38 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 7/9] spdx: add option to include only compiled sources Date: Wed, 2 Jul 2025 07:25:21 -0700 Message-ID: <5396e9b81e88ac2b1141c7f5dd7a7e6ba4fc73f9.1751466215.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 02 Jul 2025 14:25:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219840 From: Daniel Turull When SPDX_INCLUDE_COMPILED_SOURCES is enabled, only include the source code files that are used during compilation. It uses debugsource information generated during do_package. This enables an external tool to use the SPDX information to disregard vulnerabilities that are not compiled. As example, when used with the default config with linux-yocto, the spdx size is reduced from 156MB to 61MB. Tested with bitbake world on oe-core. (From OE-Core rev: c6a2f1fca76fae4c3ea471a0c63d0b453beea968) Adapted to existing files for create-spdx-2.2 CC: Mathieu Dubois-Briand CC: Joshua Watt Signed-off-by: Daniel Turull Signed-off-by: Steve Sakoman --- meta/classes/create-spdx-2.2.bbclass | 12 ++++++++ meta/lib/oe/spdx.py | 42 ++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/meta/classes/create-spdx-2.2.bbclass b/meta/classes/create-spdx-2.2.bbclass index ade1a04be3..1fc11ad7ac 100644 --- a/meta/classes/create-spdx-2.2.bbclass +++ b/meta/classes/create-spdx-2.2.bbclass @@ -100,6 +100,9 @@ python() { # Transform the license array to a dictionary data["licenses"] = {l["licenseId"]: l for l in data["licenses"]} d.setVar("SPDX_LICENSE_DATA", data) + + if d.getVar("SPDX_INCLUDE_COMPILED_SOURCES") == "1": + d.setVar("SPDX_INCLUDE_SOURCES", "1") } def convert_license_to_spdx(lic, document, d, existing={}): @@ -215,6 +218,11 @@ def add_package_files(d, doc, spdx_pkg, topdir, get_spdxid, get_types, *, archiv spdx_files = [] file_counter = 1 + + check_compiled_sources = d.getVar("SPDX_INCLUDE_COMPILED_SOURCES") == "1" + if check_compiled_sources: + compiled_sources, types = oe.spdx.get_compiled_sources(d) + bb.debug(1, f"Total compiled files: {len(compiled_sources)}") for subdir, dirs, files in os.walk(topdir): dirs[:] = [d for d in dirs if d not in ignore_dirs] if subdir == str(topdir): @@ -225,6 +233,10 @@ def add_package_files(d, doc, spdx_pkg, topdir, get_spdxid, get_types, *, archiv filename = str(filepath.relative_to(topdir)) if not filepath.is_symlink() and filepath.is_file(): + # Check if file is compiled + if check_compiled_sources: + if not oe.spdx.is_compiled_source(filename, compiled_sources, types): + continue spdx_file = oe.spdx.SPDXFile() spdx_file.SPDXID = get_spdxid(file_counter) for t in get_types(filepath): diff --git a/meta/lib/oe/spdx.py b/meta/lib/oe/spdx.py index 7aaf2af5ed..92dcd2da05 100644 --- a/meta/lib/oe/spdx.py +++ b/meta/lib/oe/spdx.py @@ -355,3 +355,45 @@ class SPDXDocument(SPDXObject): if r.spdxDocument == namespace: return r return None + +def is_compiled_source (filename, compiled_sources, types): + """ + Check if the file is a compiled file + """ + import os + # If we don't have compiled source, we assume all are compiled. + if not compiled_sources: + return True + + # We return always true if the file type is not in the list of compiled files. + # Some files in the source directory are not compiled, for example, Makefiles, + # but also python .py file. We need to include them in the SPDX. + basename = os.path.basename(filename) + ext = basename.partition(".")[2] + if ext not in types: + return True + # Check that the file is in the list + return filename in compiled_sources + +def get_compiled_sources(d): + """ + Get list of compiled sources from debug information and normalize the paths + """ + import itertools + import oe.package + source_info = oe.package.read_debugsources_info(d) + if not source_info: + bb.debug(1, "Do not have debugsources.list. Skipping") + return [], [] + + # Sources are not split now in SPDX, so we aggregate them + sources = set(itertools.chain.from_iterable(source_info.values())) + # Check extensions of files + types = set() + for src in sources: + basename = os.path.basename(src) + ext = basename.partition(".")[2] + if ext not in types and ext: + types.add(ext) + bb.debug(1, f"Num of sources: {len(sources)} and types: {len(types)} {str(types)}") + return sources, types From patchwork Wed Jul 2 14:25:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 66134 X-Patchwork-Delegate: steve@sakoman.com 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 92A39C83F0A for ; Wed, 2 Jul 2025 14:25:45 +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.web11.25259.1751466341882553090 for ; Wed, 02 Jul 2025 07:25:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=PrNgEV9X; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-3137c2021a0so5952762a91.3 for ; Wed, 02 Jul 2025 07:25:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1751466341; x=1752071141; darn=lists.openembedded.org; 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=LTq/OW/UmvI3of8JZ2ZsqQ4ZVzJuttmJ2kOWq/bNpEM=; b=PrNgEV9XHIr0twZksQcekJgQ7yc0ZbfJZobXN1y/VeYwrUtS4ArgF9g2TuGyvfUjNa tUBAEF6OITZHEhuCd5ZKyx0JniTarWors+wC6xJ193fRp/+Un6kBOzi4z244pgzkrPrl 1cKJWkvYt3wX6/rkJAmtffa2V3wOBAYocW9R2uG/7gvEGlXE12VoeaI4/UldwA7NMbCO OZCTaNkdCJAM2REdhiZ9FRvw1Ew23WoU0qX7C19sLRSI4miaftx/dKvRcttOgreX4iHC CTh4gdMrwnnypbxyRthduAK1On7/YxiLkHxjMTlUsDb0o+olYH4eGbP0sYIOcWHvPLly ehdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751466341; x=1752071141; 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=LTq/OW/UmvI3of8JZ2ZsqQ4ZVzJuttmJ2kOWq/bNpEM=; b=rG80y33/Yzivzg27cWvPv1Jvnix+6vrYQgW8U0dy+KCR9Vl62MB0fRWo3QmY7DyMJg wT1//EuC2Bt+Pid239HK5JmqESzU8jcNkFOLW2t6mUdx1qgvyGXL/LiAMCqaXTJWzERc 9lLuWZN77GqfS4EzvFvqYbzQItF+71NN8aa7yGdidSHtdNegwt0HyK4XE4tIL7r2Q3FY h0I2wmsY/yeHrKczb2xz7IfjWxCcf+VvqvrDTKUhp86UgOc35HG+Hx4WwtVY9DbYlDpr opUvxh67oFkT8rN7aAPMvmGfniQsrzMTZCMqDV9gh3MVzzA/gnEVzht756tWF0aD+8dk Q24Q== X-Gm-Message-State: AOJu0YxsFovHY6z3coj4uWma03HIXFpptUi7fdHMpe3WhUm47zztJYMC EcUOGx4rlys9VZtJx6JPo16bt5rJL9d3Tif0i74LWX3XVUAnpOK4ma0dDw/Lw9Dgs3Ew3RbzN0r PcvcE X-Gm-Gg: ASbGncuvl/raXs8doIS/hXung/8hAWiBj+BPETG1VHH7zam36s5NFB6PGsG5j1prh10 6GQUb0VIXkeJQr/eEGcaoxsLuNOpqaUqJza6bA7YmuZn9c0gHfKCmzHI8x7mfRnX032odRwagX1 cePL78tX2qyFZLhf0iCRbaoaMSzsM4dg4XWQSI9yuu8FCZAAgFT4hA+SVGHdmwV+8DzuarUG7In iXoIlk7i+Hb6buquhtWlxb+LBoskqm6GjAH0yQ8K2q2EbKGU3DwoDsJL5ltKnRpI0fbzG/oRF0t s9s0C/JFqxu62WJ7KncwPbV5vGPGAlLJFn0O4qbeEDNEZDL+4DGptw== X-Google-Smtp-Source: AGHT+IGw3bDPCrpOCgJBG+2YfPgHdE/BO3x7BLa1XhJE1Sl5JMZzx0E9KJ72sxU7bxm/k9FIPB/OUA== X-Received: by 2002:a17:90b:1b03:b0:312:ec3b:82c0 with SMTP id 98e67ed59e1d1-31a90c5ede7mr4451120a91.29.1751466340683; Wed, 02 Jul 2025 07:25:40 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:acee:7642:9516:37b7]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-318c15232c9sm14871637a91.45.2025.07.02.07.25.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 07:25:40 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 8/9] uboot: Allow for customizing installed/deployed file names Date: Wed, 2 Jul 2025 07:25:22 -0700 Message-ID: <4293150af48d9eea7da8a25deaf88b3146195d8a.1751466215.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 02 Jul 2025 14:25:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219841 From: Ryan Eatmon Backport from master: https://git.openembedded.org/openembedded-core/commit/?id=debc691853e2954bd325bad395b8829939afaa08 When assembling all of the various filenames that are installed/deployed from u-boot, we have been including the PV and PR in the filenames. This change introduces a single variable to replace these two in the filenames. This change should not be disruptive since the default value for the new UBOOT_VERSION variable is "${PV}-${PR}". In one case (UBOOT_EXTLINUX_SYMLINK [1]), PR was used without PV, this patch assumes this was a mistake and corrects it as PR would not be of much use alone. [1] https://git.openembedded.org/openembedded-core/commit/?h=master-next&id=33df3a65f3e8e136811da715d0cc247ce66ae0ea Signed-off-by: Ryan Eatmon Signed-off-by: Steve Sakoman --- meta/classes-recipe/uboot-config.bbclass | 15 +++-- meta/recipes-bsp/u-boot/u-boot.inc | 80 ++++++++++++------------ 2 files changed, 50 insertions(+), 45 deletions(-) diff --git a/meta/classes-recipe/uboot-config.bbclass b/meta/classes-recipe/uboot-config.bbclass index bf21961977..f360050042 100644 --- a/meta/classes-recipe/uboot-config.bbclass +++ b/meta/classes-recipe/uboot-config.bbclass @@ -22,12 +22,17 @@ def removesuffix(s, suffix): UBOOT_ENTRYPOINT ?= "20008000" UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}" +# When naming the files we install/deploy, the package version and revision +# are part of the filename. Create a single variable to represent this and +# allow it to be customized if desired. +UBOOT_VERSION ?= "${PV}-${PR}" + # Some versions of u-boot use .bin and others use .img. By default use .bin # but enable individual recipes to change this value. UBOOT_SUFFIX ??= "bin" UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" UBOOT_BINARYNAME ?= "${@os.path.splitext(d.getVar("UBOOT_BINARY"))[0]}" -UBOOT_IMAGE ?= "${UBOOT_BINARYNAME}-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_IMAGE ?= "${UBOOT_BINARYNAME}-${MACHINE}-${UBOOT_VERSION}.${UBOOT_SUFFIX}" UBOOT_SYMLINK ?= "${UBOOT_BINARYNAME}-${MACHINE}.${UBOOT_SUFFIX}" UBOOT_MAKE_TARGET ?= "all" @@ -36,7 +41,7 @@ UBOOT_MAKE_TARGET ?= "all" # purposes. UBOOT_ELF ?= "" UBOOT_ELF_SUFFIX ?= "elf" -UBOOT_ELF_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_ELF_SUFFIX}" +UBOOT_ELF_IMAGE ?= "u-boot-${MACHINE}-${UBOOT_VERSION}.${UBOOT_ELF_SUFFIX}" UBOOT_ELF_BINARY ?= "u-boot.${UBOOT_ELF_SUFFIX}" UBOOT_ELF_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_ELF_SUFFIX}" @@ -49,7 +54,7 @@ SPL_BINARY ?= "" SPL_DELIMITER ?= "${@'.' if d.getVar("SPL_SUFFIX") else ''}" SPL_BINARYFILE ?= "${@os.path.basename(d.getVar("SPL_BINARY"))}" SPL_BINARYNAME ?= "${@removesuffix(d.getVar("SPL_BINARYFILE"), "." + d.getVar("SPL_SUFFIX"))}" -SPL_IMAGE ?= "${SPL_BINARYNAME}-${MACHINE}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX}" +SPL_IMAGE ?= "${SPL_BINARYNAME}-${MACHINE}-${UBOOT_VERSION}${SPL_DELIMITER}${SPL_SUFFIX}" SPL_SYMLINK ?= "${SPL_BINARYNAME}-${MACHINE}${SPL_DELIMITER}${SPL_SUFFIX}" # Additional environment variables or a script can be installed alongside @@ -62,14 +67,14 @@ UBOOT_ENV ?= "" UBOOT_ENV_SRC_SUFFIX ?= "cmd" UBOOT_ENV_SRC ?= "${UBOOT_ENV}.${UBOOT_ENV_SRC_SUFFIX}" UBOOT_ENV_BINARY ?= "${UBOOT_ENV}.${UBOOT_ENV_SUFFIX}" -UBOOT_ENV_IMAGE ?= "${UBOOT_ENV}-${MACHINE}-${PV}-${PR}.${UBOOT_ENV_SUFFIX}" +UBOOT_ENV_IMAGE ?= "${UBOOT_ENV}-${MACHINE}-${UBOOT_VERSION}.${UBOOT_ENV_SUFFIX}" UBOOT_ENV_SYMLINK ?= "${UBOOT_ENV}-${MACHINE}.${UBOOT_ENV_SUFFIX}" # U-Boot EXTLINUX variables. U-Boot searches for /boot/extlinux/extlinux.conf # to find EXTLINUX conf file. UBOOT_EXTLINUX_INSTALL_DIR ?= "/boot/extlinux" UBOOT_EXTLINUX_CONF_NAME ?= "extlinux.conf" -UBOOT_EXTLINUX_SYMLINK ?= "${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE}-${PR}" +UBOOT_EXTLINUX_SYMLINK ?= "${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE}-${UBOOT_VERSION}" # Options for the device tree compiler passed to mkimage '-D' feature: UBOOT_MKIMAGE_DTCOPTS ??= "" diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 3c01720192..7935f2b4aa 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -199,16 +199,16 @@ uboot_install_config () { config=$1 type=$2 - install -D -m 644 ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} - ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} - ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY} + install -D -m 644 ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARYNAME}-${type}-${UBOOT_VERSION}.${UBOOT_SUFFIX} + ln -sf ${UBOOT_BINARYNAME}-${type}-${UBOOT_VERSION}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} + ln -sf ${UBOOT_BINARYNAME}-${type}-${UBOOT_VERSION}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY} # Install the uboot-initial-env if [ -n "${UBOOT_INITIAL_ENV}" ]; then - install -D -m 644 ${B}/${config}/u-boot-initial-env-${type} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} - ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type} - ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${type} - ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV} + install -D -m 644 ${B}/${config}/u-boot-initial-env-${type} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${UBOOT_VERSION} + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${UBOOT_VERSION} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type} + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${UBOOT_VERSION} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${type} + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${UBOOT_VERSION} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV} fi } @@ -218,9 +218,9 @@ uboot_install () { # Install the uboot-initial-env if [ -n "${UBOOT_INITIAL_ENV}" ]; then - install -D -m 644 ${B}/u-boot-initial-env ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} - ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE} - ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV} + install -D -m 644 ${B}/u-boot-initial-env ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${UBOOT_VERSION} + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${UBOOT_VERSION} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE} + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${UBOOT_VERSION} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV} fi } @@ -228,9 +228,9 @@ uboot_install_elf_config () { config=$1 type=$2 - install -m 644 ${B}/${config}/${UBOOT_ELF} ${D}/boot/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY} + install -m 644 ${B}/${config}/${UBOOT_ELF} ${D}/boot/u-boot-${type}-${UBOOT_VERSION}.${UBOOT_ELF_SUFFIX} + ln -sf u-boot-${type}-${UBOOT_VERSION}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} + ln -sf u-boot-${type}-${UBOOT_VERSION}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY} } uboot_install_elf () { @@ -242,9 +242,9 @@ uboot_install_spl_config () { config=$1 type=$2 - install -m 644 ${B}/${config}/${SPL_BINARY} ${D}/boot/${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} - ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${D}/boot/${SPL_BINARYFILE}-${type} - ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${D}/boot/${SPL_BINARYFILE} + install -m 644 ${B}/${config}/${SPL_BINARY} ${D}/boot/${SPL_BINARYNAME}-${type}-${UBOOT_VERSION}${SPL_DELIMITER}${SPL_SUFFIX} + ln -sf ${SPL_BINARYNAME}-${type}-${UBOOT_VERSION}${SPL_DELIMITER}${SPL_SUFFIX} ${D}/boot/${SPL_BINARYFILE}-${type} + ln -sf ${SPL_BINARYNAME}-${type}-${UBOOT_VERSION}${SPL_DELIMITER}${SPL_SUFFIX} ${D}/boot/${SPL_BINARYFILE} } uboot_install_spl () { @@ -288,10 +288,10 @@ do_deploy () { fi if [ -e ${WORKDIR}/fw_env.config ] ; then - install -D -m 644 ${WORKDIR}/fw_env.config ${DEPLOYDIR}/fw_env.config-${MACHINE}-${PV}-${PR} + install -D -m 644 ${WORKDIR}/fw_env.config ${DEPLOYDIR}/fw_env.config-${MACHINE}-${UBOOT_VERSION} cd ${DEPLOYDIR} - ln -sf fw_env.config-${MACHINE}-${PV}-${PR} fw_env.config-${MACHINE} - ln -sf fw_env.config-${MACHINE}-${PV}-${PR} fw_env.config + ln -sf fw_env.config-${MACHINE}-${UBOOT_VERSION} fw_env.config-${MACHINE} + ln -sf fw_env.config-${MACHINE}-${UBOOT_VERSION} fw_env.config fi if [ -n "${UBOOT_ELF}" ] @@ -361,19 +361,19 @@ uboot_deploy_config () { config=$1 type=$2 - install -D -m 644 ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ${DEPLOYDIR}/${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} + install -D -m 644 ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ${DEPLOYDIR}/${UBOOT_BINARYNAME}-${type}-${UBOOT_VERSION}.${UBOOT_SUFFIX} cd ${DEPLOYDIR} - ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK}-${type} - ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK} - ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY}-${type} - ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY} + ln -sf ${UBOOT_BINARYNAME}-${type}-${UBOOT_VERSION}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK}-${type} + ln -sf ${UBOOT_BINARYNAME}-${type}-${UBOOT_VERSION}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK} + ln -sf ${UBOOT_BINARYNAME}-${type}-${UBOOT_VERSION}.${UBOOT_SUFFIX} ${UBOOT_BINARY}-${type} + ln -sf ${UBOOT_BINARYNAME}-${type}-${UBOOT_VERSION}.${UBOOT_SUFFIX} ${UBOOT_BINARY} # Deploy the uboot-initial-env if [ -n "${UBOOT_INITIAL_ENV}" ]; then - install -D -m 644 ${B}/${config}/u-boot-initial-env-${type} ${DEPLOYDIR}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} + install -D -m 644 ${B}/${config}/u-boot-initial-env-${type} ${DEPLOYDIR}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${UBOOT_VERSION} cd ${DEPLOYDIR} - ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${MACHINE}-${type} - ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${type} + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${UBOOT_VERSION} ${UBOOT_INITIAL_ENV}-${MACHINE}-${type} + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${UBOOT_VERSION} ${UBOOT_INITIAL_ENV}-${type} fi } @@ -387,10 +387,10 @@ uboot_deploy () { # Deploy the uboot-initial-env if [ -n "${UBOOT_INITIAL_ENV}" ]; then - install -D -m 644 ${B}/u-boot-initial-env ${DEPLOYDIR}/${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} + install -D -m 644 ${B}/u-boot-initial-env ${DEPLOYDIR}/${UBOOT_INITIAL_ENV}-${MACHINE}-${UBOOT_VERSION} cd ${DEPLOYDIR} - ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${MACHINE} - ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${UBOOT_INITIAL_ENV} + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${UBOOT_VERSION} ${UBOOT_INITIAL_ENV}-${MACHINE} + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${UBOOT_VERSION} ${UBOOT_INITIAL_ENV} fi } @@ -398,11 +398,11 @@ uboot_deploy_elf_config () { config=$1 type=$2 - install -m 644 ${B}/${config}/${UBOOT_ELF} ${DEPLOYDIR}/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY}-${type} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}-${type} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK} + install -m 644 ${B}/${config}/${UBOOT_ELF} ${DEPLOYDIR}/u-boot-${type}-${UBOOT_VERSION}.${UBOOT_ELF_SUFFIX} + ln -sf u-boot-${type}-${UBOOT_VERSION}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY}-${type} + ln -sf u-boot-${type}-${UBOOT_VERSION}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY} + ln -sf u-boot-${type}-${UBOOT_VERSION}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}-${type} + ln -sf u-boot-${type}-${UBOOT_VERSION}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK} } uboot_deploy_elf () { @@ -415,12 +415,12 @@ uboot_deploy_spl_config () { config=$1 type=$2 - install -m 644 ${B}/${config}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} + install -m 644 ${B}/${config}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_BINARYNAME}-${type}-${UBOOT_VERSION}${SPL_DELIMITER}${SPL_SUFFIX} rm -f ${DEPLOYDIR}/${SPL_BINARYFILE} ${DEPLOYDIR}/${SPL_SYMLINK} - ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_BINARYFILE}-${type} - ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_BINARYFILE} - ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} - ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_SYMLINK} + ln -sf ${SPL_BINARYNAME}-${type}-${UBOOT_VERSION}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_BINARYFILE}-${type} + ln -sf ${SPL_BINARYNAME}-${type}-${UBOOT_VERSION}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_BINARYFILE} + ln -sf ${SPL_BINARYNAME}-${type}-${UBOOT_VERSION}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} + ln -sf ${SPL_BINARYNAME}-${type}-${UBOOT_VERSION}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_SYMLINK} } uboot_deploy_spl () { From patchwork Wed Jul 2 14:25:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 66129 X-Patchwork-Delegate: steve@sakoman.com 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 6E388C77B7C for ; Wed, 2 Jul 2025 14:25:45 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web11.25261.1751466343251422879 for ; Wed, 02 Jul 2025 07:25:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=JiSxoQCy; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-313bb9b2f5bso7096110a91.3 for ; Wed, 02 Jul 2025 07:25:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1751466342; x=1752071142; darn=lists.openembedded.org; 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=CuUUbrQEktYoXUaPuhKPw7TVMbptRattgROApghoQ10=; b=JiSxoQCybxD9tu9jrC1T/4iIXB6e+1Mo8OmNaJUqTyOAP9+lsncK/1pE1hjKpdVUUp qZrVSlyxNPfUvThxLdgtS4xUWTRTwZSoT/8yw1Jxts3tuNCRCNXtzBwy/pHiCohQgK9r K0ZvGYqTrzRT45sKD814F928bs0uoSfybY4NbNd01X71hQRuuLJp6kaRS7WimNzqeDgk Il7nhjoTqcxtM6Tq1J5LDf7slsT7+za+4xGEqgDj8ZRPcvtWfHPsMF94EXLUqvRGovuS B4Xqm2uEf19ub449NEvB274QHsaAF5BOAEbiCRD27UXw/fV+A5Qx97srwIYKJpzQdEk2 25Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751466342; x=1752071142; 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=CuUUbrQEktYoXUaPuhKPw7TVMbptRattgROApghoQ10=; b=fpJsA8lKz/2l0JxfNFtQxklnx40GOqMCvngAeAY0+vafzy9jeQKpItQxuefAbtq0lY 75U5p98e7D8IgwUPk/caMSyNnCzGY20136+fRsxkxZH0hzVa+JQ0zN00gtFJyGLV90oS Fgm8uAumOaWakuSXfHV17dOH2q1wSXp16Pql6e8Xuw9PK8rAGV47WbI+MyF42wo1yVA6 FjLicwDVC+PSN530y8v4Bjd2po2T0RoPPQMue7mbyAJkdRfAXgLIf8MC/FDqIeNohf7Q MZqAwR391VgjjJ7mwhGzZ8kpVZfH2nZyplVHWtqoFTeiSNIKQvQPmhTRS5Q8r1gTN67z dahA== X-Gm-Message-State: AOJu0YzB5H8bjsjCs+NqTzfV2vw0kS+tTYdduosFe1eR7ko1WrHNElix r/IuORKOe32teh7b5p3XPdAYZD4ZjBGQrTf9qKAGqYVLIzirNMj3EkRkvCBkxW5u+j7oEoc1pEn ce4vp X-Gm-Gg: ASbGncvv/rw6m2wNSLl4LsKRQGpQkp6v9nE4UTQA/FdmjtU8iyl9Ey8mnDcOpluqwQ2 JF02biwzJ6GXqr8yZkLXt/oUSX2+Mtb6dl5AGoUufawE8Ylczh5h5Zppcohjyt1KmtRlMsUmZ8g 27g7oGHXzHyLC6jcy+bCGjVWnGsbg3dlDFdjYq4CWyfiNe7jvpWWA0GtYVtfd2totFi0cIEL7gf bZXGMBhwnyOAjcwL1I/i5mEy3yiTb2kj5SYLKoJgdM56YtYXmmvjiuEOAlWix2VEO7taKG19WkO MDzuCQBiJr8QSYM4rDR6EHsi/Irv6ItW3F5hGLU93iC0fs46K7sbgg== X-Google-Smtp-Source: AGHT+IGRBTErNCaA9WJB+iwZ3ppvGOp0ltKiNsNjg9obCLxcY0opjraqItBoIQ67MmHXZklo009dyg== X-Received: by 2002:a17:90b:2d8d:b0:314:2939:efdc with SMTP id 98e67ed59e1d1-31a90b2ff4bmr4769416a91.13.1751466342290; Wed, 02 Jul 2025 07:25:42 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:acee:7642:9516:37b7]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-318c15232c9sm14871637a91.45.2025.07.02.07.25.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 07:25:41 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 9/9] tcf-agent: correct the SRC_URI Date: Wed, 2 Jul 2025 07:25:23 -0700 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 02 Jul 2025 14:25:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219842 From: Guocai He The SRC_URI is changed to git://gitlab.eclipse.org/eclipse/tcf/tcf.agent.git Signed-off-by: Guocai He Signed-off-by: Steve Sakoman --- meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index 59b9d7de78..f930500de6 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb @@ -1,5 +1,5 @@ SUMMARY = "Target Communication Framework for the Eclipse IDE" -HOMEPAGE = "http://wiki.eclipse.org/TCF" +HOMEPAGE = "https://gitlab.eclipse.org/eclipse/tcf/" DESCRIPTION = "TCF is a vendor-neutral, lightweight, extensible network protocol mainly for communicating with embedded systems (targets)." BUGTRACKER = "https://bugs.eclipse.org/bugs/" @@ -10,7 +10,7 @@ SRCREV = "1f11747e83ebf4f53e8d17f430136f92ec378709" PV = "1.8.0+git" UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))" -SRC_URI = "git://git.eclipse.org/r/tcf/org.eclipse.tcf.agent.git;protocol=https;branch=master \ +SRC_URI = "git://gitlab.eclipse.org/eclipse/tcf/tcf.agent.git;protocol=https;branch=master \ file://ldflags.patch \ file://tcf-agent.init \ file://tcf-agent.service \