From patchwork Fri Dec 29 15:44:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37028 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 E48A0C47072 for ; Fri, 29 Dec 2023 15:45:07 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web10.151492.1703864705867304746 for ; Fri, 29 Dec 2023 07:45:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=3Nld4xcG; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1d3ef33e68dso46420285ad.1 for ; Fri, 29 Dec 2023 07:45:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864704; x=1704469504; 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=ih8n+OeSXgIDyjRnrwaQ6dAUIAmZ+05E2rGPFPgi92Q=; b=3Nld4xcGmHMru0ny+7fgSkUVN9WwnatXlTjRF3W8KZ8phKuzKN+Re/gGDGEZ80F/e1 DqGmBDRfb14keQsW8ihXPZHK2K0cWsYRKc8lG2kvKYOQ41H3t2NAQmAJDAKSFuAM54ub D+z3ngXqTzztv/YewSUug8IHnHOd8LiBzOINdD4jPD/wqs/GFs3Vg6JUHHmbPF2zaw7l SgPPsuGed/gWiv8tdHqvh1z6H5DQTHEvs/P6gY1hb+baNU6UhL+kuj7xRWFgS4NzYsxa ZdcOtLQfmnM8ObTSOWdCKm9SEh/kvZ/OEATfYBdyjLy0BSQbkgfE8wZoa2w5MGIKcZos x68w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864704; x=1704469504; 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=ih8n+OeSXgIDyjRnrwaQ6dAUIAmZ+05E2rGPFPgi92Q=; b=V0n3YaMdWTiarKcieBCPRfgDX5txuAYOLeKwrqs5/GPs46T1XHuZ7BlQh4ETgI2exm vYnMDFpcD+6uyc7hyVXWDSfbAY8uFFrHjqLJ2HDbcn/J09P9wHsZZZHbpNI3vPbTjnsn CuevCCC639m05A9p8USw+OumS6t3mvPdZI5H1kDfSDym1GrSl7RATzePsrp2hgQNE+SW CuqdXLcB1p5xjYIsFlgvxM3APlFGZG6yIAOzHE/mNrDdtp2oP1AJj2x1NY93z7p1lSP1 U17BZuvwLJumfb39Yjp/hb+cVC8kgMAWcpYxVdUyGWBeihDUhoZSLSVxi4qWdILKH1oD G3Zw== X-Gm-Message-State: AOJu0YzxF+K33M2gP3q/lqBgKcwJwIqiF7V8PH7jg1pts3QrEuEHyx3S /Gbifqua/0YkJWfW9Y/YxuFfd9Xz0cRJy6YAfcBavNVwlDYthA== X-Google-Smtp-Source: AGHT+IGsyH+wVCYhuVMQlBOX0uvX5ezUO3ISzK0SDEAP2UyahCTa1ofaWYJ/RcjINsBDGQTTtn47zQ== X-Received: by 2002:a17:902:ea02:b0:1d4:3af0:866a with SMTP id s2-20020a170902ea0200b001d43af0866amr11908489plg.21.1703864704536; Fri, 29 Dec 2023 07:45:04 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:04 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 01/41] cve-update-nvd2-native: remove unused variable CVE_SOCKET_TIMEOUT Date: Fri, 29 Dec 2023 05:44:15 -1000 Message-Id: <5e545e1226dbec48e7c60735ec5969ec0e356f21.1703864512.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 ; Fri, 29 Dec 2023 15:45:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193018 From: Peter Marko This variable is not referenced in oe-core anymore. Signed-off-by: Peter Marko Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 905b45a814cb33327503b793741c19b44c8550b3) Signed-off-by: Steve Sakoman --- meta/recipes-core/meta/cve-update-nvd2-native.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-core/meta/cve-update-nvd2-native.bb b/meta/recipes-core/meta/cve-update-nvd2-native.bb index d0321f1bb5..08895013cf 100644 --- a/meta/recipes-core/meta/cve-update-nvd2-native.bb +++ b/meta/recipes-core/meta/cve-update-nvd2-native.bb @@ -26,9 +26,6 @@ NVDCVE_API_KEY ?= "" # Use a negative value to skip the update CVE_DB_UPDATE_INTERVAL ?= "86400" -# Timeout for blocking socket operations, such as the connection attempt. -CVE_SOCKET_TIMEOUT ?= "60" - CVE_DB_TEMP_FILE ?= "${CVE_CHECK_DB_DIR}/temp_nvdcve_2.db" CVE_CHECK_DB_FILE ?= "${CVE_CHECK_DB_DIR}/nvdcve_2.db" From patchwork Fri Dec 29 15:44:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37030 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 CAAA4C47072 for ; Fri, 29 Dec 2023 15:45:17 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web11.150990.1703864707989847905 for ; Fri, 29 Dec 2023 07:45:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Fvitb9WU; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1d3eae5c1d7so30788445ad.2 for ; Fri, 29 Dec 2023 07:45:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864707; x=1704469507; 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=iN6MCj8BtC0v+WxMrTIp3OSbfSMroofxG4vHbiZA/ko=; b=Fvitb9WUETyIzQkLZMfdXYyzj00rmnD9Yg348/kYMnAzJYxaL5PU8Ajfh726iMaJtJ LHfGKIj5/hQJ3dWkMP9g40WFnjIAijcO2BdlMyVFeeSEErz/ktD6xnjXeaKZ/rxXsVMR dquBKmejO+gKBCIPMoWC4gOxcjq7B0hzLBZyqretw5ZaCmbSqWvINYCFo34jDG/PPLu0 lD1Cs93e+N7s/Gke+zfR8KHwLGVdMh+jrqYXRqsyfq+brdtzzkO00zztgn3xFNWk07jm zj3mQ+FA0OdeKC5FfoPjZKGXr7WqzzUI1bE9kwyGrYX7F7G88WMCz1T+f91BpFkHLidx K4Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864707; x=1704469507; 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=iN6MCj8BtC0v+WxMrTIp3OSbfSMroofxG4vHbiZA/ko=; b=ITK35b8wOw2qF0FcBOkGBvtBm3F4Rc67ILmHpHer2DvBNCLgb4m4hKNJuE93JW/yl9 XedW/AEzGBvqnsEC5fVyHNdaA+aGZrSFXp5SXB5bZd55wTOPYbYAU/HULuhLMRFkB/n4 I5Hl8K+09emDC5j72YXoP1wh385K5YQjRZdBWhlJlIBSW/813eF7RhRIYoEhFE/bbwNL XKg8k0eX6WjUDeCYAA5pKzUpO4GndPBw1Ow//qTEtxMxEvyD1JO1EQaON/n2ZtVusrDq iOGYZjTuwyXg5CBSy9H7Z05wrE4WyytnMiFGUAF1Qh+eKp63n8z06Ng83gOUqqvNnAPS JKNg== X-Gm-Message-State: AOJu0YwSOg9cB+fzZprXW+s0cN2HIlRCRrwhIAKTmmWWT7oeovFysa5d 7oLenaPuu9WISLFcz8h5SwrGnniTk6ZIy8xTJtSnBkeTmbKw2A== X-Google-Smtp-Source: AGHT+IHaBFrNrKN0r1jmuj9qxDdmkQ2s1uh/LKJHNsU23UgQX27CChyXNS2rG+FlGv2ccV75WG3Kng== X-Received: by 2002:a17:903:2306:b0:1d4:97cb:37ae with SMTP id d6-20020a170903230600b001d497cb37aemr1509831plh.58.1703864706637; Fri, 29 Dec 2023 07:45:06 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:06 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 02/41] cve-update-nvd2-native: make number of fetch attemtps configurable Date: Fri, 29 Dec 2023 05:44:16 -1000 Message-Id: <3573b0ab09359f7eca37fd86400dc3945f5fa7c1.1703864512.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 ; Fri, 29 Dec 2023 15:45:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193019 From: Peter Marko Sometimes NVD servers are unstable and return too many errors. Last time we increased number of attempts from 3 to 5, but further increasing is not reasonable as in normal case too many retries is just abusive. Keep retries low as default and allow to increase as needed. Signed-off-by: Peter Marko Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 6b6fd8043d83b99000054ab6ad2c745d07c6bcc1) Signed-off-by: Steve Sakoman --- meta/recipes-core/meta/cve-update-nvd2-native.bb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/meta/cve-update-nvd2-native.bb b/meta/recipes-core/meta/cve-update-nvd2-native.bb index 08895013cf..9ab8dc6050 100644 --- a/meta/recipes-core/meta/cve-update-nvd2-native.bb +++ b/meta/recipes-core/meta/cve-update-nvd2-native.bb @@ -26,6 +26,9 @@ NVDCVE_API_KEY ?= "" # Use a negative value to skip the update CVE_DB_UPDATE_INTERVAL ?= "86400" +# Number of attmepts for each http query to nvd server before giving up +CVE_DB_UPDATE_ATTEMPTS ?= "5" + CVE_DB_TEMP_FILE ?= "${CVE_CHECK_DB_DIR}/temp_nvdcve_2.db" CVE_CHECK_DB_FILE ?= "${CVE_CHECK_DB_DIR}/nvdcve_2.db" @@ -111,7 +114,7 @@ def cleanup_db_download(db_file, db_tmp_file): if os.path.exists(db_tmp_file): os.remove(db_tmp_file) -def nvd_request_next(url, api_key, args): +def nvd_request_next(url, attempts, api_key, args): """ Request next part of the NVD dabase """ @@ -127,7 +130,7 @@ def nvd_request_next(url, api_key, args): request.add_header("apiKey", api_key) bb.note("Requesting %s" % request.full_url) - for attempt in range(5): + for attempt in range(attempts): try: r = urllib.request.urlopen(request) @@ -183,10 +186,11 @@ def update_db_file(db_tmp_file, d, database_time): index = 0 url = d.getVar("NVDCVE_URL") api_key = d.getVar("NVDCVE_API_KEY") or None + attempts = int(d.getVar("CVE_DB_UPDATE_ATTEMPTS")) while True: req_args['startIndex'] = index - raw_data = nvd_request_next(url, api_key, req_args) + raw_data = nvd_request_next(url, attempts, api_key, req_args) if raw_data is None: # We haven't managed to download data return False From patchwork Fri Dec 29 15:44:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37034 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 DC397C47079 for ; Fri, 29 Dec 2023 15:45:17 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web11.150991.1703864709361837763 for ; Fri, 29 Dec 2023 07:45:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=E/ms1eZC; spf=softfail (domain: sakoman.com, ip: 209.85.216.47, mailfrom: steve@sakoman.com) Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-28c075ad8e7so4789427a91.2 for ; Fri, 29 Dec 2023 07:45:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864708; x=1704469508; 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=t1GTXBESAPxJFv/dMvQM/MB5S1C+rtsxCLbTlHCGYj8=; b=E/ms1eZCZvqMT2wcKsFHPVoTkuvkHC6B1nKNxdcA7HnOgpfuIgeFA9HxwwGHch0dhc ffHap36sxUZ/PBBDBciiwPB4QCyAnSuGBg3zx4Cwj8ArpM3WP5Xd8sW6nTJ9YtGGHvok rS+DM7epGPpyUeLI3Otgzx8ftehreoaM+WESw8ouDD75DBbDti/5jn1sFkpvz/yb4uuH +m8e7rkgN31/qgkfs+LmbqTi/H5eTbn8cfiZv2l6ivMByHsqCoUfoPQ3RtVlOgJFvAHD cpCFGM51LkroZyhiZDjTvK8qsO5NtQyuPnRAKibZvMDgEFtvyfQ+IzK3oHLr+rj+1eYc wEcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864708; x=1704469508; 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=t1GTXBESAPxJFv/dMvQM/MB5S1C+rtsxCLbTlHCGYj8=; b=rcmtz3kRkoHwKmB1X8bFqZQ8V5CPz6/ERS76PH2+ojuhPr6y4GCBJsrr4O7DSxVhPx MZ+NMBzPOAEzQYtrMT0xjN02g+Gf7I2kAmHoU74LqKBQ1UeBTsmSs3D1Ris9bUfFs/LP GOg52GSv0LVSElEhLQgPeq28hfw+nwL3nKcGbf7lhUp6PoAsNJnNN9mAPWjGuKIweUxU Uq4mH3WJetleier70hIPid0TjpjzhBAPUP38W1lCltcnvr5K/KxZbKHIEew2kM/ZAU72 vW6fGQUmi1bXC/yeiKTIypuKZ6WVylT5sbRO+8Y23cOWs5MYkcGCYa6u3THeW7Z2GCs/ /2/Q== X-Gm-Message-State: AOJu0YwGznIASfSCVj9Pzrs6yT+cTRUPuu0w+GoFAZsYwgDMfKO1bGEx Vfjuplef1wr9yRrOfhhZ2TI84C4y08PqDC03JFR5FWkCduuNbw== X-Google-Smtp-Source: AGHT+IGaWgtAVLO6D08OBuJQQkCy/HZq22DOeLYSRvNAoeBk3DFyVd0CzPCtSoCBO1dltAaufMqU6w== X-Received: by 2002:a17:90a:6082:b0:28b:77c5:9017 with SMTP id z2-20020a17090a608200b0028b77c59017mr6634788pji.35.1703864708412; Fri, 29 Dec 2023 07:45:08 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:08 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 03/41] cve-update-nvd2-native: faster requests with API keys Date: Fri, 29 Dec 2023 05:44:17 -1000 Message-Id: <6998b433a0b0609bbcfb99e7c8e96e5d6b534921.1703864512.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 ; Fri, 29 Dec 2023 15:45:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193020 From: Dhairya Nagodra As per NVD, the public rate limit is 5 requests in 30s (6s delay). Using an API key increases the limit to 50 requests in 30s (0.6s delay). However, NVD still recommends sleeping for several seconds so that the other legitimate requests are serviced without denial or interruption. Keeping the default sleep at 6 seconds and 2 seconds with an API key. For failures, the wait time is unchanged (6 seconds). Reference: https://nvd.nist.gov/developers/start-here#RateLimits Signed-off-by: Dhairya Nagodra Signed-off-by: Alexandre Belloni (cherry picked from commit 5c32e2941d1dc3d04a799a1b7cbd275c1ccc9e79) Signed-off-by: Steve Sakoman --- meta/recipes-core/meta/cve-update-nvd2-native.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/meta/cve-update-nvd2-native.bb b/meta/recipes-core/meta/cve-update-nvd2-native.bb index 9ab8dc6050..941fca34c6 100644 --- a/meta/recipes-core/meta/cve-update-nvd2-native.bb +++ b/meta/recipes-core/meta/cve-update-nvd2-native.bb @@ -188,6 +188,11 @@ def update_db_file(db_tmp_file, d, database_time): api_key = d.getVar("NVDCVE_API_KEY") or None attempts = int(d.getVar("CVE_DB_UPDATE_ATTEMPTS")) + # Recommended by NVD + wait_time = 6 + if api_key: + wait_time = 2 + while True: req_args['startIndex'] = index raw_data = nvd_request_next(url, attempts, api_key, req_args) @@ -210,7 +215,7 @@ def update_db_file(db_tmp_file, d, database_time): break # Recommended by NVD - time.sleep(6) + time.sleep(wait_time) # Update success, set the date to cve_check file. cve_f.write('CVE database update : %s\n\n' % datetime.date.today()) From patchwork Fri Dec 29 15:44:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37033 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 E6574C47077 for ; Fri, 29 Dec 2023 15:45:17 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web10.151495.1703864711174988535 for ; Fri, 29 Dec 2023 07:45:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=hJHUTuNM; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1d41bb4da91so20480035ad.0 for ; Fri, 29 Dec 2023 07:45:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864710; x=1704469510; 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=r+uJBknzDmZkNjlX0pZNKihcgnVYJNvejS70nKCImUI=; b=hJHUTuNMTZ0F0HWTvkBoQLgj1wTSEP25HsAHxmXd7DeDMqXkYot8Sx+/tISuElaGnZ D3x3qzjSiC2/J5CAIJ90gcC8G9MkalNWF15KULI0Fh5Tp2+pH+PyCf3CqeVc78lFoxKk B3XfLKYfPDO74kORVzrDTovFPrSj16szQCUA35xuk6zwUs3MA3Ey1VxmJMdBEeQupCrE XcLw7RFX1btXPZpqKSW4iOYYxVjLUUqHk4sot8V2lySoWdBwLanf5lOR9lnv3zWNrwZ+ /1dg5Bt8gnX86egIW9DnBmPkLibhy1QAjxOTH4k6WDDL7ZFbVIVWWkLv0AWTlLKZC4KC P67A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864710; x=1704469510; 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=r+uJBknzDmZkNjlX0pZNKihcgnVYJNvejS70nKCImUI=; b=SrkoO6LDANBZVmRQWqLNMhUnWg/PoZyXqZTgYBRQhHBKN0HHZ3JtfTNzvcq3aUSaKv NOfuzl5MnQtrstSQsV9VbMG3cAR/SPcIt2bE9RF0dMcQ6A5pVpd/UznYhPTkC2w7a8sG udrstsJ7mneQLPpHzQ+e5rVQaiM8fcC5dRB9tp5t6Kt4V7bfYx97whl+xCbAjBK+vqzU yC1KK+fw2tIS4VbACu9SiiOUdZYGpaNEXUelC8De68grhwz4U/qBfIv/hZUciZtLlPnP u6GO77owwe1pOtbTAi/FccYBIA08ODYgvopw75TWKFZ2bfScWcRSX2AyPuLDHI2wmZ9+ zAbA== X-Gm-Message-State: AOJu0Yx2B4FLJoZvK/fqyOet8hsKTWaS0z2Egf9iukBCDHIjofKMy0b/ JqIQh6W7lZ8ZX/6/aDnM5Sf6u5a/ksZ4DH2hypVtKkQMlVq5QA== X-Google-Smtp-Source: AGHT+IHK6TmPxfbHNxcfW6+1ir+76J6Hd9EzG/vKTkZVuKJIl5bAVlMUdbjBw/UBN7DFD7jlEpan6A== X-Received: by 2002:a17:903:2807:b0:1d3:f76b:e937 with SMTP id kp7-20020a170903280700b001d3f76be937mr4935598plb.23.1703864710284; Fri, 29 Dec 2023 07:45:10 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:10 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 04/41] cve-update-nvd2-native: increase the delay between subsequent request failures Date: Fri, 29 Dec 2023 05:44:18 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Dec 2023 15:45:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193021 From: Dhairya Nagodra Sometimes NVD servers are unstable and return too many errors. There is an option to have higher fetch attempts to increase the chances of successfully fetching the CVE data. Additionally, it also makes sense to progressively increase the delay after a failed request to an already unstable or busy server. The increase in delay is reset after every successful request and the maximum delay is limited to 30 seconds. Also, the logs are improved to give more clarity. Signed-off-by: Dhairya Nagodra Signed-off-by: Alexandre Belloni (cherry picked from commit 7101d654635b707e56b0dbae8c2146b312d211ea) Signed-off-by: Steve Sakoman --- meta/recipes-core/meta/cve-update-nvd2-native.bb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/meta/cve-update-nvd2-native.bb b/meta/recipes-core/meta/cve-update-nvd2-native.bb index 941fca34c6..bfe48b27e7 100644 --- a/meta/recipes-core/meta/cve-update-nvd2-native.bb +++ b/meta/recipes-core/meta/cve-update-nvd2-native.bb @@ -114,7 +114,10 @@ def cleanup_db_download(db_file, db_tmp_file): if os.path.exists(db_tmp_file): os.remove(db_tmp_file) -def nvd_request_next(url, attempts, api_key, args): +def nvd_request_wait(attempt, min_wait): + return min ( ( (2 * attempt) + min_wait ) , 30) + +def nvd_request_next(url, attempts, api_key, args, min_wait): """ Request next part of the NVD dabase """ @@ -143,8 +146,10 @@ def nvd_request_next(url, attempts, api_key, args): r.close() except Exception as e: - bb.note("CVE database: received error (%s), retrying" % (e)) - time.sleep(6) + wait_time = nvd_request_wait(attempt, min_wait) + bb.note("CVE database: received error (%s)" % (e)) + bb.note("CVE database: retrying download after %d seconds. attempted (%d/%d)" % (wait_time, attempt+1, attempts)) + time.sleep(wait_time) pass else: return raw_data @@ -195,7 +200,7 @@ def update_db_file(db_tmp_file, d, database_time): while True: req_args['startIndex'] = index - raw_data = nvd_request_next(url, attempts, api_key, req_args) + raw_data = nvd_request_next(url, attempts, api_key, req_args, wait_time) if raw_data is None: # We haven't managed to download data return False From patchwork Fri Dec 29 15:44:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37035 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 00F8FC4707B for ; Fri, 29 Dec 2023 15:45:18 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web10.151496.1703864713351766870 for ; Fri, 29 Dec 2023 07:45:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=LkmfgU+j; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1d45f182fa2so27639145ad.3 for ; Fri, 29 Dec 2023 07:45:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864712; x=1704469512; 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=dT/cAf07XOSsyjpFsJ893wkq+oUM7VbPSIHZ0kQnJ9w=; b=LkmfgU+jbqK1zCHPSZCBnozAQUjTY1lF7XeYEZxXBHC9l1syaU5wsa2hOtL0MSNk4B 9QJjnKq9aoce92Om5FXId+K7TSOd//2ILla2gU3zWXr2YlXnWc7bK7rQ1OICaudQ1BfV fmp/oEzpS8mWN6GiBv3PnuwTMSOCRX6JvW7lDmCzrmZBHacKkQSmFfIivXwZUhW8isw+ 7803P7pGttCSr3zyB+ru/I+zij00Nunmk7oCIdW0sXQZKpFvedYCFVc6dwZDHtgbXi1W wBHnXTxjxLCti5LMCRSWO8Mc3nT4HIk7wb+VHyGD3qfpMlJ75mO5WVi+mFueou1wLa3Y t2/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864712; x=1704469512; 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=dT/cAf07XOSsyjpFsJ893wkq+oUM7VbPSIHZ0kQnJ9w=; b=t3HMUYhb2vVyZq0RT2INWqQeufAuJt77aq6O66FFK1U5u6Q1fUNVTsjyOleRHMnDtF WDuEpSkqUDTQl84n+Gjkhgx8+nYvrIjXI7WikT2ggKg5pV/duet2i0cp7e11PkXt2rFI ZUVtpV4T7XqSGLgchlrQQqY+clMXzBEKlt2OLhQXn8pjaxM2zF9ewkR340F9TRqeY4og NffKGcio6oMf6zeiiz4gZYzFBlMcoaGxfv1WOf27lsdGc+pVuHcG0lFema6RxCFhMYfN BRrwZDWaY3O6ZgizpVPsxLxVj8lwqw+XazoH59aO1lZYoeiERD1xynEyGMZqHY8l7Q1e DZ4Q== X-Gm-Message-State: AOJu0Yxg5WtDgm+H0qtRG+Ucyo/8183w9vo2g0ij1DeRCfcADkADqC24 slrzIvqsN7XCcKbcHooJWG+4js4SsM1PbxUFTP5AcapvQrsBzw== X-Google-Smtp-Source: AGHT+IEnZzxYpCEcozHiF0CpZqztGTVihhMowdrvNMxzQa+/dDVJkM9f2Ym13ErcZtrcwgH9SsbZkg== X-Received: by 2002:a17:903:200b:b0:1d4:42f:d39b with SMTP id s11-20020a170903200b00b001d4042fd39bmr10385455pla.3.1703864712143; Fri, 29 Dec 2023 07:45:12 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:11 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 05/41] rust: Fix CVE-2023-40030 Date: Fri, 29 Dec 2023 05:44:19 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Dec 2023 15:45:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193022 From: Deepthi Hemraj CVE:CVE-2023-40030 This converts the feature name validation check from a warning to an error Upstream-Status: Backport from https://github.com/rust-lang/cargo/commit/9835622853f08be9a4b58ebe29dcec8f43b64b33 Reference: https://nvd.nist.gov/vuln/detail/CVE-2023-40030 Signed-off-by: Deepthi Hemraj Signed-off-by: Steve Sakoman --- .../rust/files/0002-CVE-2023-40030.patch | 412 ++++++++++++++++++ meta/recipes-devtools/rust/rust-source.inc | 1 + 2 files changed, 413 insertions(+) create mode 100644 meta/recipes-devtools/rust/files/0002-CVE-2023-40030.patch diff --git a/meta/recipes-devtools/rust/files/0002-CVE-2023-40030.patch b/meta/recipes-devtools/rust/files/0002-CVE-2023-40030.patch new file mode 100644 index 0000000000..bf9b251226 --- /dev/null +++ b/meta/recipes-devtools/rust/files/0002-CVE-2023-40030.patch @@ -0,0 +1,412 @@ +Author: Eric Huss +Date: Sun Jun 11 12:52:25 2023 -0700 + + Convert valid feature name warning to an error. + +Upstream-Status: Backport [https://github.com/rust-lang/cargo/commit/9835622853f08be9a4b58ebe29dcec8f43b64b33] +CVE: CVE-2023-40030 +Signed-off-by: Deepthi Hemraj + +diff --git a/src/tools/cargo/crates/resolver-tests/src/lib.rs b/src/tools/cargo/crates/resolver-tests/src/lib.rs +index 01d9b5e6d..ab34e8663 100644 +--- a/src/tools/cargo/crates/resolver-tests/src/lib.rs ++++ b/src/tools/cargo/crates/resolver-tests/src/lib.rs +@@ -179,7 +179,6 @@ pub fn resolve_with_config_raw( + used: HashSet::new(), + }; + let summary = Summary::new( +- config, + pkg_id("root"), + deps, + &BTreeMap::new(), +@@ -581,7 +580,6 @@ pub fn pkg_dep(name: T, dep: Vec) -> Summary { + None + }; + Summary::new( +- &Config::default().unwrap(), + name.to_pkgid(), + dep, + &BTreeMap::new(), +@@ -610,7 +608,6 @@ pub fn pkg_loc(name: &str, loc: &str) -> Summary { + None + }; + Summary::new( +- &Config::default().unwrap(), + pkg_id_loc(name, loc), + Vec::new(), + &BTreeMap::new(), +@@ -625,7 +622,6 @@ pub fn remove_dep(sum: &Summary, ind: usize) -> Summary { + deps.remove(ind); + // note: more things will need to be copied over in the future, but it works for now. + Summary::new( +- &Config::default().unwrap(), + sum.package_id(), + deps, + &BTreeMap::new(), +diff --git a/src/tools/cargo/src/cargo/core/resolver/version_prefs.rs b/src/tools/cargo/src/cargo/core/resolver/version_prefs.rs +index 002f11ff8..bf26d0498 100644 +--- a/src/tools/cargo/src/cargo/core/resolver/version_prefs.rs ++++ b/src/tools/cargo/src/cargo/core/resolver/version_prefs.rs +@@ -73,7 +73,6 @@ impl VersionPreferences { + mod test { + use super::*; + use crate::core::SourceId; +- use crate::util::Config; + use std::collections::BTreeMap; + + fn pkgid(name: &str, version: &str) -> PackageId { +@@ -90,9 +89,8 @@ mod test { + + fn summ(name: &str, version: &str) -> Summary { + let pkg_id = pkgid(name, version); +- let config = Config::default().unwrap(); + let features = BTreeMap::new(); +- Summary::new(&config, pkg_id, Vec::new(), &features, None::<&String>).unwrap() ++ Summary::new(pkg_id, Vec::new(), &features, None::<&String>).unwrap() + } + + fn describe(summaries: &Vec) -> String { + +diff --git a/src/tools/cargo/src/cargo/core/summary.rs b/src/tools/cargo/src/cargo/core/summary.rs +index 2535c4482..1883df33b 100644 +--- a/src/tools/cargo/src/cargo/core/summary.rs ++++ b/src/tools/cargo/src/cargo/core/summary.rs +@@ -1,6 +1,6 @@ + use crate::core::{Dependency, PackageId, SourceId}; + use crate::util::interning::InternedString; +-use crate::util::{CargoResult, Config}; ++use crate::util::CargoResult; + use anyhow::bail; + use semver::Version; + use std::collections::{BTreeMap, HashMap, HashSet}; +@@ -30,7 +30,6 @@ struct Inner { + + impl Summary { + pub fn new( +- config: &Config, + pkg_id: PackageId, + dependencies: Vec, + features: &BTreeMap>, +@@ -49,7 +48,7 @@ impl Summary { + ) + } + } +- let feature_map = build_feature_map(config, pkg_id, features, &dependencies)?; ++ let feature_map = build_feature_map(pkg_id, features, &dependencies)?; + Ok(Summary { + inner: Rc::new(Inner { + package_id: pkg_id, +@@ -140,7 +139,6 @@ impl Hash for Summary { + /// Checks features for errors, bailing out a CargoResult:Err if invalid, + /// and creates FeatureValues for each feature. + fn build_feature_map( +- config: &Config, + pkg_id: PackageId, + features: &BTreeMap>, + dependencies: &[Dependency], +@@ -204,7 +202,7 @@ fn build_feature_map( + feature + ); + } +- validate_feature_name(config, pkg_id, feature)?; ++ validate_feature_name(pkg_id, feature)?; + for fv in fvs { + // Find data for the referenced dependency... + let dep_data = { +@@ -431,33 +429,63 @@ impl fmt::Display for FeatureValue { + + pub type FeatureMap = BTreeMap>; + +-fn validate_feature_name(config: &Config, pkg_id: PackageId, name: &str) -> CargoResult<()> { ++fn validate_feature_name(pkg_id: PackageId, name: &str) -> CargoResult<()> { + let mut chars = name.chars(); +- const FUTURE: &str = "This was previously accepted but is being phased out; \ +- it will become a hard error in a future release.\n\ +- For more information, see issue #8813 , \ +- and please leave a comment if this will be a problem for your project."; + if let Some(ch) = chars.next() { + if !(unicode_xid::UnicodeXID::is_xid_start(ch) || ch == '_' || ch.is_digit(10)) { +- config.shell().warn(&format!( ++ bail!( + "invalid character `{}` in feature `{}` in package {}, \ + the first character must be a Unicode XID start character or digit \ +- (most letters or `_` or `0` to `9`)\n\ +- {}", +- ch, name, pkg_id, FUTURE +- ))?; ++ (most letters or `_` or `0` to `9`)", ++ ch, ++ name, ++ pkg_id ++ ); + } + } + for ch in chars { + if !(unicode_xid::UnicodeXID::is_xid_continue(ch) || ch == '-' || ch == '+' || ch == '.') { +- config.shell().warn(&format!( ++ bail!( + "invalid character `{}` in feature `{}` in package {}, \ + characters must be Unicode XID characters, `+`, or `.` \ +- (numbers, `+`, `-`, `_`, `.`, or most letters)\n\ +- {}", +- ch, name, pkg_id, FUTURE +- ))?; ++ (numbers, `+`, `-`, `_`, `.`, or most letters)", ++ ch, ++ name, ++ pkg_id ++ ); + } + } + Ok(()) + } ++ ++#[cfg(test)] ++mod tests { ++ use super::*; ++ use crate::sources::CRATES_IO_INDEX; ++ use crate::util::into_url::IntoUrl; ++ ++ use crate::core::SourceId; ++ ++ #[test] ++ fn valid_feature_names() { ++ let loc = CRATES_IO_INDEX.into_url().unwrap(); ++ let source_id = SourceId::for_registry(&loc).unwrap(); ++ let pkg_id = PackageId::new("foo", "1.0.0", source_id).unwrap(); ++ ++ assert!(validate_feature_name(pkg_id, "c++17").is_ok()); ++ assert!(validate_feature_name(pkg_id, "128bit").is_ok()); ++ assert!(validate_feature_name(pkg_id, "_foo").is_ok()); ++ assert!(validate_feature_name(pkg_id, "feat-name").is_ok()); ++ assert!(validate_feature_name(pkg_id, "feat_name").is_ok()); ++ assert!(validate_feature_name(pkg_id, "foo.bar").is_ok()); ++ ++ assert!(validate_feature_name(pkg_id, "+foo").is_err()); ++ assert!(validate_feature_name(pkg_id, "-foo").is_err()); ++ assert!(validate_feature_name(pkg_id, ".foo").is_err()); ++ assert!(validate_feature_name(pkg_id, "foo:bar").is_err()); ++ assert!(validate_feature_name(pkg_id, "foo?").is_err()); ++ assert!(validate_feature_name(pkg_id, "?foo").is_err()); ++ assert!(validate_feature_name(pkg_id, "ⒶⒷⒸ").is_err()); ++ assert!(validate_feature_name(pkg_id, "a¼").is_err()); ++ } ++} +diff --git a/src/tools/cargo/src/cargo/sources/registry/index.rs b/src/tools/cargo/src/cargo/sources/registry/index.rs +index aa5c2a78c..6d565da8f 100644 +--- a/src/tools/cargo/src/cargo/sources/registry/index.rs ++++ b/src/tools/cargo/src/cargo/sources/registry/index.rs +@@ -293,7 +293,6 @@ impl<'cfg> RegistryIndex<'cfg> + 'a: 'b, + { + let source_id = self.source_id; +- let config = self.config; + + // First up actually parse what summaries we have available. If Cargo + // has run previously this will parse a Cargo-specific cache file rather +@@ -312,15 +311,13 @@ impl<'cfg> RegistryIndex<'cfg> { + .versions + .iter_mut() + .filter_map(move |(k, v)| if req.matches(k) { Some(v) } else { None }) +- .filter_map( +- move |maybe| match maybe.parse(config, raw_data, source_id) { ++ .filter_map(move |maybe| match maybe.parse(raw_data, source_id) { + Ok(summary) => Some(summary), + Err(e) => { + info!("failed to parse `{}` registry package: {}", name, e); + None + } +- }, +- ) ++ }) + .filter(move |is| { + if is.v > INDEX_V_MAX { + debug!( +@@ -605,7 +602,7 @@ impl Summaries { + // allow future cargo implementations to break the + // interpretation of each line here and older cargo will simply + // ignore the new lines. +- let summary = match IndexSummary::parse(config, line, source_id) { ++ let summary = match IndexSummary::parse(line, source_id) { + Ok(summary) => summary, + Err(e) => { + // This should only happen when there is an index +@@ -793,17 +790,12 @@ impl MaybeIndexSummary { + /// Does nothing if this is already `Parsed`, and otherwise the `raw_data` + /// passed in is sliced with the bounds in `Unparsed` and then actually + /// parsed. +- fn parse( +- &mut self, +- config: &Config, +- raw_data: &[u8], +- source_id: SourceId, +- ) -> CargoResult<&IndexSummary> { ++ fn parse(&mut self, raw_data: &[u8], source_id: SourceId,) -> CargoResult<&IndexSummary> { + let (start, end) = match self { + MaybeIndexSummary::Unparsed { start, end } => (*start, *end), + MaybeIndexSummary::Parsed(summary) => return Ok(summary), + }; +- let summary = IndexSummary::parse(config, &raw_data[start..end], source_id)?; ++ let summary = IndexSummary::parse(&raw_data[start..end], source_id)?; + *self = MaybeIndexSummary::Parsed(summary); + match self { + MaybeIndexSummary::Unparsed { .. } => unreachable!(), +@@ -823,7 +815,7 @@ impl IndexSummary { + /// a package. + /// + /// The `line` provided is expected to be valid JSON. +- fn parse(config: &Config, line: &[u8], source_id: SourceId) -> CargoResult { ++ fn parse(line: &[u8], source_id: SourceId) -> CargoResult { + // ****CAUTION**** Please be extremely careful with returning errors + // from this function. Entries that error are not included in the + // index cache, and can cause cargo to get confused when switching +@@ -853,7 +845,7 @@ impl IndexSummary { + features.entry(name).or_default().extend(values); + } + } +- let mut summary = Summary::new(config, pkgid, deps, &features, links)?; ++ let mut summary = Summary::new(pkgid, deps, &features, links)?; + summary.set_checksum(cksum); + Ok(IndexSummary { + summary, + +diff --git a/src/tools/cargo/src/cargo/util/toml/mod.rs b/src/tools/cargo/src/cargo/util/toml/mod.rs +index 1cc32dee8..a32f0384b 100644 +--- a/src/tools/cargo/src/cargo/util/toml/mod.rs ++++ b/src/tools/cargo/src/cargo/util/toml/mod.rs +@@ -2432,7 +2432,6 @@ impl TomlManifest { + let empty_features = BTreeMap::new(); + + let summary = Summary::new( +- config, + pkgid, + deps, + me.features.as_ref().unwrap_or(&empty_features), +diff --git a/src/tools/cargo/tests/testsuite/features.rs b/src/tools/cargo/tests/testsuite/features.rs +index 848e05677..557fab14a 100644 +--- a/src/tools/cargo/tests/testsuite/features.rs ++++ b/src/tools/cargo/tests/testsuite/features.rs +@@ -1937,8 +1937,8 @@ fn nonexistent_required_features() { + } + + #[cargo_test] +-fn invalid_feature_names_warning() { +- // Warnings for more restricted feature syntax. ++fn invalid_feature_names_error() { ++ // Errors for more restricted feature syntax. + let p = project() + .file( + "Cargo.toml", +@@ -1948,72 +1948,57 @@ fn invalid_feature_names_warning() { + version = "0.1.0" + + [features] +- # Some valid, but unusual names, shouldn't warn. +- "c++17" = [] +- "128bit" = [] +- "_foo" = [] +- "feat-name" = [] +- "feat_name" = [] +- "foo.bar" = [] +- +- # Invalid names. ++ # Invalid start character. + "+foo" = [] +- "-foo" = [] +- ".foo" = [] +- "foo:bar" = [] +- "foo?" = [] +- "?foo" = [] +- "ⒶⒷⒸ" = [] +- "a¼" = [] + "#, + ) + .file("src/lib.rs", "") + .build(); + +- // Unfortunately the warnings are duplicated due to the Summary being +- // loaded twice (once in the Workspace, and once in PackageRegistry) and +- // Cargo does not have a de-duplication system. This should probably be +- // OK, since I'm not expecting this to affect anyone. + p.cargo("check") +- .with_stderr("\ +-[WARNING] invalid character `+` in feature `+foo` in package foo v0.1.0 ([ROOT]/foo), the first character must be a Unicode XID start character or digit (most letters or `_` or `0` to `9`) +-This was previously accepted but is being phased out; it will become a hard error in a future release. +-For more information, see issue #8813 , and please leave a comment if this will be a problem for your project. +-[WARNING] invalid character `-` in feature `-foo` in package foo v0.1.0 ([ROOT]/foo), the first character must be a Unicode XID start character or digit (most letters or `_` or `0` to `9`) +-This was previously accepted but is being phased out; it will become a hard error in a future release. +-For more information, see issue #8813 , and please leave a comment if this will be a problem for your project. +-[WARNING] invalid character `.` in feature `.foo` in package foo v0.1.0 ([ROOT]/foo), the first character must be a Unicode XID start character or digit (most letters or `_` or `0` to `9`) +-This was previously accepted but is being phased out; it will become a hard error in a future release. +-For more information, see issue #8813 , and please leave a comment if this will be a problem for your project. +-[WARNING] invalid character `?` in feature `?foo` in package foo v0.1.0 ([ROOT]/foo), the first character must be a Unicode XID start character or digit (most letters or `_` or `0` to `9`) +-This was previously accepted but is being phased out; it will become a hard error in a future release. +-For more information, see issue #8813 , and please leave a comment if this will be a problem for your project. +-[WARNING] invalid character `¼` in feature `a¼` in package foo v0.1.0 ([ROOT]/foo), characters must be Unicode XID characters, `+`, or `.` (numbers, `+`, `-`, `_`, `.`, or most letters) +-This was previously accepted but is being phased out; it will become a hard error in a future release. +-For more information, see issue #8813 , and please leave a comment if this will be a problem for your project. +-[WARNING] invalid character `:` in feature `foo:bar` in package foo v0.1.0 ([ROOT]/foo), characters must be Unicode XID characters, `+`, or `.` (numbers, `+`, `-`, `_`, `.`, or most letters) +-This was previously accepted but is being phased out; it will become a hard error in a future release. +-For more information, see issue #8813 , and please leave a comment if this will be a problem for your project. +-[WARNING] invalid character `?` in feature `foo?` in package foo v0.1.0 ([ROOT]/foo), characters must be Unicode XID characters, `+`, or `.` (numbers, `+`, `-`, `_`, `.`, or most letters) +-This was previously accepted but is being phased out; it will become a hard error in a future release. +-For more information, see issue #8813 , and please leave a comment if this will be a problem for your project. +-[WARNING] invalid character `Ⓐ` in feature `ⒶⒷⒸ` in package foo v0.1.0 ([ROOT]/foo), the first character must be a Unicode XID start character or digit (most letters or `_` or `0` to `9`) +-This was previously accepted but is being phased out; it will become a hard error in a future release. +-For more information, see issue #8813 , and please leave a comment if this will be a problem for your project. +-[WARNING] invalid character `Ⓑ` in feature `ⒶⒷⒸ` in package foo v0.1.0 ([ROOT]/foo), characters must be Unicode XID characters, `+`, or `.` (numbers, `+`, `-`, `_`, `.`, or most letters) +-This was previously accepted but is being phased out; it will become a hard error in a future release. +-For more information, see issue #8813 , and please leave a comment if this will be a problem for your project. +-[WARNING] invalid character `Ⓒ` in feature `ⒶⒷⒸ` in package foo v0.1.0 ([ROOT]/foo), characters must be Unicode XID characters, `+`, or `.` (numbers, `+`, `-`, `_`, `.`, or most letters) +-This was previously accepted but is being phased out; it will become a hard error in a future release. +-For more information, see issue #8813 , and please leave a comment if this will be a problem for your project. +-[CHECKING] foo v0.1.0 [..] +-[FINISHED] [..] +-") ++ .with_status(101) ++ .with_stderr( ++ "\ ++error: failed to parse manifest at `[ROOT]/foo/Cargo.toml` ++ ++Caused by: ++ invalid character `+` in feature `+foo` in package foo v0.1.0 ([ROOT]/foo), \ ++ the first character must be a Unicode XID start character or digit \ ++ (most letters or `_` or `0` to `9`) ++", ++ ) ++ .run(); ++ ++ p.change_file( ++ "Cargo.toml", ++ r#" ++ [package] ++ name = "foo" ++ version = "0.1.0" ++ ++ [features] ++ # Invalid continue character. ++ "a&b" = [] ++ "#, ++ ); ++ ++ p.cargo("check") ++ .with_status(101) ++ .with_stderr( ++ "\ ++error: failed to parse manifest at `[ROOT]/foo/Cargo.toml` ++ ++Caused by: ++ invalid character `&` in feature `a&b` in package foo v0.1.0 ([ROOT]/foo), \ ++ characters must be Unicode XID characters, `+`, or `.` \ ++ (numbers, `+`, `-`, `_`, `.`, or most letters) ++", ++ ) + .run(); + } + + #[cargo_test] +-fn invalid_feature_names_error() { ++fn invalid_feature_name_slash_error() { + // Errors for more restricted feature syntax. + let p = project() + .file( diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index 4a720e645b..086375a3c6 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -7,6 +7,7 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n file://zlib-off64_t.patch;patchdir=${RUSTSRC} \ file://0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC} \ file://bootstrap_fail.patch;patchdir=${RUSTSRC} \ + file://0002-CVE-2023-40030.patch;patchdir=${RUSTSRC} \ " SRC_URI[rust.sha256sum] = "bb8e9c564566b2d3228d95de9063a9254182446a161353f1d843bfbaf5c34639" From patchwork Fri Dec 29 15:44:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37032 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 DAFDBC47074 for ; Fri, 29 Dec 2023 15:45:17 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web10.151499.1703864714707789551 for ; Fri, 29 Dec 2023 07:45:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=LqNm7XsH; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1d480c6342dso16484935ad.2 for ; Fri, 29 Dec 2023 07:45:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864714; x=1704469514; 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=z6EVGNdP4CC9Ny5BHEVGPQvX+J8SdLHvuE7MXDnfCUE=; b=LqNm7XsHrY6hXvE2jHPibw6pJroT5yamGM2CkiOBjY1MwGJv2SJghYkgK/FX9jLY9q UHK+S6OISwUP2bjUdUgOY/Gvid3itMas7NeJDJMzvpam44V+KRRF/fFVNI//09AjkOk/ kO9L1MbOdYj8Z5+p4XOms4LiLT0+a/xw8/iDpHPL8/45rB+KPpx7G8YX5ySoA/ISp4Pl Eqkd7iZj2V8cHHfcMTIo9wWlYqEWttLX8tC7S/opUHZjND3H6oAhjDA8boAoQ8f11LU2 TcBMbJJoBLvS5dhoL0OJ6X3d2wZ1YomYan2o7QWhkzGwqxh5KaQCeOLkEYNvEZo6cKNq CihQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864714; x=1704469514; 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=z6EVGNdP4CC9Ny5BHEVGPQvX+J8SdLHvuE7MXDnfCUE=; b=gnK0TOaWPsNVdV6VjP0OvYiKuSA/eHyZ0aZ9dvHRFM9N/2HDPd/zqGr+d8HfzEI6Vw kk0xHEakrly4kEMeEolX2NTZoxrnpsfZhFAOSMKF6mMS59ZDZ6CGfaE4u54uO1p44NiP MpjP5b7agSUxhA/w/Pd6jh4wobbfwuA5ZL80S4axxTU+tQIXtTULaxKUyLe2z3Mr1BXM fwS1p5bCue/AJBjpZk3qR1T6xxwa+XcXSFudeAAyAHbRwejWR6uIWLMhPaaCtosVKRVq 8kWDWHARJRneh6G/jibJXT9WKqqakX3sgljVsduwQ14vpMAKAAs8uOmhGbIoNVgR62+l qxnA== X-Gm-Message-State: AOJu0YzisrutFvovCuZbmmdTqud9aOAyAuVgJv0vXEVBMpLR44v0s/CB YlYZFdiVs7yWkxzBAJn1nLdpYyAQ4Tc1yWHAGuHeYjVtya1r6Q== X-Google-Smtp-Source: AGHT+IF5OXhKGNdnPHRuUAnmNxRut4C4XCKVwRQJ5iP3PZkDTx03JZfDeEh3kBPwALzw2dNV+w/rng== X-Received: by 2002:a17:902:6547:b0:1d4:1f06:f4e0 with SMTP id d7-20020a170902654700b001d41f06f4e0mr10319447pln.137.1703864713861; Fri, 29 Dec 2023 07:45:13 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:13 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 06/41] linux-yocto: update CVE exclusions Date: Fri, 29 Dec 2023 05:44:20 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Dec 2023 15:45:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193023 From: Ross Burton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 4cfc4187ac90a4504b93a01ff6333d14928728a8) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/cve-exclusion_6.1.inc | 4 ++-- meta/recipes-kernel/linux/cve-exclusion_6.5.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/cve-exclusion_6.1.inc b/meta/recipes-kernel/linux/cve-exclusion_6.1.inc index 650b83a900..bf23742d70 100644 --- a/meta/recipes-kernel/linux/cve-exclusion_6.1.inc +++ b/meta/recipes-kernel/linux/cve-exclusion_6.1.inc @@ -1,6 +1,6 @@ # Auto-generated CVE metadata, DO NOT EDIT BY HAND. -# Generated at 2023-12-05 13:22:34.961692+00:00 for version 6.1.65 +# Generated at 2023-12-18 14:15:17.069657+00:00 for version 6.1.65 python check_kernel_cve_status_version() { this_version = "6.1.65" @@ -5126,7 +5126,7 @@ CVE_STATUS[CVE-2023-5633] = "fixed-version: only affects 6.2 onwards" CVE_STATUS[CVE-2023-6111] = "fixed-version: only affects 6.6rc3 onwards" -# CVE-2023-6121 needs backporting (fixed from 6.7rc3) +CVE_STATUS[CVE-2023-6121] = "cpe-stable-backport: Backported in 6.1.65" CVE_STATUS[CVE-2023-6176] = "cpe-stable-backport: Backported in 6.1.54" diff --git a/meta/recipes-kernel/linux/cve-exclusion_6.5.inc b/meta/recipes-kernel/linux/cve-exclusion_6.5.inc index 046c3f95c3..7711bcb4d6 100644 --- a/meta/recipes-kernel/linux/cve-exclusion_6.5.inc +++ b/meta/recipes-kernel/linux/cve-exclusion_6.5.inc @@ -1,6 +1,6 @@ # Auto-generated CVE metadata, DO NOT EDIT BY HAND. -# Generated at 2023-12-05 13:22:43.339114+00:00 for version 6.5.13 +# Generated at 2023-12-18 14:15:23.952852+00:00 for version 6.5.13 python check_kernel_cve_status_version() { this_version = "6.5.13" From patchwork Fri Dec 29 15:44:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37031 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 CD4EBC47073 for ; Fri, 29 Dec 2023 15:45:17 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.web10.151504.1703864717023397920 for ; Fri, 29 Dec 2023 07:45:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=U+5voIhi; spf=softfail (domain: sakoman.com, ip: 209.85.215.180, mailfrom: steve@sakoman.com) Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-5cd5cdba609so5278943a12.0 for ; Fri, 29 Dec 2023 07:45:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864716; x=1704469516; 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=tA1SD1+ZpAjVPCn7ms22rqN3LL3ZAWxGRO9RrciSnj8=; b=U+5voIhij1JfBmhCMS4jO/pq6RiPjsSSNKnlPA70l9SBLWkjhyHGpDSZVMZDKk0yF8 ddBvTnnwTvCDhu35etHiH4PM1V2tJRWgUrqlV8OrOztype3cuQF1/QSZaHdb++sWAL14 3Ld/qQ+QdLyfUHIr4G51V9+aBU2c5TKn16h+jm6wHaLAKb4aLObjNAKS8Oif/o5IMt7d qjdVYMu5EZQ9OSWkUWqOy8E2r27iVwyg2AsXFKlJ3r53waptivI+TcF+N+wYjY0a7DWB TBHFjNw9yPc8PdpsDYH/PbPdjzRZPnrn8zjb1e+7Q++cv20xUdyrAMsSRODW4k4aLz0G EY+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864716; x=1704469516; 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=tA1SD1+ZpAjVPCn7ms22rqN3LL3ZAWxGRO9RrciSnj8=; b=i9x/4Q5c6eo2auh2p3rTQJ1Vavpmtvsq+KiCEVBGGMXLbVvUaoHuDyCjt+YkNGY9Vf pm7TrNzU29KAQj5nYEapq+5o/tALAxnmVNEpGLHOGzmt/u3jaWN2FW8a8d+unSC6F65Y JoDNfvE/p1wbTyOkoNbSSGWQb+Ou6ZD3fwAFEPZlAP/PjDgWsH42uFxZWNNf8Q0UMYpb 3c7ZF3gKILcmhg0iZe5v9aXglfZiRBwZSPr+kooQ7oq7pBM59aA8+LxZy38xq1qUi1RU Ce3F2cbZ3YMEi1QledUmatoIRFtg+OalG1AG2l0CH+URj5ShssDHOgWqi1ZprUsBtvA1 F/3A== X-Gm-Message-State: AOJu0YwXFOo/a7+kazAN2c05GIb6FI787+OzVUyM3L+6ZgrCy+P7MgPR IGj2NDlanZoE3T035azrpBJQ3pvjIkGfSjIW2hwUsAXYzB2Tmw== X-Google-Smtp-Source: AGHT+IFKAoovBhQWrcgDry5T7Li8rd4eibaV2f12s0VF3RY7vpu6qfSh/6DajdOX2o9N8cLDRf0gDQ== X-Received: by 2002:a17:902:f7ce:b0:1d4:7bbf:2de8 with SMTP id h14-20020a170902f7ce00b001d47bbf2de8mr4403692plw.130.1703864715727; Fri, 29 Dec 2023 07:45:15 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:15 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 07/41] linux-yocto/6.1: drop removed IMA option Date: Fri, 29 Dec 2023 05:44:21 -1000 Message-Id: <72adeea0757a7de664092cfac6139c28c7f6e999.1703864512.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 ; Fri, 29 Dec 2023 15:45:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193024 From: Bruce Ashfield Integrating the following commit(s) to linux-yocto/.: 1/1 [ Author: Paul Gortmaker Email: paul.gortmaker@windriver.com Subject: features/ima: drop now retired IMA_TRUSTED_KEYRING option Date: Wed, 6 Dec 2023 09:15:38 -0500 Unfortunately linux-stable backported this: Subject: ima: Remove deprecated IMA_TRUSTED_KEYRING Kconfig From: Nayna Jain [ Upstream commit 5087fd9e80e539d2163accd045b73da64de7de95 ] Time to remove "IMA_TRUSTED_KEYRING". ...to all releases still being maintained. stable-queue$git grep -l 5087fd9e80e539 releases/5.10.195/ima-remove-deprecated-ima_trusted_keyring-kconfig.patch releases/5.15.132/ima-remove-deprecated-ima_trusted_keyring-kconfig.patch releases/5.4.257/ima-remove-deprecated-ima_trusted_keyring-kconfig.patch releases/6.1.53/ima-remove-deprecated-ima_trusted_keyring-kconfig.patch releases/6.4.16/ima-remove-deprecated-ima_trusted_keyring-kconfig.patch releases/6.5.3/ima-remove-deprecated-ima_trusted_keyring-kconfig.patch So now when someone uses the feature, it triggers a do_kernel_configcheck warning when the audit runs. We added this file way back in 2019 so this fix will be needed on all active branches that are using an LTS linux-stable kernel listed above. Signed-off-by: Paul Gortmaker Signed-off-by: Bruce Ashfield ] Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit db11dfcd8304ded18fd21d7c4c2db50331402666) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_6.1.bb | 4 ++-- .../linux/linux-yocto-tiny_6.1.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 24 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb index 3d9a98b506..8d07058b71 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb @@ -14,8 +14,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "8987c29d0fc5680adf4f3ac89d6c8bd2bc279a53" -SRCREV_meta ?= "77f0a9eba731b83da9273d1c0d6bb1c3afd9b129" +SRCREV_machine ?= "2fc300ad2664d72a382351afaa02208e3bcec857" +SRCREV_meta ?= "5f331d55d0900030f5bc9b139c815f3f01a8ffd4" 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.1;destsuffix=${KMETA};protocol=https" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb index b966797d0b..c0871532df 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb @@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" -SRCREV_meta ?= "77f0a9eba731b83da9273d1c0d6bb1c3afd9b129" +SRCREV_machine ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" +SRCREV_meta ?= "5f331d55d0900030f5bc9b139c815f3f01a8ffd4" PV = "${LINUX_VERSION}+git" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index cf65afa922..6564731da9 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb @@ -18,18 +18,18 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base" KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "c7612f5ac940578eac19971dcfa4f52f25753074" -SRCREV_machine:qemuarm64 ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" -SRCREV_machine:qemuloongarch64 ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" -SRCREV_machine:qemumips ?= "61a56646314cdf030994524e9b04a89b79e0cb9b" -SRCREV_machine:qemuppc ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" -SRCREV_machine:qemuriscv64 ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" -SRCREV_machine:qemuriscv32 ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" -SRCREV_machine:qemux86 ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" -SRCREV_machine:qemux86-64 ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" -SRCREV_machine:qemumips64 ?= "8d25ce2c226b61b29e600dc6b4018afa354a6e67" -SRCREV_machine ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" -SRCREV_meta ?= "77f0a9eba731b83da9273d1c0d6bb1c3afd9b129" +SRCREV_machine:qemuarm ?= "b14dc32b21c8770b4e635ec69611aa32fff230b3" +SRCREV_machine:qemuarm64 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" +SRCREV_machine:qemuloongarch64 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" +SRCREV_machine:qemumips ?= "072df281d6a919a505df072b4741d49145cf3781" +SRCREV_machine:qemuppc ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" +SRCREV_machine:qemuriscv64 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" +SRCREV_machine:qemuriscv32 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" +SRCREV_machine:qemux86 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" +SRCREV_machine:qemux86-64 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" +SRCREV_machine:qemumips64 ?= "a5de8564807b47662da3670c5b358a1494faef77" +SRCREV_machine ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" +SRCREV_meta ?= "5f331d55d0900030f5bc9b139c815f3f01a8ffd4" # 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 Fri Dec 29 15:44:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37037 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 F23FCC47072 for ; Fri, 29 Dec 2023 15:45:27 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web11.150995.1703864718810064168 for ; Fri, 29 Dec 2023 07:45:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=W52odYHD; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1d2e6e14865so33238735ad.0 for ; Fri, 29 Dec 2023 07:45:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864717; x=1704469517; 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=yx8eAEMjm2ZvUNUBiXWKRphj4xBB1YDqPpSiAf3t3C8=; b=W52odYHDuNsIX3wVFF/ziMBu+7ljNmSW/3xyWd0/Sasgk8KtKrRPBi08jLV1BX3/WJ /VQLjKRdEh+Dm3v/LwTow/IYa0FtxEMtxEwA2HOurYd3tFlFh27POqj5tiFpuyLdXuoT pqCs4pMCMkfvsJfbGFGEOgVA2WXVqqxGiuUjlAp+fYlKuoCFcobtQB1mO5H4LqoDAAmx MBMn8NW3BCkEREib9BjWyxJzkN2O245Yi+D08FCAKuCKuQId2iBozzukrCZI5YPTCfUi KE7Vb9S4glws1MIkgoT5Uda3FiAK4rcVOShzaDfi/huLzBCvYdOqHc7pm0eGcjNHAPSU oO+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864717; x=1704469517; 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=yx8eAEMjm2ZvUNUBiXWKRphj4xBB1YDqPpSiAf3t3C8=; b=sgoKhTIvobFROR3As1nABVa8y6r3SZwkA7iV+kXUcz2fLG42muAnn0AfsO9oH0v1W9 MOrMDr4vhAueYPe0fbxGGh8h0jEE1ZTdxanxEKdgEfyp+qG3+UDyZyZb4RBAJzaZZKo5 P9WlTMjTmtYuH8m3ISGcZb9LlwuWUMDylh/gMu3/QPQBlDMPwwdwV7kTeNj7dbAMN1fa JnbGMNvoLshRusgRNYEXDCBbO4IXI8UY86k2/v5Xxnc3yFh0pv3AyimauqB/LnKukQBt qfRTlNbq13BDIzVUGR1JWPNa5UAhYkrnWuMtJ4JhzSzGJcsAXmFtwIC+KmESvOCWuLDN 2YOg== X-Gm-Message-State: AOJu0YyOn4y94mzRG6sbaudyU2OiS3d82ENun0X4pdAn1YpiIJS9IIFe vf5rgjKV80ks9wqm+I4Ae+NsAZadENEdBIDHvWu0pCFm/2jjHQ== X-Google-Smtp-Source: AGHT+IEPkuoYZnML5UsDwci27Fcr11HZfRuiLRFQnGQ0Z55TrugE6m8HhP602/UW72tSPtW8dtUUTw== X-Received: by 2002:a17:902:860c:b0:1d3:3357:22b9 with SMTP id f12-20020a170902860c00b001d3335722b9mr5937487plo.139.1703864717426; Fri, 29 Dec 2023 07:45:17 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:17 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 08/41] linux-yocto-rt/6.1: update to -rt18 Date: Fri, 29 Dec 2023 05:44:22 -1000 Message-Id: <3ada2757f8c8987af988dc8cd7525f755571c31f.1703864512.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 ; Fri, 29 Dec 2023 15:45:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193025 From: Bruce Ashfield Integrating the following commit(s) to linux-yocto-rt/6.1: 1/17 [ Author: Tvrtko Ursulin Email: tvrtko.ursulin@intel.com Subject: drm/i915: Do not disable preemption for resets Date: Fri, 18 Aug 2023 22:45:25 -0400 [commit 40cd2835ced288789a685aa4aa7bc04b492dcd45 in linux-rt-devel] Commit ade8a0f59844 ("drm/i915: Make all GPU resets atomic") added a preempt disable section over the hardware reset callback to prepare the driver for being able to reset from atomic contexts. In retrospect I can see that the work item at a time was about removing the struct mutex from the reset path. Code base also briefly entertained the idea of doing the reset under stop_machine in order to serialize userspace mmap and temporary glitch in the fence registers (see eb8d0f5af4ec ("drm/i915: Remove GPU reset dependence on struct_mutex"), but that never materialized and was soon removed in 2caffbf11762 ("drm/i915: Revoke mmaps and prevent access to fence registers across reset") and replaced with a SRCU based solution. As such, as far as I can see, today we still have a requirement that resets must not sleep (invoked from submission tasklets), but no need to support invoking them from a truly atomic context. Given that the preemption section is problematic on RT kernels, since the uncore lock becomes a sleeping lock and so is invalid in such section, lets try and remove it. Potential downside is that our short waits on GPU to complete the reset may get extended if CPU scheduling interferes, but in practice that probably isn't a deal breaker. In terms of mechanics, since the preemption disabled block is being removed we just need to replace a few of the wait_for_atomic macros into busy looping versions which will work (and not complain) when called from non-atomic sections. Signed-off-by: Tvrtko Ursulin Cc: Chris Wilson Cc: Paul Gortmaker Cc: Sebastian Andrzej Siewior Acked-by: Sebastian Andrzej Siewior Link: https://lore.kernel.org/r/20230705093025.3689748-1-tvrtko.ursulin@linux.intel.com Signed-off-by: Sebastian Andrzej Siewior [PG: backport from v6.4-rt ; minor context fixup caused by b7d70b8b06ed] Signed-off-by: Paul Gortmaker Signed-off-by: Clark Williams Signed-off-by: Bruce Ashfield ] 2/17 [ Author: Clark Williams Email: clrkwllms@kernel.org Subject: 'Linux 6.1.33-rt11' Date: Mon, 12 Jun 2023 10:40:02 -0500 Signed-off-by: Clark Williams Signed-off-by: Bruce Ashfield ] 5/17 [ Author: Sebastian Andrzej Siewior Email: bigeasy@linutronix.de Subject: io-mapping: don't disable preempt on RT in io_mapping_map_atomic_wc(). Date: Fri, 10 Mar 2023 17:29:05 +0100 io_mapping_map_atomic_wc() disables preemption and pagefaults for historical reasons. The conversion to io_mapping_map_local_wc(), which only disables migration, cannot be done wholesale because quite some call sites need to be updated to accommodate with the changed semantics. On PREEMPT_RT enabled kernels the io_mapping_map_atomic_wc() semantics are problematic due to the implicit disabling of preemption which makes it impossible to acquire 'sleeping' spinlocks within the mapped atomic sections. PREEMPT_RT replaces the preempt_disable() with a migrate_disable() for more than a decade. It could be argued that this is a justification to do this unconditionally, but PREEMPT_RT covers only a limited number of architectures and it disables some functionality which limits the coverage further. Limit the replacement to PREEMPT_RT for now. This is also done kmap_atomic(). Link: https://lkml.kernel.org/r/20230310162905.O57Pj7hh@linutronix.de Signed-off-by: Sebastian Andrzej Siewior Reported-by: Richard Weinberger Link: https://lore.kernel.org/CAFLxGvw0WMxaMqYqJ5WgvVSbKHq2D2xcXTOgMCpgq9nDC-MWTQ@mail.gmail.com Cc: Thomas Gleixner Signed-off-by: Andrew Morton (cherry picked from commit 7eb16f23b9a415f062db22739e59bb144e0b24ab) Signed-off-by: Clark Williams Signed-off-by: Bruce Ashfield ] 6/17 [ Author: Sebastian Andrzej Siewior Email: bigeasy@linutronix.de Subject: locking/rwbase: Mitigate indefinite writer starvation Date: Tue, 21 Mar 2023 17:11:40 +0100 On PREEMPT_RT, rw_semaphore and rwlock_t locks are unfair to writers. Readers can indefinitely acquire the lock unless the writer fully acquired the lock, which might never happen if there is always a reader in the critical section owning the lock. Mel Gorman reported that since LTP-20220121 the dio_truncate test case went from having 1 reader to having 16 readers and that number of readers is sufficient to prevent the down_write ever succeeding while readers exist. Eventually the test is killed after 30 minutes as a failure. Mel proposed a timeout to limit how long a writer can be blocked until the reader is forced into the slowpath. Thomas argued that there is no added value by providing this timeout. From a PREEMPT_RT point of view, there are no critical rw_semaphore or rwlock_t locks left where the reader must be preferred. Mitigate indefinite writer starvation by forcing the READER into the slowpath once the WRITER attempts to acquire the lock. Reported-by: Mel Gorman Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Acked-by: Mel Gorman Link: https://lore.kernel.org/877cwbq4cq.ffs@tglx Link: https://lore.kernel.org/r/20230321161140.HMcQEhHb@linutronix.de Cc: Linus Torvalds (cherry picked from commit 286deb7ec03d941664ac3ffaff58814b454adf65) Signed-off-by: Clark Williams Signed-off-by: Bruce Ashfield ] 7/17 [ Author: Paolo Abeni Email: pabeni@redhat.com Subject: revert: "softirq: Let ksoftirqd do its job" Date: Mon, 8 May 2023 08:17:44 +0200 Due to the mentioned commit, when the ksoftirqd processes take charge of softirq processing, the system can experience high latencies. In the past a few workarounds have been implemented for specific side-effects of the above: commit 1ff688209e2e ("watchdog: core: make sure the watchdog_worker is not deferred") commit 8d5755b3f77b ("watchdog: softdog: fire watchdog even if softirqs do not get to run") commit 217f69743681 ("net: busy-poll: allow preemption in sk_busy_loop()") commit 3c53776e29f8 ("Mark HI and TASKLET softirq synchronous") but the latency problem still exists in real-life workloads, see the link below. The reverted commit intended to solve a live-lock scenario that can now be addressed with the NAPI threaded mode, introduced with commit 29863d41bb6e ("net: implement threaded-able napi poll loop support"), and nowadays in a pretty stable status. While a complete solution to put softirq processing under nice resource control would be preferable, that has proven to be a very hard task. In the short term, remove the main pain point, and also simplify a bit the current softirq implementation. Note that this change also reverts commit 3c53776e29f8 ("Mark HI and TASKLET softirq synchronous") and commit 1342d8080f61 ("softirq: Don't skip softirq execution when softirq thread is parking"), which are direct follow-ups of the feature commit. A single change is preferred to avoid known bad intermediate states introduced by a patch series reverting them individually. Link: https://lore.kernel.org/netdev/305d7742212cbe98621b16be782b0562f1012cb6.camel@redhat.com/ Signed-off-by: Paolo Abeni Tested-by: Jason Xing Reviewed-by: Jakub Kicinski Reviewed-by: Eric Dumazet Reviewed-by: Sebastian Andrzej Siewior Link: https://lore.kernel.org/r/57e66b364f1b6f09c9bc0316742c3b14f4ce83bd.1683526542.git.pabeni@redhat.com Signed-off-by: Sebastian Andrzej Siewior (cherry picked from commit b8a04a538ed4755dc97c403ee3b8dd882955c98c) Signed-off-by: Clark Williams Signed-off-by: Bruce Ashfield ] 8/17 [ Author: Peter Zijlstra Email: peterz@infradead.org Subject: debugobjects,locking: Annotate debug_object_fill_pool() wait type violation Date: Tue, 25 Apr 2023 17:03:13 +0200 There is an explicit wait-type violation in debug_object_fill_pool() for PREEMPT_RT=n kernels which allows them to more easily fill the object pool and reduce the chance of allocation failures. Lockdep's wait-type checks are designed to check the PREEMPT_RT locking rules even for PREEMPT_RT=n kernels and object to this, so create a lockdep annotation to allow this to stand. Specifically, create a 'lock' type that overrides the inner wait-type while it is held -- allowing one to temporarily raise it, such that the violation is hidden. Reported-by: Vlastimil Babka Reported-by: Qi Zheng Signed-off-by: Peter Zijlstra (Intel) Tested-by: Qi Zheng Link: https://lkml.kernel.org/r/20230429100614.GA1489784@hirez.programming.kicks-ass.net (cherry picked from commit 0cce06ba859a515bd06224085d3addb870608b6d) Signed-off-by: Clark Williams Signed-off-by: Bruce Ashfield ] 9/17 [ Author: Wander Lairson Costa Email: wander@redhat.com Subject: sched: avoid false lockdep splat in put_task_struct() Date: Wed, 14 Jun 2023 09:23:22 -0300 In put_task_struct(), a spin_lock is indirectly acquired under the kernel stock. When running the kernel in real-time (RT) configuration, the operation is dispatched to a preemptible context call to ensure guaranteed preemption. However, if PROVE_RAW_LOCK_NESTING is enabled and __put_task_struct() is called while holding a raw_spinlock, lockdep incorrectly reports an "Invalid lock context" in the stock kernel. This false splat occurs because lockdep is unaware of the different route taken under RT. To address this issue, override the inner wait type to prevent the false lockdep splat. Signed-off-by: Wander Lairson Costa Suggested-by: Oleg Nesterov Suggested-by: Sebastian Andrzej Siewior Suggested-by: Peter Zijlstra Cc: Steven Rostedt Cc: Luis Goncalves Link: https://lore.kernel.org/r/20230614122323.37957-3-wander@redhat.com Signed-off-by: Sebastian Andrzej Siewior (cherry picked from commit a5e446e728e89d5f5c5e427cc919bc7813c64c28) Signed-off-by: Clark Williams Signed-off-by: Bruce Ashfield ] 10/17 [ Author: Sebastian Andrzej Siewior Email: bigeasy@linutronix.de Subject: mm/page_alloc: Use write_seqlock_irqsave() instead write_seqlock() + local_irq_save(). Date: Fri, 23 Jun 2023 22:15:17 +0200 __build_all_zonelists() acquires zonelist_update_seq by first disabling interrupts via local_irq_save() and then acquiring the seqlock with write_seqlock(). This is troublesome and leads to problems on PREEMPT_RT. The problem is that the inner spinlock_t becomes a sleeping lock on PREEMPT_RT and must not be acquired with disabled interrupts. The API provides write_seqlock_irqsave() which does the right thing in one step. printk_deferred_enter() has to be invoked in non-migrate-able context to ensure that deferred printing is enabled and disabled on the same CPU. This is the case after zonelist_update_seq has been acquired. There was discussion on the first submission that the order should be: local_irq_disable(); printk_deferred_enter(); write_seqlock(); to avoid pitfalls like having an unaccounted printk() coming from write_seqlock_irqsave() before printk_deferred_enter() is invoked. The only origin of such a printk() can be a lockdep splat because the lockdep annotation happens after the sequence count is incremented. This is exceptional and subject to change. It was also pointed that PREEMPT_RT can be affected by the printk problem since its write_seqlock_irqsave() does not really disable interrupts. This isn't the case because PREEMPT_RT's printk implementation differs from the mainline implementation in two important aspects: - Printing happens in a dedicated threads and not at during the invocation of printk(). - In emergency cases where synchronous printing is used, a different driver is used which does not use tty_port::lock. Acquire zonelist_update_seq with write_seqlock_irqsave() and then defer printk output. Fixes: 1007843a91909 ("mm/page_alloc: fix potential deadlock on zonelist_update_seq seqlock") Acked-by: Michal Hocko Reviewed-by: David Hildenbrand Link: https://lore.kernel.org/r/20230623201517.yw286Knb@linutronix.de Signed-off-by: Sebastian Andrzej Siewior (cherry picked from commit 4d1139baae8bc4fff3728d1d204bdb04c13dbe10) Signed-off-by: Clark Williams Signed-off-by: Bruce Ashfield ] 11/17 [ Author: Sebastian Andrzej Siewior Email: bigeasy@linutronix.de Subject: bpf: Remove in_atomic() from bpf_link_put(). Date: Wed, 14 Jun 2023 10:34:30 +0200 bpf_free_inode() is invoked as a RCU callback. Usually RCU callbacks are invoked within softirq context. By setting rcutree.use_softirq=0 boot option the RCU callbacks will be invoked in a per-CPU kthread with bottom halves disabled which implies a RCU read section. On PREEMPT_RT the context remains fully preemptible. The RCU read section however does not allow schedule() invocation. The latter happens in mutex_lock() performed by bpf_trampoline_unlink_prog() originated from bpf_link_put(). It was pointed out that the bpf_link_put() invocation should not be delayed if originated from close(). It was also pointed out that other invocations from within a syscall should also avoid the workqueue. Everyone else should use workqueue by default to remain safe in the future (while auditing the code, every caller was preemptible except for the RCU case). Let bpf_link_put() use the worker unconditionally. Add bpf_link_put_direct() which will directly free the resources and is used by close() and from within __sys_bpf(). Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20230614083430.oENawF8f@linutronix.de (cherry picked from commit ab5d47bd41b1db82c295b0e751e2b822b43a4b5a) Signed-off-by: Clark Williams Signed-off-by: Bruce Ashfield ] 12/17 [ Author: Thomas Gleixner Email: tglx@linutronix.de Subject: posix-timers: Ensure timer ID search-loop limit is valid Date: Thu, 1 Jun 2023 20:58:47 +0200 posix_timer_add() tries to allocate a posix timer ID by starting from the cached ID which was stored by the last successful allocation. This is done in a loop searching the ID space for a free slot one by one. The loop has to terminate when the search wrapped around to the starting point. But that's racy vs. establishing the starting point. That is read out lockless, which leads to the following problem: CPU0 CPU1 posix_timer_add() start = sig->posix_timer_id; lock(hash_lock); ... posix_timer_add() if (++sig->posix_timer_id < 0) start = sig->posix_timer_id; sig->posix_timer_id = 0; So CPU1 can observe a negative start value, i.e. -1, and the loop break never happens because the condition can never be true: if (sig->posix_timer_id == start) break; While this is unlikely to ever turn into an endless loop as the ID space is huge (INT_MAX), the racy read of the start value caught the attention of KCSAN and Dmitry unearthed that incorrectness. Rewrite it so that all id operations are under the hash lock. Reported-by: syzbot+5c54bd3eb218bb595aa9@syzkaller.appspotmail.com Reported-by: Dmitry Vyukov Signed-off-by: Thomas Gleixner Reviewed-by: Frederic Weisbecker Link: https://lore.kernel.org/r/87bkhzdn6g.ffs@tglx (cherry picked from commit 8ce8849dd1e78dadcee0ec9acbd259d239b7069f) Signed-off-by: Clark Williams Signed-off-by: Bruce Ashfield ] Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 53e612c42ce438b100505c93d8bb65e59f49895d) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb index 8d07058b71..78e7dd4d13 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb @@ -14,8 +14,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "2fc300ad2664d72a382351afaa02208e3bcec857" -SRCREV_meta ?= "5f331d55d0900030f5bc9b139c815f3f01a8ffd4" +SRCREV_machine ?= "4c0acd6ff800dc4d1630b11640984343bffe7825" +SRCREV_meta ?= "c5b4dd4dc469548ca1f7129c5c131f8d6cf5ff94" 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.1;destsuffix=${KMETA};protocol=https" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb index c0871532df..d91ed65999 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb @@ -18,7 +18,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" -SRCREV_meta ?= "5f331d55d0900030f5bc9b139c815f3f01a8ffd4" +SRCREV_meta ?= "c5b4dd4dc469548ca1f7129c5c131f8d6cf5ff94" PV = "${LINUX_VERSION}+git" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index 6564731da9..f431e4a937 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb @@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" SRCREV_machine:qemux86-64 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" SRCREV_machine:qemumips64 ?= "a5de8564807b47662da3670c5b358a1494faef77" SRCREV_machine ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" -SRCREV_meta ?= "5f331d55d0900030f5bc9b139c815f3f01a8ffd4" +SRCREV_meta ?= "c5b4dd4dc469548ca1f7129c5c131f8d6cf5ff94" # 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 Fri Dec 29 15:44:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37036 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 EF2DAC47073 for ; Fri, 29 Dec 2023 15:45:27 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web11.150996.1703864720465851114 for ; Fri, 29 Dec 2023 07:45:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=uOyYCAR8; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1d3e416f303so19409765ad.0 for ; Fri, 29 Dec 2023 07:45:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864719; x=1704469519; 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=JyzhWbTQ7yr4A+63izey2aw6RXX2tO7H6wFBMdLD2u0=; b=uOyYCAR8dzhsVkVKpbuIpofonL6TZdJtjy+qpsuVc5d4zZxyYWYMPUuApiXjW0LnDG RnGEXTci9YwlLyuH9rBbE8huONLmoXdOVuDeiLbp7EzNNk9gRFS9Fhrar74O+wJGmeSQ CVx7t1V98iVYm4Tx7z7yYqaU9PczQAB5TXBtJjJOm5mY0UrIS/jhk070uGFhjvsH7KUx wwQvqM3C42lp0/8T+R3Ndy7awVs+/EcJugtrw9sS8Gb2XcBeuk7AavGeEe463cXPhDh0 Eq+CI99/aTcSoZwXFTkpqDNwaKc2rhaaeFUIxXmgPWlpHPgR8EHAweYotYDvhe4oHqdy VkdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864719; x=1704469519; 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=JyzhWbTQ7yr4A+63izey2aw6RXX2tO7H6wFBMdLD2u0=; b=aOnBDb71ttTClvCa3CSeVhB3iGJswLZdya3/b3VBBqMhp0Qlk2RsZRwKK+V55aSOXg 5MKkFe6FsIVbWqlAwfX3uQ7x0te0D5mCE1CG2ek6LjiSWIp5F6+k6OJMEx3ZhChU14ES kp4h597Pwk+aWEOZdbHo914yvElCR++yjowARyvcGDI4Mtt1tLgRhLWDUmxJ+NuhVuxn t6DlvK0ypqEz8i2kRZECaF+2eTCSaktZtPVuegcZrWcddIDMLZKcR83Xnv9MBdsbMafC dvBk7RDY2TlG5hKLixlSVxYwu0ucMEefJ4MZgepq4MxzRuIdE+aul65TU8zVhtF3+hCi gUdQ== X-Gm-Message-State: AOJu0YwJmsuO8m8CFkBJA6YOBQBmvDgpjQOYgopoifKnpoAObON7BaUL LNPTtvHqovuRgc3pi2RpJcq/PnxpGGD+otq4gFITuT5Wno27hg== X-Google-Smtp-Source: AGHT+IE7FRXhtfPsyF7rBoYgwU8blgZ/SQlzp40ORWfv1pbPKJQhO5yAOkdiBu+uCkkClL47r+quBA== X-Received: by 2002:a17:902:be14:b0:1d4:6486:b013 with SMTP id r20-20020a170902be1400b001d46486b013mr3814913pls.8.1703864719140; Fri, 29 Dec 2023 07:45:19 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:18 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 09/41] linux-yocto/6.1: update to v6.1.66 Date: Fri, 29 Dec 2023 05:44:23 -1000 Message-Id: <70e1c509c81c5bc9b270076169b836562829ef51.1703864512.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 ; Fri, 29 Dec 2023 15:45:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193026 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: 6c6a6c7e211c Linux 6.1.66 ea574927fc0b iomap: update ki_pos a little later in iomap_dio_complete adf0ecebf00a x86/apic/msi: Fix misconfigured non-maskable MSI quirk b3b839fb636b x86/xen: fix percpu vcpu_info allocation 00bc8b2cf44c xen: simplify evtchn_do_upcall() call maze 9311a0ff388a xen: Allow platform PCI interrupt to be shared 402b8323461c r8169: fix deadlock on RTL8125 in jumbo mtu mode 22ee0ddb2af7 r8169: disable ASPM in case of tx timeout 10ce6301009f drm/amd/display: Fix MPCC 1DLUT programming 8332cb6c6339 drm/amd/display: Fix the delta clamping for shaper LUT 442a4d4d0157 drm/amd/display: clean code-style issues in dcn30_set_mpc_shaper_3dlut 6cd736272165 drm/amd/display: Expand kernel doc for DC 8b01195be4a9 mmc: sdhci-sprd: Fix vqmmc not shutting down after the card was pulled 38d3216032c9 mmc: core: add helpers mmc_regulator_enable/disable_vqmmc 0e0a95166882 drm/amd/pm: fix a memleak in aldebaran_tables_init 59862b869275 iommu/vt-d: Make context clearing consistent with context mapping ee2c2247690c iommu/vt-d: Disable PCI ATS in legacy passthrough mode 8f39d297a26a iommu/vt-d: Add device_block_translation() helper 3787b3168b6c iommu/vt-d: Allocate pasid table in device probe path 681aeeda413d iommu/vt-d: Omit devTLB invalidation requests when TES=0 8aaed5b81d26 cpufreq: imx6q: Don't disable 792 Mhz OPP unnecessarily d3788f6e9d5a cpufreq: imx6q: don't warn for disabling a non-existing frequency 195514bda626 drm/amd/display: Guard against invalid RPTR/WPTR being set 395a63ca1ad2 drm/amd/display: Restore rptr/wptr for DMCUB as workaround 4ec4508db975 spi: Fix null dereference on suspend b57eebfb80e8 fbdev: stifb: Make the STI next font pointer a 32-bit signed offset 5bc8d96fedce PCI: qcom-ep: Add dedicated callback for writing to DBI2 registers 10c3d86fea04 octeontx2-af: Initialize 'cntr_val' to fix uninitialized symbol error 1c8f75ee9233 PCI: Lengthen reset delay for VideoPropulsion Torrent QN16e card 7545ddda9c98 KVM: x86: Fix lapic timer interrupt lost after loading a snapshot. 21feaf558f93 net: ravb: Keep reverse order of operations in ravb_remove() 8d04278ff48b net: ravb: Stop DMA in case of failures on ravb_open() 52b751686cbf net: ravb: Start TX queues after HW initialization succeeded e2db25d16cdd net: ravb: Make write access to CXR35 first before accessing other EMAC registers f5c649ce7975 net: ravb: Use pm_runtime_resume_and_get() 149b2fe12aca net: ravb: Check return value of reset_control_deassert() 7ed2e4c2d016 ravb: Fix races between ravb_tx_timeout_work() and net related ops 8b1d088be5f1 r8169: prevent potential deadlock in rtl8169_close 9c4ac2d98a48 octeontx2-pf: Restore TC ingress police rules when interface is up aef2d5b3e56e octeontx2-af: Install TC filter rules in hardware based on priority 662b88708408 octeontx2-pf: Fix adding mbox work queue entry when num_vfs > 64 5d5bcfb1ca8d net: stmmac: xgmac: Disable FPE MMC interrupts 334e6378c28c octeontx2-af: Fix possible buffer overflow c3e974e9c4bb selftests/net: mptcp: fix uninitialized variable warnings 12dd4c1bf3bd selftests/net: unix: fix unused variable compiler warning 4e999af7cf8a selftests/net: fix a char signedness issue 249ceee95caf selftests/net: ipsec: fix constant out of range e01249a83939 uapi: propagate __struct_group() attributes to the container union fd91b48f108d dpaa2-eth: increase the needed headroom to account for alignment 94445d958307 ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet f89fef7710b2 usb: config: fix iteration issue in 'usb_get_bos_descriptor()' 9aff7c51b440 USB: core: Change configuration warnings to notices c89b34eef336 USB: xhci-plat: fix legacy PHY double init 307a6525c82a wifi: cfg80211: fix CQM for non-range use e8c1105c0ccc serial: sc16is7xx: add missing support for rs485 devicetree properties 55061c323075 serial: sc16is7xx: Put IOControl register into regmap_volatile a491c7be35ed auxdisplay: hd44780: move cursor home after clear display command 7f2116777541 Input: xpad - add HyperX Clutch Gladiate Support 7a105de27538 btrfs: fix 64bit compat send ioctl arguments not initializing version member 32912ee86931 btrfs: make error messages more clear when getting a chunk map 4fc9c61c02c0 btrfs: send: ensure send_fd is writable 86742a963fe6 btrfs: fix off-by-one when checking chunk map includes logical address 9fe447c485ed btrfs: ref-verify: fix memory leaks in btrfs_ref_tree_mod() 3f26d9b257ad btrfs: add dmesg output for first mount and last unmount of a filesystem 0ad7d59e7901 parisc: Mark altinstructions read-only and 32-bit aligned cf2ae6494d1f parisc: Ensure 32-bit alignment on parisc unwind section 2acfff573042 parisc: Mark jump_table naturally aligned 3793cd2ded7c parisc: Drop the HP-UX ENOSYM and EREMOTERELEASE error codes 79a1fdf4c212 parisc: Mark lock_aligned variables 16-byte aligned on SMP 41d7852a0a39 parisc: Use natural CPU alignment for bug_table c7c78a4aa60a parisc: Mark ex_table entries 32-bit aligned in uaccess.h 645e4b693b5e parisc: Mark ex_table entries 32-bit aligned in assembly.h c23b9eaca80c powerpc: Don't clobber f0/vs0 during fp|altivec register save e6bc42fae6b8 KVM: PPC: Book3S HV: Fix KVM_RUN clobbering FP/VEC user registers 59419ebcc0a6 iommu/vt-d: Add MTL to quirk list to skip TE disabling 0b48970ce102 bcache: revert replacing IS_ERR_OR_NULL with IS_ERR fc98ea2699c0 dma-buf: fix check in dma_resv_add_fence 4da1556996fa cpufreq/amd-pstate: Fix the return value of amd_pstate_fast_switch() 9d4c721c1866 powercap: DTPM: Fix unneeded conversions to micro-Watts a62ca58bb3cc nvme: check for valid nvme_identify_ns() before using it 82b5e603edd4 dm verity: don't perform FEC for failed readahead IO 6f5a9fc94bfc dm verity: initialize fec io before freeing it 7cfc3884a8bb drm/amd/display: fix ABM disablement 859a3a9f1e6b drm/amd/display: Update min Z8 residency time to 2100 for DCN314 6ef7f13c72df drm/amd/display: Use DRAM speed from validation for dummy p-state a67c18704706 drm/amd/display: Remove min_dst_y_next_start check for Z8 33ed892f0cde drm/amd/display: Include udelay when waiting for INBOX0 ACK c5cf436c8969 drm/amdgpu: Force order between a read and write to the same address c60884296300 drm/amd: Enable PCIe PME from D3 cebccbe80165 scsi: sd: Fix system start for ATA devices 181fd67dc5b9 scsi: Change SCSI device boolean fields to single bit flags 7d2faae81b57 dm-verity: align struct dm_verity_fec_io properly da9f55393f69 ALSA: hda/realtek: Add supported ALC257 for ChromeOS f4b130213497 ALSA: hda/realtek: Headset Mic VREF to 100% 65654af4c8a6 ALSA: hda: Disable power-save on KONTRON SinglePC ba911edc6c0c mmc: block: Be sure to wait while busy in CQE error recovery eab9ec644637 mmc: block: Do not lose cache flush during CQE error recovery e121f6d73d2e mmc: block: Retry commands in CQE error recovery 3a9a9c256f02 mmc: cqhci: Fix task clearing in CQE error recovery def67fd8efde mmc: cqhci: Warn of halt or task clear failure 2ebc8b758c7d mmc: cqhci: Increase recovery halt timeout d2fc10e262b5 mmc: sdhci-pci-gli: Disable LPM during initialization 87ceaa8521fc firewire: core: fix possible memory leak in create_units() db0b69e46da6 pinctrl: avoid reload of p state in list iteration 74820f7406a1 smb: client: report correct st_size for SMB and NFS symlinks 60fed17ca5b8 cifs: Fix FALLOC_FL_INSERT_RANGE by setting i_size after EOF moved 6406cce4b22d cifs: Fix FALLOC_FL_ZERO_RANGE by setting i_size if EOF moved Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 83c13368918a69ad63ee957f3d03362e366afe42) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_6.1.bb | 6 ++-- .../linux/linux-yocto-tiny_6.1.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb index 78e7dd4d13..54f7f4efef 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb @@ -14,13 +14,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "4c0acd6ff800dc4d1630b11640984343bffe7825" -SRCREV_meta ?= "c5b4dd4dc469548ca1f7129c5c131f8d6cf5ff94" +SRCREV_machine ?= "97d59da1d2d5a9ace6b4e7695b1eabbcd6197c4c" +SRCREV_meta ?= "211dccdc1a71cd953c83f88a025adfa6b5c58ad4" 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.1;destsuffix=${KMETA};protocol=https" -LINUX_VERSION ?= "6.1.65" +LINUX_VERSION ?= "6.1.66" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb index d91ed65999..3e025e6726 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb @@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc # CVE exclusions include recipes-kernel/linux/cve-exclusion_6.1.inc -LINUX_VERSION ?= "6.1.65" +LINUX_VERSION ?= "6.1.66" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" -SRCREV_meta ?= "c5b4dd4dc469548ca1f7129c5c131f8d6cf5ff94" +SRCREV_machine ?= "504b0b3be8465541ffb1c9a896d32841459efa0f" +SRCREV_meta ?= "211dccdc1a71cd953c83f88a025adfa6b5c58ad4" PV = "${LINUX_VERSION}+git" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index f431e4a937..18beb3c3a1 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb @@ -18,25 +18,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base" KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "b14dc32b21c8770b4e635ec69611aa32fff230b3" -SRCREV_machine:qemuarm64 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" -SRCREV_machine:qemuloongarch64 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" -SRCREV_machine:qemumips ?= "072df281d6a919a505df072b4741d49145cf3781" -SRCREV_machine:qemuppc ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" -SRCREV_machine:qemuriscv64 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" -SRCREV_machine:qemuriscv32 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" -SRCREV_machine:qemux86 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" -SRCREV_machine:qemux86-64 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" -SRCREV_machine:qemumips64 ?= "a5de8564807b47662da3670c5b358a1494faef77" -SRCREV_machine ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" -SRCREV_meta ?= "c5b4dd4dc469548ca1f7129c5c131f8d6cf5ff94" +SRCREV_machine:qemuarm ?= "7f7eb326b47065b720ad4c760b77d52021336f95" +SRCREV_machine:qemuarm64 ?= "504b0b3be8465541ffb1c9a896d32841459efa0f" +SRCREV_machine:qemuloongarch64 ?= "504b0b3be8465541ffb1c9a896d32841459efa0f" +SRCREV_machine:qemumips ?= "638a98e4a2146f79a588b125d74addaae42f75a2" +SRCREV_machine:qemuppc ?= "504b0b3be8465541ffb1c9a896d32841459efa0f" +SRCREV_machine:qemuriscv64 ?= "504b0b3be8465541ffb1c9a896d32841459efa0f" +SRCREV_machine:qemuriscv32 ?= "504b0b3be8465541ffb1c9a896d32841459efa0f" +SRCREV_machine:qemux86 ?= "504b0b3be8465541ffb1c9a896d32841459efa0f" +SRCREV_machine:qemux86-64 ?= "504b0b3be8465541ffb1c9a896d32841459efa0f" +SRCREV_machine:qemumips64 ?= "d39acda588fe786b00969ade6eef057d86386578" +SRCREV_machine ?= "504b0b3be8465541ffb1c9a896d32841459efa0f" +SRCREV_meta ?= "211dccdc1a71cd953c83f88a025adfa6b5c58ad4" # 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 # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "c6114c845984144944f1abc07c61de219367a4da" +SRCREV_machine:class-devupstream ?= "6c6a6c7e211cc02943dcb8c073919d2105054886" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v6.1/base" @@ -45,7 +45,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.1.65" +LINUX_VERSION ?= "6.1.66" PV = "${LINUX_VERSION}+git" From patchwork Fri Dec 29 15:44:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37038 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 096F4C47074 for ; Fri, 29 Dec 2023 15:45:28 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web10.151512.1703864723923306628 for ; Fri, 29 Dec 2023 07:45:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=DHHdxf/E; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1d3e8a51e6bso52868595ad.3 for ; Fri, 29 Dec 2023 07:45:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864723; x=1704469523; 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=WfU9g46mlaG8hNzGjGElecCVMzDDc5PVw0oLQWYt4PY=; b=DHHdxf/E+2tRwbbLiagSIlLrRb2Ap3VEmR+9SKsOSaIOOfQkRCe7mNGlALm94ySwpT 22EfaR/S5V7JiwUZX7FNtMs1S7mvxu7NDUDIL2shu1GqXqr7zpAEw5WzGdmmi79MQbOz /DAS3PjcuRbY8QQdjjIZB4ILq5qAG3J4VvR/MzxAd/CdLgCmLcwwfTJ1w2Y9J0tlTueA gkmcp2VhDVP6S2W1x2PJiHJKzWSHRcJeYksgd/+B8UdIymjj4Dy92cxmkr7sW/RXIe3v UiT2JnlwNWezI9DQlN0d+RNXfXhlMqLn3n9ETg0tcfCMRnMYQ0AoToa/S8PmsBIhPrGO +WzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864723; x=1704469523; 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=WfU9g46mlaG8hNzGjGElecCVMzDDc5PVw0oLQWYt4PY=; b=KwqvsmiTfPnQJWD+J8bTJtHp+dpFnMGaEObFJAqfwPWrbUAvYKGzypvA0qAp2vxAUJ zn3xSkME4miKhzuEFUBnRH5+Py38QhJZl/E8KElMGxXTuf1V1KMZIm8vv5Rm49jpRIuU NeXqxOygR0cZYZy8x8FB2Ia00BCnFze4l4ePGu/uRmVWyX8yrZgEycGl9L/eVulIDG4X l88RNfXTvIw2YvkGA4NuJqQfvyjM9zOx/xsNEq+DGezo1+eygOJgwlmR4Qj1McOKy8yW Xw1zc0ikGYZGHFuyPNHj/4xdI24mBKrCcfBEbRSOx4+1mHxy/50+5Nd8oksT35FAcR0l 4lgw== X-Gm-Message-State: AOJu0YyGgG9XkOhMRF5jVFn+LzTf3bwueoPo1+2upODImGxwtoBLm2Sd YISthswJokGUykHW1bRkul2BwVX3sJDLIynPQVTmp/o0lRtpaw== X-Google-Smtp-Source: AGHT+IGT1HxbLbyHa59Yu+ezHLLmy8aqCdXCcrvd9URKqUY5H77ziVDuqus1IKOfUj+c2bu/haFU5g== X-Received: by 2002:a17:902:fc8f:b0:1d4:5ead:785e with SMTP id mf15-20020a170902fc8f00b001d45ead785emr8756339plb.76.1703864720840; Fri, 29 Dec 2023 07:45:20 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:20 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 10/41] linux-yocto/6.1: update to v6.1.67 Date: Fri, 29 Dec 2023 05:44:24 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Dec 2023 15:45:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193027 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: e7cddbb41b63 Linux 6.1.67 db46c77f3d51 Revert "wifi: cfg80211: fix CQM for non-range use" Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit a80b32127dccd35ed7ed129e28231229afdaa53b) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_6.1.bb | 6 ++-- .../linux/linux-yocto-tiny_6.1.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb index 54f7f4efef..93fc6a73e9 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb @@ -14,13 +14,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "97d59da1d2d5a9ace6b4e7695b1eabbcd6197c4c" -SRCREV_meta ?= "211dccdc1a71cd953c83f88a025adfa6b5c58ad4" +SRCREV_machine ?= "40d218ec6d26f4d8de1481ef665e7eafb18f45aa" +SRCREV_meta ?= "b1742128ddec29743c5f9d5c031a5770ece2b1b6" 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.1;destsuffix=${KMETA};protocol=https" -LINUX_VERSION ?= "6.1.66" +LINUX_VERSION ?= "6.1.67" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb index 3e025e6726..e3d3671a32 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb @@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc # CVE exclusions include recipes-kernel/linux/cve-exclusion_6.1.inc -LINUX_VERSION ?= "6.1.66" +LINUX_VERSION ?= "6.1.67" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "504b0b3be8465541ffb1c9a896d32841459efa0f" -SRCREV_meta ?= "211dccdc1a71cd953c83f88a025adfa6b5c58ad4" +SRCREV_machine ?= "5b9711b24429c3543018411369d7086839169481" +SRCREV_meta ?= "b1742128ddec29743c5f9d5c031a5770ece2b1b6" PV = "${LINUX_VERSION}+git" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index 18beb3c3a1..3380604229 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb @@ -18,25 +18,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base" KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "7f7eb326b47065b720ad4c760b77d52021336f95" -SRCREV_machine:qemuarm64 ?= "504b0b3be8465541ffb1c9a896d32841459efa0f" -SRCREV_machine:qemuloongarch64 ?= "504b0b3be8465541ffb1c9a896d32841459efa0f" -SRCREV_machine:qemumips ?= "638a98e4a2146f79a588b125d74addaae42f75a2" -SRCREV_machine:qemuppc ?= "504b0b3be8465541ffb1c9a896d32841459efa0f" -SRCREV_machine:qemuriscv64 ?= "504b0b3be8465541ffb1c9a896d32841459efa0f" -SRCREV_machine:qemuriscv32 ?= "504b0b3be8465541ffb1c9a896d32841459efa0f" -SRCREV_machine:qemux86 ?= "504b0b3be8465541ffb1c9a896d32841459efa0f" -SRCREV_machine:qemux86-64 ?= "504b0b3be8465541ffb1c9a896d32841459efa0f" -SRCREV_machine:qemumips64 ?= "d39acda588fe786b00969ade6eef057d86386578" -SRCREV_machine ?= "504b0b3be8465541ffb1c9a896d32841459efa0f" -SRCREV_meta ?= "211dccdc1a71cd953c83f88a025adfa6b5c58ad4" +SRCREV_machine:qemuarm ?= "6b4fd468de656727bb53d6faf7634157a3f80d4b" +SRCREV_machine:qemuarm64 ?= "5b9711b24429c3543018411369d7086839169481" +SRCREV_machine:qemuloongarch64 ?= "5b9711b24429c3543018411369d7086839169481" +SRCREV_machine:qemumips ?= "09c54782be2fdab1a62e547504c28f57160b81fd" +SRCREV_machine:qemuppc ?= "5b9711b24429c3543018411369d7086839169481" +SRCREV_machine:qemuriscv64 ?= "5b9711b24429c3543018411369d7086839169481" +SRCREV_machine:qemuriscv32 ?= "5b9711b24429c3543018411369d7086839169481" +SRCREV_machine:qemux86 ?= "5b9711b24429c3543018411369d7086839169481" +SRCREV_machine:qemux86-64 ?= "5b9711b24429c3543018411369d7086839169481" +SRCREV_machine:qemumips64 ?= "a4b4e1d2daa47b400beb16e7f4aa0e7b650d8649" +SRCREV_machine ?= "5b9711b24429c3543018411369d7086839169481" +SRCREV_meta ?= "b1742128ddec29743c5f9d5c031a5770ece2b1b6" # 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 # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "6c6a6c7e211cc02943dcb8c073919d2105054886" +SRCREV_machine:class-devupstream ?= "e7cddbb41b63252ddb5b7f8247da5d0b24adfac5" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v6.1/base" @@ -45,7 +45,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.1.66" +LINUX_VERSION ?= "6.1.67" PV = "${LINUX_VERSION}+git" From patchwork Fri Dec 29 15:44:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37039 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 0ABBEC47079 for ; Fri, 29 Dec 2023 15:45:28 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mx.groups.io with SMTP id smtpd.web11.150999.1703864726561147342 for ; Fri, 29 Dec 2023 07:45:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=iuXhLZzt; spf=softfail (domain: sakoman.com, ip: 209.85.215.173, mailfrom: steve@sakoman.com) Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-5c21e185df5so5271890a12.1 for ; Fri, 29 Dec 2023 07:45:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864725; x=1704469525; 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=O1k/bh6kXARoscnhEw/evdXhGbwhiOh0/7kA/VZSL8I=; b=iuXhLZztUc/JkYarhTZcLthuz2lEKv7A8B03Z42em2FIUhQWpW86uVuh3+y/6MioOE MPRSC53A14AZ0qIsyov8mDrZhwmUDHSPf+RKyyz7btldO8kzxqJzLc7h4cxxUjaBK3+a v3EvzyTmd29OeCs/EjFFYTWGFrli6MRUi3Ckk315DBT9apClRO0FHztpQqF3o9Oom+LW lGCndRy/kteF1ugMMm1SsWgp406DaaIcBw020h0q0UmDZ5ZKA8hW1AY9AF7swbqObL1N 5ysG+AZN/cbVFAaPbGHtNVhFmS+ykEvPG3Bp0tjmDW/YuWOdlDX26cY2ILdMGBL/eqc5 zp7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864725; x=1704469525; 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=O1k/bh6kXARoscnhEw/evdXhGbwhiOh0/7kA/VZSL8I=; b=vIvshS9hWo5IBNeoEqRXn+jO0DRxTTWTagpXiBp7GR8qAkdHEcI194oU34rj6OmTMZ pXHP6USZOEW4VAvZY2YST5WDGK2dXjeX+HcJM1D5KTVq4A0oNhIOHIySAJ0MDiD56vcU Cqmh2VzZUM6S+4tMaaU5QgwJUjcjs3dEDZks6S1ItZRsUH9DP9JVq7HaAyhJrvywCTzV hNBnpOB+siwAzdS8ixqTTRmWC7WGHh+fSCy0ETnC8otnQrTqXu6Q4ixFDOpDJycWfBsF NkVREeKE9zo4j+9JkJ1cdqRllZ/n/EpkqJdMoGt1yzVTzg4q98Bc+3DQpNsLLXecM7xZ 5WxA== X-Gm-Message-State: AOJu0Yyicz4h8TNxlJVRZWbmjFCS5hIy8IqHdsinO4X3XjOfMjSk9SNz bnki+QIxYJCPDIuZN0WUtrgntdtGS8NmqzlaBI7wCNknqUQZCw== X-Google-Smtp-Source: AGHT+IG1u/SBtjxqKa38Q1HiPMrfGwUkZbZkAUoUHfqMX1z4ddKz6tAN1CDS5nDdy7DWgjLe5sCZUg== X-Received: by 2002:a17:902:d38c:b0:1d0:6ffe:a22 with SMTP id e12-20020a170902d38c00b001d06ffe0a22mr12647844pld.128.1703864725125; Fri, 29 Dec 2023 07:45:25 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:24 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 11/41] linux-yocto/6.1: update to v6.1.68 Date: Fri, 29 Dec 2023 05:44:25 -1000 Message-Id: <3f28f1247ee313d558909286af7e77a0572cc4b4.1703864512.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 ; Fri, 29 Dec 2023 15:45:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193028 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: ba6f5fb46511 Linux 6.1.68 f38b4e99e24c drm/i915: Skip some timing checks on BXT/GLK DSI transcoders d9ef7b05ccd7 drm/i915/sdvo: stop caching has_hdmi_monitor in struct intel_sdvo cf70d62ace90 drm/i915/lvds: Use REG_BIT() & co. e6d55cf49399 drm/i915/display: Drop check for doublescan mode in modevalid 9c322aaf28e8 riscv: Kconfig: Add select ARM_AMBA to SOC_STARFIVE 189c2a82933c netfilter: nft_set_pipapo: skip inactive elements during set walk b4e440cf600e MIPS: Loongson64: Enable DMA noncoherent support d52a5178cbdc MIPS: Loongson64: Handle more memory types passed from firmware 8d18a0158546 MIPS: Loongson64: Reserve vgabios memory on boot 2b9b2d28a92a KVM: SVM: Update EFER software model on CR0 trap for SEV-ES 6d6314c3dbac KVM: s390/mm: Properly reset no-dat be297475cabc MIPS: kernel: Clear FPU states when setting up kernel threads 358bd5f436d8 cifs: Fix flushing, invalidation and file size with FICLONE 18b02e4343e8 cifs: Fix flushing, invalidation and file size with copy_file_range() 69540c108d72 USB: gadget: core: adjust uevent timing on gadget unbind 2467f4f8cb7c x86/CPU/AMD: Check vendor in the AMD microcode callback 0553d5290879 devcoredump: Send uevent once devcd is ready 74799b43d856 serial: 8250_omap: Add earlycon support for the AM654 UART controller d59dafa9eb12 serial: 8250: 8250_omap: Do not start RX DMA on THRI interrupt 638a6cbacefd serial: 8250: 8250_omap: Clear UART_HAS_RHR_IT_DIS bit f434703fb893 serial: sc16is7xx: address RX timeout interrupt errata a8027753ab65 ARM: PL011: Fix DMA support c909ce57d055 usb: typec: class: fix typec_altmode_put_partner to put plugs b12ccef70545 smb: client: fix potential NULL deref in parse_dfs_referrals() f48430635b5e Revert "xhci: Loosen RPM as default policy to cover for AMD xHC 1.1" 9ce109b74875 cifs: Fix non-availability of dedup breaking generic/304 8e25331ea560 parport: Add support for Brainboxes IX/UC/PX parallel cards bee9affd37b9 serial: 8250_dw: Add ACPI ID for Granite Rapids-D UART 16da1f84f5ef usb: gadget: f_hid: fix report descriptor allocation c8bf22e0d049 drm/amdgpu: Update EEPROM I2C address for smu v13_0_0 87509778718c drm/amdgpu: Add I2C EEPROM support on smu v13_0_6 4ccb34d4313b drm/amdgpu: simplify amdgpu_ras_eeprom.c af6b1f1156fc drm/amdgpu: Return from switch early for EEPROM I2C address a3049c9a3013 drm/amdgpu: Remove second moot switch to set EEPROM I2C address 30289057ef8f drm/amdgpu: Add support for RAS table at 0x40000 c67c553b4dd9 drm/amdgpu: Decouple RAS EEPROM addresses from chips ee9efcdc76af drm/amdgpu: Remove redundant I2C EEPROM address a945568638ac drm/amdgpu: Add EEPROM I2C address support for ip discovery f549f837b9ac drm/amdgpu: Update ras eeprom support for smu v13_0_0 and v13_0_10 458affed0619 drm/amdgpu: correct the amdgpu runtime dereference usage count 41c5dd545e76 drm/amd/amdgpu: Fix warnings in amdgpu/amdgpu_display.c 613eaee4459d drm/amdgpu: fix memory overflow in the IB test 1705927a1073 gpiolib: sysfs: Fix error handling on failed export 4b716fcacd2a x86/sev: Fix kernel crash due to late update to read-only ghcb_version 06dec254c59a perf: Fix perf_event_validate_size() b0c195a825d4 arm64: dts: mt8183: kukui: Fix underscores in node names 8a3d746c7ec5 arm64: dts: mediatek: add missing space before { 5656634ce01e parisc: Fix asm operand number out of range build error in bug table f9e9e156dbbb parisc: Reduce size of the bug_table on 64-bit kernel by half 8479f5ca8b6c tracing: Stop current tracer when resizing buffer df4aa7e84d00 tracing: Set actual size after ring buffer resize 07ad456e1c02 ring-buffer: Force absolute timestamp on discard of event 40421e0cf34e LoongArch: BPF: Don't sign extend function return value ebb09d58dfe7 LoongArch: BPF: Don't sign extend memory load operand 066dcd87b94c misc: mei: client.c: fix problem of return '-EOVERFLOW' in mei_cl_write d78789ba2195 misc: mei: client.c: return negative error code in mei_cl_write 672976c28e1b hwtracing: hisi_ptt: Add dummy callback pmu::read() 0b80e6af0d90 coresight: etm4x: Remove bogous __exit annotation for some functions 766b29f6141a coresight: etm4x: Make etm4_remove_dev() return void 920f84a6e8e9 binder: fix memory leaks of spam and pending work 18847b6bba36 arm64: dts: mediatek: mt8183-evb: Fix unit_address_vs_reg warning on ntc c428285eab3c arm64: dts: mediatek: mt8183: Move thermal-zones to the root node bdd7508661fc arm64: dts: mediatek: mt8183: Fix unit address for scp reserved memory 66398d18565d arm64: dts: mediatek: mt8195: Fix PM suspend/resume with venc clocks e1d4f02a68d3 arm64: dts: mediatek: mt8173-evb: Fix regulator-fixed node names ff566a8d765f arm64: dts: mediatek: cherry: Fix interrupt cells for MT6360 on I2C7 6d50aa965650 arm64: dts: mediatek: mt8183-kukui-jacuzzi: fix dsi unnecessary cells properties c2adea319187 arm64: dts: mediatek: mt7622: fix memory node warning check 515d971cd26a md/raid6: use valid sector values to determine if an I/O should wait on the reshape 4132cc3a3aa9 powercap: DTPM: Fix missing cpufreq_cpu_put() calls 686cc4de099f mm: fix oops when filemap_map_pmd() without prealloc_pte 574a6db80f3e hugetlb: fix null-ptr-deref in hugetlb_vma_lock_write f5e6958919e0 platform/surface: aggregator: fix recv_buf() return value bcd50a3bd637 regmap: fix bogus error on regcache_sync success 1c1c6d5c7e14 r8169: fix rtl8125b PAUSE frames blasting when suspended 6a71d7785643 packet: Move reference count in packet_sock to atomic_long_t 15c251f81442 tracing: Fix a possible race when disabling buffered events b00b50091693 tracing: Fix incomplete locking when disabling buffered events 6e0d6c685b1b tracing: Disable snapshot buffer when stopping instance tracers 20fd56ca2e6d tracing: Always update snapshot buffer size f33d663db004 checkstack: fix printed address 4c00f01832f2 cgroup_freezer: cgroup_freezing: Check if not frozen 3907e9cc85ff nilfs2: prevent WARNING in nilfs_sufile_set_segment_usage() c344e99dd812 nilfs2: fix missing error check for sb_set_blocksize call d2558e726e76 ring-buffer: Test last update in 32bit version of __rb_time_read() c4dcc915ea22 ALSA: hda/realtek: Add Framework laptop 16 to quirks 0675fe3b3234 ALSA: hda/realtek: add new Framework laptop to quirks 8b23707c8a1e ALSA: hda/realtek: Enable headset on Lenovo M90 Gen5 dc1141ae5ca2 ALSA: pcm: fix out-of-bounds in snd_pcm_state_names bb43c57c3d0b ALSA: usb-audio: Add Pioneer DJM-450 mixer controls bfe5a5e2f9e9 io_uring: fix mutex_unlock with unreferenced ctx 8bba38f7a0d4 nvme-pci: Add sleep quirk for Kingston drives f2f57f51b53b io_uring/af_unix: disable sending io_uring over sockets 515c25be77ba ASoC: amd: yc: Fix non-functional mic on ASUS E1504FA 0fcfc90c8664 kprobes: consistent rcu api usage for kretprobe holder a5325a055f0f rethook: Use __rcu pointer for rethook::handler 68bc7b200305 iommu: Avoid more races around device probe 3c796895b4e2 md: don't leave 'MD_RECOVERY_FROZEN' in error path of md_set_readonly() 5255ded03422 md: introduce md_ro_state a38c1e766f4f riscv: fix misaligned access handling of C.SWSP and C.SDSP 8b41bdcc22da ARM: dts: imx28-xea: Pass the 'model' property 282b5acd586e ARM: dts: imx7: Declare timers compatible with fsl,imx6dl-gpt 12ac3b0ab837 ARM: imx: Check return value of devm_kasprintf in imx_mmdc_perf_init 4d8cc87d1845 scsi: be2iscsi: Fix a memleak in beiscsi_init_wrb_handle() bc5b79df6d54 tracing: Fix a warning when allocating buffered events fails fc2d811d3101 ARM: dts: imx6ul-pico: Describe the Ethernet PHY clock 22143a0e5ac2 arm64: dts: imx8mp: imx8mq: Add parkmode-disable-ss-quirk on DWC3 8dd0e20b41b1 arm64: dts: imx8mq: drop usb3-resume-missing-cas from usb 188de9839ff2 drm/bridge: tc358768: select CONFIG_VIDEOMODE_HELPERS 1ff56298ab32 RDMA/irdma: Avoid free the non-cqp_request scratch 0a929e837527 RDMA/core: Fix umem iterator when PAGE_SIZE is greater then HCA pgsz ebcb4e19d3ef ASoC: wm_adsp: fix memleak in wm_adsp_buffer_populate 2358e53208c0 hwmon: (nzxt-kraken2) Fix error handling path in kraken2_probe() 3baaba79088b ASoC: codecs: lpass-tx-macro: set active_decimator correct default value c11b7e26d2f0 hwmon: (acpi_power_meter) Fix 4.29 MW bug 19269741c3e2 RDMA/irdma: Fix UAF in irdma_sc_ccq_get_cqe_info() 439857e2fe4e RDMA/irdma: Refactor error handling in create CQP 59a022a869b1 RDMA/bnxt_re: Correct module description string 7ed498095c6d RDMA/rtrs-clt: Remove the warnings for req in_use check 03095a6440db RDMA/rtrs-clt: Fix the max_send_wr setting 233c32bcf069 RDMA/rtrs-srv: Destroy path files after making sure no IOs in-flight 7be574c34dc7 RDMA/rtrs-srv: Free srv_mr iu only when always_invalidate is true 9dd976c435be RDMA/rtrs-srv: Check return values while processing info request 3910ccbf25a7 RDMA/rtrs-clt: Start hb after path_up 1e46485045cd RDMA/rtrs-srv: Do not unconditionally enable irq 4a8774a63303 ASoC: fsl_sai: Fix no frame sync clock issue on i.MX8MP 3166c76d1deb arm64: dts: rockchip: Expand reg size of vdec node for RK3399 aa9ae3dffc34 arm64: dts: rockchip: Expand reg size of vdec node for RK3328 945bfe4e0b09 RDMA/irdma: Add wait for suspend on SQD 0b0afd4e1477 RDMA/irdma: Do not modify to SQD on error 9d005ea01ed0 RDMA/hns: Fix unnecessary err return when using invalid congest control algorithm 1c9561b438cb tee: optee: Fix supplicant based device enumeration 5fd29433b29d mm/damon/sysfs: eliminate potential uninitialized variable warning b5ca945612b4 drop_monitor: Require 'CAP_SYS_ADMIN' when joining "events" group 07c8229c022b psample: Require 'CAP_NET_ADMIN' when joining "packets" group af39b80173e4 bpf: sockmap, updating the sg structure should also update curr 008b807fe487 tcp: do not accept ACK of bytes we never sent 7a63521ed041 netfilter: xt_owner: Fix for unsafe access of sk->sk_socket 3176160c22d9 netfilter: nf_tables: validate family when identifying table via handle 96f8654b701f netfilter: nf_tables: bail out on mismatching dynset and set expressions c9704c26193c netfilter: nf_tables: fix 'exist' matching on bigendian arches 0bfbfd9423f3 netfilter: nft_exthdr: add boolean DCCP option matching 9225a4566bc1 dt-bindings: interrupt-controller: Allow #power-domain-cells 6b9e78d6c6b9 octeontx2-af: Update Tx link register range 9be8f66ea857 octeontx2-af: Add missing mcs flr handler call d54470adfcc7 octeontx2-af: Fix mcs stats register address 90773de07391 octeontx2-af: Fix mcs sa cam entries size 0c8baa37bfa5 octeontx2-af: Adjust Tx credits when MCS external bypass is disabled d2689aea4f2e net: hns: fix fake link up on xge port 217cc7f6a6ac net: hns: fix wrong head when modify the tx feature when sending packets 87559196c316 net: atlantic: Fix NULL dereference of skb pointer in 64c78c57e307 ipv4: ip_gre: Avoid skb_pull() failure in ipgre_xmit() ce3c5acb594e ionic: Fix dim work handling in split interrupt mode a92719900fc6 ionic: fix snprintf format length warning c91685ac1bce tcp: fix mid stream window clamp. 9fc81912fcdb net: bnxt: fix a potential use-after-free in bnxt_init_tc 0d33871b66f9 iavf: validate tx_coalesce_usecs even if rx_coalesce_usecs is zero 75fd86e54119 i40e: Fix unexpected MFS warning message ba6eb3a77a56 octeontx2-af: fix a use-after-free in rvu_npa_register_reporters 2c0cbb97b118 xsk: Skip polling event check for unbound socket ed7e211b6786 net: stmmac: fix FPE events losing 1a41ffc4dc6a octeontx2-pf: consider both Rx and Tx packet stats for adaptive interrupt coalescing 8d034da82563 arcnet: restoring support for multiple Sohard Arcnet cards 3c323796951a platform/mellanox: Check devm_hwmon_device_register_with_groups() return value 29d82b366a22 platform/mellanox: Add null pointer checks for devm_kasprintf() 646f1e9c1978 mlxbf-bootctl: correctly identify secure boot with development keys ef91309a570a r8152: Add RTL8152_INACCESSIBLE to r8153_aldps_en() d11ef4d3dd37 r8152: Add RTL8152_INACCESSIBLE to r8153_pre_firmware_1() 284cd311bb48 r8152: Add RTL8152_INACCESSIBLE to r8156b_wait_loading_flash() 0823990da76f r8152: Add RTL8152_INACCESSIBLE checks to more loops 3759e735562a r8152: Rename RTL8152_UNPLUG to RTL8152_INACCESSIBLE ecb5068f55a8 hv_netvsc: rndis_filter needs to select NLS 80de965ca52c octeontx2-af: Check return value of nix_get_nixlf before using nixlf f565044d1d84 octeontx2-pf: Add missing mutex lock in otx2_get_pauseparam a3f5de10b5cf ipv6: fix potential NULL deref in fib6_add() e2b202821dd8 platform/x86: wmi: Skip blocks with zero instances b536601d0520 of: dynamic: Fix of_reconfig_get_state_change() return value documentation 76b9ea6f54ed platform/x86: asus-wmi: Move i8042 filter install to shared asus-wmi code 3453531284cb dt: dt-extract-compatibles: Don't follow symlinks when walking tree 8a124b9e784b dt: dt-extract-compatibles: Handle cfile arguments in generator function cde700ceb0ea x86/tdx: Allow 32-bit emulation by default e09d243a518b x86/entry: Do not allow external 0x80 interrupts d5f999317e83 x86/entry: Convert INT 0x80 emulation to IDTENTRY b8ec27ae221e x86/coco: Disable 32-bit emulation by default on TDX and SEV 0870f19b54de x86: Introduce ia32_enabled() 9046665befd6 drm/amdgpu: correct chunk_ptr to a pointer to chunk. 18209382db64 kconfig: fix memory leak from range properties bcc2abaa4095 tg3: Increment tx_dropped in tg3_tso_bug() 9bbc655e1849 tg3: Move the [rt]x_dropped counters to tg3_napi 62c6d82bac2b zstd: Fix array-index-out-of-bounds UBSAN warning 875ee3a09e27 netfilter: ipset: fix race condition between swap/destroy and kernel side add/del/test 6025052bbf3d i2c: designware: Fix corrupted memory seen in the ISR 75b5016ce325 hrtimers: Push pending hrtimers away from outgoing CPU earlier 8ea2b4ba9ba2 vdpa/mlx5: preserve CVQ vringh index Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 98dd7225341e4a8c46e9db17728cd162a0d12216) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_6.1.bb | 6 ++-- .../linux/linux-yocto-tiny_6.1.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb index 93fc6a73e9..5cfc5a7dd8 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb @@ -14,13 +14,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "40d218ec6d26f4d8de1481ef665e7eafb18f45aa" -SRCREV_meta ?= "b1742128ddec29743c5f9d5c031a5770ece2b1b6" +SRCREV_machine ?= "739b3001f20153a66d2723de81faae18cd61892b" +SRCREV_meta ?= "991713c8765172cb5d18703d15589f3ec6e1b772" 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.1;destsuffix=${KMETA};protocol=https" -LINUX_VERSION ?= "6.1.67" +LINUX_VERSION ?= "6.1.68" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb index e3d3671a32..e19b0ec132 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb @@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc # CVE exclusions include recipes-kernel/linux/cve-exclusion_6.1.inc -LINUX_VERSION ?= "6.1.67" +LINUX_VERSION ?= "6.1.68" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "5b9711b24429c3543018411369d7086839169481" -SRCREV_meta ?= "b1742128ddec29743c5f9d5c031a5770ece2b1b6" +SRCREV_machine ?= "db1e71dc5c31557828fae0084b0f9cc83882eacd" +SRCREV_meta ?= "991713c8765172cb5d18703d15589f3ec6e1b772" PV = "${LINUX_VERSION}+git" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index 3380604229..1329ccc958 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb @@ -18,25 +18,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base" KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "6b4fd468de656727bb53d6faf7634157a3f80d4b" -SRCREV_machine:qemuarm64 ?= "5b9711b24429c3543018411369d7086839169481" -SRCREV_machine:qemuloongarch64 ?= "5b9711b24429c3543018411369d7086839169481" -SRCREV_machine:qemumips ?= "09c54782be2fdab1a62e547504c28f57160b81fd" -SRCREV_machine:qemuppc ?= "5b9711b24429c3543018411369d7086839169481" -SRCREV_machine:qemuriscv64 ?= "5b9711b24429c3543018411369d7086839169481" -SRCREV_machine:qemuriscv32 ?= "5b9711b24429c3543018411369d7086839169481" -SRCREV_machine:qemux86 ?= "5b9711b24429c3543018411369d7086839169481" -SRCREV_machine:qemux86-64 ?= "5b9711b24429c3543018411369d7086839169481" -SRCREV_machine:qemumips64 ?= "a4b4e1d2daa47b400beb16e7f4aa0e7b650d8649" -SRCREV_machine ?= "5b9711b24429c3543018411369d7086839169481" -SRCREV_meta ?= "b1742128ddec29743c5f9d5c031a5770ece2b1b6" +SRCREV_machine:qemuarm ?= "85915187700314cb7ac70fd33da3e9dfd7c20063" +SRCREV_machine:qemuarm64 ?= "db1e71dc5c31557828fae0084b0f9cc83882eacd" +SRCREV_machine:qemuloongarch64 ?= "db1e71dc5c31557828fae0084b0f9cc83882eacd" +SRCREV_machine:qemumips ?= "24b06ee00fc3b65a24d7e867148b08a85296e67c" +SRCREV_machine:qemuppc ?= "db1e71dc5c31557828fae0084b0f9cc83882eacd" +SRCREV_machine:qemuriscv64 ?= "db1e71dc5c31557828fae0084b0f9cc83882eacd" +SRCREV_machine:qemuriscv32 ?= "db1e71dc5c31557828fae0084b0f9cc83882eacd" +SRCREV_machine:qemux86 ?= "db1e71dc5c31557828fae0084b0f9cc83882eacd" +SRCREV_machine:qemux86-64 ?= "db1e71dc5c31557828fae0084b0f9cc83882eacd" +SRCREV_machine:qemumips64 ?= "d4659a339611a02e4ffc2861e697c1a278707d70" +SRCREV_machine ?= "db1e71dc5c31557828fae0084b0f9cc83882eacd" +SRCREV_meta ?= "991713c8765172cb5d18703d15589f3ec6e1b772" # 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 # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "e7cddbb41b63252ddb5b7f8247da5d0b24adfac5" +SRCREV_machine:class-devupstream ?= "ba6f5fb465114fcd48ddb2c7a7740915b2289d6b" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v6.1/base" @@ -45,7 +45,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.1.67" +LINUX_VERSION ?= "6.1.68" PV = "${LINUX_VERSION}+git" From patchwork Fri Dec 29 15:44:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37040 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 0F701C47074 for ; Fri, 29 Dec 2023 15:45:38 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web11.151000.1703864728323275507 for ; Fri, 29 Dec 2023 07:45:28 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=DfSaPbMT; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1d4a75a29fbso34885ad.1 for ; Fri, 29 Dec 2023 07:45:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864727; x=1704469527; 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=KzyTQ4K7XnJH6Ead8fzHXYQIMVAc1IkQOc1UGmP5YPY=; b=DfSaPbMTlpLBdMIZWwI+CNAig4aJfPZ/x7mgM8AOIV6AZ/jmpJmpsRbUbbjadXMIZZ 1g94U2dPN37Fy9JgMRNdIob9DZjHp9DUzK1U5Bba7re9Zydx4jBTfCsj+PGLBX1XlEJT /g4adZ0p03Neu6KRHK0taUbaoA4hXNIy7Kxsd8CndLMg4OGrsCSQC5dcrpwWUMA0S5/P FKYt5aJXEMjwQRF+5fDSQSTdCN26YPUVxe13bDTNrpcWy9vfap1TNdd+c+f4WImG9ouD 1eC5lummFj9xq4LV393pBcnKOxKX990mfsrJhr3h1gt3eH13pRQqcBGw9UsjbS4VfQjB t3pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864727; x=1704469527; 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=KzyTQ4K7XnJH6Ead8fzHXYQIMVAc1IkQOc1UGmP5YPY=; b=dWo3pDOcqmOxlUFJ/oOw6Y0EjCgQYsIf6Wn550reEZp0OnR/WY47k8EYHBYlrGAjOo 2fLUTGiUYHnGsK851KS0jZyxlnytT0h93CRkwW8juFqRrfyPZgXBvxbLfc0Xegtjt1C6 G0ojoStv9/xT5jd6IPvtGhonO2b5165USMCBKTgOQDe3mB//y8sYKb8TpHGFF9CCaLLf Q+6lU8ybQr0E+InSeNRI6mRkGveBtaBKxe9p9JJhSrwgnmwymZzyOx8MQt6QW6lXi8fE rPGvp5YjzRA3gqrxzzXbVUgeTZJ652uk44jbKX/54YGm9S2hdlQK5wdfrFdkxubD2/tU nRDA== X-Gm-Message-State: AOJu0YzOKbODlLg1k1CPNXRxvhYlDpwT/0lyqFAIWxq5tGAc2KcM/Gvy t5MnbDVfi0jAemjJO33B10lH92+7Bbytpf06EQiQ6ML3JOVVCQ== X-Google-Smtp-Source: AGHT+IFwYhZ7/7hE3tsuddXZvK1rrH8xcei2jGFdK6hsWo5fNTmFBSHwuLS1Z3zBVk+sruHSl9Q6KQ== X-Received: by 2002:a17:902:a3cc:b0:1d4:6803:7fd7 with SMTP id q12-20020a170902a3cc00b001d468037fd7mr6979029plb.68.1703864727083; Fri, 29 Dec 2023 07:45:27 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:26 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 12/41] linux/cve-exclusion6.1: Update to latest kernel point release Date: Fri, 29 Dec 2023 05:44:26 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Dec 2023 15:45:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193029 From: Richard Purdie Signed-off-by: Richard Purdie (cherry picked from commit c4ffd18d3e71b935acc050b106267db544d86df7) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/cve-exclusion_6.1.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux/cve-exclusion_6.1.inc b/meta/recipes-kernel/linux/cve-exclusion_6.1.inc index bf23742d70..1b51737c7d 100644 --- a/meta/recipes-kernel/linux/cve-exclusion_6.1.inc +++ b/meta/recipes-kernel/linux/cve-exclusion_6.1.inc @@ -1,9 +1,9 @@ # Auto-generated CVE metadata, DO NOT EDIT BY HAND. -# Generated at 2023-12-18 14:15:17.069657+00:00 for version 6.1.65 +# Generated at 2023-12-23 08:44:42.304531+00:00 for version 6.1.68 python check_kernel_cve_status_version() { - this_version = "6.1.65" + this_version = "6.1.68" kernel_version = d.getVar("LINUX_VERSION") if kernel_version != this_version: bb.warn("Kernel CVE status needs updating: generated for %s but kernel is %s" % (this_version, kernel_version)) From patchwork Fri Dec 29 15:44:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37042 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 221F0C47077 for ; Fri, 29 Dec 2023 15:45:38 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web11.151004.1703864730385702879 for ; Fri, 29 Dec 2023 07:45:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=1djBrqVV; spf=softfail (domain: sakoman.com, ip: 209.85.214.172, mailfrom: steve@sakoman.com) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1d44200b976so19278105ad.2 for ; Fri, 29 Dec 2023 07:45:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864729; x=1704469529; 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=Zb7vhbythagDLpgEOnJn5vR8QoTlXnCGHXZI7+r7bl8=; b=1djBrqVVTt7paNDprSxv5ws4b7+ZgCMJZE0KyFLcvDuzJGI9qKRGS1PbeyCFsBBza9 ocXs28fklFU5w+4Rhr0ignT2uTfv4qw4K9ptW9RplYl7juImYJOmXgKWOVLCNzfFBPou nJTEUW13MrPULXsql1q0AkAU7c/E3VyJEu4yWAlnrDgYyCsZEc2C9Vb+y/vxCNXpTva+ J8WzH0CSH4nxEr6p2nP/Oc2ISs8qUu/uZ2cYiDKG6fuqsyhnPNX5XYqPBn6hDOp3wE0/ 8H6Coy5/OLHrTRlp/kuc1wTawnSuonRWJDbXefuSIL6/fd04XsYYBGgerUnumeEJJh9W X8CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864729; x=1704469529; 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=Zb7vhbythagDLpgEOnJn5vR8QoTlXnCGHXZI7+r7bl8=; b=UPgL1djs5qOJIG31EZ5tZ0csOgRjSphiw9bBgQsOyK/GuGM26s/t5L8CTPzQrSEWZr 9K2rFH4MnpESpl6yaTJ4L0VjsMpgnyDIGRuJ0eyCLHY/jvc7uP7gs0JDjaFIDPZhxvpW NqwTYKNN6g9ykL6cOPtGmXVfxfzkFNzQAkVa83bEkmrokjQ8+Uz+Ms28BsA9YC8LiAak dsEe5z7C/CMnJskibpUOMzAHzIT6lsCs5vFRyShEm1+eC38giC1ohgWOvUewJlyUop8r aWwPAerCFpL/Q1NK4m99EceN+Wae57dXhJzgV5DUKXe46CMHDLWnDnVlW5qFTvOCmjYW +GbA== X-Gm-Message-State: AOJu0Yxffgosk4p2fd07mkZzZSZJXDybxL3/J+w2cdSMxZv3qHHj3DSm d8I0ZSV1/uUlMYh/TCqrz5UhbinVHNpttHAg+JJ5X8H4MvWYZw== X-Google-Smtp-Source: AGHT+IF02a66Ez6Ly4XjIXdhHx4WSpsproNmZFutWjir0MwrkE9VDtldq6c1aiQMc1jHaBsW1H9NmA== X-Received: by 2002:a17:902:fc48:b0:1d4:6730:4373 with SMTP id me8-20020a170902fc4800b001d467304373mr5046602plb.96.1703864729086; Fri, 29 Dec 2023 07:45:29 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:28 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 13/41] linux-yocto/6.5: drop removed IMA option Date: Fri, 29 Dec 2023 05:44:27 -1000 Message-Id: <0f8eaea3a46c9f6e3c99fb59e689e2a3843979d0.1703864512.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 ; Fri, 29 Dec 2023 15:45:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193030 From: Bruce Ashfield Integrating the following commit(s) to linux-yocto/.: 1/1 [ Author: Paul Gortmaker Email: paul.gortmaker@windriver.com Subject: features/ima: drop now retired IMA_TRUSTED_KEYRING option Date: Wed, 6 Dec 2023 09:15:38 -0500 Unfortunately linux-stable backported this: Subject: ima: Remove deprecated IMA_TRUSTED_KEYRING Kconfig From: Nayna Jain [ Upstream commit 5087fd9e80e539d2163accd045b73da64de7de95 ] Time to remove "IMA_TRUSTED_KEYRING". ...to all releases still being maintained. stable-queue$git grep -l 5087fd9e80e539 releases/5.10.195/ima-remove-deprecated-ima_trusted_keyring-kconfig.patch releases/5.15.132/ima-remove-deprecated-ima_trusted_keyring-kconfig.patch releases/5.4.257/ima-remove-deprecated-ima_trusted_keyring-kconfig.patch releases/6.1.53/ima-remove-deprecated-ima_trusted_keyring-kconfig.patch releases/6.4.16/ima-remove-deprecated-ima_trusted_keyring-kconfig.patch releases/6.5.3/ima-remove-deprecated-ima_trusted_keyring-kconfig.patch So now when someone uses the feature, it triggers a do_kernel_configcheck warning when the audit runs. We added this file way back in 2019 so this fix will be needed on all active branches that are using an LTS linux-stable kernel listed above. Signed-off-by: Paul Gortmaker Signed-off-by: Bruce Ashfield ] Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit d575b2822c1779077177deb177bafa94ab975bfc) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_6.5.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb index 62020312f8..fccf0252d0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb @@ -15,7 +15,7 @@ python () { } SRCREV_machine ?= "1d89cd73350cad73ecf330ad3785e6d8bdec092d" -SRCREV_meta ?= "867a6bdef9701f378f5a9ce66a713daa22598649" +SRCREV_meta ?= "3b1f87ec237ec3ad9acffb3d75c55efe958085dc" 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.5;destsuffix=${KMETA};protocol=https" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb index f57bc47b37..b63d5ad893 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb @@ -18,7 +18,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "95753fe2a7d507646224fe973e2a4fc48cb7694d" -SRCREV_meta ?= "867a6bdef9701f378f5a9ce66a713daa22598649" +SRCREV_meta ?= "3b1f87ec237ec3ad9acffb3d75c55efe958085dc" PV = "${LINUX_VERSION}+git" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.5.bb b/meta/recipes-kernel/linux/linux-yocto_6.5.bb index 1233140f8e..984940d24c 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.5.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.5.bb @@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?= "7fe59b2e3f40a94ce4477854264e219aeb972990" SRCREV_machine:qemux86-64 ?= "7fe59b2e3f40a94ce4477854264e219aeb972990" SRCREV_machine:qemumips64 ?= "ff5efc72e961cf345f935ac14cdcaa9843ec5b23" SRCREV_machine ?= "7fe59b2e3f40a94ce4477854264e219aeb972990" -SRCREV_meta ?= "867a6bdef9701f378f5a9ce66a713daa22598649" +SRCREV_meta ?= "3b1f87ec237ec3ad9acffb3d75c55efe958085dc" # 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 Fri Dec 29 15:44:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37043 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 2AE11C47079 for ; Fri, 29 Dec 2023 15:45:38 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web11.151005.1703864731679273052 for ; Fri, 29 Dec 2023 07:45:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=WOoHt/YV; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1d3f3ee00a2so27526845ad.3 for ; Fri, 29 Dec 2023 07:45:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864731; x=1704469531; 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=nWtq0zb7dlQp96Z62gepvcJ6GEuIngJ5EYq2mT+iMLQ=; b=WOoHt/YVwi6gYjRTQQRhUJyZID2oq8rKJfP6WmmEJzqrJtCeUbYwP1rU0oYJ8uJeQH vUzL58k/Fq9r+cYWxU2xsGPSPXkC20zXb5+Py2SyBk15qCirZD96jKOLEgZc69hj8tAw yo+HZEXjiWSvw3pR+Rgm4KIRMG46V5aLc6gaabHDdWME9utBMDVuxYZLVCVwZLPhkkKc iZ4w9BhaRqIUjijzrOG1d+FFsHeLAyEOfnpsfnhAwBep95CSarxLeL4O92USxAm1A7kd 5Zu9DFcudzmayU0XKt8ZQ1ojhW7X/sOy6rHGtLFbIcgXinAWcIFe07Iph0d/NwI/96eO IvBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864731; x=1704469531; 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=nWtq0zb7dlQp96Z62gepvcJ6GEuIngJ5EYq2mT+iMLQ=; b=UKytF+sD5w4pNSMxJ/HB1HvTuE85BGZxt8G5cw7w2t8chjFHR28wvm4UkCJKkuE8+R MrQXQJ/O1P+y/yHNoqnbu41ECO9AH38JJlB+ReRHfMP9M5jB1uTVi1CuIv1FWznUNsTv KYgjx4Ch4FfvLq6CbOrT/8N32kLGRIWnOk7HsSSVrptTQOEEXvcSsXC6rYFfgxR8kooS 0/iGHQjUbuLPWc8E1oZPlJYSkfLLNGBnVqlxzGooC7Qdwni11Udkpp7EVYT6g/Qyv6Tk uIvfIpxTT+a0+7sZm2jRE4gxKYsFl2IRpUEqZ1GOxinafEi6zg93dMo2ldo/togwrJfg jbHQ== X-Gm-Message-State: AOJu0Ywf233FS7f/TlJ3CPhA+PHoj5tEQzo88q6s2Hzx0jHgSI5JUgKQ y0nALKe8VJtTz0tWqrgIbJtgedqOEtOKR6kJWdG7+h/3VjmrDA== X-Google-Smtp-Source: AGHT+IF50cy6hdtbCxVpycQLsRglsUhgni0YNZYMpwSd3tl65fzZfTG+Np/n7+ySovHyqfduEgSnkA== X-Received: by 2002:a17:903:1c8:b0:1d4:47d4:82c6 with SMTP id e8-20020a17090301c800b001d447d482c6mr6038447plh.99.1703864730836; Fri, 29 Dec 2023 07:45:30 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:30 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 14/41] linux-yocto/6.5: fix AB-INT: QEMU kernel panic: No irq handler for vector Date: Fri, 29 Dec 2023 05:44:28 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Dec 2023 15:45:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193031 From: Bruce Ashfield Integrating the following commit(s) to linux-yocto/6.5: 1/2 [ Author: Thomas Gleixner Email: tglx@linutronix.de Subject: x86/alternatives: Sync core before enabling interrupts Date: Thu, 7 Dec 2023 20:49:24 +0100 text_poke_early() does: local_irq_save(flags); memcpy(addr, opcode, len); local_irq_restore(flags); sync_core(); That's not really correct because the synchronization should happen before interrupts are reenabled to ensure that a pending interrupt observes the complete update of the opcodes. It's not entirely clear whether the interrupt entry provides enough serialization already, but moving the sync_core() invocation into interrupt disabled region does no harm and is obviously correct. Signed-off-by: Thomas Gleixner Signed-off-by: Bruce Ashfield ] 2/2 [ Author: Thomas Gleixner Email: tglx@linutronix.de Subject: x86/alternatives: Disable interrupts and sync when optimizing NOPs in place Date: Thu, 7 Dec 2023 20:49:26 +0100 apply_alternatives() treats alternatives with the ALT_FLAG_NOT flag set special as it optimizes the existing NOPs in place. Unfortunately this happens with interrupts enabled and does not provide any form of core synchronization. So an interrupt hitting in the middle of the update and using the affected code path will observe a half updated NOP and crash and burn. The following 3 NOP sequence was observed to expose this crash halfways reliably under QEMU 32bit: 0x90 0x90 0x90 which is replaced by the optimized 3 byte NOP: 0x8d 0x76 0x00 So an interrupt can observe: 1) 0x90 0x90 0x90 nop nop nop 2) 0x8d 0x90 0x90 undefined 3) 0x8d 0x76 0x90 lea -0x70(%esi),%esi 4) 0x8d 0x76 0x00 lea 0x0(%esi),%esi Where only #1 and #4 are true NOPs. The same problem exists for 64bit obviously. Disable interrupts around this NOP optimization and invoke sync_core() before reenabling them. Fixes: 270a69c4485d ("x86/alternative: Support relocations in alternatives") Reported-by: Paul Gortmaker Signed-off-by: Thomas Gleixner Cc: stable@vger.kernel.org Signed-off-by: Bruce Ashfield ] Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 1c8d29ab6b02c5b783429db3b67583deb1637142) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_6.5.bb | 2 +- .../linux/linux-yocto-tiny_6.5.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_6.5.bb | 22 +++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb index fccf0252d0..0120b9ba63 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb @@ -14,7 +14,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "1d89cd73350cad73ecf330ad3785e6d8bdec092d" +SRCREV_machine ?= "3ad8578bcc3186cde9b35de8c56afc0cba68bc55" SRCREV_meta ?= "3b1f87ec237ec3ad9acffb3d75c55efe958085dc" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb index b63d5ad893..cc24e3d346 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb @@ -17,7 +17,7 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "95753fe2a7d507646224fe973e2a4fc48cb7694d" +SRCREV_machine ?= "fc3138c70652b48a0bf3620fd7aa861fa1f14e27" SRCREV_meta ?= "3b1f87ec237ec3ad9acffb3d75c55efe958085dc" PV = "${LINUX_VERSION}+git" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.5.bb b/meta/recipes-kernel/linux/linux-yocto_6.5.bb index 984940d24c..e7abc9784a 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.5.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.5.bb @@ -18,17 +18,17 @@ KBRANCH:qemux86-64 ?= "v6.5/standard/base" KBRANCH:qemuloongarch64 ?= "v6.5/standard/base" KBRANCH:qemumips64 ?= "v6.5/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "3fdf15eaa1db1b6fd1de804d03c6b4a10c2c3f4b" -SRCREV_machine:qemuarm64 ?= "70210986a1c554098fb6f75f6cd10ab85171506a" -SRCREV_machine:qemuloongarch64 ?= "7fe59b2e3f40a94ce4477854264e219aeb972990" -SRCREV_machine:qemumips ?= "338cee0966e9ea856a696df0a9f5432f74b06270" -SRCREV_machine:qemuppc ?= "2fbe7b92bda7afe7aca6e58b0ac124f2a26737ee" -SRCREV_machine:qemuriscv64 ?= "7fe59b2e3f40a94ce4477854264e219aeb972990" -SRCREV_machine:qemuriscv32 ?= "7fe59b2e3f40a94ce4477854264e219aeb972990" -SRCREV_machine:qemux86 ?= "7fe59b2e3f40a94ce4477854264e219aeb972990" -SRCREV_machine:qemux86-64 ?= "7fe59b2e3f40a94ce4477854264e219aeb972990" -SRCREV_machine:qemumips64 ?= "ff5efc72e961cf345f935ac14cdcaa9843ec5b23" -SRCREV_machine ?= "7fe59b2e3f40a94ce4477854264e219aeb972990" +SRCREV_machine:qemuarm ?= "07ca2c1cc013343f9a47b5ac4f37ed60f66fd73b" +SRCREV_machine:qemuarm64 ?= "7af45f35fdcc82bbff07fa3d031620d5f5728b6b" +SRCREV_machine:qemuloongarch64 ?= "e53dc7514de7d2fbe0f80547a50c0542928e2d11" +SRCREV_machine:qemumips ?= "e0b08aab2ccc4257f0b34e7dcb1e054ea188a43d" +SRCREV_machine:qemuppc ?= "9e609ca17604c708fdc6e7e5c9355bb2c5b73bcd" +SRCREV_machine:qemuriscv64 ?= "e53dc7514de7d2fbe0f80547a50c0542928e2d11" +SRCREV_machine:qemuriscv32 ?= "e53dc7514de7d2fbe0f80547a50c0542928e2d11" +SRCREV_machine:qemux86 ?= "e53dc7514de7d2fbe0f80547a50c0542928e2d11" +SRCREV_machine:qemux86-64 ?= "e53dc7514de7d2fbe0f80547a50c0542928e2d11" +SRCREV_machine:qemumips64 ?= "58ffd9a4a907262daaedd9aca1e95e65d9716de3" +SRCREV_machine ?= "e53dc7514de7d2fbe0f80547a50c0542928e2d11" SRCREV_meta ?= "3b1f87ec237ec3ad9acffb3d75c55efe958085dc" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll From patchwork Fri Dec 29 15:44:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37044 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 30C79C4707C for ; Fri, 29 Dec 2023 15:45:38 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web11.151008.1703864733346104323 for ; Fri, 29 Dec 2023 07:45:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=om8vmdOq; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1d3f3ee00a2so27527015ad.3 for ; Fri, 29 Dec 2023 07:45:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864732; x=1704469532; 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=f+QAUwwbkOEG9j33U/JGd1N5mrVMmxYR8BIz6f43VvA=; b=om8vmdOqCpxrlQbEc2pPuG8CrmeTZC6+LQuiyogl/Kud2bd4YNpMNJ5G7sSAn+wR9z xfyu8JpwxbOCYxn94nPtiA/RmVv5QYGVAea47L/JzNvsqABNXH1xrjd9fJ3+psgKI6dh QSx8OiuJO+oNtFm7YuCUM0Sn49tw92P79kq+vqPb8A81dyuHkz8AK6l4Gq+auCbuflY/ Smdnr2dt/c5NNy7rLtkn+ZR/1q3YTKgO3l/lpjeVdjYDDYmew4/5tFYrU9U4kMz10yXc t8JmbLVPwXbhRatKgsadZpwfbXj+plzjSH9ItFolwbxnZRgmWdLsqrPZ+4JgGRJz3Fr7 grQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864732; x=1704469532; 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=f+QAUwwbkOEG9j33U/JGd1N5mrVMmxYR8BIz6f43VvA=; b=TLovUveciapf/MokZKI8Ik9BAEOYuonwxhSda72ujAOXdgYeDMgJOYkUq2hqix82pj r21xy3WsTZAnPc/1T4AOLhjpj5cyh3yMPr/XEep5sg5bfBy4r9we0bceCqLuPXB1NKqr Hm+hFnAsPqUARAZmFUqDosupJg92Wdtn0ELbhBjyHt67adfI/G6yd3uxW/e3+uM3v9SJ wsr41+cTm8pxg77Fy4xDCfCqXh0in9frICeM5aIDm9c27XROLhKO9rCgsyQAKSyNl1kL Ayxp4anKKTS4asGpHY2KJJiIuDwCIi+Z9Cd4+8AZBR5yOidJM4Km+xE8N1w1AEsyggI3 7nKA== X-Gm-Message-State: AOJu0Ywmgq/xncDMYvHZdlA8JsgD7fUw68SxvhQUPr81ooEhfgKJPy63 TaTUy+DZ+AqVhMIPeHZ8MHToWNPcq1uqS3ZYlP5hnd615MB7vw== X-Google-Smtp-Source: AGHT+IE85bGxlB68dhEYo6/rn1Wi6BSVInTE7IePSclNYt4xZG/2Q+BK8OsHBCgGS8pEzbnVJcURyA== X-Received: by 2002:a17:903:41c4:b0:1d4:53b7:4ce8 with SMTP id u4-20020a17090341c400b001d453b74ce8mr4951354ple.39.1703864732508; Fri, 29 Dec 2023 07:45:32 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:32 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 15/41] libsolv: upgrade 0.7.25 -> 0.7.26 Date: Fri, 29 Dec 2023 05:44:29 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Dec 2023 15:45:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193032 From: Wang Mingyu Version 0.7.26 - selected bug fixes: * fix evr roundtrip in testcases * do not use deprecated headerUnload with newer rpm versions Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit abd47f16a4ef8a50af4287795969832d1391d8d2) Signed-off-by: Steve Sakoman --- .../libsolv/{libsolv_0.7.25.bb => libsolv_0.7.26.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-extended/libsolv/{libsolv_0.7.25.bb => libsolv_0.7.26.bb} (95%) diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.25.bb b/meta/recipes-extended/libsolv/libsolv_0.7.26.bb similarity index 95% rename from meta/recipes-extended/libsolv/libsolv_0.7.25.bb rename to meta/recipes-extended/libsolv/libsolv_0.7.26.bb index 69cb3f7996..bae7960138 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.7.25.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.7.26.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/openSUSE/libsolv.git;branch=master;protocol=https \ file://0001-utils-Conside-musl-when-wrapping-qsort_r.patch \ " -SRCREV = "f1be8bf3dcc7dc14d331adbc97f337fa08e641c9" +SRCREV = "48c985375134d2443eee551613161cadc278af2f" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" From patchwork Fri Dec 29 15:44:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37045 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 1E2D6C47072 for ; Fri, 29 Dec 2023 15:45:38 +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.151520.1703864735681591289 for ; Fri, 29 Dec 2023 07:45:35 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=diDnEk/B; 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-5ca29c131ebso5444615a12.0 for ; Fri, 29 Dec 2023 07:45:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864734; x=1704469534; 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=q4+hC6Rr6ExaSO0AJ9zsQH2Wl/7oCLAW/rBcPCq26SQ=; b=diDnEk/BjHsKQw8fif6jV9hF+QOPBTyn1M+eJFCn9aBql7etAqzgBm3/An63ZbphHL 14b4GwpUBoMMScKIOV7+VAPNkO+AuozcJ8ST7xnguIkncw/SyU+TSsWNcVhomzE8g3j9 3GsjpjzQRnkSWhek2ZcWvJHt59GjK0KzYD8uXi8xy9I19Xtz96hOoDgZGRxueCmQXC8t Y2Uzd8ftAU1UiIXBiFz6Sc8+dkgDlwjjqS/jFSMtmImHBgGPAcqzEPefvSVD7vEBnJCA vy7aLC57qNsTyVunTLh4oR8vTAKbJalxhVebqWuYU9s26TEkXdMpxU5QXQ5STTmfApsM u8BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864734; x=1704469534; 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=q4+hC6Rr6ExaSO0AJ9zsQH2Wl/7oCLAW/rBcPCq26SQ=; b=hc6rVYF6o9ug7EsMhJ4j8cc+g8H0Tv3Lw0oxpiy4UWYCo0Z8/1c4BZc+A3B9SgVfV1 I4TqCt8DMlQZfcRfNcWdfkLCHng+d8IIFCLSnJyc/GnPkiDFYN0xHWoJ0Kix/PD7lyae /ehuL7USXGzXBo/WsFLRThG5VXvGjDcWHa7dzNmqvynSXTe44JwaAx4v9V7ERwuCjgxs jFzABJgzjLjrvqvPLQth4SePMfZesgEOfpdeyT2nft2UHVSyR4oSGhbvCX0i1KgD5Jj3 LYydYj4YHJR7odprkfbnD22AHomMiVDvuuwYGJvDKIgNfKT4zjNE72YG7pGISjhC8yWN UZEQ== X-Gm-Message-State: AOJu0YzOFjnntn5h4Ez7qSJAUfOQBl9iEcUQMKaOBmz1XDXFsU/u0HX+ t549oPqzp2U7Wz0iRvkH+b/eapTBqdCOUfpt+7tFU3Clmx3uxQ== X-Google-Smtp-Source: AGHT+IGRLTUsoRVXFKatmq97u8lgqCa3B2Ci9JueML3SWrcq6eLwLr2+02J822coDrNQEiCcPcM4jw== X-Received: by 2002:a17:902:da86:b0:1d4:1ec2:ac17 with SMTP id j6-20020a170902da8600b001d41ec2ac17mr13976450plx.129.1703864734339; Fri, 29 Dec 2023 07:45:34 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:34 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 16/41] gstreamer1.0: upgrade 1.22.6 -> 1.22.7 Date: Fri, 29 Dec 2023 05:44:30 -1000 Message-Id: <1d4df263a62de1d860731bace77c69e56987fa6e.1703864512.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 ; Fri, 29 Dec 2023 15:45:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193033 From: Anuj Mittal This release only contains bugfixes and security fixes. For details: https://gstreamer.freedesktop.org/releases/1.22/#1.22.8 Signed-off-by: Anuj Mittal Signed-off-by: Alexandre Belloni (cherry picked from commit f6be55ef1e862d93d8275fb5792e6c66b0a0beee) Signed-off-by: Steve Sakoman --- .../{gst-devtools_1.22.6.bb => gst-devtools_1.22.7.bb} | 2 +- ...streamer1.0-libav_1.22.6.bb => gstreamer1.0-libav_1.22.7.bb} | 2 +- .../{gstreamer1.0-omx_1.22.6.bb => gstreamer1.0-omx_1.22.7.bb} | 2 +- ...plugins-bad_1.22.6.bb => gstreamer1.0-plugins-bad_1.22.7.bb} | 2 +- ...ugins-base_1.22.6.bb => gstreamer1.0-plugins-base_1.22.7.bb} | 2 +- ...ugins-good_1.22.6.bb => gstreamer1.0-plugins-good_1.22.7.bb} | 2 +- ...ugins-ugly_1.22.6.bb => gstreamer1.0-plugins-ugly_1.22.7.bb} | 2 +- ...reamer1.0-python_1.22.6.bb => gstreamer1.0-python_1.22.7.bb} | 2 +- ...rtsp-server_1.22.6.bb => gstreamer1.0-rtsp-server_1.22.7.bb} | 2 +- ...streamer1.0-vaapi_1.22.6.bb => gstreamer1.0-vaapi_1.22.7.bb} | 2 +- .../{gstreamer1.0_1.22.6.bb => gstreamer1.0_1.22.7.bb} | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) rename meta/recipes-multimedia/gstreamer/{gst-devtools_1.22.6.bb => gst-devtools_1.22.7.bb} (95%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-libav_1.22.6.bb => gstreamer1.0-libav_1.22.7.bb} (91%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.22.6.bb => gstreamer1.0-omx_1.22.7.bb} (95%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.22.6.bb => gstreamer1.0-plugins-bad_1.22.7.bb} (98%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.22.6.bb => gstreamer1.0-plugins-base_1.22.7.bb} (98%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.22.6.bb => gstreamer1.0-plugins-good_1.22.7.bb} (97%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.22.6.bb => gstreamer1.0-plugins-ugly_1.22.7.bb} (94%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.22.6.bb => gstreamer1.0-python_1.22.7.bb} (91%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.22.6.bb => gstreamer1.0-rtsp-server_1.22.7.bb} (90%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.22.6.bb => gstreamer1.0-vaapi_1.22.7.bb} (95%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.22.6.bb => gstreamer1.0_1.22.7.bb} (97%) diff --git a/meta/recipes-multimedia/gstreamer/gst-devtools_1.22.6.bb b/meta/recipes-multimedia/gstreamer/gst-devtools_1.22.7.bb similarity index 95% rename from meta/recipes-multimedia/gstreamer/gst-devtools_1.22.6.bb rename to meta/recipes-multimedia/gstreamer/gst-devtools_1.22.7.bb index 90bbd9c733..b545f020cf 100644 --- a/meta/recipes-multimedia/gstreamer/gst-devtools_1.22.6.bb +++ b/meta/recipes-multimedia/gstreamer/gst-devtools_1.22.7.bb @@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV} file://0001-connect-has-a-different-signature-on-musl.patch \ " -SRC_URI[sha256sum] = "8928560efaf16137c30285e718708e5d0bab0777eb4ef8127e0274e120d3d86b" +SRC_URI[sha256sum] = "157cf93fb2741cf0c3dea731be3af2ffae703c9f2cd3c0c91b380fbc685eb9f9" DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" RRECOMMENDS:${PN} = "git" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.6.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.7.bb similarity index 91% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.6.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.7.bb index 8906556b44..7169223636 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.6.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.7.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \ " SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz" -SRC_URI[sha256sum] = "7789e6408388a25f23cbf948cfc5c6230d735bbcd8b7f37f4a01c9e348a1e3a7" +SRC_URI[sha256sum] = "1525b917141b895fe5cf618fe8867622b2528278a0286e9f727b5f37317daca1" S = "${WORKDIR}/gst-libav-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.6.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.7.bb similarity index 95% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.6.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.7.bb index 2579aa3d66..ad40cf5513 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.6.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.7.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" -SRC_URI[sha256sum] = "223833c42518ad7eb1923bb4dd3726809f59a66d6e9aaaa69cb29ad0750c8758" +SRC_URI[sha256sum] = "d7a18ec47d40a472bd5cba2015e0be72b732f1699895398cec5cd8e6a3a53b44" S = "${WORKDIR}/gst-omx-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.6.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.7.bb similarity index 98% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.6.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.7.bb index 3db7ddff5f..b7d787b611 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.6.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.7.bb @@ -10,7 +10,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad file://0002-avoid-including-sys-poll.h-directly.patch \ file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ " -SRC_URI[sha256sum] = "b4029cd2908a089c55f1d902a565d007495c95b1442d838485dc47fb12df7137" +SRC_URI[sha256sum] = "c716f8dffa8fac3fb646941af1c6ec72fff05a045131311bf2d049fdc87bce2e" S = "${WORKDIR}/gst-plugins-bad-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.6.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.7.bb similarity index 98% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.6.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.7.bb index 1f67ca303a..3b8923e8f2 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.6.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.7.bb @@ -11,7 +11,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba file://0003-viv-fb-Make-sure-config.h-is-included.patch \ file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ " -SRC_URI[sha256sum] = "50f2b4d17c02eefe430bbefa8c5cd134b1be78a53c0f60e951136d96cf49fd4b" +SRC_URI[sha256sum] = "62519e0d8f969ebf62a9a7996f2d23efdda330217a635f4a32c0bf1c71577468" S = "${WORKDIR}/gst-plugins-base-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.6.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.7.bb similarity index 97% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.6.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.7.bb index 6b76ba957e..b8496a1750 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.6.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.7.bb @@ -8,7 +8,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-go file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch" -SRC_URI[sha256sum] = "b3b07fe3f1ce7fe93aa9be7217866044548f35c4a7792280eec7e108a32f9817" +SRC_URI[sha256sum] = "b6db0e18e398b52665b7cdce301c34a8750483d5f4fbac1ede9f80b03743cd15" S = "${WORKDIR}/gst-plugins-good-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.6.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.7.bb similarity index 94% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.6.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.7.bb index 77f79a630a..8a67531123 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.6.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.7.bb @@ -14,7 +14,7 @@ LICENSE_FLAGS = "commercial" SRC_URI = " \ https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "3e31454c98cb2f7f6d2d355eceb933a892fa0f1dc09bc36c9abc930d8e29ca48" +SRC_URI[sha256sum] = "520b46bca637189ad86a298ff245b2d89375dbcac8b05d74daea910f81a9e9da" S = "${WORKDIR}/gst-plugins-ugly-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.6.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.7.bb similarity index 91% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.6.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.7.bb index addf12c427..a387031635 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.6.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.7.bb @@ -8,7 +8,7 @@ LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[sha256sum] = "51de2d6d13b12ce095eac97c0b94ee59c2aeba3712bb7462b78c4d57dde176c5" +SRC_URI[sha256sum] = "1ef8df7608012fa469329799c950ec087737a6dabad3003c230658b58c710172" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.6.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.7.bb similarity index 90% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.6.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.7.bb index fd79fe4324..af1c2ced44 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.6.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.7.bb @@ -10,7 +10,7 @@ PNREAL = "gst-rtsp-server" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[sha256sum] = "0ae33a8b50443b62f11581a9181e906b41cd3877b2d799dbea72912c3eda4bb3" +SRC_URI[sha256sum] = "f7fac001e20ad21e36d18397741c4657c5d43571eb1cc3b49f9a93ae127dc88f" S = "${WORKDIR}/${PNREAL}-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.6.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.7.bb similarity index 95% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.6.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.7.bb index bf4c105057..4cad50742d 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.6.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.7.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "d9ba2fc26bef98c78e982c599f585d46bbb65fe122da89c2d7ab41f468a52c7b" +SRC_URI[sha256sum] = "0e9fff768b89de6d318b34146e4e781d82b9a0f4025dc541b2c8349c7bcb7f67" S = "${WORKDIR}/${REALPN}-${PV}" DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.6.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.7.bb similarity index 97% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.6.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.7.bb index a898464322..72161b272f 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.6.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.7.bb @@ -22,7 +22,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \ file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \ " -SRC_URI[sha256sum] = "f500e6cfddff55908f937711fc26a0840de28a1e9ec49621c0b6f1adbd8f818e" +SRC_URI[sha256sum] = "01e42c6352a06bdfa4456e64b06ab7d98c5c487a25557c761554631cbda64217" PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ check \ From patchwork Fri Dec 29 15:44:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37041 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 0F6CAC47073 for ; Fri, 29 Dec 2023 15:45:38 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web10.151522.1703864737438992217 for ; Fri, 29 Dec 2023 07:45:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=A3aJGYEY; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1d3f29fea66so30873185ad.3 for ; Fri, 29 Dec 2023 07:45:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864736; x=1704469536; 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=MNKdjTpS6MpbNmzFJbwJJ3DqBC11LZEpcMIgjRMaDdM=; b=A3aJGYEYAEOAyBdsRVaQs29kcq7XP4+h8Ij3vGPC0Rqii0ABynxeElvB+0YCLJ3IF2 7RWezqozoe1TVj/dit1R5mjqeMhk2c0MRa8DgpBdvg88Efar81PjwHDY0lmPy2dgFK19 eBYhi6X7nioQi3ZWmHtT56kow5A7APoSKwauJN7gxQBO8er0p1+rhzPulcYp+wdubSom nbVE98XkJvSUxpVb7zvD3hLcmRcFzc8D9qq9F+16Th+dlm+Ug001ScepV80BLKhy6eig /q3Nva73gJhG8WGZvgfkWKFkZ/fQ9GFw4yUvSdFFONXlDx8dePykqyGh/4D2qIpmJcvO K3iA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864736; x=1704469536; 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=MNKdjTpS6MpbNmzFJbwJJ3DqBC11LZEpcMIgjRMaDdM=; b=Sc5BTVtPFll8FSnvKrIXlrF72zlw9hl3ijYhNBAlCwsSUkcqtBB2eT0wkrtOxLReC6 rwquPPIW5hULQUnvE/F5Yp9uUbEBrIlCHMvoj5cXdnHyzxMnZIcth+i6iFSrVPNT/9+N cc2yCIo90zMaVwUK1pJiq3qVlcLV5m1YhQZOzbgZcnaTy5NiQTKMKILN4GSZxR1FrJ+1 iQUYYFiCgqc63eY47J9oFEKCU30Unz0PuyKXGZTFde0fIuIJe5QUw5vTsXofE/STrZcc INLE1/TlAvDo1jozwB+TNAltHyjpGIJE2HzHFzgvQEMNRoN0HtODchOVnM6Rbc3934b/ iBRA== X-Gm-Message-State: AOJu0YxvcRsAJi0PfKyAuB3NcBu0zSkC6tlxeCDNGzryB6lvYHuVNwUP 3Oo584wWD2M1Uv1VpUhTuMxGUXlXjXH52fCpLPj2biANcHwjBw== X-Google-Smtp-Source: AGHT+IFjKh1JlqxHEzISugcatPuHlWrFzTLyT4x7dCAhoP/RLkFZgIQS5Mbdjd/6X+lsLkRvsgxt6g== X-Received: by 2002:a17:902:e843:b0:1d4:2774:363f with SMTP id t3-20020a170902e84300b001d42774363fmr6142175plg.130.1703864736094; Fri, 29 Dec 2023 07:45:36 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:35 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 17/41] bind: upgrade 9.18.19 -> 9.18.20 Date: Fri, 29 Dec 2023 05:44:31 -1000 Message-Id: <6103a28c3b3df76a679acae577140d4ad2346894.1703864512.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 ; Fri, 29 Dec 2023 15:45:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193034 From: Wang Mingyu Changelog: ============ -Fix missing newlines in the output of "rndc nta -dump". -Take into account local authoritative zones when falling back to serve-stale. -Fix assertion failure when using lock-file configuration option together -X argument to named. -The 'lock-file' file was being removed when it shouldn't have been making it ineffective if named was started 3 or more times. -Fix a shutdown race in dns__catz_update_cb(). -B.ROOT-SERVERS.NET addresses are now 170.247.170.2 and 2801:1b8:10::b. -The timeouts for resending zone refresh queries over UDP were lowered to enable named to more quickly determine that a primary is down. -Don't schedule resign operations on the raw version of an inline-signing zone. -Fix a possible assertion failure on an error path in resolver.c:fctx_query(), when using an uninitialized link. -Add semantic patch to do an explicit cast from char to unsigned char in ctype.h class of functions. -Python system tests have to be executed by invoking pytest directly. Executing them with the legacy test runner is no longer supported. -The wrong covered value was being set by dns_ncache_current for RRSIG records in the returned rdataset structure. This resulted in TYPE0 being reported as the covered value of the RRSIG when dumping the cache contents. Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit 9b34124561d926d9273c52163853161515e5666a) Signed-off-by: Steve Sakoman --- .../bind/{bind_9.18.19.bb => bind_9.18.20.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-connectivity/bind/{bind_9.18.19.bb => bind_9.18.20.bb} (97%) diff --git a/meta/recipes-connectivity/bind/bind_9.18.19.bb b/meta/recipes-connectivity/bind/bind_9.18.20.bb similarity index 97% rename from meta/recipes-connectivity/bind/bind_9.18.19.bb rename to meta/recipes-connectivity/bind/bind_9.18.20.bb index 8124c5c591..187685eef5 100644 --- a/meta/recipes-connectivity/bind/bind_9.18.19.bb +++ b/meta/recipes-connectivity/bind/bind_9.18.20.bb @@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[sha256sum] = "115e09c05439bebade1d272eda08fa88eb3b60129edef690588c87a4d27612cc" +SRC_URI[sha256sum] = "4b891ebf58d3f2a7ac3dd2682990f528a3448eaa1c992ddc5c141b8587a98ec5" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # follow the ESV versions divisible by 2 From patchwork Fri Dec 29 15:44:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37047 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 2B2C8C47072 for ; Fri, 29 Dec 2023 15:45:48 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web10.151524.1703864739112646162 for ; Fri, 29 Dec 2023 07:45:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=V5clH1qU; spf=softfail (domain: sakoman.com, ip: 209.85.214.172, mailfrom: steve@sakoman.com) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1d3ec3db764so19247795ad.2 for ; Fri, 29 Dec 2023 07:45:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864738; x=1704469538; 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=cl4SZSvk6tCpz7W4dW6Dmre+e1gVFGMK0xxsGkdqkO8=; b=V5clH1qUDwTSRTAUFePhpoES4Dy0euz2r0K0d0TEpSXNzZVbHGX+HnJx9hO5X5xjVE pF5iFqDuQuC7wQwzfkeDJMDBO/s2UiXR/4xCboaF7jqGTAOfk3uzGXzLslw9Yq1I9wmL sZYcbLqnG0lwOBpEurAEMl7A25fWqiFiw6M1VGL9RvtgkfuPGWZkNHVFhQ0BhbU7OLkV PvkXtYHmwP+a7NWiUv4ksRqVvaTqp8/9GWCwbX3/W4KaKQGSCfImZ+6E7FPqx86oIkKy fdAMczlcUSFe8G8m0xzsEKl6hZGVcEXmRxtps576RqiKb81tHOiL4/Juhk3x76G5O89a 4QWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864738; x=1704469538; 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=cl4SZSvk6tCpz7W4dW6Dmre+e1gVFGMK0xxsGkdqkO8=; b=wdG0GXZKJ3HDoHr9AE6A31uGeBuBhdf6mBUEXhI4kpdluEp8fbef3EIYnVSNfqtSh8 s8iuhX0kHs9b+kJnoxA05a/wDnOkXtNwATOd/qPyCTbAiJR2SP1TFAW6SxDd9s+wtUga 2SHtViRmTSm2wxGMF+H1+t9c+Jf9X5xDE4/mTCifCnQl6G/S9OZyBHxZMBy1yzyxkHYb HP57a2SUioTPeC6ALH2jpsvXJg90f9MAm/IV64FVvXdg0DWh1Bb432I8pVgm8Q3vx7XS jSQd9S9OvnN4TmWMnYxY7YHpWk07v/kAEgTXtnOqLAbw5juXz4cBPIYY+tBJKMniOhOE H3qA== X-Gm-Message-State: AOJu0YwvFM1Zi5AfwRIB8GArh9g+W+kVLDgRcMNdqaWxpSI+pZq3LFWb Ux9DKXBaOndBvIe2DDF5Plt+ZU+xG6hkC2VUEgUs5DT7zwLv7A== X-Google-Smtp-Source: AGHT+IHSFQkPAB/2Y3U8Bqi8V27L6yu7vmmjPWbuaeJCF1slXQStQWWvUCamttJQ7tHDD+PGSLDQWQ== X-Received: by 2002:a17:903:a88:b0:1d4:5e24:b90b with SMTP id mo8-20020a1709030a8800b001d45e24b90bmr4155908plb.128.1703864737901; Fri, 29 Dec 2023 07:45:37 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:37 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 18/41] ell: upgrade 0.59 -> 0.60 Date: Fri, 29 Dec 2023 05:44:32 -1000 Message-Id: <2b799f27bb005a314ac87117ab2e9fc34be90fa3.1703864512.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 ; Fri, 29 Dec 2023 15:45:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193035 From: Wang Mingyu Changelog: ========== -Fix issue with missing NETLINK_EXT_ACK definition. -Fix issue with incorrect derivation of ECC compressed points. -Add support for ECC usage from SPAKE2+ key exchange protocol. Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit 9b13c1ffadda0893561e804d2ab789bf1c401d3a) Signed-off-by: Steve Sakoman --- meta/recipes-core/ell/{ell_0.59.bb => ell_0.60.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/ell/{ell_0.59.bb => ell_0.60.bb} (89%) diff --git a/meta/recipes-core/ell/ell_0.59.bb b/meta/recipes-core/ell/ell_0.60.bb similarity index 89% rename from meta/recipes-core/ell/ell_0.59.bb rename to meta/recipes-core/ell/ell_0.60.bb index 0483dbe582..4e414f3b90 100644 --- a/meta/recipes-core/ell/ell_0.59.bb +++ b/meta/recipes-core/ell/ell_0.60.bb @@ -15,7 +15,7 @@ DEPENDS = "dbus" inherit autotools pkgconfig SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "370dc2b7c73cd57856017180a2a70a15ca1b0183bfd453b3cffe2d707c37da3d" +SRC_URI[sha256sum] = "61cec2df694b548e51afa3e7ffd1e1ad31a9fea7bedb93a3a3cc60894390c70f" do_configure:prepend () { mkdir -p ${S}/build-aux From patchwork Fri Dec 29 15:44:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37050 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 405FBC47074 for ; Fri, 29 Dec 2023 15:45:48 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web11.151014.1703864740546097023 for ; Fri, 29 Dec 2023 07:45:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=m+Gwww5l; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1d3e84fded7so34837985ad.1 for ; Fri, 29 Dec 2023 07:45:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864740; x=1704469540; 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=oPCes6MByJtstQjDgUyNzJpBiWPQDftKxOVvWbBrJH4=; b=m+Gwww5lLobRi94YRwKrGI3a+q8PLCHGJwtHKKZsZ/K2f6z3C63FC0uyDbSIgF3Ofj LEhtSt95IEyOm54PoTQMqT9RacbWRvu1zlBMaDQqxOXdXEqnfproPmWZHuei3/rHbyjn eI84vrlf44Jag6HqUJVEOZYdGcwCqct+DRkKhduc4FLuh/BiYjYEECeEYHAKm2mKwKDV ZWGYXBBmS+hstVz7sfjGNIQodbudEJ4c8cSdyUY8o+kpndKXiZ+iotkoAAKSCAPJBUJf pSZGtoaEerWSD0k+pNhJ4VSjTDqd1e7bhMFOxXDegPiaWnSaRVEPLdxQ6lVJpiFiSJ0K OxRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864740; x=1704469540; 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=oPCes6MByJtstQjDgUyNzJpBiWPQDftKxOVvWbBrJH4=; b=decKcPeUr89jaWgncokN5sDt3A79zKaLLiCT5Fs+6ATS/3iHI4UG53rged7/KjUX0S 2yq5rgPcZMeQ4v3FVQpkhkw7q7kNJ+JiAt9oc62Q7K8dQCbICUQy9ahI/Qv36sk2Zwcy YQ67jc3qyxsICMdoG2Ub3NwoC7HidsWLBoTozXmSKpy83qIHkwNdmUTpVJtUIq5mvN90 9py/M1F+cc0N54TuCUN87OWNmoz7cCvoIJ6yxMziQpypl22OdAfUbKw7/y2RxNii1/J5 Ajv/EgKXCixJ/k5T9FtCZRERmlyfcLY5actOJPE50OXM0tUK7XyaNqUtkS4JJKy7qKNK M8bg== X-Gm-Message-State: AOJu0Yzj2VMdqdO6xD+FjQF/9yPusftDDjg8vjm5e2fC9ThhPLKPuiMt fo2IFRg2Rv/YcJ1mExMABaThhQmOqoO4/4MebC7fatr2yxOBVA== X-Google-Smtp-Source: AGHT+IE/fCIGlWDcNjOTn23Iovq2WKx32qY/qXtjSQcpD5bmanAFcOGyRtGTur1S9fbVxDucdH8PpQ== X-Received: by 2002:a17:902:f68c:b0:1d3:6255:6c9b with SMTP id l12-20020a170902f68c00b001d362556c9bmr6586545plg.3.1703864739718; Fri, 29 Dec 2023 07:45:39 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:39 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 19/41] libgcrypt: upgrade 1.10.2 -> 1.10.3 Date: Fri, 29 Dec 2023 05:44:33 -1000 Message-Id: <451480be9e8693d026fb408f5bfd1c6c77ad7182.1703864512.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 ; Fri, 29 Dec 2023 15:45:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193036 From: Wang Mingyu Changelog: ========== - Fix public key computation for other EdDSA curves. - Remove out of core handler diagnostic in FIPS mode. - Check that the digest size is not zero in gcry_pk_sign_md and gcry_pk_verify_md. - Make store an s-exp with \0 is considered to be binary. - Various constant-time improvements. - Use getrandom call only when supported by the platform. - Change the default for --with-libtool-modification to never. Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit e21583896116cf37bf6b95aea466854e4fd5e54b) Signed-off-by: Steve Sakoman --- .../libgcrypt/{libgcrypt_1.10.2.bb => libgcrypt_1.10.3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/libgcrypt/{libgcrypt_1.10.2.bb => libgcrypt_1.10.3.bb} (96%) diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.10.2.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.10.3.bb similarity index 96% rename from meta/recipes-support/libgcrypt/libgcrypt_1.10.2.bb rename to meta/recipes-support/libgcrypt/libgcrypt_1.10.3.bb index 524b06ca22..1c4f4d6038 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.10.2.bb +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.10.3.bb @@ -27,7 +27,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://no-bench-slope.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "3b9c02a004b68c256add99701de00b383accccf37177e0d6c58289664cce0c03" +SRC_URI[sha256sum] = "8b0870897ac5ac67ded568dcfadf45969cfa8a6beb0fd60af2a9eadc2a3272aa" CVE_STATUS[CVE-2018-12433] = "disputed: CVE is disputed and not affecting crypto libraries for any distro." CVE_STATUS[CVE-2018-12438] = "disputed: CVE is disputed and not affecting crypto libraries for any distro." From patchwork Fri Dec 29 15:44:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37048 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 48767C4707B for ; Fri, 29 Dec 2023 15:45:48 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web11.151015.1703864742236103797 for ; Fri, 29 Dec 2023 07:45:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=1ogBepF/; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-5cdbc7bebecso2219278a12.1 for ; Fri, 29 Dec 2023 07:45:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864741; x=1704469541; 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=JW1ZhI1h7JGDyXSMw9ElEojYSjP37bCPqqyeya6mg/M=; b=1ogBepF/edKCsbd4Bv79nuo6UnUFqWy8+PLaWR4orMj5+LdvzHjtmTvrdf7tLklq8p hTE7Fc2Jf8Xz1gzSqZn9ooJwAbRcndqv7drZGycST7p6l/N1vcuN5KCejth0iNyxoqL8 EA8fuhWMniKgVxylWKROiCKkEjZWb6nVQCHHl7XZY+dRO5cZa/5+UnPUxfAtGp/P7Yud d00DBcJ87P5XUdUZuPxsN+1mIfvTn01teQvVARQAuCw/6suynar4vZlbt9hLlcwiuD7Q e0/vLUl8QP85ExVZvSNckc3nrQ8l198b3lDu7qAbZ/ea/oO6wS23qw/pV5pW/Wcl3qKF EVFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864741; x=1704469541; 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=JW1ZhI1h7JGDyXSMw9ElEojYSjP37bCPqqyeya6mg/M=; b=RBVfGLiDFEiFZd5Isvc764hEUVc8WNuGEm1LLXqoku+ERSEf3tlBC7iJRkd7eagV9R j0TnxW6RvV6XPVNgzWrVBmrELQFlgsEC0avPW3e1X6kWJHkcfysmZorLFtLzsBaqix6O KoyXllBGLXxQn9cprrvtDnQMI8BjeaIDZk8f9+50F6fY2pwKYexxF2MJaqGW76MsCqc2 xgzeU2koDxiPTotK6LSftZcp6Rag1aoKgPSBJVbDU4Z7WJbw+ZlE7FdbNDLd/2o3cHIy Jh5kd4SkPovpYHNQZT4lO95hWaqZPfzSI8NNZb05tFz5zEtCT0ERIbWXcirkqgK+LVb1 31Jw== X-Gm-Message-State: AOJu0YzSrfLZvU2I6H6ILS+LJ2yNHJ82p7MprBNPK5zL7SjJmYZMjvAk wtQLthi0O3x9LDRTDJDekhlwdS41iV/fRKAGL7vC2v6nocNMxQ== X-Google-Smtp-Source: AGHT+IHLvo4n3jRrOJJlvhjrVYQ/g6Fn81N0XUQ2xaqz/hWpWdlmv3x0k3v4kD7ui2p37Wlr5pfboA== X-Received: by 2002:a17:903:1248:b0:1d4:9ac9:eac2 with SMTP id u8-20020a170903124800b001d49ac9eac2mr891077plh.28.1703864741383; Fri, 29 Dec 2023 07:45:41 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:41 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 20/41] libxslt: upgrade 1.1.38 -> 1.1.39 Date: Fri, 29 Dec 2023 05:44:34 -1000 Message-Id: <7828e780813857a6667cb07472a0371823781e9b.1703864512.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 ; Fri, 29 Dec 2023 15:45:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193037 From: Wang Mingyu Changelog: =========== - extensions: Don't search imports for extension prefixes - transform: Check maximum depth when processing default templates - build: Add more missing includes - python: Don't set deprecated global - build: Add missing includes - imports: Limit nesting depth - extensions: Report top-level elements in xsltDebugDumpExtensions - Add extern "C" { } block to xsltlocale.h - python: Make it compatible with python3.12 - date: Fix check for localtime_s - date: Fix check for gmtime_s - pkg-config files include cflags for static builds - Handle NOCONFIG case when setting locations from CMake target properties - autotools: Make xslt-config executable - tests: Structured error handler now passes a const xmlError - python: Fix tests on MinGW - fuzz: Fix xmlFuzzEntityLoader after recent libxml2 changes Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit 48b353f3fb8e5ab1853cba7faa3065d2fe6f36b4) Signed-off-by: Steve Sakoman --- .../libxslt/{libxslt_1.1.38.bb => libxslt_1.1.39.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/libxslt/{libxslt_1.1.38.bb => libxslt_1.1.39.bb} (95%) diff --git a/meta/recipes-support/libxslt/libxslt_1.1.38.bb b/meta/recipes-support/libxslt/libxslt_1.1.39.bb similarity index 95% rename from meta/recipes-support/libxslt/libxslt_1.1.38.bb rename to meta/recipes-support/libxslt/libxslt_1.1.39.bb index ed5b15badd..2cc0c84bec 100644 --- a/meta/recipes-support/libxslt/libxslt_1.1.38.bb +++ b/meta/recipes-support/libxslt/libxslt_1.1.39.bb @@ -15,7 +15,7 @@ DEPENDS = "libxml2" SRC_URI = "https://download.gnome.org/sources/libxslt/1.1/libxslt-${PV}.tar.xz" -SRC_URI[sha256sum] = "1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1" +SRC_URI[sha256sum] = "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0" UPSTREAM_CHECK_REGEX = "libxslt-(?P\d+(\.\d+)+)\.tar" From patchwork Fri Dec 29 15:44:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37051 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 5586DC47079 for ; Fri, 29 Dec 2023 15:45:48 +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.web11.151016.1703864744311759978 for ; Fri, 29 Dec 2023 07:45:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=po+xJm7J; 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-6d9c2db82b0so1297419b3a.1 for ; Fri, 29 Dec 2023 07:45:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864743; x=1704469543; 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=wBJ6JXYoCtPrHO4pbc8Darct6nB9tN+hwo5p7sAn68c=; b=po+xJm7JnsbiEtqlgdir+LF4jM+UPUwgVCZfXjm7Xbk4vQelJlKyZizoa5UUyPaU9h JNtwjkKW4jVYnutlnA06bQEGqP/8+L8v7IMk1LLARVolD3NgzsPhwDaJnrmgKRNiG23/ vy1UpOVb7ebSrTW2P5quZXPwM74wr2QjHCFmL0giSDkUxBZdp4Q2LUQ1pbNMnMVaE4OC zi/7yelyHKPGFoSbJi4FJc9wU5nxI2K4Rnu0faBUQeqbEtMe+TQBD44f6UcvTmu4wEjq 5ZBjkRQSKMqOyq+ru7nvIShyfN4eFZu010arJDQbtJBs1iECdjjQ/TEhTsOwzjptvjLm AaAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864743; x=1704469543; 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=wBJ6JXYoCtPrHO4pbc8Darct6nB9tN+hwo5p7sAn68c=; b=AbOg616JDZzAXVUOzWXf+iCFJ5wHkPjOTXZGw39pxgcW6g+SA85/Nf5LLxC5OX7EYW tl5yvGThPFU07FR6EIf1aqi7xOGIUHANHgSmRxj3vySyWSa0UbT2Pxis7duNpPYerug1 QuNtt1SBsQb7LCujv5hTcJzEBNEuBH5nk9Zr8xzPpUvR2uZGrXI1AqnZTYu2SSy54m6A rEg4I5q7oKkhmmRRojm8I3gdWZI7tnZRcSSoi+x4zqDpRewxnRTesOALltgYYYZYXeI+ fiBzTRZDtLAEKH+IWzy52ocz3yhdERBPn++5iXHKORh7cuxWC60Z8i+u0dswgHsPRjlt BURg== X-Gm-Message-State: AOJu0YyUlJUMv6Eus0BHjaCG6/i7W/bdAmsWC1WydzEsd80WwPv4W6Pv 8jpCaedfLhsurbzllfIDBvAWPxZU9xi+mg9+xJY9G4OVhRd+qg== X-Google-Smtp-Source: AGHT+IHv8IfDI03FKvjnrupX2bv8BN6kQxCvgtfjgT6mc33K2+Abt7M40epQRyO0URn/t0JlGvFHQA== X-Received: by 2002:a05:6a20:54a4:b0:196:5628:f17 with SMTP id i36-20020a056a2054a400b0019656280f17mr1458770pzk.37.1703864743049; Fri, 29 Dec 2023 07:45:43 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:42 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 21/41] log4cplus: upgrade 2.1.0 -> 2.1.1 Date: Fri, 29 Dec 2023 05:44:35 -1000 Message-Id: <067023cd723a9056c5c15a37d20e3b12d4b2cf02.1703864512.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 ; Fri, 29 Dec 2023 15:45:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193038 From: Wang Mingyu Changelog: =========== -Add missing source files to MSVC project files. -Resolve environment variables in include directive in configuration file. Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit 33d49b14609d9b92a7c23d79f1bdfca79a5d8197) Signed-off-by: Steve Sakoman --- .../log4cplus/{log4cplus_2.1.0.bb => log4cplus_2.1.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/log4cplus/{log4cplus_2.1.0.bb => log4cplus_2.1.1.bb} (90%) diff --git a/meta/recipes-devtools/log4cplus/log4cplus_2.1.0.bb b/meta/recipes-devtools/log4cplus/log4cplus_2.1.1.bb similarity index 90% rename from meta/recipes-devtools/log4cplus/log4cplus_2.1.0.bb rename to meta/recipes-devtools/log4cplus/log4cplus_2.1.1.bb index e0c16d2e73..be3c787ab2 100644 --- a/meta/recipes-devtools/log4cplus/log4cplus_2.1.0.bb +++ b/meta/recipes-devtools/log4cplus/log4cplus_2.1.1.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=41e8e060c26822886b592ab4765c756b" SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-stable/${PV}/${BP}.tar.gz \ " -SRC_URI[sha256sum] = "2a8eb99d71b0680c0520c7c16248cdb4195da82f396b79fea30b0d9e289c8c72" +SRC_URI[sha256sum] = "42dc435928917fd2f847046c4a0c6086b2af23664d198c7fc1b982c0bfe600c1" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/log4cplus/files/log4cplus-stable/" UPSTREAM_CHECK_REGEX = "log4cplus-stable/(?P\d+(\.\d+)+)/" From patchwork Fri Dec 29 15:44:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37049 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 3AD97C47077 for ; Fri, 29 Dec 2023 15:45:48 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web10.151525.1703864745652064416 for ; Fri, 29 Dec 2023 07:45:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=gZj8d3v2; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1d426ad4433so24165305ad.0 for ; Fri, 29 Dec 2023 07:45:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864745; x=1704469545; 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=sw8Q9x0wC6lJb7jMwAzAq7kcIqWEftYGUk+eOorTtK4=; b=gZj8d3v2PV2Yacmmvs/WHByi5HFH++sGGCvnu2rjyRQkiCqLlbpQXToJKaCUgQDcDU tkEhsJBb9ZDIUpFnNJp2bejJIi89GKLxFSSXWR2+a6rIVvtt83DWatqwmZY5w8B3XZBf CHslm4NHRZOd85o8Zn4LkrcxV9ibsb05Vm3IkR9i3ZWEZc4Uo6+YomrGfumXPat0ua3e oZkMCwO5Skiw3aFLFIc6zZ0RK+VYCw+8RB7GnmJKsO0/3vcwK0twjgoNmaY8vrKRX4qr LwVq+2uvipzO66i20gGolKDSxS1LEeESHTEISg31kOkrN8bdz0A89JYNwXde9OV1l2Na I46g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864745; x=1704469545; 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=sw8Q9x0wC6lJb7jMwAzAq7kcIqWEftYGUk+eOorTtK4=; b=lRwwg9ieoaTa7XU854YyeaIwA3c1O0KJD5MBb1k3IL/O5MJ8mBdTl6dMeHZ5fEuIqi LVdnF4pIDzcRyW79jmCylaiCCngZZjbla52IUcHv48tapU6ougBjUtSPBXguTf71dAXo oNg4Fjpg1j6yDujOAZawzitwkTZ3xTIVBQPAjfSW358mXJ9s8sqqOWZAoQew5PPp54cj cwa5xJuM+TFUzS7+PGKZIOASw2d2VLkBOctKARA6CfcLeg3YzR1GT0TgvPcMsdS8BVn8 zuCsdEIu781tW4JIZIQ5UK2MfKUq9jpkJgj7KpZffhyvjQi4mq0qIi+R+xRS7JD25bJ3 lLMA== X-Gm-Message-State: AOJu0Yym8vwDmYeJkR0oVcP3zjcD59knx+/3rlsHmjW8carBmveB34DN Uwoxwzafdx09JKszEKsJMpVWIcDFVwn+t+4MS1U3C8Od/sARGA== X-Google-Smtp-Source: AGHT+IGyX4LqLu1mgK0fhT756Q2zdBVzUcmD/1SnMEKNL1cupzM8l29+zjF72uu+rY/wl0bQ4szfaA== X-Received: by 2002:a17:902:ec92:b0:1d4:94f6:56e0 with SMTP id x18-20020a170902ec9200b001d494f656e0mr1794637plg.41.1703864744793; Fri, 29 Dec 2023 07:45:44 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:44 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 22/41] cmake: upgrade 3.27.5 -> 3.27.7 Date: Fri, 29 Dec 2023 05:44:36 -1000 Message-Id: <3f3f3118dd6976259e8d971ebf76f2eeaf96f930.1703864512.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 ; Fri, 29 Dec 2023 15:45:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193039 From: Alexander Kanavin Changes made since CMake 3.27.6: Brad King (6): Android: Require Clang 18 for -std=c++23 Tests: Clarify RunCMake.CTestTimeout case name ctest: Restore support for --timeout values higher than default test timeout Help: Document CMP0124 behavior on already-set variables FindPostgreSQL: Add support for version 16 CMake 3.27.7 Orkun Tokdemir (1): Linting: Fix empty evaluated genex Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit 0faec0c8606b31216702252d0db7aa88388df231) Signed-off-by: Steve Sakoman --- .../cmake/{cmake-native_3.27.5.bb => cmake-native_3.27.7.bb} | 0 meta/recipes-devtools/cmake/cmake.inc | 2 +- .../recipes-devtools/cmake/{cmake_3.27.5.bb => cmake_3.27.7.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/cmake/{cmake-native_3.27.5.bb => cmake-native_3.27.7.bb} (100%) rename meta/recipes-devtools/cmake/{cmake_3.27.5.bb => cmake_3.27.7.bb} (100%) diff --git a/meta/recipes-devtools/cmake/cmake-native_3.27.5.bb b/meta/recipes-devtools/cmake/cmake-native_3.27.7.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake-native_3.27.5.bb rename to meta/recipes-devtools/cmake/cmake-native_3.27.7.bb diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index ef4eec5ab1..ecb0e487df 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "5175e8fe1ca9b1dd09090130db7201968bcce1595971ff9e9998c2f0765004c9" +SRC_URI[sha256sum] = "08f71a106036bf051f692760ef9558c0577c42ac39e96ba097e7662bd4158d8e" UPSTREAM_CHECK_REGEX = "cmake-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/cmake/cmake_3.27.5.bb b/meta/recipes-devtools/cmake/cmake_3.27.7.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake_3.27.5.bb rename to meta/recipes-devtools/cmake/cmake_3.27.7.bb From patchwork Fri Dec 29 15:44:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37046 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 31A6CC47073 for ; Fri, 29 Dec 2023 15:45:48 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web11.151021.1703864747323059646 for ; Fri, 29 Dec 2023 07:45:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=MWku5JBI; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-5c6ce4dffb5so2145491a12.0 for ; Fri, 29 Dec 2023 07:45:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864746; x=1704469546; 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=IQAX+AmuNHk8RJ/21ObIDaUxsxq4EKCT96HhI858r4g=; b=MWku5JBIzYJJpTkpOjcaw3L1I66c5kD9aPflq3/3OfdHu1xL94ZkNUUhOEDCUzA3bJ PKvOnbUu5MR0tiQC4ZcHWhpGiLtoEhdj2mnaHVXX2EQdq/Gs+4nbWZ2r1lk9VHkXPS6e Up+LKl/EG7OcyX2m4SV3lzRAkryWokXtQN61O4yp2nfIXjzJGVTkSz84Vi3wvXNopQiT UdEJLbUpPq78c4LCQGf9n2U3W+iYnd1x30fwxR3k7O5S4Z+UFvyyqvR73cf4H7MUrPuF 3k5wLHVZK/559v8ZZcdjR7Y9eVkbtmH8A8HhICHVt//u0HWH+b5L3GOXL03VmMncWoP4 04wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864746; x=1704469546; 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=IQAX+AmuNHk8RJ/21ObIDaUxsxq4EKCT96HhI858r4g=; b=jl/eag0cjpXuUqVrBTrm6obi0JGtZM0sFFrJyWcIxj5ptRLSGJVwmjBx4417oFl6Tt 3huQbDpGJNgmUE/v88qwaGBKLCut3oM3QLDPnJpulIfH8OoJZ197yI2OXOAcavlGOU18 qYcBVK0pZZlLHyGVAcOC1Mdxzqd7UH7N8TNU42+OiEAp4+ZMjGyrxhiMq4b+dobe3C8/ 99VBpAZDDfRbRYnkJM+88iZzux+C3umjuCplCMHosQpEoVUKE/t2s650BBT+Na1t4Q7B vCTAsLNeWwlUrbS9RA7bONgpTvQ6jQFhe8x82Sn5zvESgZnnhgJ4AjNx9sWBqVSndZg1 rTVg== X-Gm-Message-State: AOJu0Yz6KC7Hv4Xfs2EEGLHmoCoi7A4zNheVCgJcWfbJa6SjtyO/C9gV 0DZM3bCKFj0vMpnoSBPPGlT4LpBb+Tp9oEP9xkhqAP64ZFo9kw== X-Google-Smtp-Source: AGHT+IGbW0KxMmd0YFfppy0oNQydpbfscjTaM6BDuv24dCVdkJTJitsPJUvQedW0dvWvMYTJBUjhdQ== X-Received: by 2002:a17:902:fe01:b0:1d4:3132:bf13 with SMTP id g1-20020a170902fe0100b001d43132bf13mr4597280plj.16.1703864746489; Fri, 29 Dec 2023 07:45:46 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:46 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 23/41] systemd: update LICENSE statement Date: Fri, 29 Dec 2023 05:44:37 -1000 Message-Id: <2c65ec32ce3c4a74b7117588151a94a4c6e506a6.1703864512.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 ; Fri, 29 Dec 2023 15:45:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193040 From: Massimiliano Minella As stated in the LICENSES/README.md "Unless otherwise noted, the systemd project sources are licensed under the terms and conditions of the GNU Lesser General Public License v2.1 or later", so replace LGPL-2.1-only with LGPL-2.1-or-later. With the exception of some udev sources that are licensed under GPL-2.0-or-later (but are packaged separately), the project is licensed under LGPL, and all the components are LGPL or under LGPL compatible licenses. The package libsystemd is currently under the main package license, which can cause problems when scanning for GPL software linked to CLOSED one. Add more granularity by setting a license for libsystemd to LGPL-2.1-or-later. Signed-off-by: Massimiliano Minella Signed-off-by: Richard Purdie (cherry picked from commit 54975f4b2184fe12c4995c289eba8358958e6c21) Signed-off-by: Steve Sakoman --- meta/recipes-core/systemd/systemd.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 3ba0b5ffc5..ccc3236457 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -10,7 +10,8 @@ state, maintains mount and automount points and implements an \ elaborate transactional dependency-based service control logic. It can \ work as a drop-in replacement for sysvinit." -LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LICENSE = "GPL-2.0-only & LGPL-2.1-or-later" +LICENSE:libsystemd = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" From patchwork Fri Dec 29 15:44:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37052 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 4DBDCC47073 for ; Fri, 29 Dec 2023 15:45:58 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web11.151023.1703864748981171536 for ; Fri, 29 Dec 2023 07:45:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=gbe+T6u7; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-28caeaad2d8so422250a91.0 for ; Fri, 29 Dec 2023 07:45:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864748; x=1704469548; 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=mhr5KPPB+etvlqj+SgL6ehzUJ+uhE52hSKvRkS+6U1M=; b=gbe+T6u7iuX24DW3iv6pW/qx8rDKo12rKqBkiIURSk1qnfhgQVIJBNaYmgUkaexqd8 J5wxEmSaw+ziuJY/pkNl6eCA3bI4o7zNAVKWZcgNEcGVVg9Z3YmuKSrIKvRHmJPBLSLf 2ZQAu1/f2pdke7qBDddJISpHn65JPUqbzOIBOw9hPF/ORjBfjxOJ66F4N0fuf4EtFp38 mhkktEwrrd3RP9qdB1RvEc7Etqd2ZCx4DvJv0fNmfXcdMGlq2WDWmzzqyFXf6p+NyL6b 0D4R9UQbqxGm9ncc+96fUwk/XPOHLSYL1qALkdjssyYseOEnVh8hMXgeBlRNrmEqy2GE YO1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864748; x=1704469548; 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=mhr5KPPB+etvlqj+SgL6ehzUJ+uhE52hSKvRkS+6U1M=; b=e1GNbN2vFwlXdS8sQEO4jwG+RyHfD2rMgZ5vSB8GQqAnqLgH7x4zR+D5tADmM3ZpoA dgz2vvFajEeWfi3ZG5SQQpu+j4yqh8eQQK2bk+0HFwnLJvH/VQQWZU8NPwA5HtFvB3o9 cQlNsFxJGcKiVPoWBqfkjx0IPPo63OnpccwBulJGBAC+9SMsZRgeR4sPR1rjKx5Gk6pO UnTysjZdm1ZdJ9ewZxzQ+FIbWg5eq0fvKsYPB6IW8PYjqca3uqTcczW9FEBKEwjoauZ3 0WjPkYS3aDeLA3caL1McbAu+8W144EALDgdZmmbYIlFTrl441jq10cFaN5mQ5xeX1Pxw Ox+g== X-Gm-Message-State: AOJu0YwQ6XwFn+PtGOnN9D3s4xksRRL7pd5JJpkeMqxZcKbCWDeP70YY DJBdhmTWMeBZAp19yXTjts1KBusM6IQLKCxUAGvRTFZ8faimJg== X-Google-Smtp-Source: AGHT+IGPpWb/SGg9RZvPGAWzZUHwMe57gGtiG7cXiH2A+EY5OLMbbcBDcpDYE98FBhjoD1Y+/79Zvw== X-Received: by 2002:a17:902:bb17:b0:1d3:f5a6:7d4f with SMTP id im23-20020a170902bb1700b001d3f5a67d4fmr5032903plb.110.1703864748183; Fri, 29 Dec 2023 07:45:48 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:47 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 24/41] sed -i destroys symlinks Date: Fri, 29 Dec 2023 05:44:38 -1000 Message-Id: <7b4343a30a02d8f8664ac4c4bc09e5acfb4fa60e.1703864512.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 ; Fri, 29 Dec 2023 15:45:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193041 From: Joakim Tjernlund If /etc/passwd is a symlink, sed -i on same file will replace the symlink with a new file. Prevent that by adding --follow-symlinks option to sed Signed-off-by: Joakim Tjernlund Signed-off-by: Alexandre Belloni (cherry picked from commit 6ec004b2e7b4342465af8e5e6cc66041834821a0) Signed-off-by: Steve Sakoman --- meta/classes-recipe/rootfs-postcommands.bbclass | 4 ++-- meta/classes/useradd_base.bbclass | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes-recipe/rootfs-postcommands.bbclass b/meta/classes-recipe/rootfs-postcommands.bbclass index 06388b72fb..29ee74932a 100644 --- a/meta/classes-recipe/rootfs-postcommands.bbclass +++ b/meta/classes-recipe/rootfs-postcommands.bbclass @@ -241,10 +241,10 @@ read_only_rootfs_hook () { # zap_empty_root_password () { if [ -e ${IMAGE_ROOTFS}/etc/shadow ]; then - sed -i 's%^root::%root:*:%' ${IMAGE_ROOTFS}/etc/shadow + sed --follow-symlinks -i 's%^root::%root:*:%' ${IMAGE_ROOTFS}/etc/shadow fi if [ -e ${IMAGE_ROOTFS}/etc/passwd ]; then - sed -i 's%^root::%root:*:%' ${IMAGE_ROOTFS}/etc/passwd + sed --follow-symlinks -i 's%^root::%root:*:%' ${IMAGE_ROOTFS}/etc/passwd fi } diff --git a/meta/classes/useradd_base.bbclass b/meta/classes/useradd_base.bbclass index 863cb7b76c..f1a7a9695d 100644 --- a/meta/classes/useradd_base.bbclass +++ b/meta/classes/useradd_base.bbclass @@ -160,7 +160,7 @@ perform_passwd_expire () { local username=`echo "$opts" | awk '{ print $NF }'` local user_exists="`grep "^$username:" $rootdir/etc/passwd || true`" if test "x$user_exists" != "x"; then - eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO sed -i \''s/^\('$username':[^:]*\):[^:]*:/\1:0:/'\' $rootdir/etc/shadow \" || true + eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO sed -follow-symlinks -i \''s/^\('$username':[^:]*\):[^:]*:/\1:0:/'\' $rootdir/etc/shadow \" || true local passwd_lastchanged="`grep "^$username:" $rootdir/etc/shadow | cut -d: -f3`" if test "x$passwd_lastchanged" != "x0"; then bbfatal "${PN}: passwd --expire operation did not succeed." From patchwork Fri Dec 29 15:44:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37056 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 58E2FC47079 for ; Fri, 29 Dec 2023 15:45:58 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web10.151528.1703864750835677172 for ; Fri, 29 Dec 2023 07:45:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=pJkAa5Kt; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1d4006b2566so31003415ad.0 for ; Fri, 29 Dec 2023 07:45:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864750; x=1704469550; 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=1EPWOKcutEkdsT/y4k3WVAV42OKnFfWqHjGQOJ2uZ+8=; b=pJkAa5KtBBPgDL7jEFTzFKADMF9+IKQU50S6M9rbn4jo1VjRs0iZ3ARt+RoXQuJKBR y73L+SzUTsyUhu5rjCCUIvzIoUoiWMoictzYGGk+XwnYw5a4S3Cel8V6LOIjKESVbDY7 KiNWMde18ty0uKmnOCNEzwLa5BU1xLzj5NU9aFKRXMb7NUpd5YWpC7v+rvyZm5gu+MrK mYD7I/4FqVzaBOfJqdDVqO4zi8DSnfZcLHlDVholmmX+N22JWRgyrQgIjvG1RDE4znrf S38US4fYxRgKdmL1f11xJhChwpM7Q4MF5EZ9CUCg2lIpfIzCebL2wLy/faXGNMJxYvZq CmWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864750; x=1704469550; 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=1EPWOKcutEkdsT/y4k3WVAV42OKnFfWqHjGQOJ2uZ+8=; b=FDm7Q8jAYXWsCLYYIznWwv6fh/o4p36w4xlWomPQvIlxuRmXUCk9wsyJB2+aA8WJB7 vOu6iNhrQKSwcxKqdNRxoydSt9pRQXoaxWYDyknuNrGfab+dzMvHvpndpnZ6BW2Yw2un Q25aE/M+pW1UnpabTWTS9q0cCp8OdyYmnyctW63xHzUV7NyEqIo41BGy6Vx40ghuvSTP WPv1QVlmoOd17A6WjYGktHz4etYFF+ZeAHVGCL7s8D6I71qqQG7iovkAyXGRxuBvWtZg zRstnss7uCPBcODsn643litBmq1IvMM2udmIOngZ50nYUvM7QKYvgaH2XUH2a847IfD0 qAqg== X-Gm-Message-State: AOJu0Yw+tCj09fzMkVeMXzyG2hjFr/kw21CNOxTEa//uLUideNvDrCLz XsnKIPeJD29bAdhbB5ger/xzapSEVqpG8ak6YQBoozVQNRoAzw== X-Google-Smtp-Source: AGHT+IFEapGX0iTYz58qSV5jTFz3ouNpZlpdII8PnaePwKA8Ul0PegarEO/l0jngSPpRR6X9KriCeg== X-Received: by 2002:a17:903:2b07:b0:1d4:6484:f184 with SMTP id mc7-20020a1709032b0700b001d46484f184mr3960383plb.125.1703864750007; Fri, 29 Dec 2023 07:45:50 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:49 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 25/41] gtk: Add rdepend on printbackend for cups Date: Fri, 29 Dec 2023 05:44:39 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Dec 2023 15:45:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193042 From: Markus Volk install the required printbackends Signed-off-by: Markus Volk Signed-off-by: Alexandre Belloni (cherry picked from commit 0a97892920db46043102d54ef1623669241e9780) Signed-off-by: Steve Sakoman --- meta/recipes-gnome/gtk+/gtk+3.inc | 2 +- meta/recipes-gnome/gtk+/gtk4_4.12.3.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index 8d01e6077f..4a04c06432 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc @@ -41,7 +41,7 @@ PACKAGECONFIG[x11] = "-Dx11_backend=true,-Dx11_backend=false,at-spi2-atk fontcon # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build PACKAGECONFIG[opengl] = "-Dopengl=true,-Dopengl=false,libepoxy" PACKAGECONFIG[wayland] = "-Dwayland_backend=true,-Dwayland_backend=false,wayland wayland-protocols libxkbcommon virtual/egl virtual/libgles2 wayland-native" -PACKAGECONFIG[cups] = ",,cups,cups" +PACKAGECONFIG[cups] = ",,cups,cups gtk3-printbackend-cups" PACKAGECONFIG[colord] = "-Dcolord=yes,-Dcolord=no,colord" PACKAGECONFIG[cloudproviders] = "-Dcloudproviders=true,-Dcloudproviders=false,libcloudproviders" PACKAGECONFIG[tracker3] = "-Dtracker3=true,-Dtracker3=false,tracker,tracker-miners" diff --git a/meta/recipes-gnome/gtk+/gtk4_4.12.3.bb b/meta/recipes-gnome/gtk+/gtk4_4.12.3.bb index a547db8376..001b06934e 100644 --- a/meta/recipes-gnome/gtk+/gtk4_4.12.3.bb +++ b/meta/recipes-gnome/gtk+/gtk4_4.12.3.bb @@ -66,7 +66,7 @@ PACKAGECONFIG:class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d) PACKAGECONFIG[x11] = "-Dx11-backend=true,-Dx11-backend=false,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes xinerama" PACKAGECONFIG[wayland] = "-Dwayland-backend=true,-Dwayland-backend=false,wayland wayland-protocols virtual/egl virtual/libgles2 wayland-native" PACKAGECONFIG[cloudproviders] = "-Dcloudproviders=enabled,-Dcloudproviders=disabled,libcloudproviders" -PACKAGECONFIG[cups] = "-Dprint-cups=enabled,-Dprint-cups=disabled,cups,cups" +PACKAGECONFIG[cups] = "-Dprint-cups=enabled,-Dprint-cups=disabled,cups,cups gtk4-printbackend-cups" PACKAGECONFIG[colord] = "-Dcolord=enabled,-Dcolord=disabled,colord" PACKAGECONFIG[iso-codes] = ",,iso-codes,iso-codes" PACKAGECONFIG[ffmpeg] = "-Dmedia-ffmpeg=enabled,-Dmedia-ffmpeg=disabled,ffmpeg" From patchwork Fri Dec 29 15:44:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37054 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 651BDC4707B for ; Fri, 29 Dec 2023 15:45:58 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web11.151026.1703864752559275420 for ; Fri, 29 Dec 2023 07:45:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=sUCU19Ov; spf=softfail (domain: sakoman.com, ip: 209.85.214.172, mailfrom: steve@sakoman.com) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1d41bb4da91so20482705ad.0 for ; Fri, 29 Dec 2023 07:45:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864752; x=1704469552; 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=6STXqr9iHvIrZrzkNoIjWH3+KkBRWb4K/IrG+cvBPTE=; b=sUCU19Ov2YMcCy1wL+RrP2ul7NYl1WVQkpaELA0lvHvvBeXuFyC4FqE9tTop2MOSDW 0EbJXuvXH+49NAAiGdLidbgQ8A8MHwdi0xSD1Tr6ojK1D8UAEiQgOCEeaykkFhDKAyDZ bFkqzXIRKXXZRZRmhuKRltjfQO3TkoaCZLm6mf1sZ0Ly8cEzWvxqfYMtxa14SHtV1srB H6PVXnZ2XhKcfCVK6cwtmIAw1vpIefLanRKkKpi28LB2iCcO2dK/G/4NnMc0b41GHtUC vKl4lnppmdwbhABhOghgnUBqEvYfh1hadbBPwrdmH/qfXaAcRblo7pGtQ+Y8P2mXOe4+ RDFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864752; x=1704469552; 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=6STXqr9iHvIrZrzkNoIjWH3+KkBRWb4K/IrG+cvBPTE=; b=icU1o1jlA2FH851JClw0Q24vsVQkVds635A7bvYtEZvHBvAceXWbOvYxWPAMue1SLk NJdZMN6jZFOAXsLii7kX9fjRB3Um3Ta98y5uO6eGsmkh/sENEEMQilFB33yhJmiWvIep LmJYDG+VbF9kJTCa7R6q/oTPKr/IMYfCnt4Cy+4G0cmT9R1vgbtoAIXIUIcH1nDEFEfh 0FajBQ/CqxJCpxVDV/m84oUhmlDr1xgd5v7eOUvMXVBOTqBVj+8u0fv9mxwmxKnTpHgs 7MGaLhRG77CaEBmycHh9ZKZaNgbqrAtZZwrEjKH8mUUFRh9ji+qdSwScz+IDVtnNqedV b6QA== X-Gm-Message-State: AOJu0Yw1H2eePPqqQqSofC1RJ+MKinGjNYFuwk4yOs/EDhaU6+plBKq9 ws6xKZKLKJtATGrJIOxLANnbmeS1v68Dx5HKcvxHG52J3T8Myw== X-Google-Smtp-Source: AGHT+IFPn5gSP/2UPGh2bM078CgFttn7DxSRG+oYiH6q+S26Rgr975TDdlTX5IAqzht5APrUsudPhw== X-Received: by 2002:a17:902:d503:b0:1d4:46ff:f421 with SMTP id b3-20020a170902d50300b001d446fff421mr4388088plg.122.1703864751766; Fri, 29 Dec 2023 07:45:51 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:51 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 26/41] useradd_base: Fix sed command line for passwd-expire Date: Fri, 29 Dec 2023 05:44:40 -1000 Message-Id: <67721b71bf677097645b9150a31ac833125c0c23.1703864512.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 ; Fri, 29 Dec 2023 15:45:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193043 From: Adam Johnston A previous commit tried to add the --follow-symlinks option to the perform_passwd_expire function in useradd_base.bbclass, however it used a single -. This is interpreted as --file=ollow-symlinks which results in... sed: couldn't open file ollow-symlinks: No such file or directory and... ERROR: : passwd --expire operation did not succeed. Fix by adding the missing - Signed-off-by: Adam Johnston Signed-off-by: Richard Purdie (cherry picked from commit 3c0deafcfcea3f610c7dd9a2d2884a16fbfe0497) Signed-off-by: Steve Sakoman --- meta/classes/useradd_base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/useradd_base.bbclass b/meta/classes/useradd_base.bbclass index f1a7a9695d..5e1c699118 100644 --- a/meta/classes/useradd_base.bbclass +++ b/meta/classes/useradd_base.bbclass @@ -160,7 +160,7 @@ perform_passwd_expire () { local username=`echo "$opts" | awk '{ print $NF }'` local user_exists="`grep "^$username:" $rootdir/etc/passwd || true`" if test "x$user_exists" != "x"; then - eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO sed -follow-symlinks -i \''s/^\('$username':[^:]*\):[^:]*:/\1:0:/'\' $rootdir/etc/shadow \" || true + eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO sed --follow-symlinks -i \''s/^\('$username':[^:]*\):[^:]*:/\1:0:/'\' $rootdir/etc/shadow \" || true local passwd_lastchanged="`grep "^$username:" $rootdir/etc/shadow | cut -d: -f3`" if test "x$passwd_lastchanged" != "x0"; then bbfatal "${PN}: passwd --expire operation did not succeed." From patchwork Fri Dec 29 15:44:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37057 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 70197C4707C for ; Fri, 29 Dec 2023 15:45:58 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web10.151532.1703864754665873729 for ; Fri, 29 Dec 2023 07:45:54 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=zb7jcjMh; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1d3eb299e2eso33039875ad.2 for ; Fri, 29 Dec 2023 07:45:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864753; x=1704469553; 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=u4+/vtyaluaU0GbvUa7OSACFq3E5sp7wISPLd61ODu4=; b=zb7jcjMh9e2I2KvHqs+6bc6N+QXm/6MVWNrkxzQpn1EpQPgVVjofIcxHwMFXLTxx/d gQSB7AujKjJcUGFIIi20Ozu3zx3ZuMOS9FPAmIfz5nQbpV9jAdxiQEvssCwSywUUPObF 4pwEgU5WyocfTZZWUYywcNzRvg+ACUA8kmKgYylZnKaLS9DdiHlEGIqxy4w0aG1ohH16 foZkh7grpI5VJPM1D/pBWVp+WKlg4vKdN7mk0+HcTiMOcVI6WrXhfSVd8ZJKj6EDwBC/ WrMsfpLk4pqOCoV4VG6Of65rjn0GUKtHF4qG72KIy6nozOR1fzuKPW5UnwT/74U3bjKw g9hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864753; x=1704469553; 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=u4+/vtyaluaU0GbvUa7OSACFq3E5sp7wISPLd61ODu4=; b=GI5u3iKKq0rVijAHoRLo/OqgjNyCz0urZcNoxBWx7fZ1qEIEtI7rHxTPGBcozfw+1G iCbRLl9beEi57h6zAZuB0bHpy3M+3rTHwVqzKBILJvRZjLWaIkOxwKZJUl6sl3Giox2j GqARmaFCTMmbgBYCgMh17Vh8hhAPVRtXE8Q4GKvPO75T3xYQXtIUsIsfEq6+SRxC8RnB 9YiGY2rEWSQ26Hdjf/+vLhSyhNb8+Rlo1UfW9YiZeMxZiDGn2TMg8ocA6PfraDHi3riY uaHUiAy9Msv7wvY/Lzb++l6C6IzuUOvrPX+44rDg+noaw0r5dkJf0C+OCUQNxdmptGKt /l7g== X-Gm-Message-State: AOJu0YwkLOrVsGmFWrWmN8N6LaSKg6NySayjyVmgftb5KcjuoLEZyeUK 2tJ7RVCH4OsdJqZmMiscIdDZ2Dg6inrEQnTymTOGWC/f/iYY0A== X-Google-Smtp-Source: AGHT+IGseUtvOAux5Qjp9Os5plgX8ezNi/BIOnEJNl89yp19UOlZk6/VMI6qGxBise+0utL9Bvk0PQ== X-Received: by 2002:a17:903:2443:b0:1d4:2b4a:5f1b with SMTP id l3-20020a170903244300b001d42b4a5f1bmr6152870pls.132.1703864753465; Fri, 29 Dec 2023 07:45:53 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:53 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 27/41] lib/oe/patch: ensure os.chdir restoring always happens Date: Fri, 29 Dec 2023 05:44:41 -1000 Message-Id: <1680d1766445b21e35c6b874c4767b385862017f.1703864512.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 ; Fri, 29 Dec 2023 15:45:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193044 From: Ross Burton If we chdir(), do the chdir back to the original directory in a finally block so they always run. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit cdc40292818683b6df1c814498c7589450a163fa) Signed-off-by: Steve Sakoman --- meta/lib/oe/patch.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index ff9afc9df9..9b480b2b28 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -772,8 +772,9 @@ class NOOPResolver(Resolver): self.patchset.Push() except Exception: import sys - os.chdir(olddir) raise + finally: + os.chdir(olddir) # Patch resolver which relies on the user doing all the work involved in the # resolution, with the exception of refreshing the remote copy of the patch @@ -833,9 +834,9 @@ class UserResolver(Resolver): # User did not fix the problem. Abort. raise PatchError("Patch application failed, and user did not fix and refresh the patch.") except Exception: - os.chdir(olddir) raise - os.chdir(olddir) + finally: + os.chdir(olddir) def patch_path(url, fetch, workdir, expand=True): From patchwork Fri Dec 29 15:44:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37055 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 58E0CC47077 for ; Fri, 29 Dec 2023 15:45:58 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web11.151028.1703864755952998050 for ; Fri, 29 Dec 2023 07:45:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=rOttsPI6; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1d2e6e14865so33240865ad.0 for ; Fri, 29 Dec 2023 07:45:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864755; x=1704469555; 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=pBdeHcYnJPD7+XUwqe/K7JOg/XjDxZQrJMegvc2p5Vg=; b=rOttsPI62x1itQqtiN+gmGcquT1XAd1O79i+L1UljYhZJFvQbnSQYw3csWYjGCZSR4 TR2OcJ0XmQTVlOwETJY5t7Z7OUGCAx0hbZkr1mPE0RrAZFHFr3U9XZiNocI65vG0/lH1 H+9yWXZr6TsvrnBqGUlRBOai3as5X6pi0gIxgKWhebgEZtVItDBvcNIT4zn37Kh6GNN1 M8KdeBV1lDlYWIFAqgnbDeO/+laUMeQ3ygJCwP5DYveUsPk9mdXpK3g8xalGLZXb13W/ f/Xu1YoJQrp8irnVOK5D/dCbX/9ZfDkb2gX5iKsgCUUoauB3DoXzc/lQMPTaiTpMjjwf DrCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864755; x=1704469555; 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=pBdeHcYnJPD7+XUwqe/K7JOg/XjDxZQrJMegvc2p5Vg=; b=oeLbGRAIuFgHcVimm5Ri1Vw9+aq1Rpi/XmgbY0+siulG5geJgHtwlYgIK6Rm99+4/K iFvdIZPNA3lzCLtKHw2lEjbAZr/sTFdFIOgjfihd4mwc86NkGFA02/N034QQvvzH/xK7 JfeckVniavTY7P43aF65H6C7naBRN3DmQsf7q9B3JwsQmooEzG7MqI/LJUvi/8zIzXln QxBtXrXcih/wt38WsY/jpuvIuGDj7vp49Spg4/gbiwmAy3agYqIiFA81raTutoXAPVAl Ch80Myznkum9o1mZSlA55/ews1PN88UTiyQ5M75YlyvuGbXhLFd9iiAEGZHNx1woeMpa Gcbw== X-Gm-Message-State: AOJu0YzC4La8AIyU7pCHknsEX5B64aH9gWaUHnlEzV0JkuDt5wkqU+JS vo4hAFb0KIrHLSP9COxIcnaeo6hAzNJleBg87Z3Vdxha0lZ/7A== X-Google-Smtp-Source: AGHT+IHbxLZ0NlhLC/9spNvA9qPaflOat9QaM5Hf5T0gewWb8MeYRfqBPx2YFr0F+yaeCIx1G+J8Rg== X-Received: by 2002:a17:902:ecc2:b0:1d4:5fdb:59f9 with SMTP id a2-20020a170902ecc200b001d45fdb59f9mr3936272plh.127.1703864755180; Fri, 29 Dec 2023 07:45:55 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:54 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 28/41] kernel-arch: use ccache only for compiler Date: Fri, 29 Dec 2023 05:44:42 -1000 Message-Id: <4fe3ec1b7e1d034b236816166d58801a4b0e8d70.1703864512.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 ; Fri, 29 Dec 2023 15:45:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193045 From: Javier Tia Attempting to use it with other tools is not beneficial, only with the compiler. Confirmation from ccache's maintainer [1]. [1] https://github.com/ccache/ccache/discussions/1346#discussioncomment-7616180 Signed-off-by: Javier Tia Signed-off-by: Richard Purdie (cherry picked from commit 47fa8d81083f1ef594f8fe6fcab3e227e9607b3f) Signed-off-by: Steve Sakoman --- meta/classes-recipe/kernel-arch.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes-recipe/kernel-arch.bbclass b/meta/classes-recipe/kernel-arch.bbclass index 6a50bbfd42..404f2e7061 100644 --- a/meta/classes-recipe/kernel-arch.bbclass +++ b/meta/classes-recipe/kernel-arch.bbclass @@ -74,8 +74,8 @@ TARGET_STRIP_KERNEL_ARCH ?= "" HOST_STRIP_KERNEL_ARCH ?= "${TARGET_STRIP_KERNEL_ARCH}" KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_KERNEL_ARCH} -fuse-ld=bfd ${DEBUG_PREFIX_MAP} -fdebug-prefix-map=${STAGING_KERNEL_DIR}=${KERNEL_SRC_PATH} -fdebug-prefix-map=${STAGING_KERNEL_BUILDDIR}=${KERNEL_SRC_PATH}" -KERNEL_LD = "${CCACHE}${HOST_PREFIX}ld.bfd ${HOST_LD_KERNEL_ARCH}" -KERNEL_AR = "${CCACHE}${HOST_PREFIX}ar ${HOST_AR_KERNEL_ARCH}" -KERNEL_OBJCOPY = "${CCACHE}${HOST_PREFIX}objcopy ${HOST_OBJCOPY_KERNEL_ARCH}" +KERNEL_LD = "${HOST_PREFIX}ld.bfd ${HOST_LD_KERNEL_ARCH}" +KERNEL_AR = "${HOST_PREFIX}ar ${HOST_AR_KERNEL_ARCH}" +KERNEL_OBJCOPY = "${HOST_PREFIX}objcopy ${HOST_OBJCOPY_KERNEL_ARCH}" KERNEL_STRIP = "${HOST_PREFIX}strip ${HOST_STRIP_KERNEL_ARCH}" TOOLCHAIN ?= "gcc" From patchwork Fri Dec 29 15:44:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37053 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 4DBA9C47072 for ; Fri, 29 Dec 2023 15:45:58 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web10.151534.1703864757733724419 for ; Fri, 29 Dec 2023 07:45:57 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Xl3u30QO; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1d43df785c2so14937895ad.1 for ; Fri, 29 Dec 2023 07:45:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864757; x=1704469557; 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=RvGdPLj3YvVO/df8DZlzqIqy/ILAOrSdNm4f3vgf6ZY=; b=Xl3u30QOU2kdoyM5iStcKEi9+jVNJjwWH1kF7dyCpXdpCW0bMdnf5F/RWskLv/S2Vh yFQ9KoXbRIEYMOXaKfeHC8PUaXlxhsaEvyxO1rdnj4LM8sJmWXnJ6QQsusZdLtov9zDk agr2/JygIKA47HP1kL9Mivxo7iIo4oD9HTZqBPUdOmUI35VxzLJoMxJZyIs/D4mVplql Hi3koyPDcSS4e/ZAb0uxAFf5AXYYrbttA7FJajFZMS5z2NfDTSchG6uqHbOFLZWQZQh+ 5zQ/ecS2zx5Fmc+TaKyBaBcOD9Dzqg1bg9O66xcvaQtufB0dyYdVm0Wjwmma4H4+dsEn UoTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864757; x=1704469557; 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=RvGdPLj3YvVO/df8DZlzqIqy/ILAOrSdNm4f3vgf6ZY=; b=QAXZAOxzPYsZHk95TuWdgRBWfoV/vLfo1GoF3B4cbrxa/ZoWE18sehT1h1Jt9vxWe3 YO46udPpoHzYWdFMkkE15bEzvteLh5ZVBjolKdQC8Ch0mf6pmlc/6kKSuz1LEIMDUBJJ 3ay8S933PJ0TluCREsUN9iCFEvoHmjC3hyfRxH4UImV7ZsCSMSJfot0/9tkfpRQ2Stmy C9dQ8N4uAk/4zgsx0b1lowz4dPFTqZJtDrrN3P8F9eCYh2R69JcmSRVrGozimupU15N+ jW+w3OCLqfclR+oIrWAkPcCfLM+GrBaOZ0M8Vmmp22+zjigOKEsPmfpSxHOQlA6DBmD+ VRwA== X-Gm-Message-State: AOJu0YwzLGcYxlL1AXVjTdUb5EMpWmuHytCL+krs1JZfHkWG6+IqRBsk QrjSn6HoTGPHI54Ow81wWoArUVLWy2l5U+jePJXJzYVde+mORQ== X-Google-Smtp-Source: AGHT+IEMPS5Sn3warNQbLsetY9IL33se+AYctllJCO39JVd7BpkUdlWDjz1m3WrokNL/QR4G8LKMDg== X-Received: by 2002:a17:902:b283:b0:1d3:f345:3c05 with SMTP id u3-20020a170902b28300b001d3f3453c05mr5643193plr.72.1703864756807; Fri, 29 Dec 2023 07:45:56 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:56 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 29/41] package_ipk: Fix Source: field variable dependency Date: Fri, 29 Dec 2023 05:44:43 -1000 Message-Id: <431e6ad7c5b0af3909f5a43599764c529146e6d6.1703864512.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 ; Fri, 29 Dec 2023 15:45:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193046 From: Richard Purdie The Source: variable is generated from FILE but this is excluded from checksums normally which results in a reproduciubility issue when the filename changes. Add in a dependency by reworking the code a little to avoid this. Signed-off-by: Richard Purdie (cherry picked from commit 3ea7da76c6930031a0071069027b1d71f737fbc9) Signed-off-by: Steve Sakoman --- meta/classes-global/package_ipk.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/classes-global/package_ipk.bbclass b/meta/classes-global/package_ipk.bbclass index b4b7bc9ac2..64fa237c00 100644 --- a/meta/classes-global/package_ipk.bbclass +++ b/meta/classes-global/package_ipk.bbclass @@ -47,6 +47,10 @@ python do_package_ipk () { do_package_ipk[vardeps] += "ipk_write_pkg" do_package_ipk[vardepsexclude] = "BB_NUMBER_THREADS" +# FILE isn't included by default but we want the recipe to change if basename() changes +IPK_RECIPE_FILE = "${@os.path.basename(d.getVar('FILE'))}" +IPK_RECIPE_FILE[vardepvalue] = "${IPK_RECIPE_FILE}" + def ipk_write_pkg(pkg, d): import re, copy import subprocess @@ -62,7 +66,7 @@ def ipk_write_pkg(pkg, d): outdir = d.getVar('PKGWRITEDIRIPK') pkgdest = d.getVar('PKGDEST') - recipesource = os.path.basename(d.getVar('FILE')) + recipesource = d.getVar('IPK_RECIPE_FILE') localdata = bb.data.createCopy(d) root = "%s/%s" % (pkgdest, pkg) From patchwork Fri Dec 29 15:44:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37060 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 6A33FC47073 for ; Fri, 29 Dec 2023 15:46:08 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web11.151034.1703864759891126675 for ; Fri, 29 Dec 2023 07:45:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=nxX03LWP; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1d2e6e14865so33241065ad.0 for ; Fri, 29 Dec 2023 07:45:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864758; x=1704469558; 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=+ElcxYNMll73KwBx4ciVCdgJMglO8v//cLRtRxjHhLc=; b=nxX03LWPnYqz9Lg5+b6LtlBSyqk21HxhR/It7DsCFRmn+OqzC2vWo7Y818em/hh4rO lAmqxc7KUlr2o06d5n+AHZ/q+esft3LqpFD/O6mAbw4orLBdO871oaV/X3okEFzBoWC2 xcGIo1BvZ8RORNqPpHahbjNDjaKirkCJzAkz6uFx7Gd4lJXD1pdWkLWyisgYUyczs82t +g1aozlcE3z6vlbSfq2scSfw9zAyVXLTYqqInlZUaDWuykEO6Au15rlY8DhDmdVa9Kmq VmBd8gNx8ta+w3aTmyG0ckcF/1sEr8WGqdA/G03OjjxKkWJ1hW//X56z98gj3mhob1dO oUPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864758; x=1704469558; 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=+ElcxYNMll73KwBx4ciVCdgJMglO8v//cLRtRxjHhLc=; b=MC2X+2fd0z3KLyz5KKwmSOTx3TduC72/T0luumy53PcZ03SzXb3hqrNNFfiGprmE57 WihdOPdPtHV670ETPSFLNw1NbHDPNq2ua319u1pU8ZSSJnofzJh3wtYaEORsTSDpIOeg YyyrjOAB1CIyMRFTwXFZ4My2batdaKOll0xDGLKi86Hge4SSd5q0NXDK5Xy4+BoPLUKo wAh6Qsb8JP+csvds//v9Yc//nfOkWsJdig6bGt2Hd8NIwiJaQOxQtDB86RSXz4irbMNr FzpoTu2PtU7SqL3I2A26JR3lW3JBsiaiZzUkNTgdRmxuOfbIt8gBbnTwlj9vVAZfjz1z Hz9Q== X-Gm-Message-State: AOJu0YxNXQRSchRtrbHwRusAn8tXVpUDHvecFi0loqTHTvqTx+F4slGG dBYYj8SYnHD7cxdNUfwRgkB2RzwxwiM8s7nccISkYwDB03IwJg== X-Google-Smtp-Source: AGHT+IFq/7Y9JUyZBg8ZFgEfHpA6gjDszv5m34wSA89mKKxQ8OwRvTH3l9e286qJ/1juJckky7VhUg== X-Received: by 2002:a17:902:d2cb:b0:1d4:2230:7f33 with SMTP id n11-20020a170902d2cb00b001d422307f33mr6554356plc.70.1703864758692; Fri, 29 Dec 2023 07:45:58 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:45:58 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 30/41] systemd-compat-units.bb: fix postinstall script Date: Fri, 29 Dec 2023 05:44:44 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Dec 2023 15:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193047 From: Michael Opdenacker This fixes an issue running "opkg upgrade" on a system with systemd (and when there is an update to "systemd-compat-units", for example between yocto 4.2.2 and 4.2.3): //var/lib/opkg/info/systemd-compat-units.postinst: cd: line 3: can't cd to /etc/init.d: No such file or directory The existence of /etc/init.d is now tested without causing an error if doesn't exist. Fixes [YOCTO #15292] Signed-off-by: Michael Opdenacker Signed-off-by: Richard Purdie (cherry picked from commit 0330331a1386fd2a34b410a7f62b29bfc8dc23c4) Signed-off-by: Steve Sakoman --- meta/recipes-core/systemd/systemd-compat-units.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb b/meta/recipes-core/systemd/systemd-compat-units.bb index 253bc9fcf1..c03d97f9c9 100644 --- a/meta/recipes-core/systemd/systemd-compat-units.bb +++ b/meta/recipes-core/systemd/systemd-compat-units.bb @@ -27,7 +27,8 @@ SYSTEMD_DISABLED_SYSV_SERVICES = " \ pkg_postinst:${PN} () { - cd $D${sysconfdir}/init.d || exit 0 + test -d $D${sysconfdir}/init.d || exit 0 + cd $D${sysconfdir}/init.d echo "Disabling the following sysv scripts: " From patchwork Fri Dec 29 15:44:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37058 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 752DAC47077 for ; Fri, 29 Dec 2023 15:46:08 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web11.151036.1703864761340921448 for ; Fri, 29 Dec 2023 07:46:01 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=sFlnVypO; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-6da4a923b1bso199833b3a.2 for ; Fri, 29 Dec 2023 07:46:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864760; x=1704469560; 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=wsjOXav9clpIUdadPU1Xw5bWzxCYKMRkjioQmJqJxgA=; b=sFlnVypOf9StCC1AlaUWRYR7ywBZv9Bb8jOSzoSPYbf4kXmFIDhIsyz8jJ27p0T2Lq goY4mXuMEUSaeJSa1ahAZLYBQwIIb24I0OveQy2vwuQWm/fQFfriUWcff45IqRey+Qdf 2m8AU8vAUvEIUvPYqzWLFkRLS3Egz6ShAoBKYZ08nqkofnnNx9MXsKOZvxOrDVAaXpHT ihEOB60I0hpqb3ad2xwD/nGUffg5OaZ22o/SwWuhsaANaXSd6mHG4A3dIich5i/na9yo zk/PmJ1EioUn/ZBlWiqORhCc8d2lGEAUdkaUZI7qVSVLFwUuSyYjE6ka3V0GEwlHRNMC kR7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864760; x=1704469560; 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=wsjOXav9clpIUdadPU1Xw5bWzxCYKMRkjioQmJqJxgA=; b=n3VVjFtfiqmgGtzWt5ywIaLMDRHQulwQtaJQMpjkik4k6IqX11qqcB1hCh7bh6AMK4 FdDz9RlDPZX52BLS2Xo/fgvOj/q/NaAZ0KWn9bQhUPHolCNRxOPQgk4U21lrK4b3w/9U 51kPGlVp9+MBVV6Ix3V4YW6gc+VSfE6iXFM7Ps4y+6AoI3fv2JKbEwd3XqqIxDZARxwA 4O4FU0Jd1erB/5tObfZZUamVYZ/hF4CR8v2m4/yM4rGikKw94E+G2TnCW0qz3CildIsI klx8ZOZCA9M3YRfkfBTznd7635AEQerjq1pKHN8a+7w+yDwY4NG7jafK0CzF6EcpPSjA 12mA== X-Gm-Message-State: AOJu0Yyt7RnRu0MV/8WsEd5Cg5uVr5ch69qhZBFLsSunsQAunlbbhWAx fZWM6i6Av4jnq4EaNl7vhkdxgZdV54SZGVikli0ui4sm4HcHNQ== X-Google-Smtp-Source: AGHT+IEmsZkr/CtoICZzuJuUNZv2H3INB4ytkRl20jVvBdjPOT5twnueJNXilJT0l69skaF1Ddczjw== X-Received: by 2002:a05:6a20:8e06:b0:196:3380:484d with SMTP id y6-20020a056a208e0600b001963380484dmr2337772pzj.95.1703864760498; Fri, 29 Dec 2023 07:46:00 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.45.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:46:00 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 31/41] devtool: fix update-recipe dry-run mode Date: Fri, 29 Dec 2023 05:44:45 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Dec 2023 15:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193048 From: Julien Stephan When running devtool update-recipe with --mode=srcrev AND --append switch in dry-run, we get the following error: Traceback (most recent call last): [...] Exception: destpath should be set here Fix this by removing a misplaced else statement in _update_recipe_srcrev Signed-off-by: Julien Stephan Signed-off-by: Alexandre Belloni (cherry picked from commit 85ba125703d5b442133fd7c470b915460ee68ac9) Signed-off-by: Steve Sakoman --- scripts/lib/devtool/standard.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index d53fb81007..cd79c7802c 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -1576,11 +1576,10 @@ def _update_recipe_srcrev(recipename, workspace, srctree, rd, appendlayerdir, wi patchfields['SRC_URI'] = '\\\n '.join(srcuri) if dry_run_outdir: logger.info('Creating bbappend (dry-run)') - else: - appendfile, destpath = oe.recipeutils.bbappend_recipe( - rd, appendlayerdir, files, wildcardver=wildcard_version, - extralines=patchfields, removevalues=removevalues, - redirect_output=dry_run_outdir) + appendfile, destpath = oe.recipeutils.bbappend_recipe( + rd, appendlayerdir, files, wildcardver=wildcard_version, + extralines=patchfields, removevalues=removevalues, + redirect_output=dry_run_outdir) else: files_dir = _determine_files_dir(rd) for basepath, path in upd_f.items(): From patchwork Fri Dec 29 15:44:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37062 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 7DF4CC47074 for ; Fri, 29 Dec 2023 15:46:08 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web10.151539.1703864763061789636 for ; Fri, 29 Dec 2023 07:46:03 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=ZgUdw7C2; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1d4751dcb56so13891935ad.1 for ; Fri, 29 Dec 2023 07:46:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864762; x=1704469562; 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=KnqXR7jLLU9eCCxRiyqaRVY7kBl3/QqqBYACouKvJ20=; b=ZgUdw7C2T6MK27QndP7c1imTcw/pLxU8eWydmOnlEZR/swiyfDP+b44pb/OHdvbd08 J/qASOr6ECL7buCpLtx6sC06anfwtxw+G/8Sgk1dLutg1fDn4Di/fA6qedCemsCQIsS7 /9HvQHEaybHeo0wERuSxb4p8XXmbmU7nox3SWqIXZpAGMFKDyrKEYSKdwWL7Y271piQt vw5YAnTdV372zhhL7kJ67vJ7Olo86ucsEXfRWC3z/RhOwHBnT+oayfgEZ18yT1GaJiR3 UgSELD6AcCgugTNs1tPS6byRQ4E4SkKhVl2Bqh4sjZW+YOrvkpzaOUYpPwvBC2GWrjZB 3Chg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864762; x=1704469562; 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=KnqXR7jLLU9eCCxRiyqaRVY7kBl3/QqqBYACouKvJ20=; b=LFxHG1Nrn7IDwxv47gseoBqBtFIfAnoBflCwtQWMUVnGZdGD2vMCxkHJzZHLGGJtwT W7JJ5XNdNlKuCsW4hVES4+dU9aH76Esgs6Dy6pv2chvDPjNSeXejttskjcT6Bvohv7yq 4GDjBhcTuBM4X7fBAl23DbhJkXH/+IMPmWx0v1wUObxWZp9Gro7XmQdd2YBt8dXC2qWF 6s2+ilRSk2nW0OFK1xcPk9jxuKrv1tPyLoExlGegSklsyytoba5B8tc8PFkGFHhpnu56 OR9KYpWR3EyY9xxxNWiuSj3lu7FNRtejZj+EhqIdP8CT2KuBXzfZkFcaUKp4DPSzl5rv 83rw== X-Gm-Message-State: AOJu0YyVmo9I3XfaWEP4MzwFJm1bcpckY8F5BJ1ZEgnzfOPFsFlXcY8/ SeN7mxH2I1HmBZofBAnpAFjOiJF7HCOc2k0Wd8OSi4QmbQ4vKw== X-Google-Smtp-Source: AGHT+IHq3aX89c8Dk4WyQFM6wE5Klrac19BCTu47YUPbkuULz5ani75HQ04F7pMnHZIIBejAergj9A== X-Received: by 2002:a17:902:eacc:b0:1d0:8383:741d with SMTP id p12-20020a170902eacc00b001d08383741dmr5847889pld.30.1703864762201; Fri, 29 Dec 2023 07:46:02 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.46.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:46:01 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 32/41] python3-ptest: skip test_storlines Date: Fri, 29 Dec 2023 05:44:46 -1000 Message-Id: <11eab2b5d14efa75fcb0686a9f835f9675883113.1703864512.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 ; Fri, 29 Dec 2023 15:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193049 From: Trevor Gamblin [YOCTO #14933] test_storlines is yet another Python ptest that fails intermittently on the Yocto AB, so disable it during ptests for now. Signed-off-by: Trevor Gamblin Signed-off-by: Alexandre Belloni (cherry picked from commit d7b9f8157e6214a83b5495e8a32e11540ae65ff8) Signed-off-by: Steve Sakoman --- ...orlines-skip-due-to-load-variability.patch | 32 +++++++++++++++++++ .../recipes-devtools/python/python3_3.11.5.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch diff --git a/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch b/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch new file mode 100644 index 0000000000..199031d42a --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch @@ -0,0 +1,32 @@ +From 013ff01fdf2aa6ca69a7c80a2a2996630877e4ea Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin +Date: Fri, 6 Oct 2023 10:59:44 -0400 +Subject: [PATCH] test_storlines: skip due to load variability + +This is yet another test that intermittently fails on the Yocto AB when +a worker is under heavy load, so skip it during testing. + +Upstream-Status: Inappropriate [OE-Specific] + +[YOCTO #14933] + +Signed-off-by: Trevor Gamblin +--- + Lib/test/test_ftplib.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py +index 082a90d46b..508814d56a 100644 +--- a/Lib/test/test_ftplib.py ++++ b/Lib/test/test_ftplib.py +@@ -629,6 +629,7 @@ def test_storbinary_rest(self): + self.client.storbinary('stor', f, rest=r) + self.assertEqual(self.server.handler_instance.rest, str(r)) + ++ @unittest.skip('timing related test, dependent on load') + def test_storlines(self): + data = RETR_DATA.replace('\r\n', '\n').encode(self.client.encoding) + f = io.BytesIO(data) +-- +2.41.0 + diff --git a/meta/recipes-devtools/python/python3_3.11.5.bb b/meta/recipes-devtools/python/python3_3.11.5.bb index 8e023c7dfb..d375de4b19 100644 --- a/meta/recipes-devtools/python/python3_3.11.5.bb +++ b/meta/recipes-devtools/python/python3_3.11.5.bb @@ -33,6 +33,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-Avoid-shebang-overflow-on-python-config.py.patch \ file://0001-Update-test_sysconfig-for-posix_user-purelib.patch \ file://0001-skip-no_stdout_fileno-test-due-to-load-variability.patch \ + file://0001-test_storlines-skip-due-to-load-variability.patch \ " SRC_URI:append:class-native = " \ From patchwork Fri Dec 29 15:44:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37061 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 84576C4707B for ; Fri, 29 Dec 2023 15:46:08 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web11.151043.1703864764870594647 for ; Fri, 29 Dec 2023 07:46:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=3R0zStSk; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1d427518d52so35051385ad.0 for ; Fri, 29 Dec 2023 07:46:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864764; x=1704469564; 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=74R3OCCjFDzNPBm1IEAl2z8VqJqL7Cgp3ml4mxXL5bU=; b=3R0zStSkQ3NmRUEdmRFywrMszCNTpo/O1Bbci+qWwqUBhV77IO1S7Wh0vQWkFfKPw4 AcSGasL5Et/Mvk2XeH7RBisjYHEn2LJcv05pYb+dYodf2304ck84hDkRhSXkulOwxBlb s/I188T9343R6EPmCPoPqyK0lGYvw+oIW/l/OBKByE0D8Mj7ZIZWMO1lI3SdvdCd6Bew VBP3np47jKLj7deK3ctSkGOR8IbthRtlocMtfkXlrKyDaPDlLu4fONLBGawzjAHiq9oU uxlUxFb5RpqaX7L9BezCI3kXt9sGbtgbc/lZwDk99itdYzlKehtB+Hzfg1BKdYq8FLpi VPOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864764; x=1704469564; 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=74R3OCCjFDzNPBm1IEAl2z8VqJqL7Cgp3ml4mxXL5bU=; b=XF/3+/x+ks7l3i/cFetFNkSX4jNkyp5l9x6xPL3+HgN/mdvCzFFhYpgnXH/Cewe9sT uLYpvMVbvm1MrIoMLXTR+up/k1D+SaFB1DKFxSiBuzS/TtgIxcONB9fUiUYckzuMWqhv iq1sRyHTSpMc9VXfpAmqdOJcTzX1r820z7/aNX7x5DMXu6MQ5TyysZy/g9fTmTHBzdtm v9VTqqiJ+RW3VtKSv9wiN2Int2sYpFhxLzVzIDsFuwCL2Hxj3ikhzJrqFOxInzpaYHRQ qpJ8K5+FLurIeYzKt6fs9lAGo6ob6gwnnhxPxiYXvoixlEpLHQ/rE/GfHQXWuVNs3J/E 7Yqg== X-Gm-Message-State: AOJu0YyQ4ePJKYF42le2klVPC3mBvkVlplZ+1yCCUIeG1nn2N20e0hf2 nrGbf556wz87QBTYgTiu5GJ2aMVmVheEqhRQ3uwZWA2PpePsVw== X-Google-Smtp-Source: AGHT+IGPoyMuU2zQL6sGzUcV+cSLcLXdtPP/j0v4G23KGPkOYoE5xKStwqSh1Wn16kjXMwLUmcj+Aw== X-Received: by 2002:a17:902:7088:b0:1d0:6ffd:6119 with SMTP id z8-20020a170902708800b001d06ffd6119mr11977545plk.59.1703864763956; Fri, 29 Dec 2023 07:46:03 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.46.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:46:03 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 33/41] devtool: finish/update-recipe: restrict mode srcrev to recipes fetched from SCM Date: Fri, 29 Dec 2023 05:44:47 -1000 Message-Id: <9254b08fbfba3734d5bc717a382d909595833db1.1703864512.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 ; Fri, 29 Dec 2023 15:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193050 From: Julien Stephan When specifying --mode / -m srcrev with devtool finish/update-recipe on recipes that are not fetched from a SCM repository we get the following error: Traceback (most recent call last): [..] File "<...>/poky/meta/lib/oe/patch.py", line 49, in runcmd raise CmdError(cmd, exitstatus >> 8, "stdout: %s\nstderr: %s" % (stdout, stderr)) oe.patch.CmdError: Command Error: 'sh -c 'git format-patch --no-signature --no-numbered INVALID -o /tmp/oepatchbj7pfmzj -- .'' exited with 0 Output: stdout: stderr: fatal: bad revision 'INVALID' Fix this by adding a check and abort with a proper error message. Signed-off-by: Julien Stephan Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 5b77f60e85d07921ae5e808daa1fd7d8c3dc40ea) Signed-off-by: Steve Sakoman --- scripts/lib/devtool/standard.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index cd79c7802c..55fa38ccfb 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -1530,6 +1530,11 @@ def _update_recipe_srcrev(recipename, workspace, srctree, rd, appendlayerdir, wi recipedir = os.path.basename(recipefile) logger.info('Updating SRCREV in recipe %s%s' % (recipedir, dry_run_suffix)) + # Get original SRCREV + old_srcrev = rd.getVar('SRCREV') or '' + if old_srcrev == "INVALID": + raise DevtoolError('Update mode srcrev is only valid for recipe fetched from an SCM repository') + # Get HEAD revision try: stdout, _ = bb.process.run('git rev-parse HEAD', cwd=srctree) @@ -1556,7 +1561,6 @@ def _update_recipe_srcrev(recipename, workspace, srctree, rd, appendlayerdir, wi if not no_remove: # Find list of existing patches in recipe file patches_dir = tempfile.mkdtemp(dir=tempdir) - old_srcrev = rd.getVar('SRCREV') or '' upd_p, new_p, del_p = _export_patches(srctree, rd, old_srcrev, patches_dir) logger.debug('Patches: update %s, new %s, delete %s' % (dict(upd_p), dict(new_p), dict(del_p))) From patchwork Fri Dec 29 15:44:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37059 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 6A312C47072 for ; Fri, 29 Dec 2023 15:46:08 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web10.151541.1703864767193375030 for ; Fri, 29 Dec 2023 07:46:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=CxCI7YIX; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1d40eec5e12so48815375ad.1 for ; Fri, 29 Dec 2023 07:46:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864766; x=1704469566; 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=XdS3rjhA7wltURco/4cadY09zcmFFh5wrMwPYOkGZek=; b=CxCI7YIXqE86+3mRFTRUKM6pHhfkEYtCJ/SccF9/CDvaHLcd/NFMH/f0A2JkuUggd8 maa4ZuTtwtxP00a9DtxLKu5+oPI0G3pvlagzv9XXLVkuPtDSap1oRZjbpYts5qzurhxD fKi6TrD+u/ztzon8TZusAB2iyDK/+kCzLD6MleAO03cXkP5t0Eummq6DK8q2/dvSmH0I VbgPdcxAEoBuLNIKXeNgwkGlQ5X85cSsah/NaZ/rVcO9nOIroEuRdLLiuVi0Kc5w/Cvv gnPGhTtONEXw//BZltZeWEwjExnZuOG47ycNgAvDQw/DwTWnrthRcOlA3GSsApzy9mGu FatA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864766; x=1704469566; 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=XdS3rjhA7wltURco/4cadY09zcmFFh5wrMwPYOkGZek=; b=X41uEmNj9RCVFxEjd3SSbqZg4r6ViHMaGecSk2sYf4Y9LNj883A78t/eI9TwR7g2st hZAWsV6YwUX0oI1WN164yYnSV60+ziEZfT3n4K5Nm63NmVvKbDA02G1HHhGsZhuR8NFO OWkLkfVPBUcIpozsyAueaiJfhmpuQ1aBnmfFqq5E1w/BGO75CnCTSSVReLKS/ZEMNqZY RBgyE77pCi9V1iutAZ0AeFiTOc8d4DJJ8gKNMgDvqeBGyn8UGg5YCJpDLfuN7mrhj1vt PYeVIYfsBqzXPP5asDavtwiNjD3jU/q6DqLcZy25OSVX+1HyhVnGBqVWK9UCToXeNzLT m7aA== X-Gm-Message-State: AOJu0YyO3N/4dxnwhgZObvoex82/o0aEDk3avNJ8ZSqVL4dXmm/mThRO yRh6jbCBUp6+Sv7iB0rO/Sqe4DOfc3PoWuC6g4Z7q1I//jJJlw== X-Google-Smtp-Source: AGHT+IELgBxJ/UMpB/aP59oYOoPwrNoFmhu7qWSUXlHqUQj7eaAtSlj7cU4xREh1Ah9WHU6s/877KQ== X-Received: by 2002:a17:902:ea02:b0:1d4:32a9:f682 with SMTP id s2-20020a170902ea0200b001d432a9f682mr13099422plg.41.1703864765868; Fri, 29 Dec 2023 07:46:05 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.46.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:46:05 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 34/41] bluez5: fix connection for ps5/dualshock controllers Date: Fri, 29 Dec 2023 05:44:48 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Dec 2023 15:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193051 From: Markus Volk Bluez 5.69 added a regression. Bluetooth connection for playstation controllers stopped working. This adds a backport patch for the issue Signed-off-by: Markus Volk Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit be05a177f943e9c8ce6c0fdbd157ee6f9103eef9) Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/bluez5/bluez5.inc | 1 + ...e_probe-failing-if-SDP-record-is-not.patch | 313 ++++++++++++++++++ 2 files changed, 314 insertions(+) create mode 100644 meta/recipes-connectivity/bluez5/bluez5/0002-input-Fix-.device_probe-failing-if-SDP-record-is-not.patch diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index e10158a6e5..a23e4e58a6 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -55,6 +55,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ file://0001-test-gatt-Fix-hung-issue.patch \ file://0004-src-shared-util.c-include-linux-limits.h.patch \ + file://0002-input-Fix-.device_probe-failing-if-SDP-record-is-not.patch \ " S = "${WORKDIR}/bluez-${PV}" diff --git a/meta/recipes-connectivity/bluez5/bluez5/0002-input-Fix-.device_probe-failing-if-SDP-record-is-not.patch b/meta/recipes-connectivity/bluez5/bluez5/0002-input-Fix-.device_probe-failing-if-SDP-record-is-not.patch new file mode 100644 index 0000000000..d0884338db --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5/0002-input-Fix-.device_probe-failing-if-SDP-record-is-not.patch @@ -0,0 +1,313 @@ +From 3a9c637010f8dc1ba3e8382abe01065761d4f5bb Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Tue, 10 Oct 2023 12:38:29 -0700 +Subject: [PATCH 02/40] input: Fix .device_probe failing if SDP record is not + found + +Due to changes introduced by 67a26abe53bf +("profile: Add probe_on_discover flag") profiles may get probed when +their profile UUID are discovered, rather than resolved, which means +the SDP record may not be available. + +Fixes: https://github.com/bluez/bluez/issues/614 + +Upstream-Status: Backport [https://github.com/bluez/bluez/commit/3a9c637010f8dc1ba3e8382abe01065761d4f5bb] +--- + profiles/input/device.c | 182 +++++++++++++++++++--------------------- + 1 file changed, 84 insertions(+), 98 deletions(-) + +diff --git a/profiles/input/device.c b/profiles/input/device.c +index e2ac6ea60..4a50ea992 100644 +--- a/profiles/input/device.c ++++ b/profiles/input/device.c +@@ -60,7 +60,7 @@ struct input_device { + char *path; + bdaddr_t src; + bdaddr_t dst; +- uint32_t handle; ++ const sdp_record_t *rec; + GIOChannel *ctrl_io; + GIOChannel *intr_io; + guint ctrl_watch; +@@ -754,7 +754,8 @@ static void epox_endian_quirk(unsigned char *data, int size) + } + } + +-static int create_hid_dev_name(sdp_record_t *rec, struct hidp_connadd_req *req) ++static int create_hid_dev_name(const sdp_record_t *rec, ++ struct hidp_connadd_req *req) + { + char sdesc[sizeof(req->name) / 2]; + +@@ -776,7 +777,7 @@ static int create_hid_dev_name(sdp_record_t *rec, struct hidp_connadd_req *req) + + /* See HID profile specification v1.0, "7.11.6 HIDDescriptorList" for details + * on the attribute format. */ +-static int extract_hid_desc_data(sdp_record_t *rec, ++static int extract_hid_desc_data(const sdp_record_t *rec, + struct hidp_connadd_req *req) + { + sdp_data_t *d; +@@ -817,36 +818,40 @@ invalid_desc: + return -EINVAL; + } + +-static int extract_hid_record(sdp_record_t *rec, struct hidp_connadd_req *req) ++static int extract_hid_record(struct input_device *idev, ++ struct hidp_connadd_req *req) + { + sdp_data_t *pdlist; + uint8_t attr_val; + int err; + +- err = create_hid_dev_name(rec, req); ++ if (!idev->rec) ++ return -ENOENT; ++ ++ err = create_hid_dev_name(idev->rec, req); + if (err < 0) + DBG("No valid Service Name or Service Description found"); + +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_PARSER_VERSION); ++ pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_PARSER_VERSION); + req->parser = pdlist ? pdlist->val.uint16 : 0x0100; + +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_DEVICE_SUBCLASS); ++ pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_DEVICE_SUBCLASS); + req->subclass = pdlist ? pdlist->val.uint8 : 0; + +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_COUNTRY_CODE); ++ pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_COUNTRY_CODE); + req->country = pdlist ? pdlist->val.uint8 : 0; + +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_VIRTUAL_CABLE); ++ pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_VIRTUAL_CABLE); + attr_val = pdlist ? pdlist->val.uint8 : 0; + if (attr_val) + req->flags |= (1 << HIDP_VIRTUAL_CABLE_UNPLUG); + +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_BOOT_DEVICE); ++ pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_BOOT_DEVICE); + attr_val = pdlist ? pdlist->val.uint8 : 0; + if (attr_val) + req->flags |= (1 << HIDP_BOOT_PROTOCOL_MODE); + +- err = extract_hid_desc_data(rec, req); ++ err = extract_hid_desc_data(idev->rec, req); + if (err < 0) + return err; + +@@ -1035,11 +1040,6 @@ static gboolean encrypt_notify(GIOChannel *io, GIOCondition condition, + static int hidp_add_connection(struct input_device *idev) + { + struct hidp_connadd_req *req; +- sdp_record_t *rec; +- char src_addr[18], dst_addr[18]; +- char filename[PATH_MAX]; +- GKeyFile *key_file; +- char handle[11], *str; + GError *gerr = NULL; + int err; + +@@ -1049,33 +1049,7 @@ static int hidp_add_connection(struct input_device *idev) + req->flags = 0; + req->idle_to = idle_timeout; + +- ba2str(&idev->src, src_addr); +- ba2str(&idev->dst, dst_addr); +- +- snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s", src_addr, +- dst_addr); +- sprintf(handle, "0x%8.8X", idev->handle); +- +- key_file = g_key_file_new(); +- if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) { +- error("Unable to load key file from %s: (%s)", filename, +- gerr->message); +- g_clear_error(&gerr); +- } +- str = g_key_file_get_string(key_file, "ServiceRecords", handle, NULL); +- g_key_file_free(key_file); +- +- if (!str) { +- error("Rejected connection from unknown device %s", dst_addr); +- err = -EPERM; +- goto cleanup; +- } +- +- rec = record_from_string(str); +- g_free(str); +- +- err = extract_hid_record(rec, req); +- sdp_record_free(rec); ++ err = extract_hid_record(idev, req); + if (err < 0) { + error("Could not parse HID SDP record: %s (%d)", strerror(-err), + -err); +@@ -1091,7 +1065,7 @@ static int hidp_add_connection(struct input_device *idev) + + /* Make sure the device is bonded if required */ + if (classic_bonded_only && !input_device_bonded(idev)) { +- error("Rejected connection from !bonded device %s", dst_addr); ++ error("Rejected connection from !bonded device %s", idev->path); + goto cleanup; + } + +@@ -1161,6 +1135,68 @@ static int connection_disconnect(struct input_device *idev, uint32_t flags) + return ioctl_disconnect(idev, flags); + } + ++static bool is_device_sdp_disable(const sdp_record_t *rec) ++{ ++ sdp_data_t *data; ++ ++ data = sdp_data_get(rec, SDP_ATTR_HID_SDP_DISABLE); ++ ++ return data && data->val.uint8; ++} ++ ++static enum reconnect_mode_t hid_reconnection_mode(bool reconnect_initiate, ++ bool normally_connectable) ++{ ++ if (!reconnect_initiate && !normally_connectable) ++ return RECONNECT_NONE; ++ else if (!reconnect_initiate && normally_connectable) ++ return RECONNECT_HOST; ++ else if (reconnect_initiate && !normally_connectable) ++ return RECONNECT_DEVICE; ++ else /* (reconnect_initiate && normally_connectable) */ ++ return RECONNECT_ANY; ++} ++ ++static void extract_hid_props(struct input_device *idev, ++ const sdp_record_t *rec) ++{ ++ /* Extract HID connectability */ ++ bool reconnect_initiate, normally_connectable; ++ sdp_data_t *pdlist; ++ ++ /* HIDNormallyConnectable is optional and assumed FALSE if not ++ * present. ++ */ ++ pdlist = sdp_data_get(rec, SDP_ATTR_HID_RECONNECT_INITIATE); ++ reconnect_initiate = pdlist ? pdlist->val.uint8 : TRUE; ++ ++ pdlist = sdp_data_get(rec, SDP_ATTR_HID_NORMALLY_CONNECTABLE); ++ normally_connectable = pdlist ? pdlist->val.uint8 : FALSE; ++ ++ /* Update local values */ ++ idev->reconnect_mode = ++ hid_reconnection_mode(reconnect_initiate, normally_connectable); ++} ++ ++static void input_device_update_rec(struct input_device *idev) ++{ ++ struct btd_profile *p = btd_service_get_profile(idev->service); ++ const sdp_record_t *rec; ++ ++ rec = btd_device_get_record(idev->device, p->remote_uuid); ++ if (!rec || idev->rec == rec) ++ return; ++ ++ idev->rec = rec; ++ idev->disable_sdp = is_device_sdp_disable(rec); ++ ++ /* Initialize device properties */ ++ extract_hid_props(idev, rec); ++ ++ if (idev->disable_sdp) ++ device_set_refresh_discovery(idev->device, false); ++} ++ + static int input_device_connected(struct input_device *idev) + { + int err; +@@ -1168,6 +1204,9 @@ static int input_device_connected(struct input_device *idev) + if (idev->intr_io == NULL || idev->ctrl_io == NULL) + return -ENOTCONN; + ++ /* Attempt to update SDP record if it had changed */ ++ input_device_update_rec(idev); ++ + err = hidp_add_connection(idev); + if (err < 0) + return err; +@@ -1411,74 +1450,21 @@ int input_device_disconnect(struct btd_service *service) + return 0; + } + +-static bool is_device_sdp_disable(const sdp_record_t *rec) +-{ +- sdp_data_t *data; +- +- data = sdp_data_get(rec, SDP_ATTR_HID_SDP_DISABLE); +- +- return data && data->val.uint8; +-} +- +-static enum reconnect_mode_t hid_reconnection_mode(bool reconnect_initiate, +- bool normally_connectable) +-{ +- if (!reconnect_initiate && !normally_connectable) +- return RECONNECT_NONE; +- else if (!reconnect_initiate && normally_connectable) +- return RECONNECT_HOST; +- else if (reconnect_initiate && !normally_connectable) +- return RECONNECT_DEVICE; +- else /* (reconnect_initiate && normally_connectable) */ +- return RECONNECT_ANY; +-} +- +-static void extract_hid_props(struct input_device *idev, +- const sdp_record_t *rec) +-{ +- /* Extract HID connectability */ +- bool reconnect_initiate, normally_connectable; +- sdp_data_t *pdlist; +- +- /* HIDNormallyConnectable is optional and assumed FALSE +- * if not present. */ +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_RECONNECT_INITIATE); +- reconnect_initiate = pdlist ? pdlist->val.uint8 : TRUE; +- +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_NORMALLY_CONNECTABLE); +- normally_connectable = pdlist ? pdlist->val.uint8 : FALSE; +- +- /* Update local values */ +- idev->reconnect_mode = +- hid_reconnection_mode(reconnect_initiate, normally_connectable); +-} +- + static struct input_device *input_device_new(struct btd_service *service) + { + struct btd_device *device = btd_service_get_device(service); +- struct btd_profile *p = btd_service_get_profile(service); + const char *path = device_get_path(device); +- const sdp_record_t *rec = btd_device_get_record(device, p->remote_uuid); + struct btd_adapter *adapter = device_get_adapter(device); + struct input_device *idev; + +- if (!rec) +- return NULL; +- + idev = g_new0(struct input_device, 1); + bacpy(&idev->src, btd_adapter_get_address(adapter)); + bacpy(&idev->dst, device_get_address(device)); + idev->service = btd_service_ref(service); + idev->device = btd_device_ref(device); + idev->path = g_strdup(path); +- idev->handle = rec->handle; +- idev->disable_sdp = is_device_sdp_disable(rec); +- +- /* Initialize device properties */ +- extract_hid_props(idev, rec); + +- if (idev->disable_sdp) +- device_set_refresh_discovery(device, false); ++ input_device_update_rec(idev); + + return idev; + } +-- +2.42.0 + From patchwork Fri Dec 29 15:44:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37063 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 82300C47073 for ; Fri, 29 Dec 2023 15:46:18 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web10.151542.1703864768618641491 for ; Fri, 29 Dec 2023 07:46:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=aFCz674j; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1d3ec3db764so19249045ad.2 for ; Fri, 29 Dec 2023 07:46:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864768; x=1704469568; 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=5K4WVdQAlu4ZRuqCCQoZ7vo5oHs/DHnm4XpmhkZIF9c=; b=aFCz674jtP5Fke7qjDRxbgTbDrg5Z/Dn90oAYmf2wdTnr5iuv6V6Fi64vrtD1Ibxrr mtys7j1IaV+zUeMn0rTt2nWFZZaXBVvvtdrBUirqLg0q3HXgczZkhFPUWnZOi+DuId7j vHk29x8XKGF6QyXfQTbsfv7Z8Re68yGJ6DlpemD3TN78SI9c8Jm+jjbi+I3DN11b/N8h /FvZu6m4BVnTNrGtPUtGSkjTZROXmYO+dRYxmIA6ic6mFDtzg97E4JOgpQxOpPqLlnTT W/v755YTh+ixnJuJfruvQA6XvBuQmWfWFuEqeZ+cZ3wt4BSZlLA+rYwoyuPnERlAGRq6 GmFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864768; x=1704469568; 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=5K4WVdQAlu4ZRuqCCQoZ7vo5oHs/DHnm4XpmhkZIF9c=; b=LA9zORA+Fv8qXdV1da085g/v1foz+bnCsUAFuwUIVU9JB8Zzci8ADqKc04DO4HxhU6 xzD47Pspkwrcs10cxB9Y354yqmWXg9PRQU7xuSR2Qi9KJVr6quGZ5VZyZ6vLqTv6zBuN 24tN1frVtSIac2lqE3hr7t0JYjfwO7vim1U0fBV9DflFk0O2D5CgS0kGq78s3gds11vo UbkqAYJ7NdzAnyKTivy4LRkqtH4z3p94TiiNtDKiov2WhJ/jyXbQarXDqLhLtT9Q2o+a 0EHRE3sMrVN4rNwERnZKlxD0KrJVYCSeGC/vZmXKW/u8mArzB9NwhbYCo8ak+CCp3FJ+ /ubA== X-Gm-Message-State: AOJu0YzPwOY2p+EWLr+a6Ax/aCn7q95/fAXdoiY2KeWwUpAcycUJiuu9 6am5GDuVb9bbp2A5lBH/Z0mcJOQ6vfpa9J8tBAPpm/9TfJ13fg== X-Google-Smtp-Source: AGHT+IG18u9qjjSp0G7DhhqIOQNbJDW9cke5wjqJOYgbpahaEtU8u8+isuuo1NTCfFPdrN+dVZ+JIg== X-Received: by 2002:a17:903:32d1:b0:1d4:4f4e:e4a5 with SMTP id i17-20020a17090332d100b001d44f4ee4a5mr4675290plr.103.1703864767738; Fri, 29 Dec 2023 07:46:07 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.46.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:46:07 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 35/41] cups: Add root,sys,wheel to system groups Date: Fri, 29 Dec 2023 05:44:49 -1000 Message-Id: <1cca30bb163fbc3f6b79fe3cff6d6b405830a63a.1703864512.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 ; Fri, 29 Dec 2023 15:46:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193052 From: Markus Volk The Cups documentation states: The default contains "admin", "lpadmin", "root", "sys" and/or "system". https://www.cups.org/doc/man-cups-files.conf.html#:~:text=SystemGroup Add root and sys accordingly Also add wheel group. This is required for systems with polkit support in order to control the printer settings with cups-pk-helper. Not only for gnome-control-center, but also when using plain system-config-printer on a system with running polkit, cups-pk-helper would be a required rdepend. Signed-off-by: Markus Volk Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 572fed0ac6dbcf5749e19c7b624826fc30cf301e) Signed-off-by: Steve Sakoman --- meta/recipes-extended/cups/cups.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index fa32c38549..4c414b6549 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -55,7 +55,7 @@ EXTRA_OECONF = " \ --enable-debug \ --disable-relro \ --enable-libusb \ - --with-system-groups=lpadmin \ + --with-system-groups=lpadmin,root,sys,wheel \ --with-cups-group=lp \ --with-domainsocket=/run/cups/cups.sock \ --with-pkgconfpath=${libdir}/pkgconfig \ From patchwork Fri Dec 29 15:44:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37065 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 8EBFFC47072 for ; Fri, 29 Dec 2023 15:46:18 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web11.151049.1703864770761673376 for ; Fri, 29 Dec 2023 07:46:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=hRPVcQft; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1d40eec5e12so48815755ad.1 for ; Fri, 29 Dec 2023 07:46:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864769; x=1704469569; 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=Twp4zngxN6CSSGC1OZwdzvF3ONQnVw9Q4NiIjHRsnLo=; b=hRPVcQftZhoGDpdd8sJX5J93G1dXGPCuBjJMpTD0Ke+XbLYa0ZT1Phfc+XhccE460D ECEQM7ubz1i/XJaK9JIiC+zvtv0T+N3AQVmOao9MrqsKMbN2XlSXXz2+0ICQpn91O8T3 ulmO1ZP9/BNgniLNdLguzSr2C/5mqGVYH/WkSv/+Aruj4k/o1XV7bdCDkr5xiZQnSbPS iH8k6BpMDxmcjtG/maqIc0iOV9satimBVzwQqcuhyQic1uZc3ZJzCeO2VH0jAnYLJPA3 HiaIhwRq+uvZCx6iivnDW4VtN3Xe/1DCzQuxWyOdNLev0SGRh5FEokfkhcHkq6MJwOfj t0dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864769; x=1704469569; 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=Twp4zngxN6CSSGC1OZwdzvF3ONQnVw9Q4NiIjHRsnLo=; b=d9IeP83e0yRijXVkQfXtDf/DQ9efw3af6rGU3rh1KleDCx9uICfp1UiCRP4bqIwQNd h7tRqqIDiWi4y8RpggesJSmTx2dPa8qAXgNEtQHWwDNRqBfXDe7IUvSHCgmwTYzF6kbJ 2tKUOs3dtM3FV+rwoHOfwWvgJwSjhEvyR6EI2f7YY6dcbaymUNj2r0BdzSHkhBjuHk5P QmefMdcCNwytY6Deqha+TFcq+E430BV213jQYDnMY9oG7PMgMZZ/vvP3eWwSWvlgBX03 AffQ9Ie+MQyrpK5t8/RWpPt/Klw4OaujdU4ejmKv3Dp20WauHLuJ6p4Up7k0gN06p/XT AUww== X-Gm-Message-State: AOJu0YzJxsOwxowXAycBj9Pm2lJDzgmQx2nmoeeUWI+h1OjhgKyEj8jO YUqRmVhjgxVtqDouJ8jeadNqvWT1Cn5soU9yMqFmPR8gdvLuyw== X-Google-Smtp-Source: AGHT+IGoiCcWKE2/N+domkjBMeiLMYGPdWLI9VqQjGBteOeHVjJxzjGppT0RcSnjem58dBb/onkCNA== X-Received: by 2002:a17:902:e808:b0:1d4:2a9d:8274 with SMTP id u8-20020a170902e80800b001d42a9d8274mr14959274plg.77.1703864769497; Fri, 29 Dec 2023 07:46:09 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.46.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:46:09 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 36/41] json-c: fix icecc compilation Date: Fri, 29 Dec 2023 05:44:50 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Dec 2023 15:46:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193053 From: Marco Felsch Skip -Werror to make it possible to compile this recipe with ICECC else all fallthrough comments will be removed since we pre-process the files on the host before sending them to the compile nodes which then cause errors because of default -Werror switch. Fixes: caf64f85b5c5 ("json-c: update 0.13.1 - > 0.14") Signed-off-by: Marco Felsch Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 915f8307b063e17ddadd5dface83578b8ad254e2) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/json-c/json-c_0.17.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/json-c/json-c_0.17.bb b/meta/recipes-devtools/json-c/json-c_0.17.bb index f4b7a32cea..20bcece768 100644 --- a/meta/recipes-devtools/json-c/json-c_0.17.bb +++ b/meta/recipes-devtools/json-c/json-c_0.17.bb @@ -17,6 +17,9 @@ UPSTREAM_CHECK_REGEX = "json-c-(?P\d+(\.\d+)+)-\d+" RPROVIDES:${PN} = "libjson" +# Required for ICECC builds +EXTRA_OECMAKE = "-DDISABLE_WERROR=ON" + inherit cmake ptest do_install_ptest() { From patchwork Fri Dec 29 15:44:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37067 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 96D15C47077 for ; Fri, 29 Dec 2023 15:46:18 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web10.151544.1703864772532749436 for ; Fri, 29 Dec 2023 07:46:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=LnIKzfSu; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1d43df785c2so14938695ad.1 for ; Fri, 29 Dec 2023 07:46:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864771; x=1704469571; 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=cCiustOEvXb1+EFoPsMl9sTj6e6AerC8DC/pcdiPioQ=; b=LnIKzfSu5DkXjEVUDZPme5JZZTZqE+4WSKzZEeEejmaKPx+3iNn8/Ot8WdKn8hPdp4 Vk7NCQQiamr7t1hCmpnWf9lMgN0ksdhdkrExnXD7yAi8/T258Z+FSpWo7VIEIvbeVZXQ j6aVAdYl2jKbYd6GGqO3r6d7pPfgddyI0locGf7uOUACzp/LVzsnBrCFs8L3A/JGxngV f4mDQal1snwqeLYWAfriGjh/3o1VXKagKvmggIdaIOodCUQBQwA/wgg6w8nnm95fktp4 IblzPEDRsocL4366CUMa3i9emjvy39Pe3bgyVpZoZUrA/2QekofGACzUW5HkXsy4WyHK Vywg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864771; x=1704469571; 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=cCiustOEvXb1+EFoPsMl9sTj6e6AerC8DC/pcdiPioQ=; b=suG/8XZT82hX7sVLh4kSwTOnOKqMuR1qOKBXc+JcK7otHSBCCFUjfV/qhNzlqu71w4 glB75Zj7JGJXzODK2D3Zsgq3Q5Ek9hWaSsB7mH/l/iNaZd7xef4W+rj/jGNULzLdg59f wZNwoYILmTOv+aDvZ5H0OA98ccF9bt/W6WU0ECexP/ZkfrTEUTR3Y8hk15VlOeXcSbzU fMIGk/hV3C6jlU+maE8SE4vP7Tio5X1IqI54+n0DKKrkRJG5TqrSSkYyRWnLCdF3XceA m1YzsNM5IsKVA6WpgBo0yLw5TPcRqEB3/uTAySk4HJKek0CtMYr/FeawkxkpPRyaHCSF 876Q== X-Gm-Message-State: AOJu0Yz3oY8avf7caoSHE0JvkSAc/lRhPvGcJ6VavgO1wj8nIV/63y7c jNXcLmfWabLKpYZsZRj/lgNGOv9GFPP8sHrpa4Z4JBtX1VPjFg== X-Google-Smtp-Source: AGHT+IH0L6PiUN+7QQdAkg0ijSDvyHIfDz9oueT+PT3g74JJdUg9JMLtKYus99wXik6bfX7Y/3mSiw== X-Received: by 2002:a17:902:c945:b0:1d4:3af6:6d20 with SMTP id i5-20020a170902c94500b001d43af66d20mr4318432pla.42.1703864771225; Fri, 29 Dec 2023 07:46:11 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.46.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:46:10 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 37/41] systemd-boot: Fix build issues on armv7a-linux Date: Fri, 29 Dec 2023 05:44:51 -1000 Message-Id: <9fbb9b974cc8a92eb77a080c89410fb2c8b311c1.1703864512.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 ; Fri, 29 Dec 2023 15:46:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193054 From: Viswanath Kraleti Backport a fix to address the build failure on armv7a introduced in systemd v254-rc1. see https://github.com/systemd/systemd/issues/29381 Signed-off-by: Viswanath Kraleti Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 782790dc6423fe3ae1ce4cd674ab492bfc881230) Signed-off-by: Steve Sakoman --- .../systemd/systemd-boot_254.4.bb | 4 +++ ...n-Pass-all-static-pie-args-to-linker.patch | 35 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0030-meson-Pass-all-static-pie-args-to-linker.patch diff --git a/meta/recipes-core/systemd/systemd-boot_254.4.bb b/meta/recipes-core/systemd/systemd-boot_254.4.bb index 4ee25ee72f..2b43ccf243 100644 --- a/meta/recipes-core/systemd/systemd-boot_254.4.bb +++ b/meta/recipes-core/systemd/systemd-boot_254.4.bb @@ -8,6 +8,10 @@ DEPENDS = "intltool-native libcap util-linux gperf-native python3-jinja2-native inherit meson pkgconfig gettext inherit deploy +SRC_URI += " \ + file://0030-meson-Pass-all-static-pie-args-to-linker.patch \ + " + LDFLAGS:prepend = "${@ " ".join(d.getVar('LD').split()[1:])} " EFI_LD = "bfd" diff --git a/meta/recipes-core/systemd/systemd/0030-meson-Pass-all-static-pie-args-to-linker.patch b/meta/recipes-core/systemd/systemd/0030-meson-Pass-all-static-pie-args-to-linker.patch new file mode 100644 index 0000000000..8e563238ef --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0030-meson-Pass-all-static-pie-args-to-linker.patch @@ -0,0 +1,35 @@ +From f85a387a67900b02c69abccb88c2ef7191c67277 Mon Sep 17 00:00:00 2001 +From: Jan Janssen +Date: Sun, 1 Oct 2023 09:55:48 +0200 +Subject: [PATCH] meson: Pass all -static-pie args to linker + +Fixes: #29381 + +Upstream-Status: Backport [https://github.com/systemd/systemd/commit/cecbb162a3134b43d2ca160e13198c73ff34c3ef] +Signed-off-by: Viswanath Kraleti +--- + src/boot/efi/meson.build | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build +index 2773eaf286..9a60a57329 100644 +--- a/src/boot/efi/meson.build ++++ b/src/boot/efi/meson.build +@@ -161,9 +161,14 @@ efi_c_ld_args = [ + '-Wl,--entry=efi_main', + '-Wl,--fatal-warnings', + +- # These flags should be passed by -static-pie, but seem to be missing sometimes. +- '-Wl,--no-dynamic-linker', +- '-z', 'text', ++ # These flags should be passed by -static-pie, but for whatever reason the flag translation ++ # is not enabled on all architectures. Not passing `-static` would just allow the linker to ++ # use dynamic libraries, (which we can't/don't use anyway). But if `-pie` is missing and the ++ # gcc build does not default to `-pie` we get a regular (no-pie) binary that will be ++ # rightfully rejected by elf2efi. Note that meson also passes `-pie` to the linker driver, ++ # but it is overridden by our `-static-pie`. We also need to pass these directly to the ++ # linker as `-static`+`-pie` seem to get translated differently. ++ '-Wl,-static,-pie,--no-dynamic-linker,-z,text', + + # EFI has 4KiB pages. + '-z', 'common-page-size=4096', From patchwork Fri Dec 29 15:44:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37066 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 9A1C7C4707B for ; Fri, 29 Dec 2023 15:46:18 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web10.151546.1703864774567838767 for ; Fri, 29 Dec 2023 07:46:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=ioIvlVLl; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1d43df785c2so14938935ad.1 for ; Fri, 29 Dec 2023 07:46:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864774; x=1704469574; 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=GQOTxCpdnXMFDMWjwVUgSlQ+MAhdWYK3wyltJQoywwU=; b=ioIvlVLl+8fCrrt3mHZpjUdwlznp0RyARL+D7qm/JjCznD8+3WEQ7Ti+d2v/o6YowP 6Ta3q0Tmuqa8FMOA5ISd4vy64ziF+w0IhCa715dF6FQ2hiH4nFA6s7+wbKPFt6rq8lkD 2oHk/shmyrOu1OtbMQbRuTp1ZgRRmU1qrrMiTREGlwzHEFlNU2K/KqgmYA1GDA+A1MiL hg0KTRpWNWk7G3NAGioLJdl04MXVb9W4AqvJrFHkRIOkVQJ3rqx0di8uLKlXiijUx11u +2Wavqn1sCiMm2Tyb03ZS9ek6N1esw5hvGA93pF5VnU4Bb69z40whFIid1uE9acURxnI 2/nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864774; x=1704469574; 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=GQOTxCpdnXMFDMWjwVUgSlQ+MAhdWYK3wyltJQoywwU=; b=HzFN3mYVstHhH2MLOtHcF3KsyWy4FYQwIClE4rhXS64N2Ijiis3SUzMjx85BB7Nohu TLHgAXsWRAzv0gI+lGZRjdZDdSK0loxDbXFqQAWRIjZCglShlY+yPCKsjOQNNQBOg6+7 xSvC4QG6EvGg2J1JhiXbK5R4F9oqcQVXUph9MUApsLUrzKkCTsh0KuShsNrpURCJ4Elq aIuyVcCUCT0IpD0HQZxjY32iof3m5uSWrsW2PIlLZhH+9SW3fOc/00LadLRQev+JXxjk jmnzvr/NWDNp5QVcw/O+F7/FQiE3/DdvNPbPGVNZmGHTiNY1JI7196gnStkH2zZHEMfu TLqw== X-Gm-Message-State: AOJu0YzSlkGJ83sg6O/I0o1g5opbVqjugbyLAvB/40i4FCpPm9iPZtIK utzD9LPZEKkBuSd0iPv/i381ZyVa65/Q+BRa89vQmJmF8/3gpg== X-Google-Smtp-Source: AGHT+IGtpZMaNUqA4HbzotiFm2weqOUQTfFOJEoyWUKyvp442kpBsflssypBYMoXeN+dg4H+rI1PHg== X-Received: by 2002:a17:902:b496:b0:1d4:9225:a88f with SMTP id y22-20020a170902b49600b001d49225a88fmr1427109plr.13.1703864773711; Fri, 29 Dec 2023 07:46:13 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.46.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:46:13 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 38/41] patchtest: shorten patch signed-off-by test output Date: Fri, 29 Dec 2023 05:44:52 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Dec 2023 15:46:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193055 From: Trevor Gamblin The patch Signed-off-by test's output line is excessively long, and can trigger a failsafe in the patchtest automated service's email content generation. Shorten the output by reducing redundant phrasing and using os.path.basename to get only the failing patch's name, not the entire path, as the submitter should have a good idea of where it is located regardless. Signed-off-by: Trevor Gamblin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit cc7546ded87dd44a988d7a23f1d7645094b5cdd4) Signed-off-by: Steve Sakoman --- meta/lib/patchtest/tests/test_patch.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/patchtest/tests/test_patch.py b/meta/lib/patchtest/tests/test_patch.py index 65d0f930b0..d7187a0cb1 100644 --- a/meta/lib/patchtest/tests/test_patch.py +++ b/meta/lib/patchtest/tests/test_patch.py @@ -6,6 +6,7 @@ # import base +import os import parse_signed_off_by import parse_upstream_status import pyparsing @@ -87,7 +88,7 @@ class TestPatch(base.Base): if TestPatch.prog.search_string(payload): break else: - self.fail('A patch file has been added without a Signed-off-by tag. Sign off the added patch file (%s)' % newpatch.path) + self.fail('A patch file has been added without a Signed-off-by tag: \'%s\'' % os.path.basename(newpatch.path)) def test_cve_tag_format(self): for commit in TestPatch.commits: From patchwork Fri Dec 29 15:44:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37064 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 82333C47074 for ; Fri, 29 Dec 2023 15:46:18 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web11.151052.1703864777093247596 for ; Fri, 29 Dec 2023 07:46:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=c25YTh6y; spf=softfail (domain: sakoman.com, ip: 209.85.214.172, mailfrom: steve@sakoman.com) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1d41bb4da91so20483755ad.0 for ; Fri, 29 Dec 2023 07:46:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864776; x=1704469576; 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=ge79HK4mhTRbSi2FtrAC8aw5+ylzUjzokAMN9U56dxY=; b=c25YTh6yZS4iTHd5e3hb8GldCtt74zVzfTDywwFHT0hJIJtSoZwD978rIX3sEOpOGg ODlskpTiIUBdJVMVKb6/4m9tcXniwWsZph7W7j+tZaRfTrMCHLb3ZOwYo5al73ayvRaL eSmwLIhoMlUYU+sh9vOFKKCEMou08wMx5NBUFzuZP8XYkYgK/k5a/ymaWyN8CoCldB7T Oz2gKp6zLNKw7YpBdlygM3umhJNXl0m+yXVX1VCPk2kKF6e0jvIIZhTOC4nbM/AERSOE /zcvdozbfoyt7WBmzWTJD/ZejaFPMvaXf6Lf+5XTY35ILUTLgDaeVi74FvUaDlnOpMM5 a2+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864776; x=1704469576; 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=ge79HK4mhTRbSi2FtrAC8aw5+ylzUjzokAMN9U56dxY=; b=FLuc030NrdHgknf05vwYa2Le4WfYcLcp4D+U9u3czu1BLTu4r3K5OuuRHmnZT55CmY FuyYpm7gc5+v+xA4U/PMY7yRU38AzT8DY5M/B1G/Cu68u64iMmUo4u8AxFWwhhWhxCFk r1pXm2hT6PpEyWJSvlEalQG/gPmQtonKY0fQ6CyGuFc+I2vj5vyPntzzsNRpqFx4QvL+ +0pnTMGTRAtZttRObLchjqi9vZ+OI2GzcFukf6D+4Ika5DobB/40usPC+F81I0ebGVIa 01Xt5x1gjAGg1sipBsLXAKxnxFsmf80Ph1DIV+r/WFYXxMRbmK9MDWpsRqxWKbSZom6Y rjfA== X-Gm-Message-State: AOJu0Yx/isVWUM2uzLdjS5JsLPu7QPdvRIMfpgF1JjBdWI+aMinh9Hdt B1ZbPbuwVHx0Q22Ou3g7L2GXGTsgFygBKPO8/Mubi9/Q8Rel0Q== X-Google-Smtp-Source: AGHT+IFS00p1epVqEyj80PCy7L8uu9zC/I9BlvB5iCOfL4cu1odOhWct8DXW12p20UVfX3WrJMNtlA== X-Received: by 2002:a17:903:11ce:b0:1d4:9c03:44e3 with SMTP id q14-20020a17090311ce00b001d49c0344e3mr786303plh.52.1703864776184; Fri, 29 Dec 2023 07:46:16 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.46.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:46:15 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 39/41] testimage: Drop target_dumper and most of monitor_dumper Date: Fri, 29 Dec 2023 05:44:53 -1000 Message-Id: <4c7aa982a996b23a4c5100c5a5a9390e26e5fe46.1703864512.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 ; Fri, 29 Dec 2023 15:46:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193056 From: Richard Purdie The target_dumper code is basically broken. It has been reading binary files over the text base serial communication and runs at every command failure which makes no sense. Each run might overwrite files from the previous run and the output appears corrupted due to confusion from the binary data. For now, remove the commands and the target dumper code as the command and execution point are problematic. Also remove the same pieces of the monitor code but leave the command list since in theory this can be moved to a more useful place in the code. Signed-off-by: Richard Purdie (cherry picked from commit a24d787987dccc95fdd95b7e85bf525a1c55b285) Signed-off-by: Steve Sakoman --- meta/classes-recipe/testimage.bbclass | 16 ---------------- meta/lib/oeqa/core/target/qemu.py | 10 ---------- meta/lib/oeqa/core/target/ssh.py | 20 +------------------- meta/lib/oeqa/targetcontrol.py | 2 -- 4 files changed, 1 insertion(+), 47 deletions(-) diff --git a/meta/classes-recipe/testimage.bbclass b/meta/classes-recipe/testimage.bbclass index c6b7a1e142..f36d941891 100644 --- a/meta/classes-recipe/testimage.bbclass +++ b/meta/classes-recipe/testimage.bbclass @@ -109,21 +109,6 @@ TESTIMAGE_DUMP_DIR ?= "${LOG_DIR}/runtime-hostdump/" TESTIMAGE_UPDATE_VARS ?= "DL_DIR WORKDIR DEPLOY_DIR_IMAGE IMAGE_LINK_NAME" -testimage_dump_target () { - top -bn1 - ps - free - df - # The next command will export the default gateway IP - export DEFAULT_GATEWAY=$(ip route | awk '/default/ { print $3}') - ping -c3 $DEFAULT_GATEWAY - dmesg - netstat -an - ip address - # Next command will dump logs from /var/log/ - find /var/log/ -type f -name !wtmp* 2>/dev/null -exec echo "====================" \; -exec echo {} \; -exec echo "====================" \; -exec cat {} \; -exec echo "" \; -} - testimage_dump_monitor () { query-status query-block @@ -352,7 +337,6 @@ def testimage_main(d): target_kwargs['serialcontrol_cmd'] = d.getVar("TEST_SERIALCONTROL_CMD") or None target_kwargs['serialcontrol_extra_args'] = d.getVar("TEST_SERIALCONTROL_EXTRA_ARGS") or "" target_kwargs['testimage_dump_monitor'] = d.getVar("testimage_dump_monitor") or "" - target_kwargs['testimage_dump_target'] = d.getVar("testimage_dump_target") or "" def export_ssh_agent(d): import os diff --git a/meta/lib/oeqa/core/target/qemu.py b/meta/lib/oeqa/core/target/qemu.py index 6893d10226..d93b3ac94a 100644 --- a/meta/lib/oeqa/core/target/qemu.py +++ b/meta/lib/oeqa/core/target/qemu.py @@ -14,8 +14,6 @@ from collections import defaultdict from .ssh import OESSHTarget from oeqa.utils.qemurunner import QemuRunner -from oeqa.utils.dump import MonitorDumper -from oeqa.utils.dump import TargetDumper supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic'] @@ -47,14 +45,6 @@ class OEQemuTarget(OESSHTarget): use_kvm=kvm, use_slirp=slirp, dump_dir=dump_dir, logger=logger, serial_ports=serial_ports, boot_patterns = boot_patterns, use_ovmf=ovmf, tmpfsdir=tmpfsdir) - dump_monitor_cmds = kwargs.get("testimage_dump_monitor") - self.monitor_dumper = MonitorDumper(dump_monitor_cmds, dump_dir, self.runner) - if self.monitor_dumper: - self.monitor_dumper.create_dir("qmp") - - dump_target_cmds = kwargs.get("testimage_dump_target") - self.target_dumper = TargetDumper(dump_target_cmds, dump_dir, self.runner) - self.target_dumper.create_dir("qemu") def start(self, params=None, extra_bootparams=None, runqemuparams=''): if self.use_slirp and not self.server_ip: diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py index f4dd0ca417..09cdd14c75 100644 --- a/meta/lib/oeqa/core/target/ssh.py +++ b/meta/lib/oeqa/core/target/ssh.py @@ -48,8 +48,6 @@ class OESSHTarget(OETarget): if port: self.ssh = self.ssh + [ '-p', port ] self.scp = self.scp + [ '-P', port ] - self._monitor_dumper = None - self.target_dumper = None def start(self, **kwargs): pass @@ -57,15 +55,6 @@ class OESSHTarget(OETarget): def stop(self, **kwargs): pass - @property - def monitor_dumper(self): - return self._monitor_dumper - - @monitor_dumper.setter - def monitor_dumper(self, dumper): - self._monitor_dumper = dumper - self.monitor_dumper.dump_monitor() - def _run(self, command, timeout=None, ignore_status=True): """ Runs command in target using SSHProcess. @@ -104,14 +93,7 @@ class OESSHTarget(OETarget): status, output = self._run(sshCmd, processTimeout, ignore_status) self.logger.debug('Command: %s\nStatus: %d Output: %s\n' % (command, status, output)) - if (status == 255) and (('No route to host') in output): - if self.monitor_dumper: - self.monitor_dumper.dump_monitor() - if status == 255: - if self.target_dumper: - self.target_dumper.dump_target() - if self.monitor_dumper: - self.monitor_dumper.dump_monitor() + return (status, output) def copyTo(self, localSrc, remoteDst): diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py index e21655c979..6e8b781973 100644 --- a/meta/lib/oeqa/targetcontrol.py +++ b/meta/lib/oeqa/targetcontrol.py @@ -103,7 +103,6 @@ class QemuTarget(BaseTarget): self.rootfs = os.path.join(d.getVar("DEPLOY_DIR_IMAGE"), d.getVar("IMAGE_LINK_NAME") + '.' + self.image_fstype) self.kernel = os.path.join(d.getVar("DEPLOY_DIR_IMAGE"), d.getVar("KERNEL_IMAGETYPE", False) + '-' + d.getVar('MACHINE', False) + '.bin') self.qemulog = os.path.join(self.testdir, "qemu_boot_log.%s" % self.datetime) - dump_target_cmds = d.getVar("testimage_dump_target") dump_monitor_cmds = d.getVar("testimage_dump_monitor") dump_dir = d.getVar("TESTIMAGE_DUMP_DIR") if not dump_dir: @@ -144,7 +143,6 @@ class QemuTarget(BaseTarget): tmpfsdir = d.getVar("RUNQEMU_TMPFS_DIR"), serial_ports = len(d.getVar("SERIAL_CONSOLES").split())) - self.target_dumper = TargetDumper(dump_target_cmds, dump_dir, self.runner) self.monitor_dumper = MonitorDumper(dump_monitor_cmds, dump_dir, self.runner) if (self.monitor_dumper): self.monitor_dumper.create_dir("qmp") From patchwork Fri Dec 29 15:44:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37068 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 9C1E3C47073 for ; Fri, 29 Dec 2023 15:46:28 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web11.151054.1703864779387687919 for ; Fri, 29 Dec 2023 07:46:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=QkKcbSee; spf=softfail (domain: sakoman.com, ip: 209.85.214.172, mailfrom: steve@sakoman.com) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1d426ad4433so24168345ad.0 for ; Fri, 29 Dec 2023 07:46:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864778; x=1704469578; 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=PCm3dpnyWiWC8VzeqmEGDcgoYFs///YTL5GEheKd004=; b=QkKcbSeemmLvmkzo8ThxfYtWiZSBbsLxN/9g/cb6tvr3+A3nCD6gAveozu6/mc8IHX f42Q0NpHOgxtZoVuY2CPeGQlyGmyOCx9yD0kiV4GzpCGfPI/MuRYESyg31iCFNKzsbqH XlfZ+Fu9ybuPf2cW5G68AhasF7lmfpt8XaOLcxhA8wn11AaTZsr44zBBsEzZBWJcNqec OkMEaQ9Lv6goZ+4xsHMB9YCnfL91Vnuc0B9+14q/cq3KMm39On9OxnV/KK9Y0xeYNag0 IUueJ5d3r0Out3FLIeOJKH/SvGAkYfof1OypOtMwdPl/dtRYUPDwuLOrHx57ld0z5ihB vjTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864778; x=1704469578; 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=PCm3dpnyWiWC8VzeqmEGDcgoYFs///YTL5GEheKd004=; b=RZV9MNfykPiv9i+NZJc/rcz5za19IVEAxMh6IpNridG/wtVdxW09/3ZFeT8X3W+gjc 6DKcNpP7cY5iNB4mmQB7s06dI0gMrMlo8EvKdDtSW3syxo5GTIxk8QhuzJPgxY5Ny8AR c2zAyAY5urgzQ6CRI4o4rmKQBVHQEA8rkafLRjacw4VKXT+vnw553xPTASheMYFCi3gv SjNY0DKxCXPE6JOw1NYJMHefIeL+e2Ne8yJHBaJWX3eAbR6kNTbt/wZ4OSFke1I5Z4eD E9KyxAZ9+uk8x2NYeiKpfBVfCZE+CSYWWRLbY/RpEqLCvGjTSWJ9MszxLXAGxyaVYlat Mxvg== X-Gm-Message-State: AOJu0Yx5jk5fMVMgKNw8HeMpofuM9f6KLITF9h5baU6hQq9V4oGuE2rE tiJzKGHEY5okitSgTYEpYOZKC9w96N41XnVB0rTmyAhcYFmhQA== X-Google-Smtp-Source: AGHT+IFo8AOuxjAPFBygf9X50FmNLX5mjRQjbJqLUZW5r/M3pU59+x6hFbfnAGRX+Uo3ixZdliM2XQ== X-Received: by 2002:a17:902:82c5:b0:1d4:11a8:a2cc with SMTP id u5-20020a17090282c500b001d411a8a2ccmr5079955plz.19.1703864778192; Fri, 29 Dec 2023 07:46:18 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.46.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:46:17 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 40/41] tcl: skip timing-dependent tests in run-ptest Date: Fri, 29 Dec 2023 05:44:54 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Dec 2023 15:46:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193057 From: Ross Burton There are several tests in the test suite which are very dependent on timing and fail on a loaded host system, so skip them. [ YOCTO #14825 #14882 #15081 ] Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni (cherry picked from commit 68beb4f4b5a0bea5d431decddf7656f18ac7a04a) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/tcltk/tcl/run-ptest | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/tcltk/tcl/run-ptest b/meta/recipes-devtools/tcltk/tcl/run-ptest index 5b9127784e..51e1e4aa7b 100644 --- a/meta/recipes-devtools/tcltk/tcl/run-ptest +++ b/meta/recipes-devtools/tcltk/tcl/run-ptest @@ -3,7 +3,11 @@ # clock.test needs a timezone to be set export TZ="Europe/London" export TCL_LIBRARY=library -SKIPPED_TESTS= + +# Some tests are overly strict with timings and fail on loaded systems. +# See bugs #14825 #14882 #15081. +SKIPPED_TESTS='cmdMZ-6.6 exit-1.* socket-* socket_inet-*' + for i in `ls tests/*.test | awk -F/ '{print $2}'`; do ./tcltest tests/all.tcl -file $i -skip "$SKIPPED_TESTS" >$i.log 2>&1 grep -q -F -e "Files with failing tests:" -e "Test files exiting with errors:" $i.log From patchwork Fri Dec 29 15:44:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 37069 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 950E3C47072 for ; Fri, 29 Dec 2023 15:46:28 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web10.151549.1703864781322207618 for ; Fri, 29 Dec 2023 07:46:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=01GUpVGL; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1d426ad4433so24168625ad.0 for ; Fri, 29 Dec 2023 07:46:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1703864780; x=1704469580; 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=741ANwDec7YXTBr90YSnfxQLAgN9HQW0Kxcwhb+byDM=; b=01GUpVGLSWXkXAOfM20FRwpURKM6S2HxL06s336P4y8jwt7/2swUK5QjCXmkIHBGYg 7d/QSASyEwyH79Ja6LspYmYbyiXxKN42bb3Fd/+35L4sLS85RpudmllddRVZ1PAM7BmW 4OS7BK6lslAPyaPQP/8MSJUStfqwv3oyBKjgMQn+7NXu14il3HRUEMWY2LDImOwZ7bJV FvnKvB5+wQCeZhwxSFhe1OSPlR04Zpi5bTKDBZoJxtWRPyLccfOvhTXouQmHV+mXFDzL +OT7U+IpIvvQVDzYl0B0RS+o3w+XSsLE6JThh8KICYsoJs3uO1Tb9IUP9m/w1QzqzWex HNGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703864780; x=1704469580; 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=741ANwDec7YXTBr90YSnfxQLAgN9HQW0Kxcwhb+byDM=; b=uiJ4UZIzTP3UudCCdEaeAxAn7SIoMTwaw1zWvDn20L3V1TCrF2uQgbJc+ovNMhOaHc RdCIN4WAYg1T4v9BfT6tPxcMbyREUFfaMvlz1S/x6dx6FQMzVeFF5aB3PDS9mKJonZt+ PFmltO0XAVMcPUvrHybrbCUiQZF5UuSOJfScoEfBpxcQvuDROLHEoBdWmx+8zJVTdXdh UMvRcCqdF0Zs9dPOCCbJAF5ACJX0+XzbVyoIaeWfvxAtmdW3gpqipKnDbR937LehRUFq nMNzlG7ym/5fmTnkT+zVO9qHRvkGYb/IOz5+FBW8O9XyIMvqTSSNphZutfaaLg+gIIDh LwQg== X-Gm-Message-State: AOJu0Yx9QN7Utw9lsCGE2J23tEfJzu3nXjVWPcCN80T+gEssbIh86thK J1dHJEwr5eMzM0B4wWWCL2zIggUlo6D2wCkjExp/hgTyiyaNWg== X-Google-Smtp-Source: AGHT+IHdZLPXgq5XH0X4QjyVJ+/xbAu5wAv0HIXpsDQdAyf6m6AUg3Fs6CsNhf7kloOyyFwJUZ7NaA== X-Received: by 2002:a17:902:cec6:b0:1d4:2f07:4fb4 with SMTP id d6-20020a170902cec600b001d42f074fb4mr5914479plg.7.1703864780480; Fri, 29 Dec 2023 07:46:20 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm15772705plb.6.2023.12.29.07.46.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 07:46:20 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 41/41] tcl: skip async and event tests in run-ptest Date: Fri, 29 Dec 2023 05:44:55 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Dec 2023 15:46:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193058 From: Ross Burton These test suites are full of timing-sensitive test cases, so skip them too. [ YOCTO #15321 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit dd06c3668dbe9ec1cf9a0a84d7a6bc9851f9c662) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/tcltk/tcl/run-ptest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/tcltk/tcl/run-ptest b/meta/recipes-devtools/tcltk/tcl/run-ptest index 51e1e4aa7b..87e025fce1 100644 --- a/meta/recipes-devtools/tcltk/tcl/run-ptest +++ b/meta/recipes-devtools/tcltk/tcl/run-ptest @@ -5,8 +5,8 @@ export TZ="Europe/London" export TCL_LIBRARY=library # Some tests are overly strict with timings and fail on loaded systems. -# See bugs #14825 #14882 #15081. -SKIPPED_TESTS='cmdMZ-6.6 exit-1.* socket-* socket_inet-*' +# See bugs #14825 #14882 #15081 #15321. +SKIPPED_TESTS='async-* cmdMZ-6.6 event-* exit-1.* socket-* socket_inet-*' for i in `ls tests/*.test | awk -F/ '{print $2}'`; do ./tcltest tests/all.tcl -file $i -skip "$SKIPPED_TESTS" >$i.log 2>&1