From patchwork Wed Nov 27 04:11:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 53258 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 7F445D66BB3 for ; Wed, 27 Nov 2024 04:11:47 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web11.64878.1732680705808853627 for ; Tue, 26 Nov 2024 20:11:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=3CYnHOjH; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-7251abe0e69so2043332b3a.0 for ; Tue, 26 Nov 2024 20:11:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732680705; x=1733285505; 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=d2W8/Loxw9zJzvVRcMrnftM1xFBCF62L+k6TX1olBBs=; b=3CYnHOjHTsGy+xhXnvGobJM4hC0W654xav0KbV6NgASNVtJo6acPdVDqvuZIlY3CLj gdOc0q5kn8j9ZXH8TPueCw5VByYE9dm/jos1LbOtKDBZS0GSLMb81NncXOYLTKS6wVcn eSYY5wpMrt9igRQDrjRqKu1QCbP7Q7RwF6VS0JWFPdFxEtNSrrANiZ30qEz1do4XDx1q ZPK0qzceEvCeCwu3p3NmcNckF4/fCLg1zPhltwb28rTSOmRzyDpk+No1laT6AOqt02qY TQu8MIQdRvNfWkgIGbCn4V7eHgZ5SU5gbkxVX81Krwvw3p87uBc2YqO2xFBbRr4B56OC 4/uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732680705; x=1733285505; 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=d2W8/Loxw9zJzvVRcMrnftM1xFBCF62L+k6TX1olBBs=; b=fs+mNbbkK9ESdaeWnT60Jr+0yWHcG94Ks4w2qhia08AHkj6O9XQQpmsSlp4GTLEkI7 80oOwrVtPaizUcucEFHEPSBOJzizqnyV7t/YysaX8Nhw1dHuFIEUyy4HaZf4cK4c/irC W+E2EJ8fcNGVk6OkjpemQWskWyidF1QEdnQcEiHKXyh4FDTBHdYk11f08tnFic9EKBef uOmBnNR7+s6kkzEhTEvELx9rCPQQnGjgpRjt31/nlkkZOInI43Hs/GvtRBFdAlrvbTOz eBS8A4SJhEfXdHcO4RxXgaUeabzK2jJZCvCnIw6Jz0IhsRA1KjmwFvQOimkLJMCPpiR0 FMsw== X-Gm-Message-State: AOJu0Yy5JrN69Qs2KDwiutrtLkuVg0YU57SpSB6xo2iVrKs/83MjETbp yq6CCl061LlQCx2Og6CcMQ+O+EPrJrpcZi/xOMdW7HvG6sUd8k6/tC/mOa1M//8jfqCNk22Mvrz x X-Gm-Gg: ASbGncuoWb+nB5nDqKMVKNshwsZ/NnjQK8HuycX/bky1vf8MFrA8J9WgKtiDAKqsnSJ VRS7+NxytgYmZYUcnvSObZ5rx6R29Fg9XB4TX1RZYL4nDVvmDqIIirjpYqARqagHsAV1ia17AYp Lw+H1SeLsu5ww43aZT4V4HDWw+9RGiielIg8QakFNhqMMABLBvB1EkDaWGwtixH0aJ6ZfhQqzN8 dI97CKFMn5lKLSpnAM6kIrp9j9b+/mBhbjVijc= X-Google-Smtp-Source: AGHT+IEoeaqqseYYzLU5sSq3FRw1FcQMF4b9RL56bnntWi1uEtR7tGgalaEMJuCR/W7r58i8Ks+kPQ== X-Received: by 2002:a05:6a00:4654:b0:71e:4c18:8e3b with SMTP id d2e1a72fcca58-72530013a13mr2602798b3a.2.1732680705028; Tue, 26 Nov 2024 20:11:45 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de485c84sm9240796b3a.80.2024.11.26.20.11.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 20:11:44 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 01/18] cve-check: do not skip cve status description after : Date: Tue, 26 Nov 2024 20:11:21 -0800 Message-Id: <4921605aab4c9588e5c96de3afe08e9d35f51145.1732680538.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 27 Nov 2024 04:11:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207895 From: Peter Marko Correct maxsplit parameter from 5 to 4 to not drop text if description contains ":". Example: >>> "detail: cpe:vendor:product:description:cont".split(':', 5) ['detail', ' cpe', 'vendor', 'product', 'description', 'xxx'] >>> "detail: cpe:vendor:product:description:cont".split(':', 4) ['detail', ' cpe', 'vendor', 'product', 'description:xxx'] Signed-off-by: Peter Marko Signed-off-by: Richard Purdie (cherry picked from commit 3c4d8ca41ac0b429af92bf0ea84f1dfd0cda9e1f) Signed-off-by: Steve Sakoman --- meta/lib/oe/cve_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/cve_check.py b/meta/lib/oe/cve_check.py index 487f30dc25..268adfb528 100644 --- a/meta/lib/oe/cve_check.py +++ b/meta/lib/oe/cve_check.py @@ -239,7 +239,7 @@ def decode_cve_status(d, cve): if not status: return {} - status_split = status.split(':', 5) + status_split = status.split(':', 4) status_out = {} status_out["detail"] = status_split[0] product = "*" From patchwork Wed Nov 27 04:11:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 53263 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 59E19D66BB7 for ; Wed, 27 Nov 2024 04:11:57 +0000 (UTC) Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) by mx.groups.io with SMTP id smtpd.web10.64660.1732680707536110747 for ; Tue, 26 Nov 2024 20:11:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=a5uOOnQq; spf=softfail (domain: sakoman.com, ip: 209.85.167.174, mailfrom: steve@sakoman.com) Received: by mail-oi1-f174.google.com with SMTP id 5614622812f47-3ea411ef5a9so1550562b6e.0 for ; Tue, 26 Nov 2024 20:11:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732680707; x=1733285507; 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=Kcb7TDklw9FpjjotIA51UGDl+fRDLriBhNGuPyvKIQE=; b=a5uOOnQqg2aO80HPAMO3MN5/CE9DQcik/L2Im55xWdVRNW6ZpS5YInI6wGgicjeJsQ dfDs2lG8wbxLNwWojOrME0g2d3/47RVncTPz3qSRMx8pSFmu+xaG1uNPiHbdhl7vV3wi R0bCgdSRLrWCMS/+BrrzSM/9N6dm+0wYNcOcpzrOQ0O7lvDonkLIrMObDs79PrE47LnQ OSJQ5qfrfVBtuyvHTFarKpRUcS2tdi7xLaBH4CO6s+xNJlSrYHXBKind0GH+XQBzg2QL lJApjG/oPRTJPmJV9bxoXAninPQhOfyXLVReUZ0idO8iwOBiKNvCFJYZy9Q4phWsRMEw 70uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732680707; x=1733285507; 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=Kcb7TDklw9FpjjotIA51UGDl+fRDLriBhNGuPyvKIQE=; b=ETRvmBTqiP0Eo0IEEyX5B3jX2IFLIOwDeQuFKhRpo1MS9Gqsd9ySt+wncaNk2ktDLQ G2OZ0cCh+Ltk23BJv61L8KqJ/QzxEpWjP7q5R6R62WTfMSOlDABhLb8uzhlYhelGK3U7 OnHzrsvHp8bLCp9NXWGipp9TkrFqwnR1tjxqgG7Odi2L4rd3e6qo0O30pCJo+DlwGE1B +8Gls0WY/veG6OCK3RxAYTW5uPv0S6Vg2YivYyHRuBs4q9cAEN0XLQuD0AAa3vAvswTl GHMSfU6Fc1Eq5SUDRAnBbxpUyjTKnZsvUaMtCxVH2KKoKuYIFFCkxhV3vPPkXzGqlxv5 Qm8w== X-Gm-Message-State: AOJu0Yw2XEgCA4zQd4CU/zt9Yjx9rzpH0d3wG/Mp8uBY5/jEH7eeejOn SpIW1vfEec01BpT02d8aVUMcQTS1K59dyuWEZSP1M8qQUQGCvL80loJtBpwrOVg7JS+SIxQWhS6 t X-Gm-Gg: ASbGncuWcZkylKvvEr5HEOYzNOexvWoH5naPXduf1NTMGYfSL5+YGwlKluySZlzp0Hw IZNLnEKeb2TQ9xRHz0iXwNO2ou+MMCe4X96zSuVPWiD78mZiN3YwAqljxsSK3j/mx5u73qeD06+ 9C6BHtjIdDc0gEhwLHnfv70vauE6MA73vG5LUbtZG8Z2S9enW2DH7cPbvQJb3vPTG1ziJPbwo8g 5VnmmprwGSIVZ1gxZAerW11KsWxQ0RaGTk0uok= X-Google-Smtp-Source: AGHT+IFKurp6lgFEzG+0hXF7yE7NdOc/UeiSfojU/wrNmPt/PxVFmHZ0OUEL+eSjvt3cyEq8QMy6jw== X-Received: by 2002:a05:6808:1807:b0:3e7:a15c:4692 with SMTP id 5614622812f47-3ea6dd4e5f9mr1575729b6e.27.1732680706475; Tue, 26 Nov 2024 20:11:46 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de485c84sm9240796b3a.80.2024.11.26.20.11.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 20:11:46 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 02/18] cve-check: fix malformed cve status description with : characters Date: Tue, 26 Nov 2024 20:11:22 -0800 Message-Id: <5cd34a34879ad424f3b1637b48892d6fa037861d.1732680538.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 27 Nov 2024 04:11:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207896 From: Peter Marko When CPE is not provided and character ":" is in cve status description, current code takes only last part of split function. This works only if there is no ":" in description, otherwise it drops the other split parts. Do a new split of the original string to take the whole description unchanged. This fixes following entries from world build of poky+meta-oe+meta-python: tiff-4.6.0-r0 do_cve_check: CVE_STATUS with 3 parts for CVE-2015-7313 CVE_STATUS: fixed-version: Tested with check from https://security-tracker.debian.org/tracker/CVE-2015-7313 and already 4.3.0 doesn't have the issue description: //security-tracker.debian.org/tracker/CVE-2015-7313 and already 4.3.0 doesn't have the issue corrected: Tested with check from https://security-tracker.debian.org/tracker/CVE-2015-7313 and already 4.3.0 doesn't have the issue gnupg-2.5.0-r0 do_cve_check: CVE_STATUS with 3 parts for CVE-2022-3219 CVE_STATUS: upstream-wontfix: Upstream doesn't seem to be keen on merging the proposed commit - https://dev.gnupg.org/T5993 description: //dev.gnupg.org/T5993 corrected: Upstream doesn't seem to be keen on merging the proposed commit - https://dev.gnupg.org/T5993 libyaml-0.2.5-r0 do_cve_check: CVE_STATUS with 3 parts for CVE-2024-35325 CVE_STATUS: upstream-wontfix: Upstream thinks this is a misuse (or wrong use) of the libyaml API - https://github.com/yaml/libyaml/issues/303 description: //github.com/yaml/libyaml/issues/303 corrected: Upstream thinks this is a misuse (or wrong use) of the libyaml API - https://github.com/yaml/libyaml/issues/303 libyaml-0.2.5-r0 do_cve_check: CVE_STATUS with 3 parts for CVE-2024-35326 CVE_STATUS: upstream-wontfix: Upstream thinks there is no working code that is exploitable - https://github.com/yaml/libyaml/issues/302 description: //github.com/yaml/libyaml/issues/302 corrected: Upstream thinks there is no working code that is exploitable - https://github.com/yaml/libyaml/issues/302 libyaml-0.2.5-r0 do_cve_check: CVE_STATUS with 3 parts for CVE-2024-35328 CVE_STATUS: upstream-wontfix: Upstream thinks there is no working code that is exploitable - https://github.com/yaml/libyaml/issues/302 description: //github.com/yaml/libyaml/issues/302 corrected: Upstream thinks there is no working code that is exploitable - https://github.com/yaml/libyaml/issues/302 cpio-2.15-r0 do_cve_check: CVE_STATUS with 3 parts for CVE-2023-7216 CVE_STATUS: disputed: intended behaviour, see https://lists.gnu.org/archive/html/bug-cpio/2024-03/msg00000.html description: //lists.gnu.org/archive/html/bug-cpio/2024-03/msg00000.html corrected: intended behaviour, see https://lists.gnu.org/archive/html/bug-cpio/2024-03/msg00000.html openssh-9.9p1-r0 do_cve_check: CVE_STATUS with 3 parts for CVE-2023-51767 CVE_STATUS: upstream-wontfix: It was demonstrated on modified sshd and does not exist in upstream openssh https://bugzilla.mindrot.org/show_bug.cgi?id=3656#c1. description: //bugzilla.mindrot.org/show_bug.cgi?id=3656#c1. corrected: It was demonstrated on modified sshd and does not exist in upstream openssh https://bugzilla.mindrot.org/show_bug.cgi?id=3656#c1. cups-2.4.10-r0 do_cve_check: CVE_STATUS with 3 parts for CVE-2021-25317 CVE_STATUS: not-applicable-config: This concerns /var/log/cups having lp ownership, our /var/log/cups is root:root, so this doesn't apply. description: root, so this doesn't apply. corrected: This concerns /var/log/cups having lp ownership, our /var/log/cups is root:root, so this doesn't apply. unzip-1_6.0-r0 do_cve_check: CVE_STATUS with 3 parts for CVE-2008-0888 CVE_STATUS: fixed-version: Patch from https://bugzilla.redhat.com/attachment.cgi?id=293893&action=diff applied to 6.0 source description: //bugzilla.redhat.com/attachment.cgi?id=293893&action=diff applied to 6.0 source corrected: Patch from https://bugzilla.redhat.com/attachment.cgi?id=293893&action=diff applied to 6.0 source syslog-ng-4.7.0-r0 do_cve_check: CVE_STATUS with 6 parts for CVE-2022-38725 CVE_STATUS: cpe-incorrect: cve-check wrongly matches cpe:2.3:a:oneidentity:syslog-ng:*:*:*:*:premium:*:*:* < 7.0.32 description: syslog-ng:*:*:*:*:premium:*:*:* < 7.0.32 corrected: cve-check wrongly matches cpe:2.3:a:oneidentity:syslog-ng:*:*:*:*:premium:*:*:* < 7.0.32 Signed-off-by: Peter Marko Signed-off-by: Richard Purdie (cherry picked from commit cc33dd9176726cb4b2d2f142ed1bc655da8e0a9f) Signed-off-by: Steve Sakoman --- meta/lib/oe/cve_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/cve_check.py b/meta/lib/oe/cve_check.py index 268adfb528..647a94f5af 100644 --- a/meta/lib/oe/cve_check.py +++ b/meta/lib/oe/cve_check.py @@ -257,7 +257,7 @@ def decode_cve_status(d, cve): else: # Other case: no CPE, the syntax is then: # detail: description - description = status_split[len(status_split)-1].strip() if (len(status_split) > 1) else "" + description = status.split(':', 1)[1].strip() if (len(status_split) > 1) else "" status_out["vendor"] = vendor status_out["product"] = product From patchwork Wed Nov 27 04:11:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 53259 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 59D9AD66BB0 for ; Wed, 27 Nov 2024 04:11:57 +0000 (UTC) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mx.groups.io with SMTP id smtpd.web11.64879.1732680708750250067 for ; Tue, 26 Nov 2024 20:11:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=ZUzW6OoN; spf=softfail (domain: sakoman.com, ip: 209.85.210.178, mailfrom: steve@sakoman.com) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-724fee568aaso3434131b3a.1 for ; Tue, 26 Nov 2024 20:11:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732680708; x=1733285508; 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=dvN2nF3bynpO9E5Vi9Z641o8yv8xM6mFv+CxxPnJves=; b=ZUzW6OoNEKYhmKD57B3ZLWyeTH1mpIcUaoCdzuUVP00MXFoL17gscZUUVJYoTD+jFY b7VAQSltQjwRxBO/8yigUZ3Ofidyp39hopvvQ8VwIVxXADqxdbR/0c3SkI/T6+Go3v4M iJ8sHAuVG016zHvykQzcDSOIFol7a8bMQg7Cr0HmU+G5dJsxuEVwnCNFDjLHlwch3hWs TbCpZXrSLAtTe0vCb8H8tBhNZXtbBdcg5Nf20Bwo+s5l0/F1wodxFie6HxdMjLvOq7jo aSImwkwacus+gO5mhiZXiXfkmNV+yBs64hanC/LJKhKSjzxWajQZJO+YL83n0NnyobO2 t8Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732680708; x=1733285508; 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=dvN2nF3bynpO9E5Vi9Z641o8yv8xM6mFv+CxxPnJves=; b=RU5AHqXs0YEvAekaPPym1R4+1A4SUKiW8IQ58g0Da5fnBfbxcDhyqi51t8OynkwMJr CDbumtROezdSOT11M7sZcQaUDAw6C8CFL65pVwCodlxQov3wsbya2ANLUnBkByU9aTry kMg0hNZS0XvtQ7yNlFqiMEJfOW/f9KdWvcM+NqGsG7WZEIbsSLl8T9HnEM9/0v2Qk9JE L7i4yGLLO4I8g1b09auSKFlr3LbOuC5MhPKPay8Rdg56U2wUU1sULQ+yiHn1jmiBZx7y /lxHVv4EAm9OJ0JeHzeuvp3pAyhJqmJ5Q59HaBLfT1xGFm2HAjNkotQd0KPVCpPg71xj 89HA== X-Gm-Message-State: AOJu0YyvuasXbFNUjM+faOMsU2PtfjT9xn+aCcWmt9hK1xEmMMQlKSRv Bifmvm0xRUL2333ZdVsnHNylpwWYsPkVGzbvkS6weuCxljtyzeZlUQEBnTHXnyvxs3x5Rcdzpkl p X-Gm-Gg: ASbGncsbHUSa7w0yC1fgBjZJVncQasssck9wb/Dbf+ALD7rBuaoINC2R/59o2qw1+Ud 82NJakrOBi0UJ0pGm8piNrGRbnHbtjaa8QkXdAbc950yAR9765VIGWi2qw3ZFQCDmHYSEi7Zq4h yUASsqigkY93hjJgEyhVCEJQeGgTjpPqRSAsMvJiHH6dhHZR4OKF2whYW0Q3wQx3+Iudun/8F7J QRHRmghoB8md2X+Xra0UbVdmJKehift5LjpXN0= X-Google-Smtp-Source: AGHT+IHV+lcQWQltsHGd+ZcYwyjwOroAIWWSqCQ2DpScyG3yxN2crImqQFxDf2+nm+Uxdl32qmTSGg== X-Received: by 2002:a05:6a20:1594:b0:1e0:d618:1fba with SMTP id adf61e73a8af0-1e0e09cc482mr3106903637.0.1732680707847; Tue, 26 Nov 2024 20:11:47 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de485c84sm9240796b3a.80.2024.11.26.20.11.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 20:11:47 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 03/18] tzdata/tzcode-native: upgrade 2024a -> 2024b Date: Tue, 26 Nov 2024 20:11:23 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 27 Nov 2024 04:11:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207897 From: Jinfeng Wang Signed-off-by: Jinfeng Wang Signed-off-by: Richard Purdie (cherry picked from commit b84b29b1827624270cc1698feda2ee87d55c01e4) Signed-off-by: Steve Sakoman --- meta/recipes-extended/timezone/timezone.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/timezone/timezone.inc b/meta/recipes-extended/timezone/timezone.inc index 4734adcc08..adf095280f 100644 --- a/meta/recipes-extended/timezone/timezone.inc +++ b/meta/recipes-extended/timezone/timezone.inc @@ -6,7 +6,7 @@ SECTION = "base" LICENSE = "PD & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" -PV = "2024a" +PV = "2024b" SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode;subdir=tz \ http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata;subdir=tz \ @@ -16,5 +16,5 @@ S = "${WORKDIR}/tz" UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" -SRC_URI[tzcode.sha256sum] = "80072894adff5a458f1d143e16e4ca1d8b2a122c9c5399da482cb68cba6a1ff8" -SRC_URI[tzdata.sha256sum] = "0d0434459acbd2059a7a8da1f3304a84a86591f6ed69c6248fffa502b6edffe3" +SRC_URI[tzcode.sha256sum] = "5e438fc449624906af16a18ff4573739f0cda9862e5ec28d3bcb19cbaed0f672" +SRC_URI[tzdata.sha256sum] = "70e754db126a8d0db3d16d6b4cb5f7ec1e04d5f261255e4558a67fe92d39e550" From patchwork Wed Nov 27 04:11:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 53260 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 5EC0FD66BB8 for ; Wed, 27 Nov 2024 04:11:57 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web10.64661.1732680710119255238 for ; Tue, 26 Nov 2024 20:11:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=DHu2wW/j; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-7252b5d7b1dso313189b3a.0 for ; Tue, 26 Nov 2024 20:11:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732680709; x=1733285509; 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=yYMFHnqmXwbd2ERbA8xqnBTWC5JI6Ij+Zscxv7nD2J0=; b=DHu2wW/jQbdCBs3GEu8LyE5rq+dYNi5mjFhtYm11dTv33nep7PTvPC1/f0A0psyo01 nqVkl3bom4VxNVCt8NmJQeNzv/+Ty2mphGF0dxGc+qQlWyt/UnQIC9iR+tXdUUDAFYw7 jgHuMjsVUK7Kgv8B5k+hvhCfRwQAHBi46Wnkb88lIuMu7bTf5k1cqZ4Ko5Z9TvdLkkof xyKmUlL7pM3D6HRg4CY8Yd24t/ZHFNHUFk1VY8ChMC+SsIUGvkFM/b78xneeuK/LMVkD mcCzF1SgRch1A3Ke0UvjzKwswft95Rw17xL9yl3yZa86YaDjSsndKuK4B98OeP0oRLTZ 5h7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732680709; x=1733285509; 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=yYMFHnqmXwbd2ERbA8xqnBTWC5JI6Ij+Zscxv7nD2J0=; b=rd2Nsga5eFYm2qvtw/7PTX4Q5aWZCPmAvT4hHtyvVBzagNH3tuEfbongRcYi92wP5f 3mRgEXv2RldjFGWOdvFy4iS2NY2FANuA13jiyMbVjofi/MZtyPRidrg89aV7AJNxO+6H SYpkciuyoa4/JXwtTMIAMT/NxCcHdwOoZfwzLQeZUHKgX/nd8vhmfywPP1xd9yfwrIff 0Ci66PvYSgJEyStxq4oXSDy7Y5wh6J5kCbUbMcYfpBe5cmUYDsxQe8F/qrQEOrk3t2OR mqcYHT5l+Y1hNNOPd95SJ6Lg9N9p1lyy5tBHMdg2uMgNts+CaXTfvnZV28qZ6hDkoYL4 sC0g== X-Gm-Message-State: AOJu0YyuVTpKgikgax1MDe+xvOeDl63+h+fTMk/KLS79h9UEc5DPfvvz 9Gu6qZcDgGguxODQgKeApoxGTDvYsTaalR+py8fgK46BSBeKcrVbezM9AdMgO/YW/57CxxuSb31 + X-Gm-Gg: ASbGnctmNGikuWL3oyQuFN88mea0PO1iysTM4iC9BkpSYybESRV3xpB0N8Vn1G4GEZV /T+6+DWhk5nyjaXEXV/cY3jboA3sczG0zSdNHBYIQz6gzQ2MHiAbD+V0j+5hgHeSkhtQD56VbER GkrKU1qcO6Ak379iW4wzuEfVWVZwauAgflaTv3dGwyGNXLVT+RE66Ds98UOkJmX2ElOMymcRs/f O7n7chGJN5/z2+uDfxReYxha00pZmUACGpRo4Q= X-Google-Smtp-Source: AGHT+IGNTdALZiIAdqvdcvta+C4jl8ZLo7pFO2j0i8qZXNZLi5v3Hco+p6Ri0bBfphLqfPT4KQM0XQ== X-Received: by 2002:a05:6a00:2351:b0:724:bb67:a6b0 with SMTP id d2e1a72fcca58-7251ccc21eamr11437147b3a.3.1732680709259; Tue, 26 Nov 2024 20:11:49 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de485c84sm9240796b3a.80.2024.11.26.20.11.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 20:11:48 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 04/18] xwayland: upgrade 24.1.2 -> 24.1.3 Date: Tue, 26 Nov 2024 20:11:24 -0800 Message-Id: <38a09bff16c85b10386435eca88358aec0159ba5.1732680538.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 27 Nov 2024 04:11:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207898 From: Wang Mingyu Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie (cherry picked from commit b42744482d5b883c04e81b4be56ef19bc27caa3f) Signed-off-by: Steve Sakoman --- .../xwayland/{xwayland_24.1.2.bb => xwayland_24.1.3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/xwayland/{xwayland_24.1.2.bb => xwayland_24.1.3.bb} (96%) diff --git a/meta/recipes-graphics/xwayland/xwayland_24.1.2.bb b/meta/recipes-graphics/xwayland/xwayland_24.1.3.bb similarity index 96% rename from meta/recipes-graphics/xwayland/xwayland_24.1.2.bb rename to meta/recipes-graphics/xwayland/xwayland_24.1.3.bb index a3ece64348..7e817a7241 100644 --- a/meta/recipes-graphics/xwayland/xwayland_24.1.2.bb +++ b/meta/recipes-graphics/xwayland/xwayland_24.1.3.bb @@ -10,7 +10,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz" -SRC_URI[sha256sum] = "141eb76e7e422a3661c08782c70be40931084755042c04506e0d97dd463ef7d2" +SRC_URI[sha256sum] = "dcdb57a66cc9b124c8f936760592628ac4e744a7d7b3179aa86189ad7ea4cb10" UPSTREAM_CHECK_REGEX = "xwayland-(?P\d+(\.(?!90\d)\d+)+)\.tar" From patchwork Wed Nov 27 04:11:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 53261 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 68CD7D66BB9 for ; Wed, 27 Nov 2024 04:11:57 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web11.64881.1732680711787988505 for ; Tue, 26 Nov 2024 20:11:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=oCQAZw7v; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-724e7d5d5b2so4730347b3a.2 for ; Tue, 26 Nov 2024 20:11:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732680711; x=1733285511; 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=n3C8oXHISNc4NW+FKF73OocDKBB6e0du1oC+P5ML4r8=; b=oCQAZw7v/O3+ZKnUHZcgrhd8NkMOvGTPDkjClIwQJ3MGErR/BdrFb043nhSH+FxDab F3UKOhCYgSdY/CjX/O38uxJ+MIVyflaOH4FnAeAvgBpB2kIsutegEA+K/+t52EeB6XS/ dA1nsfKTcp5wAheHDbuFYTtuoe8VS/HCGRphVTNli1ygNDzHe0fFdUrSulxMmL0gIIkd EY0unekX++ClAoT7P3ov3kwr3PURfXDQXIntwyp+xeeE+ntOKgvZ4SYcfj8FR+cWndZq 8OSghgPrs2PdcFWn9zi8qHQQsrLmqqOYTqJcIINMGcJOboCm0BlZTAJbfcNIIfHhgXIe 7AWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732680711; x=1733285511; 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=n3C8oXHISNc4NW+FKF73OocDKBB6e0du1oC+P5ML4r8=; b=MLEynqtXG2QoNRrt7DKf1DUG+XGL6sNo9GfmW+z3oynzuldJ/yJR66DEPjswQX4tVn baiE8PKnP4iQZ2VAcUIa8fO5ChXT3m5zj1zAjQGf5urwJwqJcQShDBLC05JrcR4XKGld rlxbujJ6WVZowpzwZj3xn9xIMeErcb+s7qEWKpHwPf8DIwAVWUhlhMDaiwzOsQcTxUg/ IwUlOQv2vFlford+JiFVTbm/2z1vpj4nfr/pPRlGluTqZk9t/iOSshC0iFIdB0ZTJ+w3 rXiwIU+OBBID+DfElAChjRnklMoaau+7IM1Oi9VR5P9tl2zR2GIRUW7RJMqmMh4oA7QZ DaDg== X-Gm-Message-State: AOJu0Yy1Acz/l1zSj4DJQ8JdYfUW1cLrRb5GoEyewhTR+NTY4kgiAcus cz49VswJKB/aIIQ/hV5dz1Y8/xdaE/3nqU7SccGKaJEG5MViVrkJFraBxaEE+28EDcPNTF0EUBI S X-Gm-Gg: ASbGnctyd7v2IMwTGufCkU4rNZSP2T6h3j8hse2XWMbhxXlavyVuanX+/rtpZhQ+3gd sdkE1AVvBiEkE87K0jn2wza5t0b7yWY7pOk5tiJpP+smuaew+jHXwG9sNQyiIv1OO7ONFI/sCgC Lxs/ROMv2Q9ED2W6Rj3j2IrRSVwWzuFEhle71/Cz9DjwbYAb/WOwDhlrmz+0nqTtX6KrJf2+xwJ 3EpokjRv+iDWI3pFrsGk9uvImSfjal8T7pdkXI= X-Google-Smtp-Source: AGHT+IGvkKsR6QoRjVu5DV1cPX28MM6SuCvSwPbXVtnw4sCVe9gbH20HmQgu6abP9E2wLF6ilqyI/w== X-Received: by 2002:a05:6a00:1956:b0:71e:4930:162c with SMTP id d2e1a72fcca58-7252ffd6fb0mr2216747b3a.6.1732680710960; Tue, 26 Nov 2024 20:11:50 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de485c84sm9240796b3a.80.2024.11.26.20.11.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 20:11:50 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 05/18] xwayland: upgrade 24.1.3 -> 24.1.4 Date: Tue, 26 Nov 2024 20:11:25 -0800 Message-Id: <95a4db564feff2c0dd21dad735b7a95a03c2a647.1732680538.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 27 Nov 2024 04:11:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207899 From: Vijay Anusuri Includes security fix CVE-2024-9632 Ref: https://lists.x.org/archives/xorg/2024-October/061766.html Signed-off-by: Vijay Anusuri Signed-off-by: Richard Purdie (cherry picked from commit 3fdc716d1260b4a92a46cfd2059ce044447f9172) Signed-off-by: Steve Sakoman --- .../xwayland/{xwayland_24.1.3.bb => xwayland_24.1.4.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/xwayland/{xwayland_24.1.3.bb => xwayland_24.1.4.bb} (96%) diff --git a/meta/recipes-graphics/xwayland/xwayland_24.1.3.bb b/meta/recipes-graphics/xwayland/xwayland_24.1.4.bb similarity index 96% rename from meta/recipes-graphics/xwayland/xwayland_24.1.3.bb rename to meta/recipes-graphics/xwayland/xwayland_24.1.4.bb index 7e817a7241..6f8589ba5a 100644 --- a/meta/recipes-graphics/xwayland/xwayland_24.1.3.bb +++ b/meta/recipes-graphics/xwayland/xwayland_24.1.4.bb @@ -10,7 +10,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz" -SRC_URI[sha256sum] = "dcdb57a66cc9b124c8f936760592628ac4e744a7d7b3179aa86189ad7ea4cb10" +SRC_URI[sha256sum] = "d96a78dbab819f55750173444444995b5031ebdcc15b77afebbd8dbc02af34f4" UPSTREAM_CHECK_REGEX = "xwayland-(?P\d+(\.(?!90\d)\d+)+)\.tar" From patchwork Wed Nov 27 04:11:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 53262 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 72171D66BBD for ; Wed, 27 Nov 2024 04:11:57 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mx.groups.io with SMTP id smtpd.web10.64662.1732680713623882454 for ; Tue, 26 Nov 2024 20:11:53 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Ym3X4hIa; spf=softfail (domain: sakoman.com, ip: 209.85.210.173, mailfrom: steve@sakoman.com) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-724e1742d0dso4301978b3a.0 for ; Tue, 26 Nov 2024 20:11:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732680713; x=1733285513; 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=wlWb2u3YlOAmEjoFrd0i19+bGH0DiMac2v0YpWhQIOg=; b=Ym3X4hIakpeNM52ViAh8dZW61NMZZdS8UhCKx8dtVv5ZkJnOiSOsxtHJjv3cwAcKSY XbwHOH03Eqg2D0o6uI5XqUWdO2B+XdgY3LYPEpjeVRmqbSN3fkB6VEw7G8MY7dD6L7hI s2oaCDq/fUPFfvTXB3ycOmXJlXe3vAMa2fTGCihj9uoOcTORBD61h4G73cp6SCk0kRK/ NQpNFLcrflMC9AndykRTlo+3RJ1yHUuKXSZ0rJdMadJgHUu60J+uitpLWXAjKI6lU37j 46I1kHxqffT4GEklmPYZ7dS7mjvV0kqZit/sytgxpwmLqMq4gzosUzIMQaeC99YcRlS9 Hslw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732680713; x=1733285513; 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=wlWb2u3YlOAmEjoFrd0i19+bGH0DiMac2v0YpWhQIOg=; b=BMsloc/hEqEiaBOFCBG2FjuOAsaqFs8Hid/oqOpP4N8F4vtYA4O50LSMkHlmhy4Hkh 1mXUX3lygqaldWWXbaSiuTu5bELzao+wAzS5JHIpRMGtcxjWchG154TcHNjiypA0fQSa RNFFVLKfh1/1juWayqZaMZAn6SMW16BNbPPALmIIKtsxMN45dq/V22D9YC9fRvI2Yfp2 +anAOuL1IneNfuQZLe1SmnVxzszeH0aMtJPCs9IqbWs940pUNEdtTJ3SNbyyrwCRU05X sCkWzc5g2axNysq6EPGBl2EtYaRdRWn92sTMnMmkvd+gJ7aR8gA9/15zOOrw9Llgr/4O ri7A== X-Gm-Message-State: AOJu0YwODWX9+MmZlu44gvdZ7fvor/E1bO3/dUTmoGQnr25/lTDF0N0d r1kaRhedMwHexHUHwsyy9dFfw2VrJ4L9k6LbtK0oFu37EJEGxrJnx2Ju89z0oxg/0r0FDEHt1zK 3 X-Gm-Gg: ASbGncvRDZbyARHJ1cJQNym9klPLT4604KOkqApNB1PP1dsIodmwdn1bi3qFKTmGilW BC8WF+lmz+oWRMJhZJYQ6KMueeV+BT4jtZuJeWvtbBvaT7BkM+kcUIuYRxS2PDkCZ0Fn5gewNOR AF1lutfhGmaCTci1TkMoQPWCX7QZbv3VlWoejuaz8pE+GYDDeO5nR/oq6o3t97sa+9mE+JGm11A RNjfSX3cJtGWQQ1M5fjSBfeOjJeAIC1xcKfkVI= X-Google-Smtp-Source: AGHT+IHFj2wy9JfneHlS0iujnP0Awc7bvLofFOGQOhCiwnjAS67VUWqONjOZ7fOh2zOGJclClxebbw== X-Received: by 2002:a05:6a00:92a6:b0:71e:1314:899a with SMTP id d2e1a72fcca58-7253014da2dmr2699230b3a.20.1732680712746; Tue, 26 Nov 2024 20:11:52 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de485c84sm9240796b3a.80.2024.11.26.20.11.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 20:11:52 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 06/18] linux-yocto/6.10: genericarm64.cfg: enable CONFIG_DMA_CMA Date: Tue, 26 Nov 2024 20:11:26 -0800 Message-Id: <0b5476e41714ba1290bad711d9adfe894c3a70e3.1732680538.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 27 Nov 2024 04:11:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207900 From: Bruce Ashfield Integrating the following commit(s) to linux-yocto/.: 1/1 [ Author: Mikko Rapeli Email: mikko.rapeli@linaro.org Subject: genericarm64.cfg: enable CONFIG_DMA_CMA Date: Thu, 24 Oct 2024 08:49:29 +0300 It's needed for graphics on AMD KV260. Cc: Bill Mills Signed-off-by: Mikko Rapeli Signed-off-by: Bruce Ashfield ] Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 7d1572bce914ff67c3e08f95dfd8504b00b9a8e0) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_6.10.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb index a1096f6a04..8f87a096ad 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb @@ -15,7 +15,7 @@ python () { } SRCREV_machine ?= "3e91e02b6041d6720a5cf2f64323bb9b73f20765" -SRCREV_meta ?= "83eed9befe28696b06fc5cc7bb31d81b27a7f325" +SRCREV_meta ?= "0e4596272608c13c9e25bbefd6f27f213bac077d" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.10;destsuffix=${KMETA};protocol=https" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb index 50a461149d..abfee6953d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb @@ -18,7 +18,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" -SRCREV_meta ?= "83eed9befe28696b06fc5cc7bb31d81b27a7f325" +SRCREV_meta ?= "0e4596272608c13c9e25bbefd6f27f213bac077d" PV = "${LINUX_VERSION}+git" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.10.bb b/meta/recipes-kernel/linux/linux-yocto_6.10.bb index 81898a4328..9b2334afd0 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.10.bb @@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" SRCREV_machine:qemux86-64 ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" SRCREV_machine:qemumips64 ?= "61cac1396fe9250a4b7a5cc6ae3deb9dda4290c3" SRCREV_machine ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" -SRCREV_meta ?= "83eed9befe28696b06fc5cc7bb31d81b27a7f325" +SRCREV_meta ?= "0e4596272608c13c9e25bbefd6f27f213bac077d" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same From patchwork Wed Nov 27 04:11:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 53264 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 75C49D66BBB for ; Wed, 27 Nov 2024 04:11:57 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web10.64664.1732680714967688927 for ; Tue, 26 Nov 2024 20:11:55 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=bgGzGSDY; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-724d57a9f7cso5219047b3a.3 for ; Tue, 26 Nov 2024 20:11:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732680714; x=1733285514; 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=ZVv8T/U4LV4ak4uYuzVpx1dmzUpqhpbpmfIVRseRXlU=; b=bgGzGSDYXErfOX00+bqrVJtJ63HLgNd9Om4p2YyJekiXKcXlDpfKi4L7hms2A68FEE OqS5EYX+kOyOt+Rr9tZl+onF1oqBRl1H0ey6Nc7VbacTrOM70KTqu7BXrE3XsxEBQDSZ X3RWINQ52Jn+7PBj8TeY33WEQuCR48lVeoTjeUvs9oCywv7EMU1/BDSAKREH2TeRixFy lOztkSDzRD1tmV0gwWMOqMnls8Rv+p+id5DZcxbjYqBpr2nyajkqx1E3a1eLsSxxYvyK 1kWBvaK5+yivvmeFUYeX9gZ4xW0e0EWFO4c5B0amAhKjYkLlwKKUAh9jTeZN1OJhh5As OPbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732680714; x=1733285514; 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=ZVv8T/U4LV4ak4uYuzVpx1dmzUpqhpbpmfIVRseRXlU=; b=WZ8pZHLcoFb6g8g1OeBBw4MWT8EJaFOJXBl6/fPblOIDKNViYhKkeAdlwGRYgt0lYJ BxiMLJQFtIYN+0shiWdrL3Fne3IFt8cJPFnDnZWRNefqCJPLjMcLsxRc4bgqAoeWFNuH nS1COrB5IDeRxAvDnfgnugdv20Ga8K8TRyfaGdsuQSUKlezyqpfNewXXUuEHmelIOHOZ jKJq/EVT2kLdpBwqxiYed1+Dxbybe9ZLBZGeae8do3tV2Fo7lEg33WteU76BjdAljqnt lvko8Qv6kq63LSAM0G1kmfQjvSYM3/HtPz19ak18HX5lJ0tbdlGq8g+Rhq2Ksb2/zGYm nzIQ== X-Gm-Message-State: AOJu0YxrwxlK8WpFMKQxhCgrrq8Ah7v/hXzohCVsL211VaBrg9ohRWVg 98Apwbbjoaf8Tc7a93lNiB0uOH44jjCe2KgxyqzIMiM4rNEaOzynPYhbu9DyPtlz7vL/KogAq/x i X-Gm-Gg: ASbGnctsjUR3kDgrpBFhXIdz0m5vqNbE5xONrHq04196xOscZ82Qliafl6XgsiMPMJ+ o8FPujr57o2HaStRjtZFuiS0ib1A7Q4K8TF0PYyTqO1mO6OMyPU2s/8VZ55MRMofcGq4PgR5KKK jWk6dzUGI3VrYGI0bNK49U+rVp/EqCi7aSsRw1rmEO63SK/9Q3aey9CBBlaAdVio1FrHT7qsAJz R9Je3N993aAP/3/ISQOs+wPsKdFNLySVYPfcc4= X-Google-Smtp-Source: AGHT+IEct65Sq/bf+N8ZkIOKG7X8ngkJkNd8jwk5ChN+jDb8RzmbiIGaeSe5xuZIOZOaCNuch/3Iug== X-Received: by 2002:a05:6a00:3a1c:b0:71e:14c:8d31 with SMTP id d2e1a72fcca58-7253013e41dmr1966332b3a.16.1732680714141; Tue, 26 Nov 2024 20:11:54 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de485c84sm9240796b3a.80.2024.11.26.20.11.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 20:11:53 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 07/18] linux-yocto/6.10: cfg: gpio: allow to re-enable the deprecated GPIO sysfs interface Date: Tue, 26 Nov 2024 20:11:27 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 27 Nov 2024 04:11:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207901 From: Bruce Ashfield Integrating the following commit(s) to linux-yocto/.: 1/1 [ Author: Bartosz Golaszewski Email: bartosz.golaszewski@linaro.org Subject: gpio: allow to re-enable the deprecated GPIO sysfs interface Date: Mon, 11 Nov 2024 14:08:23 +0100 The GPIO sysfs interface is disabled in standard linux config and in general users should use the character device instead but there are still programs out there that depend on it so for the time being add a kernel feature allowing to enable it. Signed-off-by: Bartosz Golaszewski Signed-off-by: Bruce Ashfield ] Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit ae19861bfc336d869a7a84b13ab3e7b318e1b560) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_6.10.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb index 8f87a096ad..fa78313a9e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb @@ -15,7 +15,7 @@ python () { } SRCREV_machine ?= "3e91e02b6041d6720a5cf2f64323bb9b73f20765" -SRCREV_meta ?= "0e4596272608c13c9e25bbefd6f27f213bac077d" +SRCREV_meta ?= "3a72fcf6df4fd9edc8c5933393be76cea6cb4a42" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.10;destsuffix=${KMETA};protocol=https" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb index abfee6953d..d21fd63d38 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb @@ -18,7 +18,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" -SRCREV_meta ?= "0e4596272608c13c9e25bbefd6f27f213bac077d" +SRCREV_meta ?= "3a72fcf6df4fd9edc8c5933393be76cea6cb4a42" PV = "${LINUX_VERSION}+git" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.10.bb b/meta/recipes-kernel/linux/linux-yocto_6.10.bb index 9b2334afd0..45d7bfd619 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.10.bb @@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" SRCREV_machine:qemux86-64 ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" SRCREV_machine:qemumips64 ?= "61cac1396fe9250a4b7a5cc6ae3deb9dda4290c3" SRCREV_machine ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" -SRCREV_meta ?= "0e4596272608c13c9e25bbefd6f27f213bac077d" +SRCREV_meta ?= "3a72fcf6df4fd9edc8c5933393be76cea6cb4a42" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same From patchwork Wed Nov 27 04:11:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 53265 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 77245D66BB9 for ; Wed, 27 Nov 2024 04:12:07 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web10.64668.1732680724912094487 for ; Tue, 26 Nov 2024 20:12:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=FAsBCcG7; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-7f71f2b136eso5118182a12.1 for ; Tue, 26 Nov 2024 20:12:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732680724; x=1733285524; 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=1h/57eVIUd/Hd1x/CoMEujq0nlznAeijLvrvdtSwVAc=; b=FAsBCcG7W/CIfeXPgqLpJkZhZy9wy3nkISa/qVDoGeiG6QKF0lqsxqXxVhBxtXAbZO 2Ege382EXkV3hsfQjhdvY7Eo3KJ6FBGvXRjOsHEa/tEgVZXMTD1TttJ5B7kTtbjX33zv 9ZIUcnH6qw0wFA3b4trwON+qGxw4QbbmQgNc6R/zBBGWeR/Q/+FpOUDk65JTgwFE17f4 ZFa6cP8F/X+23bqceNfYJDMvRb+woPXQmn8eG47Nti96MKiLWpHXScPkMb4qZi6g7Ypw g8YcF7qqSkYzml8ZM1r6HDoWZu0VkJ+0jpSCzLEqwvo/UdtDbwxybzgV2AFEb091fVMK u+3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732680724; x=1733285524; 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=1h/57eVIUd/Hd1x/CoMEujq0nlznAeijLvrvdtSwVAc=; b=jqk8ndu34sEY+v/j/opYPb0o6OSSiJSaxUWVY9s7f82ztzKgxkhYPu3y6QwWwqQERD bAnNHlrHuV36ykPEplTqsoj2TrcY/nqC3JqKdvu/okYmZkHx8mV2voWloT1Sq/jI7gPe JhKsO7GkIuRqIt9dKq/lMYw3TLF99EK7w2+Hj/SjZ1rSpR+OZG+k3XSiKYSrJNrNhqrd xG1P+45nkoeEFCYXJ/xXncFEC8ockgW8Www7eZChU1yxBXCRZzNxyocjhzMjDx77hyEh 2/YXmH6EBut6wQxCEVyEwIv7XB0x30oQx6DUvlfrLU7C5z6H4kgIehY2G1N7EyPZ8GyC HZcQ== X-Gm-Message-State: AOJu0YySpnVLjsdtCq6mbTKMTdSvWce/TrkuGrkaYSVL12mJrj5+mvLY +gxQLDty7C9LppDGPA43N3gztL5v8zFBCxH8IfqZhWPZ72LFECp8KTgsTzcrt7bQEpg5ZsKdxIb + X-Gm-Gg: ASbGncsFdxlVHbN3pD0a6bn9/uspWwK5ru5uLfASXsoHeTCh1eeaAzXSyYVjA8oKIT+ oenQ3Cn8l3j8ngZ5fMBmdmSNwLe4dthCPmiQ7ETg2HDdybFK8SvF7bXnOggRCAVaFYjCZm1r5Xz Z1kOx+FsssTss8uMyiEoLmeBAC0jSnnnGbRHsUP8uY1fKWUD4HY56z9fN0e7RaNA/u9qRcLmnMY zsEu3kpmOuArc6fRIwh/4mcLlb8WTDfQozsOfc= X-Google-Smtp-Source: AGHT+IGSSt/98fDlGsVPPWepdoLCnJFAveuAg/dFbXFC564HRJA73xaiZhSeTbkMypdBQgj2MYZRuw== X-Received: by 2002:a05:6a20:748f:b0:1e0:d10f:806c with SMTP id adf61e73a8af0-1e0e0afa675mr3010946637.6.1732680724045; Tue, 26 Nov 2024 20:12:04 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de485c84sm9240796b3a.80.2024.11.26.20.12.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 20:12:03 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 08/18] linux-yocto/6.10: bsp/genericarm64: disable ARM64_SME Date: Tue, 26 Nov 2024 20:11:28 -0800 Message-Id: <3a6e6639b0dc4a49adfba15e720bb884d9859aa7.1732680538.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 27 Nov 2024 04:12:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207902 From: Bruce Ashfield Integrating the following commit(s) to linux-yocto/.: 1/1 [ Author: Ross Burton Email: ross.burton@arm.com Subject: bsp/genericarm64: disable ARM64_SME Date: Thu, 21 Nov 2024 15:53:35 +0000 From upstream: arm64: Kconfig: Make SME depend on BROKEN for now commit 81235ae0c846e1fb46a2c6fe9283fe2b2b24f7dc upstream. Although support for SME was merged in v5.19, we've since uncovered a number of issues with the implementation, including issues which might corrupt the FPSIMD/SVE/SME state of arbitrary tasks. While there are patches to address some of these issues, ongoing review has highlighted additional functional problems, and more time is necessary to analyse and fix these. For now, mark SME as BROKEN in the hope that we can fix things properly in the near future. As SME is an OPTIONAL part of ARMv9.2+, and there is very little extant hardware, this should not adversely affect the vast majority of users. Signed-off-by: Ross Burton Signed-off-by: Bruce Ashfield ] Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 022f9814cb9d6d420e9d89a746f4c67b452c498f) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_6.10.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb index fa78313a9e..7c0425bb27 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb @@ -15,7 +15,7 @@ python () { } SRCREV_machine ?= "3e91e02b6041d6720a5cf2f64323bb9b73f20765" -SRCREV_meta ?= "3a72fcf6df4fd9edc8c5933393be76cea6cb4a42" +SRCREV_meta ?= "af06ad75b8da89e99d2cc0090ce2a7877ef51391" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.10;destsuffix=${KMETA};protocol=https" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb index d21fd63d38..891dcb596a 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb @@ -18,7 +18,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" -SRCREV_meta ?= "3a72fcf6df4fd9edc8c5933393be76cea6cb4a42" +SRCREV_meta ?= "af06ad75b8da89e99d2cc0090ce2a7877ef51391" PV = "${LINUX_VERSION}+git" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.10.bb b/meta/recipes-kernel/linux/linux-yocto_6.10.bb index 45d7bfd619..3718077ea9 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.10.bb @@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" SRCREV_machine:qemux86-64 ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" SRCREV_machine:qemumips64 ?= "61cac1396fe9250a4b7a5cc6ae3deb9dda4290c3" SRCREV_machine ?= "bbe3d1be4e9c03765cb4f93155eabfc0724d3bee" -SRCREV_meta ?= "3a72fcf6df4fd9edc8c5933393be76cea6cb4a42" +SRCREV_meta ?= "af06ad75b8da89e99d2cc0090ce2a7877ef51391" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same From patchwork Wed Nov 27 04:11:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 53266 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 77274D66BBB for ; Wed, 27 Nov 2024 04:12:07 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web10.64669.1732680726317445428 for ; Tue, 26 Nov 2024 20:12:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=2MIHR2Z1; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-724e14b90cfso4481064b3a.2 for ; Tue, 26 Nov 2024 20:12:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732680725; x=1733285525; 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=iSHODsRCg6oFVq4PP3wcKTGzoUScDfKIeeXtpdDFV0g=; b=2MIHR2Z1hUGdzUpQ+zf4qmm7vUGAO9+Ic2edLSRo/VUQtxsNzUbFZkQqRfshgwWS7H EyGA2xwBFkk6NDUZoyBfhwF6rLXFPeRstHKMuq5BjOMc/uJU9hcS/HhxWJP581YhUrEK H9RQbSdsgY9lYv0NevQ49IhMvCm1iK2cZ9pCD9yjVfOt0PDOmuA1YP8J0oxf7pxQeIDk RmvHq0KD3bg1bOlnIUzqn0qjJz4PJDox1zsE2PbR8WGKK1pjnAFzEzRKQOnVjxQN9Ty5 544PTwhKWIkGD4rh0LT8rZj5DNcmYor5frFeGNAwLPKFHKRP6mIC3aE/LamyQGs53Jbc ffcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732680725; x=1733285525; 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=iSHODsRCg6oFVq4PP3wcKTGzoUScDfKIeeXtpdDFV0g=; b=itmP4mrrqGyAveA44Hgp9rYg+Uw3Z9/vz3HUUJsTRREIEmh62FCq+GgfStAeQTX58y RNHb1oJtWV6mLHbaBS+o5U8LooHgvbD8BZeAiHjmN7hbWD6HIvJP8IsjsN6UEWIH319o IOpTH23Oy3c5ZlMU4LeXRvo7o6bivC3cCdBNP8ChOQJOsAkGFLSL/0RsZm3TVftuDXLa lBdeRU5ZxB4M7+MoDF1w8JR7wO/0/f+nmL1zsPd7bNrlbcPqhgQTRxAnJ/DhYJxy3jTK ABMpN/u+ISAgLjjYeCyicm570KVrqhu2pBKIo3HbhLkvX8MF5fX6RW+odBBVRDiRRRZG m1ug== X-Gm-Message-State: AOJu0YwJ4bXUVgmpRUXIij/p/asKh3n3cEPwdfS7mXfOc3m5RgV+XTTj EekLYEo6oleVj9yXyRyGc1BYB0v388CQMXJaTq5baBGNCAwIS6Vm92kStSEQmRFeNe0711tqAJ1 / X-Gm-Gg: ASbGnctdnAkn8CwGgt7HtoUmWLxg5H7/guBx/QdciJVEZaQ1u92KsMCT5+vBesd5y6c kPODjB/ZmwJppIMf2qwQyaPXb6/WYGUUueBPmGMR78/UNfTbZBs4SUaLMrox9c+IHK76BIYCWSQ 0lwdgZz9CCIdtUMJp+9dpJZZTEpRGKLdfEPMTZSEC6C5EwVV40eWDvM1eLWLq0udWcdrZ1d1EMV 123N8AA7xCw9lRf3tHCKXjgtqV0ZJDzF9snLG8= X-Google-Smtp-Source: AGHT+IG2IjYZxMYVgTq/njlLL3MLxtSHSBNePrFbwIKHBzV9JIZUgath5UMgC8yI2hjl/WDTpz5tdA== X-Received: by 2002:a05:6a00:1887:b0:725:2b93:3583 with SMTP id d2e1a72fcca58-7253014c613mr2161494b3a.21.1732680725526; Tue, 26 Nov 2024 20:12:05 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de485c84sm9240796b3a.80.2024.11.26.20.12.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 20:12:05 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 09/18] scripts/install-buildtools: Update to 5.1 Date: Tue, 26 Nov 2024 20:11:29 -0800 Message-Id: <4f58037a49ef538d89d9c6df81b1b2d8a2eab4d7.1732680538.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 27 Nov 2024 04:12:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207903 From: Aleksandar Nikolic Update to the 5.1 release of the 5.1 series for buildtools. Signed-off-by: Aleksandar Nikolic Signed-off-by: Steve Sakoman --- scripts/install-buildtools | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install-buildtools b/scripts/install-buildtools index 92a4c9dfb1..6387287ade 100755 --- a/scripts/install-buildtools +++ b/scripts/install-buildtools @@ -57,8 +57,8 @@ logger = scriptutils.logger_create(PROGNAME, stream=sys.stdout) DEFAULT_INSTALL_DIR = os.path.join(os.path.split(scripts_path)[0],'buildtools') DEFAULT_BASE_URL = 'https://downloads.yoctoproject.org/releases/yocto' -DEFAULT_RELEASE = 'yocto-5.0.3' -DEFAULT_INSTALLER_VERSION = '5.0.3' +DEFAULT_RELEASE = 'yocto-5.1' +DEFAULT_INSTALLER_VERSION = '5.1' DEFAULT_BUILDDATE = '202110XX' # Python version sanity check From patchwork Wed Nov 27 04:11:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 53267 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 72C00D66BBD for ; Wed, 27 Nov 2024 04:12:17 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web10.64670.1732680727666560224 for ; Tue, 26 Nov 2024 20:12:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=veoXhggl; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-7f71f2b136eso5118218a12.1 for ; Tue, 26 Nov 2024 20:12:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732680727; x=1733285527; 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=TT9ht49fM0Sh0yxYc/tnLG5X7KPDLQ4Hq8o0IGhc318=; b=veoXhgglAg6Hz6/U3Gpi6VR7byfscXlnH3rQHMhxz/alYJj6xwZrA8RO5KX6kk6uyC RZGTBZGvjmUlNrC+pUyf83hmSR+3lakb9n3jQPvLo1aJR25MrKUV3i6RX2Cp4KmI7ZLD +96V2Agc66jbGLmiDP4e3cmDoI/uku4e326hyTgoEAM099Cv5W2WkyHGZRIO4a5sgBND zJsW0StNG/4EGR9s8dYmgA3rOw/NbstOq8tUDL8H31Sx0os3ugfLhA/QJeoxfpekUdOK ibm8s66ItNSU/9fRCaZ+56ECUgZPffM3fz9SnL22HlQyht9cx3rbMJBR5dxaG43nm9JQ dWfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732680727; x=1733285527; 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=TT9ht49fM0Sh0yxYc/tnLG5X7KPDLQ4Hq8o0IGhc318=; b=FNgU2goEmKvxVqO6obahxOC90WxlHZF1IyaLvEDhuL1Ck+w6ZEfyGNBX0wlD9Phd2T zxb+rrPQotqK4/fszle4pJI57EYdl2MVXqCA7n2O4103lno8hKNFT+ETcTEbKRzUNDJG R5mtaiB8z9z4BVj0qAr7OB5jtcE3RA8k6BvRmTBGjhtwub2lPBGthNPoDctY3w188ryM lVQqMTIa/wIxd21Y6H7FEXz+5sj5X62SL1LnILzvk9YIw0AEMJEYv4Udtwbc3fiXaZiA gt3cr4Ceb6Kfd7aVrf+iROwLYZ550Vu2v9rqVBQ6MZgFkeeM6Hlu9f6NOEXKxDJIhExI U00A== X-Gm-Message-State: AOJu0Yz6KZc6yuizPDfu+Wo2oxaSYUiFHxLyQYGWoM8A+foxFXjyy32I QaDDLGMwoKT7aGL4UCf3kpwFgIhoFC/hyXZKb99HXOEI6Ojt7W50l+8/bKqHBGLWSYo/QXjiMF8 m X-Gm-Gg: ASbGnct1jJp9TsHQU36gcpISXFZBFyMjZzSpcTNx8oUeGClDtSI999oPZY3Hg5T6r7o WLRWAQAQEUUcY0azH0u+UyfMHf0/HiJ8JOkJEEtVIuM5vEncAmq2ZAW05BkC4FESbNjB15h71NC vjMlh9Ii7ge9wdqZpqyGI6Di1zqhNoHVU1EgVJbh7Nf5imAQgw5verHl8TSc9VX3+JIb3FkVkNe 1juAspIkuO5dwj3RYeasvezQfcpcOxCKi1kiDk= X-Google-Smtp-Source: AGHT+IHJtrH89g9qt7pz442k8cBMFdtD13KzmdpaucEMayP5O76Dlc6lqySYs+HQf2oQfxA9EAkQYA== X-Received: by 2002:a05:6a20:6f0a:b0:1e0:d766:8da1 with SMTP id adf61e73a8af0-1e0e0c033c3mr2622435637.39.1732680726912; Tue, 26 Nov 2024 20:12:06 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de485c84sm9240796b3a.80.2024.11.26.20.12.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 20:12:06 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 10/18] systemd: fix broken links for sysvinit-compatible commands Date: Tue, 26 Nov 2024 20:11:30 -0800 Message-Id: <681e3d20c2ac16778e302b468ec278aed9562639.1732680538.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 27 Nov 2024 04:12:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207904 From: Yi Zhao Since commit[1], PACKAGECONFIG[sysvinit] is not enabled by default when sysvinit is not in DISTRO_FEATURES, which causes the following sysvinit-compatible commands/services to not be built and installed: runlevel telinit rc-local.service systemd-initctl systemd-initctl.service systemd-rc-local-generator systemd-sysv-generator systemd-update-utmp-runlevel.service Therefore, links to these commands/services should only be created when PACKAGECONFIG[sysvinit] is enabled. [1] https://git.openembedded.org/openembedded-core/commit/?id=3668235fd60a9027608f37251c4b453ed21b3687 Signed-off-by: Yi Zhao Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie (cherry picked from commit a20b698f1acdee972cf1ff570b09a2e2c36bef1a) Signed-off-by: Steve Sakoman --- meta/recipes-core/systemd/systemd_256.5.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_256.5.bb b/meta/recipes-core/systemd/systemd_256.5.bb index 68f15ab065..af810c0fcd 100644 --- a/meta/recipes-core/systemd/systemd_256.5.bb +++ b/meta/recipes-core/systemd/systemd_256.5.bb @@ -339,7 +339,7 @@ do_install() { install -d ${D}${systemd_system_unitdir}/rescue.target.wants # Create symlinks for systemd-update-utmp-runlevel.service - if ${@bb.utils.contains('PACKAGECONFIG', 'utmp', 'true', 'false', d)}; then + if ${@bb.utils.contains('PACKAGECONFIG', 'utmp', 'true', 'false', d)} && ${@bb.utils.contains('PACKAGECONFIG', 'sysvinit', 'true', 'false', d)}; then ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_system_unitdir}/graphical.target.wants/systemd-update-utmp-runlevel.service ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_system_unitdir}/multi-user.target.wants/systemd-update-utmp-runlevel.service ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_system_unitdir}/poweroff.target.wants/systemd-update-utmp-runlevel.service @@ -841,7 +841,9 @@ python do_warn_musl() { } addtask warn_musl before do_configure -ALTERNATIVE:${PN} = "halt reboot shutdown poweroff runlevel ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}" +ALTERNATIVE:${PN} = "halt reboot shutdown poweroff \ + ${@bb.utils.contains('PACKAGECONFIG', 'sysvinit', 'runlevel', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}" ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.systemd" ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/resolv.conf" From patchwork Wed Nov 27 04:11:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 53268 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 73E11D3B9BD for ; Wed, 27 Nov 2024 04:12:17 +0000 (UTC) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mx.groups.io with SMTP id smtpd.web10.64671.1732680729365442173 for ; Tue, 26 Nov 2024 20:12:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=cFAT9QMk; spf=softfail (domain: sakoman.com, ip: 209.85.215.176, mailfrom: steve@sakoman.com) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-7fc41dab8e3so1326204a12.3 for ; Tue, 26 Nov 2024 20:12:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732680729; x=1733285529; 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=FWkhdiQThyDxsp/gq0cnwgI9PXMr5ybdNQFBiMZTqVs=; b=cFAT9QMkMVYY8iSxyE+PU8adAqpZoB1VCuiUTwi8cJREe0Hy+77fqUsHEgbUFNxqts RmQDiwsXBzI0cothSllYz3R2pkt8Tpabfvk6J8nbzayWd1UVCFyu0jaOkdyI/Siyl4+q z2IJbhobJzwM+jc1spzsxnycKgnTQGSJ4Kk3uILXeYB/S548EB+sxjwQ4DxU5eRKwQ9J IEdif3gLnJZrMB3wSZhwso0z8BtMr82kFlPZCT3pb/jZGPm0vEznVK3IbkQlgex7dXnV adyrtZNHWtvUpGfu2mgRrNHw7KP4PEHhTEuupLr0ne/J1SvrcNcDhEF6HP3hbIZitFUb E1xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732680729; x=1733285529; 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=FWkhdiQThyDxsp/gq0cnwgI9PXMr5ybdNQFBiMZTqVs=; b=rD3og9POABgKBqB6JPyInCxUGGMfFtBZei85nZ5/U7cTVCVvIqX+p3Hj1GDl4mJKRJ pZYQBxwh5Ro2aLp7t5KNPRLkKEc4roGZZ/RYD8yufbW4RAb3AFOTDMUnjWdmvfnCA5K2 Z8JOniNHKxcNPBKiGb8Qo0CnTHshg39VBbBdJAYU1Dl5d/q8+pe8ml7rn7QN0CzIXDiM zLAyUk89wmXXTIIfIen8beyxUoyKyusQgGPWlQVT3eC601kTsex0JNumd2wIAH1NnGAw b9ZXK5rDcIu2/Py+nYJlHc4jpy4Dpos/Lyh6fg0bvOsopkvt9UzelKmB67D4gzkXOr21 G2jw== X-Gm-Message-State: AOJu0Yyofk7H1pbwMM0oP3eu/3nubf0gy0y6lTIn7WW0dZGiRmyVV1+t 6QIBL8+HmmZs6+7Yhm9AHWQYxbFlA7AGGNyEzCT6ZOMn+eu/5MlaFtZZtuHd0wls1B8n3OivfzG N X-Gm-Gg: ASbGncuMt9D6u/030nfrxy5srDIdi32fFFo5SSVuj8NQ8nI5jV0SSilZ4ldvXEGqpVx lKxEjrch/sCsK5lEoViH0wk5wZkamgD7IsSGipspXkRTM54ahWFxesHtb5VzPXvnfPgKiEgRjmL Ej58zp2X+h7++9NU0rWRJwrPjutbjlCIRJXLuNUv6vAzaHYOBrnfYGDLXnuJkxryOTmk7Zz4C/5 y+WPxzriI2icJgz33dcJ1dF2O3010eVYes7J1o= X-Google-Smtp-Source: AGHT+IEW68RVvRMzgwbFRwJbU/reIXxSZ8eQjLdYF29eOgR/9d++L+SSMjh7tLqreU49kUCH6YVVog== X-Received: by 2002:a05:6a21:2d87:b0:1e0:c954:ea7c with SMTP id adf61e73a8af0-1e0e0b16a5emr2903750637.27.1732680728655; Tue, 26 Nov 2024 20:12:08 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de485c84sm9240796b3a.80.2024.11.26.20.12.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 20:12:08 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 11/18] ffmpeg: fix packaging examples Date: Tue, 26 Nov 2024 20:11:31 -0800 Message-Id: <24bf3ad245fa2dba14a59477279c6db3c8bcd088.1732680538.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 27 Nov 2024 04:12:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207905 From: Martin Jansa * I've noticed that ffmpeg package isn't created in my builds, due to --disable-programs in EXTRA_OECONF added by our .bbappend, but was surprised that lib32-ffmpeg is created. * lib32-ffmpeg was created only because it contained the examples which are installed in /usr/share/ffmpeg even when PN is lib32-ffmpeg as we pass --datadir=${datadir}/ffmpeg in EXTRA_OECONF here * --disable-programs controls ${bindir}/ffprobe ${bindir}/ffmpeg and ${datadir}/ffmpeg/ffprobe.xsd ${datadir}/ffmpeg/libvpx-*.ffpreset Signed-off-by: Martin Jansa Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie (cherry picked from commit d7bf828b6431a254201675e41047f53da47912f5) Signed-off-by: Steve Sakoman --- meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb index bb6b71735c..db0aa60826 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb @@ -182,6 +182,6 @@ FILES:libavutil = "${libdir}/libavutil${SOLIBS}" FILES:libpostproc = "${libdir}/libpostproc${SOLIBS}" FILES:libswresample = "${libdir}/libswresample${SOLIBS}" FILES:libswscale = "${libdir}/libswscale${SOLIBS}" -FILES:${PN}-examples = "${datadir}/${PN}/examples" +FILES:${PN}-examples = "${datadir}/${BPN}/examples" CVE_PRODUCT = "ffmpeg libswresample libavcodec" From patchwork Wed Nov 27 04:11:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 53270 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 72C30D66BBF for ; Wed, 27 Nov 2024 04:12:17 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web10.64672.1732680731201563546 for ; Tue, 26 Nov 2024 20:12:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=WcpkOXK7; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-724e7d5d5b2so4730530b3a.2 for ; Tue, 26 Nov 2024 20:12:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732680730; x=1733285530; 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=oWuOyCgrBrh3EN0Cps5LUohtDFWhmI5daNF56h0sHOo=; b=WcpkOXK7VVGk3IscvKzX2K7rOqL4F4JGI0zkSySgErS4/IojNlp/+NDmqNYQxGhMPs JEl340xutt89KPMKMmZy7jBhSUVqtYe1nR6bvzGLvUvJpgZ+UxDxNK1EJ0Cd57jJyosk /UxaTU7oo69eDe26IM+TQNzWHq9LyytFh21IaYtY9hfTfdM9BorQ+Z1EAEATC0/DIKU4 rL53FI05fibGxFqXMil1wGGm5CYymAb4V6haKuRP7FeTtGrG8+yjs6aX9Rr+hwcqW8BI 2913ewxhXMve62FxiLJNMuW7fBKBAZvnlF0chwBseQThI5qga650QipBH2K1tMjLKBex +HqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732680730; x=1733285530; 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=oWuOyCgrBrh3EN0Cps5LUohtDFWhmI5daNF56h0sHOo=; b=iW73wXCAPB7ZwucFUq//kM2YUydPuJMOzyK0WYPall3/Z6BhrU7gRwLiY7FNDfFoJx Gsh5baB9HfPh7KzHOkya4dNKWwQ4Y8N6GlBHRjXvG75KnBh1pi+TGNIB9olrob5KcLAQ C2W+e3l5H1OSJS3ToLlYgNFvtQyYjucKKqdKZIhW2UVNgcELi6dOmBQvjR/ZgYCGX6gB IGosi01TkoF/DtP3bbJx2bfj3E1Cw006iuuGFvRS5XhSy5JPpcsa4DdGniosBssSyhmH dBR8NGXGwykA7m0gKFMGagsKrIecVE7KtHIFVQv2p08DZJktRmtShE8EU/CowqFqkz3U zi4g== X-Gm-Message-State: AOJu0YwHcceLurMyj/AFjf9DDv76I6TzaKsWa2OBVw18V6WXtAub15KH XK3ddyUUQz/lfNmCFcMRV6rCroGGHjygeQqV//LywCdhOzUHZaLlEvB8ur+ZY6CVLAdczSEzqlM L X-Gm-Gg: ASbGncuO+PgQK5OqOmItiVnaMgObuIMH43CQVfd3XU27MCMmF3YUX2Zj1XCFr/x0LaI 03I1VhnY1usq81KugPHIAD8kcG5ygU+4uc9upTD2rYBNa/KClCmmQR9sE6VRrwseVpFqu+kU2R4 mavelPQ+/9fvI+zYS6xPSW+Utchm1NmumELH27U6Aq4OylBycNiQ9Yd/07YP1wSeWMwWAYpoWyA C7xpZSBMUCCEkyC0GgonFS0tnkmb5Hw+AuQa94= X-Google-Smtp-Source: AGHT+IEx6H57LGA3O4OkvgJl9NnobF4iCfIVl9xL75UTQUaqpql/oPmDEgJNSF1hFNQ7Vk+iI3+Jvw== X-Received: by 2002:a05:6a00:230b:b0:724:f86e:e3d9 with SMTP id d2e1a72fcca58-72530045af1mr2244554b3a.14.1732680730185; Tue, 26 Nov 2024 20:12:10 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de485c84sm9240796b3a.80.2024.11.26.20.12.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 20:12:09 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 12/18] shadow: use update-alternatives to handle groups.1 Date: Tue, 26 Nov 2024 20:11:32 -0800 Message-Id: <822d70b7ccc2e5922de99a7703ec7eb3f814e29f.1732680538.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 27 Nov 2024 04:12:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207906 From: Chen Qi This patch fixes the following error at do_rootfs: update-alternatives: Error: not linking /PATH/TO/rootfs/usr/share /man/man1/groups.1 to /usr/share/man/man1/groups.1.coreutils since /PATH/TO/rootfs/usr/share/man/man1/groups.1 exists and is not a link The problem can be reproduced by adding the following lines to local.conf and then building an image: EXTRA_IMAGE_FEATURES:append = " doc-pkgs" IMAGE_INSTALL:append = " shadow coreutils" groups.1 is handled by update-alternatives in coreutils recipe, so do it in shadow recipe too. Signed-off-by: Chen Qi Signed-off-by: Richard Purdie (cherry picked from commit 78c8eb60097df2e16c699464c39ff9142fc1ae69) Signed-off-by: Steve Sakoman --- meta/recipes-extended/shadow/shadow.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index b5e77b9874..171d6e27c3 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -200,9 +200,10 @@ ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" -ALTERNATIVE:${PN}-doc = "chfn.1 chsh.1" +ALTERNATIVE:${PN}-doc = "chfn.1 chsh.1 groups.1" ALTERNATIVE_LINK_NAME[chfn.1] = "${mandir}/man1/chfn.1" ALTERNATIVE_LINK_NAME[chsh.1] = "${mandir}/man1/chsh.1" +ALTERNATIVE_LINK_NAME[groups.1] = "${mandir}/man1/groups.1" ALTERNATIVE:${PN}-base = "newgrp groups login su" ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" From patchwork Wed Nov 27 04:11:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 53271 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 80C4AD3B9BE for ; Wed, 27 Nov 2024 04:12:17 +0000 (UTC) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mx.groups.io with SMTP id smtpd.web11.64891.1732680732522886928 for ; Tue, 26 Nov 2024 20:12:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=odbnQUxp; spf=softfail (domain: sakoman.com, ip: 209.85.215.170, mailfrom: steve@sakoman.com) Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-7ea8c4ce232so5568709a12.0 for ; Tue, 26 Nov 2024 20:12:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732680732; x=1733285532; 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=QF87IdLUt9OH85ynMkiwRlV70diyi+gR7IUWpkgdjLQ=; b=odbnQUxplNF5BdFuf2zQIW2bM5O2Bvp02DFsF2K97shHMLTr8N5oJ2bBj3aK6v+7Gd W3bUSMYstJ8C9ox4+xdDQ92nSMoOlUCH5cXzvc7KdPjJoIIGjHr8o5RxgRbxdQ0XXgWt lrilhm+okBYeDSunihuWPFCF4DsPDC7hlE0P2PL7hEFw5XVav14jzF7E1YNbpuaFcbE+ xsx9Krq1TikYv1p8vKhqUVAfXK42BmFT1oZoNsxoIdswouftgIihv/ZFDjvB2eH78gGI nIqPHSSghTEg+J9uYvrk3hbuHSaxtdh9Ei7yt2Csa0PS8ddPD/MDr0r5e6CJZ++hm1Ah OTrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732680732; x=1733285532; 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=QF87IdLUt9OH85ynMkiwRlV70diyi+gR7IUWpkgdjLQ=; b=PJ4Jt93u4CR2HtEYsTfL13aSbgPsUPXgq2zMgNogFxTtVGvuUYDZB1bnziz7+gL8Kz /xa5YNvcymyu90NYQOIwaAvAnDdpniRklwVfFxgrn6ntW5AdUSN1NKHbTuNRzAGlwpDr 1uSOTXbPNyobeLTEuQGvN/H7XjsoG0QSsSxc1mWc7nR6bWPvboCvqr2puGOyjsz7vvms ZXOhteTWHaWIaPmy9GcKTSnk1yuWPjJGHFkQ8kOWVPrtclT+wUQOSFVivHQ0eCCZBZyw WLLm9QmGEPciZiRJjQDcHid/fx3leXDKap3gUTkJHxqWzFbuVLZE49XW/V8O1JTHWs1g OZFw== X-Gm-Message-State: AOJu0YxC1fy0cPLEoViBvYJF2lj9XOpNRglJ36fzpu+42FumkzdBECxA CYFbbjtptzltdtdNrHHx+C1zje0q5RfOhEY0Wn2akr0gMEy3iknH5zjXhGgAZjiCMbNm80M4RnT D X-Gm-Gg: ASbGncu8lwLllCJzldnx6b7kHZvKbvoF+Juv8ndW0zq0LdNsMnRzrkQjidpSzZV0p4m j56KJi7QbDLBCnMr2w+Sg+SWE9gG0lwYSYc8jh2mc5bpSq4phNfEGod79yjTNT/FoMfAmO+vXdt yVy67sIQkqjN+Jw7f8d3LIooVycvYesjX0SYeN+BchC6iWxZSi+EysLf1cENv/njLCKyps4TNbj swBek/02qYchZBOlJ8dqlNIffYirVwj0+JFA2w= X-Google-Smtp-Source: AGHT+IE0bssANU7s1jJocPpAdCIVKSylDHgKSEobdEpNwpVW6/0Us4f5y0jSm6y6+dKI3WsemEKRsw== X-Received: by 2002:a05:6a21:3289:b0:1e0:d14b:d54c with SMTP id adf61e73a8af0-1e0e0b58d0fmr2954492637.30.1732680731725; Tue, 26 Nov 2024 20:12:11 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de485c84sm9240796b3a.80.2024.11.26.20.12.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 20:12:11 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 13/18] openssl: Fix SDK environment script to avoid unbound variable Date: Tue, 26 Nov 2024 20:11:33 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 27 Nov 2024 04:12:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207907 From: Richard Purdie Avoid errors like: buildtools/sysroots/x86_64-pokysdk-linux/environment-setup.d/openssl.sh: line 6: BB_ENV_PASSTHROUGH_ADDITIONS: unbound variable by setting an explicit empty default value. Signed-off-by: Richard Purdie (cherry picked from commit 5a2a4910a22668f25679a47deaa9e2ed28665efa) Signed-off-by: Steve Sakoman --- .../recipes-connectivity/openssl/files/environment.d-openssl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh index f90088aab7..aadf1edcb6 100644 --- a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh +++ b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh @@ -3,4 +3,4 @@ export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs" export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs/ca-certificates.crt" export OPENSSL_MODULES="$OECORE_NATIVE_SYSROOT/usr/lib/ossl-modules/" export OPENSSL_ENGINES="$OECORE_NATIVE_SYSROOT/usr/lib/engines-3" -export BB_ENV_PASSTHROUGH_ADDITIONS="$BB_ENV_PASSTHROUGH_ADDITIONS SSL_CERT_DIR SSL_CERT_FILE OPENSSL_CONF OPENSSL_MODULES OPENSSL_ENGINES" +export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} SSL_CERT_DIR SSL_CERT_FILE OPENSSL_CONF OPENSSL_MODULES OPENSSL_ENGINES" From patchwork Wed Nov 27 04:11:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 53269 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 81106D5A6D8 for ; Wed, 27 Nov 2024 04:12:17 +0000 (UTC) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mx.groups.io with SMTP id smtpd.web11.64892.1732680734033597200 for ; Tue, 26 Nov 2024 20:12:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=13U5pGTv; spf=softfail (domain: sakoman.com, ip: 209.85.210.171, mailfrom: steve@sakoman.com) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-724f74d6457so3683164b3a.0 for ; Tue, 26 Nov 2024 20:12:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732680733; x=1733285533; 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=UYPIUGXNHlKBtU0DlTzXV0RGuclt6W53R1WMtbTtnyk=; b=13U5pGTvln7PqQfQxZ27Uv5KvSGiXhS4/1NbPWuREoxzI2A2TgaXxLxid9y5cfASa2 pAq8cSJhojpGAYvoQnSyybiIBNcacnY5h9ySOb+apdA+5tTz1VZsYAc86PzGKlKH6yNm UuWQshpiZ5S51JHdhV2q1tbirdyFRGl4BpXSK5Ld/B64GrorEAWwTG6oAyQSt/eswlsb BJpo9l1ckbcccO2RtsmqnjUYRU3DQ6ZTbA6G+BzS/pWTr/63Iio7AKhDV1hvG198GC5+ yNRmqIs8owlZhLwnoy3YHaWx5/Ngqcd2bs1a4hjc+DW9TVqL0mT9+8a+X7tVx0gVRiNn Xuug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732680733; x=1733285533; 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=UYPIUGXNHlKBtU0DlTzXV0RGuclt6W53R1WMtbTtnyk=; b=XfHIAh60JUKXmzH1hkHlWfYwDSIq4iGgW2POKLHWkZoHbDEzGa+1XvNZkKuu44bU3q 9r3k0qTQyrHx99WQFhwj/SWjiA8iLckcI3zQNvzUvojOaP2P5n2qlSKG7HuEMDQ6NMVX OnMqZDL3bg7arZA2gsVdiCQBWzX0DN+XhYki8mfU72/tZkYqWXV61zQEwiDWp+/ARX7l F9PsNFNH6RNgE5OpkhHrasb0NgNwlenZ+RWPZFTGIuSWSpQpZXtpM6QbkilEl+1Ds0Ow v9X+TvgdeCqOMiPcltf0nTrI2uqdxZgbCP7ZrxjyHYIaHtvAs1S6TFdSlBqi0T1Aqej8 55cg== X-Gm-Message-State: AOJu0YxGC4KlNZ12kJK8tCXFuOPJNj1zL308ptwyJdLDt6bM2wvcrucc zzy6Mvz33iM3KwHQbl4yULSXzThMOWReWy1te7heVshlPnddYwXE6cOuxYW0BBQQQlUuPC6ukwI Q X-Gm-Gg: ASbGnctOjDyuvtwF8/xQexY1EPyHSBNm9FQZq7gJtcWHFUMjeHpD2kShCyFVhh0eYph iu2NiDbqJbWNxUARwxYfdC19zM/CWyOHv5HYBIOZJxK0YoeJb/1+ar1us8N0Ep7aWsdBhaUkln1 Y1viXYbUIvwvYD7uB+If7S1Q5jf6slvRembNSKOGnCKMs6XXeg4BtMxTHW8CTN2Pob2wVYN8mvn BvG21iWmNQ8O9z4EoJX5kApGVP7VJ1UgMEZs08= X-Google-Smtp-Source: AGHT+IFmzDqslajGgAftfh94yy9C1qNcCsWSrtj9fQUK2EVUznR6jHoqDtWCQmDvj25n+TZz/PrR3Q== X-Received: by 2002:a05:6a00:1887:b0:724:591e:ea20 with SMTP id d2e1a72fcca58-7253009a6e0mr2204241b3a.14.1732680733235; Tue, 26 Nov 2024 20:12:13 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de485c84sm9240796b3a.80.2024.11.26.20.12.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 20:12:12 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 14/18] selftest/sstatetests: run CDN mirror check only once Date: Tue, 26 Nov 2024 20:11:34 -0800 Message-Id: <6ffde2643e6ee8a2a0eddca173a254dbdc4a79bb.1732680538.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 27 Nov 2024 04:12:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207908 From: Alexander Kanavin The first no-fail check was an attempt to work around the old CDN's instability (and it didn't really help); it should not be necessary with the new CDN, and only delays a-full completion. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 7f75c42b7fcf60a9ca58d3ded9047df675d76dc2) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/sstatetests.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py index faaf7f6b0c..fa0172dd6d 100644 --- a/meta/lib/oeqa/selftest/cases/sstatetests.py +++ b/meta/lib/oeqa/selftest/cases/sstatetests.py @@ -978,12 +978,10 @@ MACHINE = "{}" def test_cdn_mirror_qemux86_64(self): exceptions = [] - self.run_test("qemux86-64", "core-image-minimal core-image-full-cmdline core-image-sato-sdk", exceptions, ignore_errors = True) self.run_test("qemux86-64", "core-image-minimal core-image-full-cmdline core-image-sato-sdk", exceptions) def test_cdn_mirror_qemuarm64(self): exceptions = [] - self.run_test("qemuarm64", "core-image-minimal core-image-full-cmdline core-image-sato-sdk", exceptions, ignore_errors = True) self.run_test("qemuarm64", "core-image-minimal core-image-full-cmdline core-image-sato-sdk", exceptions) def test_local_cache_qemux86_64(self): From patchwork Wed Nov 27 04:11:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 53272 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 8E873D5A6DA for ; Wed, 27 Nov 2024 04:12:17 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web10.64675.1732680735264120006 for ; Tue, 26 Nov 2024 20:12:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=u8X+GbwY; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-7252b5d7b1dso313321b3a.0 for ; Tue, 26 Nov 2024 20:12:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732680734; x=1733285534; 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=KbHg2LwIPLRvTFdwdKV44HmOkdogxZMkEjTV7ZUJdhY=; b=u8X+GbwYBBKrRRy9Ke2ZrYoItlMydKcIlFj7bPraM5nZMKV1yURgrTknD4wjazqrT8 rvTnRWKVDrYVfk6EI0cIJ6EpS0CFdvB8YWgVkmoSoO+6JO7q4VTW5e1SldGTjwxPWNAW YYtApO5OU2OfIXFVQq9Bu1fYmT6DsiDHPVZnZfi7ynkpg+t6UbW+Eyg7HWDUk7wr/M2J WHUSZgAtBgfxyb6KzYVL+jmD1lQk7zEKwK+hWCSAhq7hDrbA9QA5EVNMjAk10Bn7G2Ov bGL+X2r5Xko72Z1jjcDK0+VGXFX0rFLa3WbbI34ewKrtOBhm1jp/VxlZ93IUQCP7TH7I 1Kqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732680734; x=1733285534; 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=KbHg2LwIPLRvTFdwdKV44HmOkdogxZMkEjTV7ZUJdhY=; b=U9PdclU++o34LmBc3keKqVYBK5WUN2uO7OwnTidjcrvAng1C9P14xiaoPwkZdi5o3e scMH2PVV/znhoqyfqG6iTC1AX7oTBlVvS5LxtEU2thgN6A1JYHS8azWXSe3niXnMKqIr Gxa1gerXQBsTjDPaGH5FNWpK11ZhWFlST3HuJvBDeQAvKjNbdB0OYqthxq13sK1navCB F7m7Me1hdReu63SiN6Bizd4e14csewJIxnjIQg/i/fL+7pgAgPOaIzvmYpo1d6408y2R xr1oTOtVzCJ/luIXNXAttDBxS2sA5c3xvSmWt/9qldYLUPto/q3cFmyIbM3OL6V4Fb35 qw3g== X-Gm-Message-State: AOJu0Yz83JyEo88L1yjGteM/x3fS618yD4OqcYZb9GZKO/ugQ6RoVCLl lZLqFn4ctcG5UA7YKNFj+0qQlzwSxGkIPbZxQ5SDR9Lm3va2gqva9GaxsFG5QpmOmnNyqkomi/W M X-Gm-Gg: ASbGncu0hFcBeQ7eBVpKpKm3lG5UuZ7qdIhmd4jmjrP40iY3tImNOigYTK9A7hXztgq SYn7d96/C4+0XHLl9TRKBzRNPDOtOOdohVMiTVVSdKOg2WC3JN2+b2GdXV+kYFt1I4rMc3AaLi/ RL+y2eYjLmOcOl+LzOl+4vVW2ty5tM28ut5kyXxa/hiKvTkGSmecl6j+/2i6f+ahi10jQU8th75 FMXfCP977U4nUCnQvaXg07rPFkA3+2jJmCs59c= X-Google-Smtp-Source: AGHT+IFThhdzBPsYfPURB0KdAlTZ/yYwDoINklQ/c6txFh75AQst/VQqRHDNRYp0iP9uCR2/TxtwCA== X-Received: by 2002:a05:6a00:1747:b0:71e:41a6:a0c6 with SMTP id d2e1a72fcca58-7252fc2100emr2714862b3a.13.1732680734503; Tue, 26 Nov 2024 20:12:14 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de485c84sm9240796b3a.80.2024.11.26.20.12.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 20:12:14 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 15/18] kexec-tools: update COMPATIBLE_HOST because of makedumpfile Date: Tue, 26 Nov 2024 20:11:35 -0800 Message-Id: <6922821ab9a0e72e666e57e4b941e5821503509e.1732680538.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 27 Nov 2024 04:12:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207909 From: Kai Kang makedumpfile is not compatible with mipsarcho32 and riscv32, so set for kexec-tools accordingly. And update packagegroup-core-tools-testapps too. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie (cherry picked from commit 9107d9c09c7dab385c6034778cefadca3613be9c) Signed-off-by: Steve Sakoman --- .../packagegroups/packagegroup-core-tools-testapps.bb | 1 + meta/recipes-kernel/kexec/kexec-tools_2.0.29.bb | 3 +++ 2 files changed, 4 insertions(+) diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb index 34af40a43f..180660adab 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb @@ -13,6 +13,7 @@ inherit packagegroup KEXECTOOLS ?= "kexec" KEXECTOOLS:e5500-64b ?= "" KEXECTOOLS:microblaze ?= "" +KEXECTOOLS:mipsarcho32 ?= "" KEXECTOOLS:nios2 ?= "" KEXECTOOLS:riscv64 ?= "" KEXECTOOLS:riscv32 ?= "" diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.29.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.29.bb index 2c2901f19e..4edd6b2c65 100644 --- a/meta/recipes-kernel/kexec/kexec-tools_2.0.29.bb +++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.29.bb @@ -81,5 +81,8 @@ SYSTEMD_SERVICE:kdump = "kdump.service" SECURITY_PIE_CFLAGS:remove = "-fPIE -pie" COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|freebsd.*)' +# makedumpfile would not compile on mips/rv32 +COMPATIBLE_HOST:mipsarcho32 = "null" +COMPATIBLE_HOST:riscv32 = "null" INSANE_SKIP:${PN} = "arch" From patchwork Wed Nov 27 04:11:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 53275 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 8F15BD5A6DA for ; Wed, 27 Nov 2024 04:12:27 +0000 (UTC) Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by mx.groups.io with SMTP id smtpd.web10.64676.1732680737600218897 for ; Tue, 26 Nov 2024 20:12:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=eChMxnW7; spf=softfail (domain: sakoman.com, ip: 209.85.167.179, mailfrom: steve@sakoman.com) Received: by mail-oi1-f179.google.com with SMTP id 5614622812f47-3ea5a7a5e48so815905b6e.0 for ; Tue, 26 Nov 2024 20:12:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732680737; x=1733285537; 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=IMpUc/7W4lnpBdDrByKnhx8eqgmwGDX++OhKioT2ahM=; b=eChMxnW7KUT7aPkm2OVxEDlgxo6lI+TsTLhHYhenebq/C7dl6FvoOM9JNxt2qJ5sX0 1G9/5gfjJpOMvgqOCYCR5kaOhCr2mmbQBWKQyFEh5vfHS8Qa2x9HUkIClYUZcM4YglCZ uCfh/E5wyS4BOLAXSuaIGHJ26jw5XpOKyfLxG7zWTKUepWRnFp3ov3WXC8gZBAMjGAVh Zra7HTCZPtmCo0s1rVq+uOtAoB12xk72UETyYNWoE6OGP5M9+UXmoIjBptM83+ErGiXH O1Z1e/nk5JYf2D9Gysg4/icQlRYZA23dhfrPpyZxlbzQuqrHdqx0ixFk8uHWB47bszjA IXIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732680737; x=1733285537; 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=IMpUc/7W4lnpBdDrByKnhx8eqgmwGDX++OhKioT2ahM=; b=mfBz4MHT/fXDCZgIyTtPwYiMJwf3LqaIwPQxP4p2qUhdFvZ6JGDeZU8uP0W16xGhXv M8R5egW46TJmYF31lfp5tbcNrZiq1ViemOH4LaeTuIzZFtQnSPlLIFIQDsr+eCYK3RBD MhznWUcbtgLg5xNscUeR93PMvKEJ/+fet5DzfsCKYIdiMWYvnQIgSV5dv3AFtN/rB4hz VsUeY9+fO+bwKjEasGznyz6cd28EHW3zML0WHk8oNTbjnIcXtHLrlrKlstu3m5xAqux3 Mg+snaAu2vkCT/ByQgzBq2y23p+1EwMeAF1RY6E+wOk5xnsZday1QmCz1maOIttqIoqk okHQ== X-Gm-Message-State: AOJu0YynoTOmoW4VBSj2Sk81sGw2PtYH106ZHowcK/xlaQJ0Q9HALGKk ZSAFLkEEOsbB5oa6jn7fHLpvFtjKMO6ft0xvCGTLpjbQe+Zu00S72VufMR6KUnIR+paIDB+XISh 1 X-Gm-Gg: ASbGncsSdqKe+2e1W+a3FRlf83tNsX/CtothB0eomhNY10AE04xt/6FbxlMPvDtpQQL 3qib1oadCAIjopkT/fY0e4RWW4St8YaBrg4sECJuHZ6AxuUBEjxZ+J6dDljhjSPi1uUIazY2eXC hbZwoEeVvj0nfYdSwEn2EpMWhVSHlCrdNKaW1j7BSpEn1IfNUuAKe9lLlZ1ARiqZwvEpS2rHTvU +GkJT9S/hoc9He9ZPIgizJg1I3gXxHszksXBXw= X-Google-Smtp-Source: AGHT+IEDPFeNyH5gMw646HBvaUprTsQ5umDFw6BWJgfXlKy6CVoSFH45nLVSnK1DwwEWNOzOo0CkhA== X-Received: by 2002:a05:6808:2219:b0:3e6:60dc:5aee with SMTP id 5614622812f47-3ea6db8721cmr1530730b6e.3.1732680736227; Tue, 26 Nov 2024 20:12:16 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de485c84sm9240796b3a.80.2024.11.26.20.12.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 20:12:15 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 16/18] gcc: add a backport patch to fix an issue with tzdata 2024b Date: Tue, 26 Nov 2024 20:11:36 -0800 Message-Id: <08dfd3849bd804f4760ebeca226645e65709a65a.1732680538.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 27 Nov 2024 04:12:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207910 From: Markus Volk There is an issue in the std::chrono::tzdb parser that causes problems since the tzdata-2024b release started using %z in the main format. As a real world problem I encounter an issue with the waybar clock module, which ignores the timezone setting and only shows system time. Signed-off-by: Markus Volk Signed-off-by: Richard Purdie (cherry picked from commit 39018429f05511053ab12e23e7f4487ea25ee529) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/gcc/gcc-14.2.inc | 1 + ...4fffe3fc82a710bea66ad651720d71c938b8.patch | 549 ++++++++++++++++++ 2 files changed, 550 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc/gcc.git-ab884fffe3fc82a710bea66ad651720d71c938b8.patch diff --git a/meta/recipes-devtools/gcc/gcc-14.2.inc b/meta/recipes-devtools/gcc/gcc-14.2.inc index f05484cfc0..9cfb246294 100644 --- a/meta/recipes-devtools/gcc/gcc-14.2.inc +++ b/meta/recipes-devtools/gcc/gcc-14.2.inc @@ -68,6 +68,7 @@ SRC_URI = "${BASEURI} \ file://0023-Fix-install-path-of-linux64.h.patch \ file://0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch \ file://0025-gcc-testsuite-tweaks-for-mips-OE.patch \ + file://gcc.git-ab884fffe3fc82a710bea66ad651720d71c938b8.patch \ " S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${SOURCEDIR}" diff --git a/meta/recipes-devtools/gcc/gcc/gcc.git-ab884fffe3fc82a710bea66ad651720d71c938b8.patch b/meta/recipes-devtools/gcc/gcc/gcc.git-ab884fffe3fc82a710bea66ad651720d71c938b8.patch new file mode 100644 index 0000000000..e5abdcc703 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc/gcc.git-ab884fffe3fc82a710bea66ad651720d71c938b8.patch @@ -0,0 +1,549 @@ +From ab884fffe3fc82a710bea66ad651720d71c938b8 Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely +Date: Tue, 30 Apr 2024 09:52:13 +0100 +Subject: [PATCH] libstdc++: Fix std::chrono::tzdb to work with vanguard format + +I found some issues in the std::chrono::tzdb parser by testing the +tzdata "vanguard" format, which uses new features that aren't enabled in +the "main" and "rearguard" data formats. + +Since 2024a the keyword "minimum" is no longer valid for the FROM and TO +fields in a Rule line, which means that "m" is now a valid abbreviation +for "maximum". Previously we expected either "mi" or "ma". For backwards +compatibility, a FROM field beginning with "mi" is still supported and +is treated as 1900. The "maximum" keyword is only allowed in TO now, +because it makes no sense in FROM. To support these changes the +minmax_year and minmax_year2 classes for parsing FROM and TO are +replaced with a single years_from_to class that reads both fields. + +The vanguard format makes use of %z in Zone FORMAT fields, which caused +an exception to be thrown from ZoneInfo::set_abbrev because no % or / +characters were expected when a Zone doesn't use a named Rule. The +ZoneInfo::to(sys_info&) function now uses format_abbrev_str to replace +any %z with the current offset. Although format_abbrev_str also checks +for %s and STD/DST formats, those only make sense when a named Rule is +in effect, so won't occur when ZoneInfo::to(sys_info&) is used. + +Since making this change on trunk, the tzdata-2024b release started +using %z in the main format, not just vanguard. This makes a backport to +release branches necessary (see PR 116657). + +This change also implements a feature that has always been missing from +time_zone::_M_get_sys_info: finding the Rule that is active before the +specified time point, so that we can correctly handle %s in the FORMAT +for the first new sys_info that gets created. This requires implementing +a poorly documented feature of zic, to get the LETTERS field from a +later transition, as described at +https://mm.icann.org/pipermail/tz/2024-April/058891.html +In order for this to work we need to be able to distinguish an empty +letters field (as used by CE%sT where the variable part is either empty +or "S") from "the letters field is not known for this transition". The +tzdata file uses "-" for an empty letters field, which libstdc++ was +previously replacing with "" when the Rule was parsed. Instead, we now +preserve the "-" in the Rule object, so that "" can be used for the case +where we don't know the letters (and so need to decide it). + +(cherry picked from commit 0ca8d56f2085715f27ee536c6c344bc47af49cdd) + +Upstream-Status: Backport [https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=5ceea2ac106d6dd1aa8175670b15a801316cf1c9] + +Signed-off-by: Markus Volk +--- + libstdc++-v3/src/c++20/tzdb.cc | 265 +++++++++++------- + .../std/time/time_zone/sys_info_abbrev.cc | 106 +++++++ + libstdc++-v3/testsuite/std/time/tzdb/1.cc | 6 +- + 3 files changed, 274 insertions(+), 103 deletions(-) + create mode 100644 libstdc++-v3/testsuite/std/time/time_zone/sys_info_abbrev.cc + +diff --git a/libstdc++-v3/src/c++20/tzdb.cc b/libstdc++-v3/src/c++20/tzdb.cc +index c7c7cc9deee6..7e8cce7ce8cf 100644 +--- a/libstdc++-v3/src/c++20/tzdb.cc ++++ b/libstdc++-v3/src/c++20/tzdb.cc +@@ -342,51 +342,103 @@ namespace std::chrono + friend istream& operator>>(istream&, on_day&); + }; + +- // Wrapper for chrono::year that reads a year, or one of the keywords +- // "minimum" or "maximum", or an unambiguous prefix of a keyword. +- struct minmax_year ++ // Wrapper for two chrono::year values, which reads the FROM and TO ++ // fields of a Rule line. The FROM field is a year and TO is a year or ++ // one of the keywords "maximum" or "only" (or an abbreviation of those). ++ // For backwards compatibility, the keyword "minimum" is recognized ++ // for FROM and interpreted as 1900. ++ struct years_from_to + { +- year& y; ++ year& from; ++ year& to; + +- friend istream& operator>>(istream& in, minmax_year&& y) ++ friend istream& operator>>(istream& in, years_from_to&& yy) + { +- if (ws(in).peek() == 'm') // keywords "minimum" or "maximum" ++ string s; ++ auto c = ws(in).peek(); ++ if (c == 'm') [[unlikely]] // keyword "minimum" + { +- string s; +- in >> s; // extract the rest of the word, but only look at s[1] +- if (s[1] == 'a') +- y.y = year::max(); +- else if (s[1] == 'i') +- y.y = year::min(); +- else +- in.setstate(ios::failbit); ++ in >> s; // extract the rest of the word ++ yy.from = year(1900); ++ } ++ else if (int num = 0; in >> num) [[likely]] ++ yy.from = year{num}; ++ ++ c = ws(in).peek(); ++ if (c == 'm') // keyword "maximum" ++ { ++ in >> s; // extract the rest of the word ++ yy.to = year::max(); ++ } ++ else if (c == 'o') // keyword "only" ++ { ++ in >> s; // extract the rest of the word ++ yy.to = yy.from; + } + else if (int num = 0; in >> num) +- y.y = year{num}; ++ yy.to = year{num}; ++ + return in; + } + }; + +- // As above for minmax_year, but also supports the keyword "only", +- // meaning that the TO year is the same as the FROM year. +- struct minmax_year2 ++ bool ++ select_std_or_dst_abbrev(string& abbrev, minutes save) + { +- minmax_year to; +- year from; ++ if (size_t pos = abbrev.find('/'); pos != string::npos) ++ { ++ // Select one of "STD/DST" for standard or daylight. ++ if (save == 0min) ++ abbrev.erase(pos); ++ else ++ abbrev.erase(0, pos + 1); ++ return true; ++ } ++ return false; ++ } + +- friend istream& operator>>(istream& in, minmax_year2&& y) +- { +- if (ws(in).peek() == 'o') // keyword "only" +- { +- string s; +- in >> s; // extract the whole keyword +- y.to.y = y.from; +- } +- else +- in >> std::move(y.to); +- return in; +- } +- }; ++ // Set the sys_info::abbrev string by expanding any placeholders. ++ void ++ format_abbrev_str(sys_info& info, string_view letters = {}) ++ { ++ if (size_t pos = info.abbrev.find('%'); pos != string::npos) ++ { ++ if (info.abbrev[pos + 1] == 's') ++ { ++ // Expand "%s" to the variable part, given by Rule::letters. ++ if (letters == "-") ++ info.abbrev.erase(pos, 2); ++ else ++ info.abbrev.replace(pos, 2, letters); ++ } ++ else if (info.abbrev[pos + 1] == 'z') ++ { ++ // Expand "%z" to the UT offset as +/-hh, +/-hhmm, or +/-hhmmss. ++ hh_mm_ss t(info.offset); ++ string z(1, "+-"[t.is_negative()]); ++ long val = t.hours().count(); ++ int digits = 2; ++ if (int m = t.minutes().count()) ++ { ++ digits = 4; ++ val *= 100; ++ val += m; ++ if (int s = t.seconds().count()) ++ { ++ digits = 6; ++ val *= 100; ++ val += s; ++ } ++ } ++ auto sval = std::to_string(val); ++ z += string(digits - sval.size(), '0'); ++ z += sval; ++ info.abbrev.replace(pos, 2, z); ++ } ++ } ++ else ++ select_std_or_dst_abbrev(info.abbrev, info.save); ++ } + + // A time zone information record. + // Zone NAME STDOFF RULES FORMAT [UNTIL] +@@ -462,6 +514,7 @@ namespace std::chrono + info.offset = offset(); + info.save = minutes(m_save); + info.abbrev = format(); ++ format_abbrev_str(info); // expand %z + return true; + } + +@@ -469,12 +522,9 @@ namespace std::chrono + friend class time_zone; + + void +- set_abbrev(const string& abbrev) ++ set_abbrev(string abbrev) + { +- // In practice, the FORMAT field never needs expanding here. +- if (abbrev.find_first_of("/%") != abbrev.npos) +- __throw_runtime_error("std::chrono::time_zone: invalid data"); +- m_buf = abbrev; ++ m_buf = std::move(abbrev); + m_pos = 0; + m_expanded = true; + } +@@ -544,9 +594,7 @@ namespace std::chrono + + // Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S + +- in >> quoted(rule.name) +- >> minmax_year{rule.from} +- >> minmax_year2{rule.to, rule.from}; ++ in >> quoted(rule.name) >> years_from_to{rule.from, rule.to}; + + if (char type; in >> type && type != '-') + in.setstate(ios::failbit); +@@ -557,7 +605,7 @@ namespace std::chrono + if (save_time.indicator != at_time::Wall) + { + // We don't actually store the save_time.indicator, because we +- // assume that it's always deducable from the actual offset value. ++ // assume that it's always deducible from the offset value. + auto expected = save_time.time == 0s + ? at_time::Standard + : at_time::Daylight; +@@ -567,8 +615,6 @@ namespace std::chrono + rule.save = save_time.time; + + in >> rule.letters; +- if (rule.letters == "-") +- rule.letters.clear(); + return in; + } + +@@ -719,58 +765,6 @@ namespace std::chrono + #endif // TZDB_DISABLED + }; + +-#ifndef TZDB_DISABLED +- namespace +- { +- bool +- select_std_or_dst_abbrev(string& abbrev, minutes save) +- { +- if (size_t pos = abbrev.find('/'); pos != string::npos) +- { +- // Select one of "STD/DST" for standard or daylight. +- if (save == 0min) +- abbrev.erase(pos); +- else +- abbrev.erase(0, pos + 1); +- return true; +- } +- return false; +- } +- +- // Set the sys_info::abbrev string by expanding any placeholders. +- void +- format_abbrev_str(sys_info& info, string_view letters = {}) +- { +- if (size_t pos = info.abbrev.find("%s"); pos != string::npos) +- { +- // Expand "%s" to the variable part, given by Rule::letters. +- info.abbrev.replace(pos, 2, letters); +- } +- else if (size_t pos = info.abbrev.find("%z"); pos != string::npos) +- { +- // Expand "%z" to the UT offset as +/-hh, +/-hhmm, or +/-hhmmss. +- hh_mm_ss t(info.offset); +- string z(1, "+-"[t.is_negative()]); +- long val = t.hours().count(); +- if (minutes m = t.minutes(); m != m.zero()) +- { +- val *= 100; +- val += m.count(); +- if (seconds s = t.seconds(); s != s.zero()) +- { +- val *= 100; +- val += s.count(); +- } +- } +- z += std::to_string(val); +- info.abbrev.replace(pos, 2, z); +- } +- else +- select_std_or_dst_abbrev(info.abbrev, info.save); +- } +- } +-#endif // TZDB_DISABLED +- + // Implementation of std::chrono::time_zone::get_info(const sys_time&) + sys_info + time_zone::_M_get_sys_info(sys_seconds tp) const +@@ -839,12 +833,72 @@ namespace std::chrono + info.abbrev = ri.format(); + + string_view letters; +- if (i != infos.begin()) ++ if (i != infos.begin() && i[-1].expanded()) ++ letters = i[-1].next_letters(); ++ ++ if (letters.empty()) + { +- if (i[-1].expanded()) +- letters = i[-1].next_letters(); +- // XXX else need to find Rule active before this time and use it +- // to know the initial offset, save, and letters. ++ sys_seconds t = info.begin - seconds(1); ++ const year_month_day date(chrono::floor(t)); ++ ++ // Try to find a Rule active before this time, to get initial ++ // SAVE and LETTERS values. There may not be a Rule for the period ++ // before the first DST transition, so find the earliest DST->STD ++ // transition and use the LETTERS from that. ++ const Rule* active_rule = nullptr; ++ sys_seconds active_rule_start = sys_seconds::min(); ++ const Rule* first_std = nullptr; ++ for (const auto& rule : rules) ++ { ++ if (rule.save == minutes(0)) ++ { ++ if (!first_std) ++ first_std = &rule; ++ else if (rule.from < first_std->from) ++ first_std = &rule; ++ else if (rule.from == first_std->from) ++ { ++ if (rule.start_time(rule.from, {}) ++ < first_std->start_time(first_std->from, {})) ++ first_std = &rule; ++ } ++ } ++ ++ year y = date.year(); ++ ++ if (y > rule.to) // rule no longer applies at time t ++ continue; ++ if (y < rule.from) // rule doesn't apply yet at time t ++ continue; ++ ++ sys_seconds rule_start; ++ ++ seconds offset{}; // appropriate for at_time::Universal ++ if (rule.when.indicator == at_time::Wall) ++ offset = info.offset; ++ else if (rule.when.indicator == at_time::Standard) ++ offset = ri.offset(); ++ ++ // Time the rule takes effect this year: ++ rule_start = rule.start_time(y, offset); ++ ++ if (rule_start >= t && rule.from < y) ++ { ++ // Try this rule in the previous year. ++ rule_start = rule.start_time(--y, offset); ++ } ++ ++ if (active_rule_start < rule_start && rule_start < t) ++ { ++ active_rule_start = rule_start; ++ active_rule = &rule; ++ } ++ } ++ ++ if (active_rule) ++ letters = active_rule->letters; ++ else if (first_std) ++ letters = first_std->letters; + } + + const Rule* curr_rule = nullptr; +@@ -2069,9 +2123,11 @@ namespace std::chrono + istringstream in2(std::move(rules)); + in2 >> rules_time; + inf.m_save = duration_cast(rules_time.time); ++ // If the FORMAT is "STD/DST" then we can choose the right one ++ // now, so that we store a shorter string. + select_std_or_dst_abbrev(fmt, inf.m_save); + } +- inf.set_abbrev(fmt); ++ inf.set_abbrev(std::move(fmt)); + } + + // YEAR [MONTH [DAY [TIME]]] +@@ -2082,7 +2138,12 @@ namespace std::chrono + abbrev_month m{January}; + int d = 1; + at_time t{}; ++ // XXX DAY should support ON format, e.g. lastSun or Sun>=8 + in >> m >> d >> t; ++ // XXX UNTIL field should be interpreted ++ // "using the rules in effect just before the transition" ++ // so might need to store as year_month_day and hh_mm_ss and only ++ // convert to a sys_time once we know the offset in effect. + inf.m_until = sys_days(year(y)/m.m/day(d)) + seconds(t.time); + } + else +diff --git a/libstdc++-v3/testsuite/std/time/time_zone/sys_info_abbrev.cc b/libstdc++-v3/testsuite/std/time/time_zone/sys_info_abbrev.cc +new file mode 100644 +index 000000000000..f1a8fff02f58 +--- /dev/null ++++ b/libstdc++-v3/testsuite/std/time/time_zone/sys_info_abbrev.cc +@@ -0,0 +1,106 @@ ++// { dg-do run { target c++20 } } ++// { dg-require-effective-target tzdb } ++// { dg-require-effective-target cxx11_abi } ++// { dg-xfail-run-if "no weak override on AIX" { powerpc-ibm-aix* } } ++ ++#include ++#include ++#include ++ ++static bool override_used = false; ++ ++namespace __gnu_cxx ++{ ++ const char* zoneinfo_dir_override() { ++ override_used = true; ++ return "./"; ++ } ++} ++ ++using namespace std::chrono; ++ ++void ++test_format() ++{ ++ std::ofstream("tzdata.zi") << R"(# version test_1 ++Zone Africa/Bissau -1:2:20 - LMT 1912 Ja 1 1u ++ -1 - %z 1975 ++ 0 - GMT ++Zon Some/Zone 1:2:3 - %z 1900 ++ 1:23:45 - %z 1950 ++Zo Another/Zone 1:2:3 - AZ0 1901 ++ 1 Roolz A%sZ 2000 ++ 1 Roolz SAZ/DAZ 2005 ++ 1 Roolz %z ++Rule Roolz 1950 max - April 1 2 1 D ++Rul Roolz 1950 max - Oct 1 1 0 S ++Z Strange/Zone 1 - X%sX 1980 ++ 1 - FOO/BAR 1990 ++ 2:00 - %zzz 1995 ++ 0:9 - %zzz 1996 ++ 0:8:7 - %zzz 1997 ++ 0:6:5.5 - %zzz 1998 ++)"; ++ ++ const auto& db = reload_tzdb(); ++ VERIFY( override_used ); // If this fails then XFAIL for the target. ++ VERIFY( db.version == "test_1" ); ++ ++ // Test formatting %z as ++ auto tz = locate_zone("Africa/Bissau"); ++ auto inf = tz->get_info(sys_days(1974y/1/1)); ++ VERIFY( inf.abbrev == "-01" ); ++ ++ tz = locate_zone("Some/Zone"); ++ inf = tz->get_info(sys_days(1899y/1/1)); ++ VERIFY( inf.abbrev == "+010203" ); ++ inf = tz->get_info(sys_days(1955y/1/1)); ++ VERIFY( inf.abbrev == "+012345" ); ++ ++ tz = locate_zone("Another/Zone"); ++ // Test formatting %s as the LETTER/S field from the active Rule. ++ inf = tz->get_info(sys_days(1910y/January/1)); ++ VERIFY( inf.abbrev == "ASZ" ); ++ inf = tz->get_info(sys_days(1950y/January/1)); ++ VERIFY( inf.abbrev == "ASZ" ); ++ inf = tz->get_info(sys_days(1950y/June/1)); ++ VERIFY( inf.abbrev == "ADZ" ); ++ inf = tz->get_info(sys_days(1999y/January/1)); ++ VERIFY( inf.abbrev == "ASZ" ); ++ inf = tz->get_info(sys_days(1999y/July/1)); ++ VERIFY( inf.abbrev == "ADZ" ); ++ // Test formatting STD/DST according to the active Rule. ++ inf = tz->get_info(sys_days(2000y/January/2)); ++ VERIFY( inf.abbrev == "SAZ" ); ++ inf = tz->get_info(sys_days(2001y/January/1)); ++ VERIFY( inf.abbrev == "SAZ" ); ++ inf = tz->get_info(sys_days(2001y/July/1)); ++ VERIFY( inf.abbrev == "DAZ" ); ++ // Test formatting %z as the offset determined by the active Rule. ++ inf = tz->get_info(sys_days(2005y/January/2)); ++ VERIFY( inf.abbrev == "+01" ); ++ inf = tz->get_info(sys_days(2006y/January/1)); ++ VERIFY( inf.abbrev == "+01" ); ++ inf = tz->get_info(sys_days(2006y/July/1)); ++ VERIFY( inf.abbrev == "+02" ); ++ ++ // Test formatting %z, %s and S/D for a Zone with no associated Rules. ++ tz = locate_zone("Strange/Zone"); ++ inf = tz->get_info(sys_days(1979y/January/1)); ++ VERIFY( inf.abbrev == "XX" ); // No Rule means nothing to use for %s. ++ inf = tz->get_info(sys_days(1981y/July/1)); ++ VERIFY( inf.abbrev == "FOO" ); // Always standard time means first string. ++ inf = tz->get_info(sys_days(1994y/July/1)); ++ VERIFY( inf.abbrev == "+02zz" ); ++ inf = tz->get_info(sys_days(1995y/July/1)); ++ VERIFY( inf.abbrev == "+0009zz" ); ++ inf = tz->get_info(sys_days(1996y/July/1)); ++ VERIFY( inf.abbrev == "+000807zz" ); ++ inf = tz->get_info(sys_days(1997y/July/1)); ++ VERIFY( inf.abbrev == "+000606zz" ); ++} ++ ++int main() ++{ ++ test_format(); ++} +diff --git a/libstdc++-v3/testsuite/std/time/tzdb/1.cc b/libstdc++-v3/testsuite/std/time/tzdb/1.cc +index 796f3a8b4256..7a31c1c20ba7 100644 +--- a/libstdc++-v3/testsuite/std/time/tzdb/1.cc ++++ b/libstdc++-v3/testsuite/std/time/tzdb/1.cc +@@ -39,11 +39,15 @@ test_locate() + const tzdb& db = get_tzdb(); + const time_zone* tz = db.locate_zone("GMT"); + VERIFY( tz != nullptr ); +- VERIFY( tz->name() == "Etc/GMT" ); + VERIFY( tz == std::chrono::locate_zone("GMT") ); + VERIFY( tz == db.locate_zone("Etc/GMT") ); + VERIFY( tz == db.locate_zone("Etc/GMT+0") ); + ++ // Since 2022f GMT is now a Zone and Etc/GMT a link instead of vice versa, ++ // but only when using the vanguard format. As of 2024a, the main and ++ // rearguard formats still have Etc/GMT as a Zone and GMT as a link. ++ VERIFY( tz->name() == "GMT" || tz->name() == "Etc/GMT" ); ++ + VERIFY( db.locate_zone(db.current_zone()->name()) == db.current_zone() ); + } + +-- +2.43.5 + From patchwork Wed Nov 27 04:11:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 53273 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 83BF1D3B9BD for ; Wed, 27 Nov 2024 04:12:27 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mx.groups.io with SMTP id smtpd.web10.64678.1732680738477532029 for ; Tue, 26 Nov 2024 20:12:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=sq64G9D+; spf=softfail (domain: sakoman.com, ip: 209.85.215.179, mailfrom: steve@sakoman.com) Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-7f8b37edeb7so5519046a12.0 for ; Tue, 26 Nov 2024 20:12:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732680738; x=1733285538; 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=oSamagVjNvA8/jA2D8jx8hVF1kVQsEeqECk/DpIUGeE=; b=sq64G9D+zTfpMTqeGDpa9H4C2zg8FX8u02MXw7PlPr7/N6D2FeGcx83puBcnZcYBuy /oAu6rG0BawxbeysdjbHTVnjtefuIcqYoFd5cnB8cA/e/Gk205dcpJJamchwKmy10McD snOmNyIskSLOMLCk1JRQ0urcsvzsTYkAmTZzL1HpxMH3fRh1nJY1SPmxW2dwlx6Yf5dH UAIrJNmg7aulV6JgGlXFwJVbmYePYHuNAYCbAOtqSQib5VXNi6C4Kvk8C3SyELPvuNL3 wrtxKVu0YT+4QxCeWvWlPFjOERrF9EwkHisUQe49LtFZ5QvrRaYA0fKpFUX68bPPV0yR 03bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732680738; x=1733285538; 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=oSamagVjNvA8/jA2D8jx8hVF1kVQsEeqECk/DpIUGeE=; b=k9MPMgvJw5Zy84f7+pO/d04okvUPJ7ERSrASzxfxRPAqkFL/TLClUmfcXxof4q38Ox Fmx2RpmSUk0YYgI8Gntsp6hKlaOjh1EwGf8M0AmSxV+u1bZcd2eil1r/jEcYeFs6+iqF XeOCPdke01Xf48+7QzVrBAgMLYCPvl8HL/306TIjiZ/E4s9VRY7F6RZleNJ+4PGSefho iC9VFBAn4D+hc0Ge8N/u1bkaJZ+VZh2lCOEXxzbs/fbLFS6+I2WX1VgFaxk8Rsv4NuWe lN+p6zHqlDvXZBqRPv9LA8W7FbloWN8GDpkfBaKpVkPdoM9d6sImYaJVvnVmhMtQaIcw 1T4Q== X-Gm-Message-State: AOJu0YxzQmGriz74H2RwIx52GVkJGDfVowC7tCKpYupmYX8hnlJ+ok5/ I5eB04cLRJFqSYao15r05Lqej+KKjkfSMzOeL0EZ91r8fUbQGNQ4nlgWo4g2haTuc/l+wguWDLA 9 X-Gm-Gg: ASbGnctzL60bOactp9lYeqYHLdnGCeMw62JpgVlW0uTlRMe31T5NdrL9Ex6T7xt/oVi ruEbFg+11cJFoN4vHTplkvKxd0GH3cujRQmMiDZmSG0icknNkhRFH+iKHwy94JludMUsB+qGGFx P9OwM9jM6obw+qv3+CDgkVE7zmBw/NC1BqtNhU1AY6DheZjcsYCyJxARID+KbGywq0vRi0mcyr6 YHkqeQeyOHtWzEKLGIV44siZPMUagsnEZmOh1o= X-Google-Smtp-Source: AGHT+IH/xSV4z7SO4/EeTJdvqMse4jWxv+AMqPOoXm2xeZ5lgKq50uf6yaskMe8GyYRevk1E6lnRmQ== X-Received: by 2002:a05:6a20:7349:b0:1e0:c8d9:337a with SMTP id adf61e73a8af0-1e0e0b4b612mr3222800637.27.1732680737698; Tue, 26 Nov 2024 20:12:17 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de485c84sm9240796b3a.80.2024.11.26.20.12.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 20:12:17 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 17/18] package_rpm: use zstd's default compression level Date: Tue, 26 Nov 2024 20:11:37 -0800 Message-Id: <9ec8b99470ed744c8eca0b23f99ba54210984080.1732680538.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 27 Nov 2024 04:12:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207911 From: Alexander Kanavin zstd uses 3 by default, while 19 is the highest and slowest. It's not clear why 19 was picked to begin with, possibly I copy-pasted it from rpm's examples without thinking: https://git.yoctoproject.org/poky/commit/?h=master-next&id=4a4d5f78a6962dda5f63e9891825c80a8a87bf66 This brings significant speedups in rpm's compression step: for example compressing webkitgtk takes 11s instead of 36s. The rpm size increases from 175648k to 234860k. I think it's a worthy default tradeoff. Signed-off-by: Alexander Kanavin Signed-off-by: Steve Sakoman --- meta/classes-global/package_rpm.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index ddc4bf3a6a..b2b7fafa17 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -10,7 +10,7 @@ IMAGE_PKGTYPE ?= "rpm" RPM = "rpm" RPMBUILD = "rpmbuild" -RPMBUILD_COMPMODE ?= "${@'w19T%d.zstdio' % int(d.getVar('ZSTD_THREADS'))}" +RPMBUILD_COMPMODE ?= "${@'w3T%d.zstdio' % int(d.getVar('ZSTD_THREADS'))}" PKGWRITEDIRRPM = "${WORKDIR}/deploy-rpms" From patchwork Wed Nov 27 04:11:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 53274 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 8F120D5A6D9 for ; Wed, 27 Nov 2024 04:12:27 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web11.64895.1732680739904666463 for ; Tue, 26 Nov 2024 20:12:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Jvm1DDuz; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-724d8422dbaso5002116b3a.0 for ; Tue, 26 Nov 2024 20:12:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732680739; x=1733285539; 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=h9y1+i7weqlhMtSeFtZo7cfbR0/S6fHtYu7qvTsyTos=; b=Jvm1DDuzV5mFvDKp3o0ffGanvxZIZkz1JWXHl/U2I2miPi+qkebxv0/y0hW3ZTRj1T 3TugcF3QRT6ZaK37/tyIJKNLOD9bYcjDAEG1xetATlBWtCg/0sBd9mM3B/51GADSX/Hj XhgT9c8A54fkcIA23iD+CKv5cltrVMJOLmGiQUhq3n3SSVRkXq91FiPihbwglu81S9le 1Tcl3NbpAgQqLKEuEQqlwtzH5i+zog1vFLLxBEKm6NUpTkaF11QpEBPtYDbIqHOyAcDC 8vp3537AZU9e5LQybpbXzt8voXhLq0Sx50xcK5UX27G31q6Mr2+6e4jstRaEIr1m5FkO hXNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732680739; x=1733285539; 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=h9y1+i7weqlhMtSeFtZo7cfbR0/S6fHtYu7qvTsyTos=; b=ROpOBUrkuAoL+SX04R/kHm75RZPyE5bzziI1tJQWy53j6x1z+zOJpSHmUYzkokSbCo Wdnm5dpzbjfk3ZpR4ixLsTdYO/t/MPG8+09s8zbdBazLZXK2pZTi4su7S4AB0uaA160S hXp7JJQKl9HNaE4VSQtu+cYhIYo48jjvHnQKIr7H8BMv2+zRa4qP5yJQshEPbnNrgKsH izq2f92DOD/0WxkWA4it+D2ur2dgdtaShmYdvhw2etBJQOG6yuUmlFKjuX6BXEhQKETE 3hSPVTG2N3aVFvfHZ8XoQ1VJ8ZkOaunt/HkGMZjpjkopZzcHptZpGq19zMAfXncCTRuc 0Yeg== X-Gm-Message-State: AOJu0Yx06zdMCCNWzWg19h5zqdkaifvzayxr0J3XENSDu/xO0olhkw0B YSINk78IMcko5ppO4HaUQEct1EdT4JPHGjAvJuWw7j1W55Y/UJO4a/c5ga2klFYg2wnqZcE3iaQ u X-Gm-Gg: ASbGnctGKXnxUc4Rmkx1xTqyfxv3M1gAMp4YT4SXGs8x2FgWq0+nyhwDuj4NcUohmU7 3tbXJe5g0dB0Kj0rjcKU+MiGOets4dzR1tJE9YshEq1nzIHqzGPBFPMHL+kjAv9pdUBcFGBifdP ZypYfU3kUD7w+n06LXE2mzUkulU+6oEMMybmMfDeVMJ3v8y0BoudKfL4jhqlSjzqfXiBFd6vh77 bGkIEQxQ0KhqCETKCcg6jS2ziDPM7BF+ZpDLXI= X-Google-Smtp-Source: AGHT+IFJG0l1GqXY6pJoC8Qp+bfmIlNWq+cFJOYsN39p1wik9AeCSIGHVmshTapyGzv3b1eTE1CePQ== X-Received: by 2002:a05:6a00:1a8b:b0:724:fcff:505b with SMTP id d2e1a72fcca58-7253007218fmr2450341b3a.14.1732680739129; Tue, 26 Nov 2024 20:12:19 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de485c84sm9240796b3a.80.2024.11.26.20.12.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 20:12:18 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 18/18] package_rpm: restrict rpm to 4 threads Date: Tue, 26 Nov 2024 20:11:38 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 27 Nov 2024 04:12:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207912 From: Alexander Kanavin TL;DR version: with this, and the previous compression level changes I am seeing drastic speedups in package_write_rpm completion times: webkitgtk goes from 78 seconds to 37 seconds glibc-locale goes from 399 seconds to 58 seconds (!) The long version: rpm uses multithreading for two purposes: - spawning compressors (which are nowadays themselves multi-threaded, so the feature is not as useful as it once was) - parallel file classification While the former behaves well on massively parallel CPUs (it was written and verified here :), the latter was then added by upstream and only benchmarked on their very old, slow laptop, apparently: https://github.com/rpm-software-management/rpm/commit/41f0e214f2266f02d6185ba11f797716de8125d4 On anything more capable it starts showing pathologic behavior, presumably from spawning massive amount of very short-lived threads, and then having to synchronize them. For example classifying glibc-locale takes 5m20s with 256 threads (default on my machine!) 1m49s with 64 threads 59s with 16 threads 48s with 8 threads Even a more typical recipe like webkitgtk is affected: 47s with 256 threads 32s with 64 threads 27s with 16 or 8 threads I have found that the optimal amount is actually four: this also means that only four compressors are running at a time, but as they're themselves using threads, and typical recipes are dominated by just two or three large packages, this does not affect overall completion time. Signed-off-by: Alexander Kanavin Signed-off-by: Steve Sakoman --- meta/classes-global/package_rpm.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index b2b7fafa17..021c53593f 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -696,6 +696,7 @@ python do_package_rpm () { cmd = cmd + " --define '_use_internal_dependency_generator 0'" cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'" cmd = cmd + " --define '_build_id_links none'" + cmd = cmd + " --define '_smp_ncpus_max 4'" cmd = cmd + " --define '_source_payload %s'" % rpmbuild_compmode cmd = cmd + " --define '_binary_payload %s'" % rpmbuild_compmode cmd = cmd + " --define 'clamp_mtime_to_source_date_epoch 1'"