From patchwork Fri Jan 20 18:10: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: 18369 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 31E19C52D11 for ; Fri, 20 Jan 2023 18:11:10 +0000 (UTC) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web10.82043.1674238266670787536 for ; Fri, 20 Jan 2023 10:11:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=VixoPuBS; spf=softfail (domain: sakoman.com, ip: 209.85.210.175, mailfrom: steve@sakoman.com) Received: by mail-pf1-f175.google.com with SMTP id i65so4614866pfc.0 for ; Fri, 20 Jan 2023 10:11:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=jvWOkLsRh8N+pBD/Yi6OzMgR4IqWoU5ANkgAdi/EuQM=; b=VixoPuBS3aQDA/9/wcWuo5bINxvCqkQCNj2r6uDYibDKChQeY4nwSQAAcwbMnUGGM1 KjNJqJueO7MzVvQ5mF11p5fEAcDY7/ozmzYJDBYzF1zmQ5Slm0ecdC1UdfDdNLJ4l3zD j1+hrFY8hjxpoZiLqzUS2UXSkM4WGYO3Hs1Gc7o/pFTylBYjffe4eLLCAE65OMHfunuH Lb1YJPY9aooXYBqidaZyPM5TvnFji2X4IqNDR7XwJGfOtO5aoDbzkpF61n0+2jOl0MLN wm/bbkAhkw9NrwplYMhBU1f2hu6EgEWLGEduN/6fxAQ3/GjLfsZuD6ouVzCh3SAxLD5/ lJFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jvWOkLsRh8N+pBD/Yi6OzMgR4IqWoU5ANkgAdi/EuQM=; b=23bzEkbx3gkBW3fsDsC/KuXjosJHWjSNbZeTiRkZR/qm17h++Ytk1MXP/lI63UGiLm qiFeTuCh5kIRo3tIsi42gDDfLzo8KyqGfSwLXoWix14z5xshy5FoJprVm32UxkkgDRaT HOzBjjZayIj5imL1LZjQTDExn8LOH0QEb99pvvs7L1nSpKrc/wbp/jqeFXqrA06DaYUW 9N4VmK/f0MnmcwWcTvKe1II7sWfCgTQYJz5YaBhkQTe+hggJrUey7wTgJ/mF/PXCQRrV NNazi76DoAVH2X9BvFZWuF2HjnfASQxJUdIhxn6FmyyoZyUAGfPgzh9q4GmqeNSjIcqA QN9Q== X-Gm-Message-State: AFqh2ko4p6IpZr8GIVZBJWJAebbk54PaJvt5zYAsF4sA0toRUz2OLUD1 b/uFph5W4vqep6hmKFO+YgMfRVL58hnFAjD9nMw= X-Google-Smtp-Source: AMrXdXuybAhnUwKfYkd3lHJEfowNzmY9pQ5lP8VzlAMFQhC08zQj239w78F5GR4a+XbuPkndelEQcA== X-Received: by 2002:aa7:972e:0:b0:58d:b330:6e7d with SMTP id k14-20020aa7972e000000b0058db3306e7dmr18176470pfg.26.1674238265678; Fri, 20 Jan 2023 10:11:05 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:05 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 01/41] cve-update-db-native: avoid incomplete updates Date: Fri, 20 Jan 2023 08:10:18 -1000 Message-Id: <66aa05be4c237d24295d5e02de6e2dbef43af6dc.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176207 From: Marta Rybczynska The database update has been done on the original file. In case of network connection issues, temporary outage of the NVD server or a similar situation, the function could exit with incomplete data in the database. This patch solves the issue by performing the update on a copy of the database. It replaces the main one only if the whole update was successful. See https://bugzilla.yoctoproject.org/show_bug.cgi?id=14929 Reported-by: Alberto Pianon Signed-off-by: Marta Rybczynska Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 8efe99214d8b005f0ecac690ce5ba17b31758f92) Signed-off-by: Steve Sakoman --- .../recipes-core/meta/cve-update-db-native.bb | 83 ++++++++++++++----- 1 file changed, 61 insertions(+), 22 deletions(-) diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index 9b9dbbd75f..079f062f79 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb @@ -21,6 +21,8 @@ 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_1.1.db" + python () { if not bb.data.inherits_class("cve-check", d): raise bb.parse.SkipRecipe("Skip recipe when cve-check class is not loaded.") @@ -32,25 +34,15 @@ python do_fetch() { """ import bb.utils import bb.progress - import sqlite3, urllib, urllib.parse, gzip - from datetime import date + import shutil bb.utils.export_proxies(d) - YEAR_START = 2002 - db_file = d.getVar("CVE_CHECK_DB_FILE") db_dir = os.path.dirname(db_file) + db_tmp_file = d.getVar("CVE_DB_TEMP_FILE") - cve_socket_timeout = int(d.getVar("CVE_SOCKET_TIMEOUT")) - - if os.path.exists("{0}-journal".format(db_file)): - # If a journal is present the last update might have been interrupted. In that case, - # just wipe any leftovers and force the DB to be recreated. - os.remove("{0}-journal".format(db_file)) - - if os.path.exists(db_file): - os.remove(db_file) + cleanup_db_download(db_file, db_tmp_file) # The NVD database changes once a day, so no need to update more frequently # Allow the user to force-update @@ -68,9 +60,60 @@ python do_fetch() { pass bb.utils.mkdirhier(db_dir) + if os.path.exists(db_file): + shutil.copy2(db_file, db_tmp_file) + + if update_db_file(db_tmp_file, d) == True: + # Update downloaded correctly, can swap files + shutil.move(db_tmp_file, db_file) + else: + # Update failed, do not modify the database + bb.note("CVE database update failed") + os.remove(db_tmp_file) +} + +do_fetch[lockfiles] += "${CVE_CHECK_DB_FILE_LOCK}" +do_fetch[file-checksums] = "" +do_fetch[vardeps] = "" + +def cleanup_db_download(db_file, db_tmp_file): + """ + Cleanup the download space from possible failed downloads + """ + + # Clean up the updates done on the main file + # Remove it only if a journal file exists - it means a complete re-download + if os.path.exists("{0}-journal".format(db_file)): + # If a journal is present the last update might have been interrupted. In that case, + # just wipe any leftovers and force the DB to be recreated. + os.remove("{0}-journal".format(db_file)) + + if os.path.exists(db_file): + os.remove(db_file) + + # Clean-up the temporary file downloads, we can remove both journal + # and the temporary database + if os.path.exists("{0}-journal".format(db_tmp_file)): + # If a journal is present the last update might have been interrupted. In that case, + # just wipe any leftovers and force the DB to be recreated. + os.remove("{0}-journal".format(db_tmp_file)) + + if os.path.exists(db_tmp_file): + os.remove(db_tmp_file) + +def update_db_file(db_tmp_file, d): + """ + Update the given database file + """ + import bb.utils, bb.progress + from datetime import date + import urllib, gzip, sqlite3 + + YEAR_START = 2002 + cve_socket_timeout = int(d.getVar("CVE_SOCKET_TIMEOUT")) # Connect to database - conn = sqlite3.connect(db_file) + conn = sqlite3.connect(db_tmp_file) initialize_db(conn) with bb.progress.ProgressHandler(d) as ph, open(os.path.join(d.getVar("TMPDIR"), 'cve_check'), 'a') as cve_f: @@ -88,7 +131,7 @@ python do_fetch() { except urllib.error.URLError as e: cve_f.write('Warning: CVE db update error, Unable to fetch CVE data.\n\n') bb.warn("Failed to fetch CVE data (%s)" % e.reason) - return + return False if response: for l in response.read().decode("utf-8").splitlines(): @@ -98,7 +141,7 @@ python do_fetch() { break else: bb.warn("Cannot parse CVE metadata, update failed") - return + return False # Compare with current db last modified date cursor = conn.execute("select DATE from META where YEAR = ?", (year,)) @@ -119,7 +162,7 @@ python do_fetch() { except urllib.error.URLError as e: cve_f.write('Warning: CVE db update error, CVE data is outdated.\n\n') bb.warn("Cannot parse CVE data (%s), update failed" % e.reason) - return + return False else: bb.debug(2, "Already up to date (last modified %s)" % last_modified) # Update success, set the date to cve_check file. @@ -128,11 +171,7 @@ python do_fetch() { conn.commit() conn.close() -} - -do_fetch[lockfiles] += "${CVE_CHECK_DB_FILE_LOCK}" -do_fetch[file-checksums] = "" -do_fetch[vardeps] = "" + return True def initialize_db(conn): with conn: From patchwork Fri Jan 20 18:10:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 18368 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 226EEC38141 for ; Fri, 20 Jan 2023 18:11:10 +0000 (UTC) Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by mx.groups.io with SMTP id smtpd.web10.82045.1674238268398348032 for ; Fri, 20 Jan 2023 10:11:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=dDhhiL1P; spf=softfail (domain: sakoman.com, ip: 209.85.215.181, mailfrom: steve@sakoman.com) Received: by mail-pg1-f181.google.com with SMTP id 36so4727914pgp.10 for ; Fri, 20 Jan 2023 10:11:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=esiAvX1AcRURrqYUIr8xnM3mGTK/KFTAb75OpUu+fSI=; b=dDhhiL1PVBMkgfy8a5cG4Paxbhy4hCU0rO/SKPX6WnEqCpSi+rHkNmQqd77RgvDJuQ KVUxji6s98Z9VCzmnzo4p0KD/fUcAPmAJOV6KZH6DQapjYo2+sdDmD9JuFmpn3bRbRlf ZLjEa8qIg5OHwla+bVtpJo7gdySlsQVglcjJVzZzmXwvQyDhtYs6PXL98HKl01g4kvLP tJCV+K+3ZTG8PP3yq0gJnFTiVewmTWrUW0/wI9Yn30Cz3KI1OCGkyGbWTjBKkBvHCZA2 nfHIaH/R/hiNuvvSc33TYAGA2ajLj/muvebp0coXnSOsAbP8jB4juFKAGOjeohsScJkA 0ENA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=esiAvX1AcRURrqYUIr8xnM3mGTK/KFTAb75OpUu+fSI=; b=ztjDC5OjeT7QcdQAPOZPFm7zhuCx5RgMXJ++PyBxUINTw3s+VGTFJ7yAl7HmO9t9S1 ebqfU8LBES4HOHyMLbRguC9/edLxcpHT/NHNiAvX3TtmF+gaguXWRyONWyJYPiGaHJE+ o9Gk5IpBdb4Tb2by+4IwjkayHX1cWJYuFUTDNDmirjFQfn5ACMEMxKO6aBJGuBRRj53i bDARLueA4H02sK5/2Rfb00/gUX1Az9W0cc6eXtDNSDNRhdePyXtPotmTPO7W+PvhNxWZ J/CM7xZLT8zTqNwKCrq6Zo9mpWflb1sPns4L/IgMrszEBsTzdT75XRZDa9A7PzpD1XPo GTLQ== X-Gm-Message-State: AFqh2kp8MIJevEUcr8jCTA64TscBYyCEbPRzX6pnLieD0Xw+kN8fBJGP pfT/IREwisPfkyr9RwDzSvFOTRZcVbIPw7iz5UU= X-Google-Smtp-Source: AMrXdXu7BOko9u+64f4ENUMQPHO0ZcCzelp6R9nL2y0Tq6Kf1avnzKdNP/pI6HRxHNILWHCq9CBpng== X-Received: by 2002:a62:38d8:0:b0:582:ca4d:f6a7 with SMTP id f207-20020a6238d8000000b00582ca4df6a7mr40348918pfa.4.1674238267469; Fri, 20 Jan 2023 10:11:07 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:07 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 02/41] cve-update-db-native: show IP on failure Date: Fri, 20 Jan 2023 08:10:19 -1000 Message-Id: <60e06c9666a2b254c50b2f51932d395f88dd550c.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176208 From: Ross Burton We get random SSL failures when fetching the CVE database, and it's notable that the NVD server is behind a DNS round-robin or geographically diverse servers. On a hunch that there is one misconfigured server, dump the IP that we connected to. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 91f46d431dc8f40e8c6475c800bb61cb08b82b0a) Signed-off-by: Steve Sakoman --- meta/recipes-core/meta/cve-update-db-native.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index 079f062f79..e042e67b09 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb @@ -130,7 +130,10 @@ def update_db_file(db_tmp_file, d): response = urllib.request.urlopen(meta_url, timeout=cve_socket_timeout) except urllib.error.URLError as e: cve_f.write('Warning: CVE db update error, Unable to fetch CVE data.\n\n') - bb.warn("Failed to fetch CVE data (%s)" % e.reason) + bb.warn("Failed to fetch CVE data (%s)" % e) + import socket + result = socket.getaddrinfo("nvd.nist.gov", 443, proto=socket.IPPROTO_TCP) + bb.warn("Host IPs are %s" % (", ".join(t[4][0] for t in result))) return False if response: From patchwork Fri Jan 20 18:10: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: 18371 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 017E1C05027 for ; Fri, 20 Jan 2023 18:11:20 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web10.82047.1674238270372454591 for ; Fri, 20 Jan 2023 10:11:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=cUlDOwCG; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id 200so4581685pfx.7 for ; Fri, 20 Jan 2023 10:11:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=urLriLf3f4SoV8UtPI/rGAIFXTEMbllsJlQ0FcDbdrc=; b=cUlDOwCGxzOaIhLb165CqgYnFfSEaPIVKxS+g5+29CPbcZh6nrpYdyFjhc6HJMp258 FYLAoXiQhlZzmmMLLyCZ7DnzKLDSLgvAdrKkl3IA3l1a7Fi7KPY6jIf2TTTu2We0MT29 QODj0LkCdK+BXt9CDVjAo0kccG2MjFcST/auancSovlFr3b+3CE0waHSkbtleioGXlSB 8nonQngB02vaycY8PJRrdAI4LNJJtgSrKYGGDfuG7zAMiSN3IcSBz6V/Qgv4kGJZbnil t0rkorxIGasmcUCnkQTCZmkRwnMg/wsElSPBi2C3mUDRtOWQeV6f39q+hSDW/MfkUuEu pFTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=urLriLf3f4SoV8UtPI/rGAIFXTEMbllsJlQ0FcDbdrc=; b=ulO/t0WE/pb9waE52TYVEOh+K7O5bSjE6YKqQvk7SdRxogHs1r/i1Z7Le5ouCJLwpF 6wLcr0bJyYE/E3fTlbdVKq+wyXuhlbBdgSiLERw6J/vCOfAprq5mi/ldnHw1NXyPhsQd 85MiP0PcAww2AX67Yc1XbC+HOiBe6qjgrfdekesku576FP/pcXvFwhGWAPS2n0C38mFy x0jsuOCPgRZFLkcYI3cTAKWXa+A7redOtvoQrcIaTVhajyobu14OzJuZnsLZa6nuoOCe oFxWG/hUgRK/EU0ohjxAJi/kaVHszedtyBqBWz9Yj8dn4VITbZq/aGBo/pF8ZRd9bPi8 iG8Q== X-Gm-Message-State: AFqh2kp2BuwSlf/yVFjiwP2sSnJrXH/xOXP8crDkBAW3qiBlT6YnaiCG gvtHuBPB+TXgJaD23zAUNQF51pBlLPGp8r6hQPY= X-Google-Smtp-Source: AMrXdXv+9BsxiQ0l1031RYfCXIIluIr/Ch0jU4UEEiSURqvo8RjxEeh3mpm9zMPjQzj64D1fd5kkPQ== X-Received: by 2002:a05:6a00:4291:b0:573:f869:2115 with SMTP id bx17-20020a056a00429100b00573f8692115mr16335859pfb.9.1674238269387; Fri, 20 Jan 2023 10:11:09 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:09 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 03/41] cve-check: write the cve manifest to IMGDEPLOYDIR Date: Fri, 20 Jan 2023 08:10:20 -1000 Message-Id: <7d4179576c32c3464cb1a612840fd6aa37f7ff1f.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176209 From: Jermain Horsman When building an image cve_check_write_rootfs_manifest() would sometimes fail with a FileNotFoundError when writing the manifest.cve due to the parent directory (DEPLOY_DIR_IMAGE) not (yet) existing. The image task will provide the manifest in the deploy directory afterwards, so other recipes depending on the manifest being in DEPLOY_DIR_IMAGE should continue to function properly. Signed-off-by: Jermain Horsman Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 00fb2aae22ce0d7ff5f3f8766fa770eeb4e73483) Signed-off-by: Steve Sakoman --- meta/classes/cve-check.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 4b4ea7893e..41fdf8363f 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -48,8 +48,8 @@ CVE_CHECK_LOG_JSON ?= "${T}/cve.json" CVE_CHECK_DIR ??= "${DEPLOY_DIR}/cve" CVE_CHECK_RECIPE_FILE ?= "${CVE_CHECK_DIR}/${PN}" CVE_CHECK_RECIPE_FILE_JSON ?= "${CVE_CHECK_DIR}/${PN}_cve.json" -CVE_CHECK_MANIFEST ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cve" -CVE_CHECK_MANIFEST_JSON ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.json" +CVE_CHECK_MANIFEST ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cve" +CVE_CHECK_MANIFEST_JSON ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.json" CVE_CHECK_COPY_FILES ??= "1" CVE_CHECK_CREATE_MANIFEST ??= "1" @@ -202,7 +202,7 @@ python cve_check_write_rootfs_manifest () { recipies.add(pkg_data["PN"]) bb.note("Writing rootfs CVE manifest") - deploy_dir = d.getVar("DEPLOY_DIR_IMAGE") + deploy_dir = d.getVar("IMGDEPLOYDIR") link_name = d.getVar("IMAGE_LINK_NAME") json_data = {"version":"1", "package": []} From patchwork Fri Jan 20 18:10: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: 18372 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 01816C25B4E for ; Fri, 20 Jan 2023 18:11:20 +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.web10.82049.1674238272220831627 for ; Fri, 20 Jan 2023 10:11:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=EB9fmHGW; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id z31so1473845pfw.4 for ; Fri, 20 Jan 2023 10:11:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=fu2jxwjnbBNvjgssPJZykZk5DYyM7ZeC8PG8LR+LcrU=; b=EB9fmHGWlMU+KyRw9R06dkJe3aVUoloEsu683ZqGX16z0nL6JC3WxsmbLIJfao6NBk nfdvRmlZXDJnS/QeOucWnxgP0+Nz9T5JtFgwpyqFMHOYjJJ2Dgu5ZsJWsARFOie7tWDw 5a3/3L+FEGieck1kGIBbbU7hN+OpB97qQyuzFX4FJEso9Dcd4zaRwjQBmah8jMoRfN/l NqFQKEjW7D5QAxnvESlTNUAPOvOIVhRJzQGqgqlhMTk+fb3pxk2cGJRY/j5JBUqKxMqx OXnqg8RIoJ3D0tQm9feaDCvCytjJ+PHbMQhFLk8sBM9UmZ1ArrfPt3ep4jvDLlQ+8ehp FS8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fu2jxwjnbBNvjgssPJZykZk5DYyM7ZeC8PG8LR+LcrU=; b=fptrneNoRgZh5DM5gQGNETJb3DmCKM5Ix7kNMP2ihSnYLHF4C4qX2XW/7dnmmZbo4v hQGlt3AIJ4cKf5DJ8wyCEUkf8IWHGENudp4oUkXkzMdJViBLnPKoOGhf47f80GRbeX/1 HIj1InQYA3Jj2VzrH9SaEhwoBB57MyRIdE6GZPDxkZmy5FEWq0YncMm03iyt6zXhGNLb YMa1ODAKmoivuRg9JrjPh+rjiqux3wjm5kuPB2ggqoyY0yL+g2Yh3qwt+ch6+qYA42q4 +2FcffC5+VnpFYkXVnNKzGMFWiNAYH53dmbNYl2ZBs8fIBr8G0Izw22MmGQjTaxDCKgF VIOA== X-Gm-Message-State: AFqh2krJeORF3mAxnGd08gDPeazKTEIvLBajsAx7FjxbbqTSdRMZz8gY j+RlbzZ9fLWc693PWGY6cTKnDiKWkzEqOePPR8s= X-Google-Smtp-Source: AMrXdXvS2nkELK4cH/CJa792W30j3PEGxF5nVMNMwKUDtT3UMnMWXKQtgHxnYA6a+OBETSXgbVud7g== X-Received: by 2002:aa7:8d04:0:b0:58b:c35:ebab with SMTP id j4-20020aa78d04000000b0058b0c35ebabmr34098890pfe.11.1674238271223; Fri, 20 Jan 2023 10:11:11 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:10 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 04/41] cairo: fix CVE patches assigned wrong CVE number Date: Fri, 20 Jan 2023 08:10:21 -1000 Message-Id: <785197a9c79e0fe8d27951fa9c0782c92fed2b0c.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176210 From: Quentin Schulz CVE-2019-6461 and CVE-2019-6462 are fixed, but the reporting is incorrect as the patch for CVE-2019-6461 is actually for CVE-2019-6462 and vice-versa. This swaps both files and edit the CVE field to report the correct identifier. Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit f12c2a5ac94cb29f473f3c7e335463c7fb6d8a6e) Signed-off-by: Steve Sakoman --- .../cairo/cairo/CVE-2019-6461.patch | 46 ++++++------------- .../cairo/cairo/CVE-2019-6462.patch | 46 +++++++++++++------ 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch b/meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch index 0b7d9a0c36..a2dba6cb20 100644 --- a/meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch +++ b/meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch @@ -1,40 +1,20 @@ -CVE: CVE-2019-6461 -Upstream-Status: Backport -Signed-off-by: Quentin Schulz - -From ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 Mon Sep 17 00:00:00 2001 -From: Heiko Lewin -Date: Sun, 1 Aug 2021 11:16:03 +0000 -Subject: [PATCH] _arc_max_angle_for_tolerance_normalized: fix infinite loop +There is an assertion in function _cairo_arc_in_direction(). ---- - src/cairo-arc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) +CVE: CVE-2019-6461 +Upstream-Status: Pending +Signed-off-by: Ross Burton diff --git a/src/cairo-arc.c b/src/cairo-arc.c -index 390397bae..1c891d1a0 100644 +index 390397bae..1bde774a4 100644 --- a/src/cairo-arc.c +++ b/src/cairo-arc.c -@@ -90,16 +90,18 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) - { M_PI / 11.0, 9.81410988043554039085e-09 }, - }; - int table_size = ARRAY_LENGTH (table); -+ const int max_segments = 1000; /* this value is chosen arbitrarily. this gives an error of about 1.74909e-20 */ +@@ -186,7 +186,8 @@ _cairo_arc_in_direction (cairo_t *cr, + if (cairo_status (cr)) + return; - for (i = 0; i < table_size; i++) - if (table[i].error < tolerance) - return table[i].angle; +- assert (angle_max >= angle_min); ++ if (angle_max < angle_min) ++ return; - ++i; -+ - do { - angle = M_PI / i++; - error = _arc_error_normalized (angle); -- } while (error > tolerance); -+ } while (error > tolerance && i < max_segments); - - return angle; - } --- -2.38.1 - + if (angle_max - angle_min > 2 * M_PI * MAX_FULL_CIRCLES) { + angle_max = fmod (angle_max - angle_min, 2 * M_PI); diff --git a/meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch b/meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch index 4e4598c5b5..7c3209291b 100644 --- a/meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch +++ b/meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch @@ -1,20 +1,40 @@ -There is an assertion in function _cairo_arc_in_direction(). - CVE: CVE-2019-6462 -Upstream-Status: Pending -Signed-off-by: Ross Burton +Upstream-Status: Backport +Signed-off-by: Quentin Schulz + +From ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 Mon Sep 17 00:00:00 2001 +From: Heiko Lewin +Date: Sun, 1 Aug 2021 11:16:03 +0000 +Subject: [PATCH] _arc_max_angle_for_tolerance_normalized: fix infinite loop + +--- + src/cairo-arc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/cairo-arc.c b/src/cairo-arc.c -index 390397bae..1bde774a4 100644 +index 390397bae..1c891d1a0 100644 --- a/src/cairo-arc.c +++ b/src/cairo-arc.c -@@ -186,7 +186,8 @@ _cairo_arc_in_direction (cairo_t *cr, - if (cairo_status (cr)) - return; +@@ -90,16 +90,18 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) + { M_PI / 11.0, 9.81410988043554039085e-09 }, + }; + int table_size = ARRAY_LENGTH (table); ++ const int max_segments = 1000; /* this value is chosen arbitrarily. this gives an error of about 1.74909e-20 */ -- assert (angle_max >= angle_min); -+ if (angle_max < angle_min) -+ return; + for (i = 0; i < table_size; i++) + if (table[i].error < tolerance) + return table[i].angle; - if (angle_max - angle_min > 2 * M_PI * MAX_FULL_CIRCLES) { - angle_max = fmod (angle_max - angle_min, 2 * M_PI); + ++i; ++ + do { + angle = M_PI / i++; + error = _arc_error_normalized (angle); +- } while (error > tolerance); ++ } while (error > tolerance && i < max_segments); + + return angle; + } +-- +2.38.1 + From patchwork Fri Jan 20 18:10: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: 18376 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 07744C38159 for ; Fri, 20 Jan 2023 18:11:20 +0000 (UTC) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mx.groups.io with SMTP id smtpd.web11.82148.1674238273975308392 for ; Fri, 20 Jan 2023 10:11:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=YleQHis5; spf=softfail (domain: sakoman.com, ip: 209.85.215.178, mailfrom: steve@sakoman.com) Received: by mail-pg1-f178.google.com with SMTP id v3so4749762pgh.4 for ; Fri, 20 Jan 2023 10:11:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=TqgUwesgIwVhJ2vm0KYPb0WDMl7a9GOKKheaLWyx4FI=; b=YleQHis5PsMyh0MidosG5p9nfOH7r0ygQqR5TE2sSx2Cc+kiPudS2WeYM1rTR6Infa KmNGccyKTeMcB6uCQhA+e5NTN4f5L/OEU995Er0wsm5+t3CjYbFJPlaVIKdlaRtF0hiN CbQUncRsJ7r5ahZfWOnEjb15yLc/qPF3zYNObh3Y+AACTrcs7+L9vc7RbG69f9Fuopta DXDU5jXrdLx9Y8IWLjeS8Ht3QYVxAbQRn8BtGaCVyPYJRXjJwZJ6w5pFPHBeMCHCpyzL 9BKNK14eYauLHQES9StEDINQbqfXO0ugFncoOI3yb0oEOeg7kRxuEfHbyhBsGpq0BhRV rsJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TqgUwesgIwVhJ2vm0KYPb0WDMl7a9GOKKheaLWyx4FI=; b=yRCGvNpuiLkFspp7exF3B5G+btCTFEUed77QvdUvKIB2O5aFhScoieZfrHQVVZbDUI 49H8o0sf2Ejsu7o8/6MFeTOQX2ZDe0JvkHlhGKgB0yFaF2xxOXDnSR2sNEBhNARWIaKi o6wUFVr3t7wnCwhnPEvWNQZ6595WRVx0lYyaUZUs+C9KPIddy7PfUpSZ+L68NyNr0g72 /ZfFLTVIf+8U9gQvpSBfqBth5zOLI2txnHkfklyaFF+p2xDNfGSkrsxKL3XB7dldDLBu VwQRoF/yseAJ55lYYH4rffvkb96x9JB4TJLf/f1SXOZp1Pzodm7TctxiAjlrDbwdJpdD rZcw== X-Gm-Message-State: AFqh2koaIfG1vdq+/fB3x3xayaXLIsOz8RvSlkvLFqTFGt9s3VNQV+4D mlmAME+7I23lNAJBRSMJxjGHENvRd3tCF2mXqiY= X-Google-Smtp-Source: AMrXdXuFU78aUjXvHc5lDfHpoRPfMyMqiETyynf5TwcQBqHMlYWMjB/6kwTLnJ0TIHGjQOYHxm/PLw== X-Received: by 2002:aa7:8493:0:b0:58d:98e0:79a9 with SMTP id u19-20020aa78493000000b0058d98e079a9mr14914539pfn.34.1674238273022; Fri, 20 Jan 2023 10:11:13 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:12 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 05/41] curl: Fix CVE-2022-43551 and CVE-2022-43552 Date: Fri, 20 Jan 2023 08:10:22 -1000 Message-Id: <514561e323a8f63d42af9baa226ac53955c40cff.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176211 From: Robert Joslyn Backport patches to address these CVEs. * https://curl.se/docs/CVE-2022-43551.html * https://curl.se/docs/CVE-2022-43552.html Signed-off-by: Robert Joslyn Signed-off-by: Steve Sakoman --- .../curl/curl/CVE-2022-43551.patch | 32 ++++++++ .../curl/curl/CVE-2022-43552.patch | 78 +++++++++++++++++++ meta/recipes-support/curl/curl_7.85.0.bb | 2 + 3 files changed, 112 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2022-43551.patch create mode 100644 meta/recipes-support/curl/curl/CVE-2022-43552.patch diff --git a/meta/recipes-support/curl/curl/CVE-2022-43551.patch b/meta/recipes-support/curl/curl/CVE-2022-43551.patch new file mode 100644 index 0000000000..7c617ef1db --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2022-43551.patch @@ -0,0 +1,32 @@ +From 08aa76b7b24454a89866aaef661ea90ae3d57900 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Mon, 19 Dec 2022 08:36:55 +0100 +Subject: [PATCH] http: use the IDN decoded name in HSTS checks + +Otherwise it stores the info HSTS into the persistent cache for the IDN +name which will not match when the HSTS status is later checked for +using the decoded name. + +Reported-by: Hiroki Kurosawa + +Closes #10111 + +Upstream-Status: Backport [https://github.com/curl/curl/commit/9e71901634e276dd] +Signed-off-by: Robert Joslyn +--- + lib/http.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/http.c b/lib/http.c +index b0ad28e..8b18e8d 100644 +--- a/lib/http.c ++++ b/lib/http.c +@@ -3654,7 +3654,7 @@ CURLcode Curl_http_header(struct Curl_easy *data, struct connectdata *conn, + else if(data->hsts && checkprefix("Strict-Transport-Security:", headp) && + (conn->handler->flags & PROTOPT_SSL)) { + CURLcode check = +- Curl_hsts_parse(data->hsts, data->state.up.hostname, ++ Curl_hsts_parse(data->hsts, conn->host.name, + headp + strlen("Strict-Transport-Security:")); + if(check) + infof(data, "Illegal STS header skipped"); diff --git a/meta/recipes-support/curl/curl/CVE-2022-43552.patch b/meta/recipes-support/curl/curl/CVE-2022-43552.patch new file mode 100644 index 0000000000..059dad17d8 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2022-43552.patch @@ -0,0 +1,78 @@ +From 6ae56c9c47b02106373c9482f09c510fd5c50a84 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Mon, 19 Dec 2022 08:38:37 +0100 +Subject: [PATCH] smb/telnet: do not free the protocol struct in *_done() + +It is managed by the generic layer. + +Reported-by: Trail of Bits + +Closes #10112 + +Upstream-Status: Backport [https://github.com/curl/curl/commit/4f20188ac644afe1] +Signed-off-by: Robert Joslyn +--- + lib/smb.c | 14 ++------------ + lib/telnet.c | 3 --- + 2 files changed, 2 insertions(+), 15 deletions(-) + +diff --git a/lib/smb.c b/lib/smb.c +index 039d680..f682c1f 100644 +--- a/lib/smb.c ++++ b/lib/smb.c +@@ -62,8 +62,6 @@ static CURLcode smb_connect(struct Curl_easy *data, bool *done); + static CURLcode smb_connection_state(struct Curl_easy *data, bool *done); + static CURLcode smb_do(struct Curl_easy *data, bool *done); + static CURLcode smb_request_state(struct Curl_easy *data, bool *done); +-static CURLcode smb_done(struct Curl_easy *data, CURLcode status, +- bool premature); + static CURLcode smb_disconnect(struct Curl_easy *data, + struct connectdata *conn, bool dead); + static int smb_getsock(struct Curl_easy *data, struct connectdata *conn, +@@ -78,7 +76,7 @@ const struct Curl_handler Curl_handler_smb = { + "SMB", /* scheme */ + smb_setup_connection, /* setup_connection */ + smb_do, /* do_it */ +- smb_done, /* done */ ++ ZERO_NULL, /* done */ + ZERO_NULL, /* do_more */ + smb_connect, /* connect_it */ + smb_connection_state, /* connecting */ +@@ -105,7 +103,7 @@ const struct Curl_handler Curl_handler_smbs = { + "SMBS", /* scheme */ + smb_setup_connection, /* setup_connection */ + smb_do, /* do_it */ +- smb_done, /* done */ ++ ZERO_NULL, /* done */ + ZERO_NULL, /* do_more */ + smb_connect, /* connect_it */ + smb_connection_state, /* connecting */ +@@ -941,14 +939,6 @@ static CURLcode smb_request_state(struct Curl_easy *data, bool *done) + return CURLE_OK; + } + +-static CURLcode smb_done(struct Curl_easy *data, CURLcode status, +- bool premature) +-{ +- (void) premature; +- Curl_safefree(data->req.p.smb); +- return status; +-} +- + static CURLcode smb_disconnect(struct Curl_easy *data, + struct connectdata *conn, bool dead) + { +diff --git a/lib/telnet.c b/lib/telnet.c +index 923c7f8..48cd0d7 100644 +--- a/lib/telnet.c ++++ b/lib/telnet.c +@@ -1248,9 +1248,6 @@ static CURLcode telnet_done(struct Curl_easy *data, + + curl_slist_free_all(tn->telnet_vars); + tn->telnet_vars = NULL; +- +- Curl_safefree(data->req.p.telnet); +- + return CURLE_OK; + } + diff --git a/meta/recipes-support/curl/curl_7.85.0.bb b/meta/recipes-support/curl/curl_7.85.0.bb index a4561494d1..1e47e9fac5 100644 --- a/meta/recipes-support/curl/curl_7.85.0.bb +++ b/meta/recipes-support/curl/curl_7.85.0.bb @@ -17,6 +17,8 @@ SRC_URI = " \ file://CVE-2022-35260.patch \ file://CVE-2022-42915.patch \ file://CVE-2022-42916.patch \ + file://CVE-2022-43551.patch \ + file://CVE-2022-43552.patch \ " SRC_URI[sha256sum] = "88b54a6d4b9a48cb4d873c7056dcba997ddd5b7be5a2d537a4acb55c20b04be6" From patchwork Fri Jan 20 18:10: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: 18375 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 10278C38141 for ; Fri, 20 Jan 2023 18:11:20 +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.82150.1674238275798686670 for ; Fri, 20 Jan 2023 10:11:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=IA7RBKNT; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id d3so6009232plr.10 for ; Fri, 20 Jan 2023 10:11:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=gMrcHRju3OAHSeNs15lyK/pHCRdxDGAHYlsjfaVNCbM=; b=IA7RBKNT6SnvOXaEWNlmNMmU59U5iqgEtybdWD94o+vOLxYR18U91Z74UZcaDszVdV zDldPzKUmGoHo+Qcz779psh4h2/t7+EjUwgTKGyP7FZ9C4TgGVSfbLoG47tw2ZIQNzm1 /nm2HGCOaoHdeHRNBRk7HzdjSVW9JGqxwAJyZ4fOEeIsXc4pO6f7Xpn+PD846PrqwfJ+ NMjrVrEpZOCV2W5pisJd3Ns56GpKNjSYlgBLpxL5B3kI5CUSEST/Y+t1yWfebLhDw3AN KvqKfotGGnpVFVw5/pPgP5zioNG+G71w3neybWPyuXIesDebTCpnJIJL3Ney3fxSP62Y BSYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gMrcHRju3OAHSeNs15lyK/pHCRdxDGAHYlsjfaVNCbM=; b=SRd1ovp3P53yyAViYUje6XZMUZ+a+QCAY53i2pa1BToTSYAlMPEwh/D5YLEV9pTIJI 5YMjj2N41V1g2iX78xCY4tY9f5VD764uZak6dlIrKrWOs6ZAI56CoM1XJL6j/T7wY1PS atA+uJjs42dHcdw2lTGFNqFt1fU+TVt7seYkD6CzD5JSfELtqSVQTWBWviSAGMMSS/Sb lkyfQSNzHhOvzyqSV2bULER+zLwZUk5o2e3uMz93A0/bOAtTtrDmS1mefhvSGPGOUM5z WFdA0w6DSrn3A6cIj4Kw7I70l4D6dGAd2gOZIrwcfkNFCUXirgDIMEhkTsSQiYsaVI7p Bfvg== X-Gm-Message-State: AFqh2konRrzZlz3kMCJ1wj1oWRluD5czZtZ2g5jaWFSZi3B6ZSIfXpAl QI0tLT6AVjCid0NWmwyND/LgZ7yqq1/Sur9mWe0= X-Google-Smtp-Source: AMrXdXuslUiQTdfctkbh3DXrpQvhPccNqKEFeZpM0mam7l50xoZfY1WdD92xwgoCkB5IfkB85cfT6g== X-Received: by 2002:a05:6a20:6f09:b0:a4:efdd:a9b9 with SMTP id gt9-20020a056a206f0900b000a4efdda9b9mr16135274pzb.44.1674238274844; Fri, 20 Jan 2023 10:11:14 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:14 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 06/41] pango: upgrade 1.50.11 -> 1.50.12 Date: Fri, 20 Jan 2023 08:10:23 -1000 Message-Id: <032a2a1abf19954c59d50fcacafb2293ac5a9351.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176212 From: Ross Burton Overview of changes in 1.50.12, 18-11-2022 ========================================== - Fix weight conversion on MacOS - Update to Unicode 15 - Some introspection annotation fixes - Improve PangoAttrList serialization - Fix char offset calculatiosn in multi-paragraph layouts Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 35fc61a1dd63a0555b67da899418010d595b545c) Signed-off-by: Steve Sakoman --- ...d-install-nofonts-fonts.conf-as-it-i.patch | 35 ------------------- .../{pango_1.50.11.bb => pango_1.50.12.bb} | 3 +- 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 meta/recipes-graphics/pango/pango/0001-tests-meson.build-install-nofonts-fonts.conf-as-it-i.patch rename meta/recipes-graphics/pango/{pango_1.50.11.bb => pango_1.50.12.bb} (90%) diff --git a/meta/recipes-graphics/pango/pango/0001-tests-meson.build-install-nofonts-fonts.conf-as-it-i.patch b/meta/recipes-graphics/pango/pango/0001-tests-meson.build-install-nofonts-fonts.conf-as-it-i.patch deleted file mode 100644 index 8dacd62138..0000000000 --- a/meta/recipes-graphics/pango/pango/0001-tests-meson.build-install-nofonts-fonts.conf-as-it-i.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 13f8ba5d5b699df1f88eeea859406daba6d6941f Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 8 Nov 2022 18:08:51 +0100 -Subject: [PATCH] tests/meson.build: install nofonts/fonts.conf as it is - required by tests - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/pango/-/merge_requests/654] -Signed-off-by: Alexander Kanavin ---- - tests/meson.build | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/tests/meson.build b/tests/meson.build -index 8b4bfa38..6c1c461b 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -250,6 +250,10 @@ foreach d: test_items_data - installed_test_items_data += d + '.expected' - endforeach - -+installed_test_nofonts_data = [ -+ 'nofonts/fonts.conf', -+] -+ - installed_test_datadir = join_paths(pango_datadir, 'installed-tests', 'pango') - installed_test_bindir = join_paths(pango_libexecdir, 'installed-tests', 'pango') - -@@ -261,6 +265,7 @@ if get_option('install-tests') - install_data(installed_test_breaks_data, install_dir: join_paths(installed_test_bindir, 'breaks')) - install_data(installed_test_items_data, install_dir: join_paths(installed_test_bindir, 'itemize')) - install_data(installed_test_fontsets_data, install_dir: join_paths(installed_test_bindir, 'fontsets')) -+ install_data(installed_test_nofonts_data, install_dir: join_paths(installed_test_bindir, 'nofonts')) - endif - - gen_installed_test = files([ 'gen-installed-test.py' ]) diff --git a/meta/recipes-graphics/pango/pango_1.50.11.bb b/meta/recipes-graphics/pango/pango_1.50.12.bb similarity index 90% rename from meta/recipes-graphics/pango/pango_1.50.11.bb rename to meta/recipes-graphics/pango/pango_1.50.12.bb index 6f599f5b78..6779f39c4f 100644 --- a/meta/recipes-graphics/pango/pango_1.50.11.bb +++ b/meta/recipes-graphics/pango/pango_1.50.12.bb @@ -22,10 +22,9 @@ GIR_MESON_DISABLE_FLAG = "disabled" SRC_URI += "file://run-ptest \ file://0001-Skip-running-test-layout-test.patch \ - file://0001-tests-meson.build-install-nofonts-fonts.conf-as-it-i.patch \ " -SRC_URI[archive.sha256sum] = "8800f812d89ee61388188703203f3a7878963c22f8695aaf1fa0a1a1428d17ae" +SRC_URI[archive.sha256sum] = "caef96d27bbe792a6be92727c73468d832b13da57c8071ef79b9df69ee058fe3" DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" From patchwork Fri Jan 20 18:10: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: 18373 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 103DBC52D11 for ; Fri, 20 Jan 2023 18:11:20 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web11.82153.1674238277463498526 for ; Fri, 20 Jan 2023 10:11:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Asaw+39q; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id a184so4562106pfa.9 for ; Fri, 20 Jan 2023 10:11:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Y+2CNxYouLVYqcsFTxa6YpTKp0ARwEnzD1sy/HS4oMU=; b=Asaw+39qoIfS1Qide7qjaZXE0+u6OX3krBGzBiwTrl39vgy3zF2Kat3hnwTEtql0kq Eh7YgradzlB2ukDK2aNdqMnFU9jQG7B/vp9LB6MVzHiwWz9nkMjWKx4KH72nn4aVSSLk NcXFcyFeZ7YFp0skFOlsm80OTqA3+FiCnRIOckTkre779zSYWQzSe0/vWjFUZQ6B80bY mN8EFA6YCIj9aCRfsQx0zroj7UgO0CEDkBADpHd4XRRrUHO63+OAQ1Mjx9o3EWfI6h1U B1osTgC3l+Qd690as3CnF1I1Uio4ekQsFDCEjC/HWdzTSXUaj6z/5kVlzbaKRkgPMwna x1cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y+2CNxYouLVYqcsFTxa6YpTKp0ARwEnzD1sy/HS4oMU=; b=NdLIDzq1mMUF6gEvl8QGwBs7Gf0jzXsMW77TF0UxmEhkj3MIxxnPokhJuVlhUdb3mV uzyTZ/QS2gfuyiIRF8yYzfDNf8va3npC0C0rKt60bm+3G3n45/HhgkzX4gAt+hIWFPeV Jg51rtm/VqHJuLiJ0th8hFEFR1tUhxyKaUybtPc17Xms33MaC28Rb1SeToNaNfQ7uJCn JxmXWjOFz3/srzT5ASclJIQeecb5a1F3/dD2Z3dFtEEEkigapuCHr6Nuuk8phgry+6GA QkSiPbPn85WuEjQxi7cCIYIK7PDciyY+CxOL3dl/H4wuakpl+Nu3VaeKv2s7dV9W5FyD D9ZQ== X-Gm-Message-State: AFqh2krlnDE/BRRAzFffV7+6R1TlsJ7yuAmUFaF7hotV+emcJdpmWo9B 47H6k9UKV2jXP2osqhAagvjzV0EJkaZHocJJR34= X-Google-Smtp-Source: AMrXdXszHgnmmsBVIVcIC1QvaoqKsJOEuZ2EQco5jV4A7CsDCQcPr25LRnJfr1qnXvgOv33eGO8gng== X-Received: by 2002:a05:6a00:4295:b0:58d:b2c0:e4e3 with SMTP id bx21-20020a056a00429500b0058db2c0e4e3mr15671245pfb.25.1674238276605; Fri, 20 Jan 2023 10:11:16 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:16 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 07/41] libksba: update 1.6.2 -> 1.6.3 Date: Fri, 20 Jan 2023 08:10:24 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176213 From: Alexander Kanavin Noteworthy changes in version 1.6.3 (2022-12-06) Fix another integer overflow in the CRL parser. [T6284,CVE-2022-47629] Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 83f3f21b1b84ab9e7b461ac966691c80f4ed4e97) Signed-off-by: Steve Sakoman --- .../libksba/libksba/ksba-add-pkgconfig-support.patch | 6 +++--- .../libksba/{libksba_1.6.2.bb => libksba_1.6.3.bb} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-support/libksba/{libksba_1.6.2.bb => libksba_1.6.3.bb} (94%) diff --git a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch index af96bd57cd..bdb80ff34d 100644 --- a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch +++ b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch @@ -1,4 +1,4 @@ -From 6081640895b6d566fa21123e2de7d111eeab5c4c Mon Sep 17 00:00:00 2001 +From ca8174aa81d7bf364b33f7254a9e887735c4996d Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 3 Dec 2012 18:17:31 +0800 Subject: [PATCH] libksba: add pkgconfig support @@ -16,7 +16,7 @@ Signed-off-by: Chen Qi 1 file changed, 4 insertions(+), 86 deletions(-) diff --git a/src/ksba.m4 b/src/ksba.m4 -index 6b55bb8..6e7336f 100644 +index 452c245..aa96255 100644 --- a/src/ksba.m4 +++ b/src/ksba.m4 @@ -23,37 +23,6 @@ dnl with a changed API. @@ -44,7 +44,7 @@ index 6b55bb8..6e7336f 100644 - fi - - use_gpgrt_config="" -- if test x"$KSBA_CONFIG" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then +- if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then - if $GPGRT_CONFIG ksba --exists; then - KSBA_CONFIG="$GPGRT_CONFIG ksba" - AC_MSG_NOTICE([Use gpgrt-config as ksba-config]) diff --git a/meta/recipes-support/libksba/libksba_1.6.2.bb b/meta/recipes-support/libksba/libksba_1.6.3.bb similarity index 94% rename from meta/recipes-support/libksba/libksba_1.6.2.bb rename to meta/recipes-support/libksba/libksba_1.6.3.bb index f6ecb9aec4..dc39693be4 100644 --- a/meta/recipes-support/libksba/libksba_1.6.2.bb +++ b/meta/recipes-support/libksba/libksba_1.6.3.bb @@ -24,7 +24,7 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://ksba-add-pkgconfig-support.patch" -SRC_URI[sha256sum] = "fce01ccac59812bddadffacff017dac2e4762bdb6ebc6ffe06f6ed4f6192c971" +SRC_URI[sha256sum] = "3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c" do_configure:prepend () { # Else these could be used in preference to those in aclocal-copy From patchwork Fri Jan 20 18:10: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: 18374 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 18727C38A23 for ; Fri, 20 Jan 2023 18:11:20 +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.web10.82052.1674238279366093535 for ; Fri, 20 Jan 2023 10:11:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=FhIYopnx; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id f3so4749467pgc.2 for ; Fri, 20 Jan 2023 10:11:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=l+Xjh6iU8x66C49jS0iNM5Nep7Ik4Wuw5UpHZtQ9cjs=; b=FhIYopnxR3XJqQhoAKNXsKyj5Bbzh9VFPLLmQhYhJIVmbhS6kqsNIKZbmYo5o73vH9 6gWCVMLW9jX76NGOvOqFtjfp+FuFxaxJFlvEmoV5x9VvZ6irajTln9i4sWqNEL5IlzIW BQev39hMN4h2g18GSYnOhbYhzLCe9jHbLZpLEdhy0WGKjlDK/iznK4uZ1Mt4mXV5jrUh Ghe0zqNmwPlFZ1/wKPhYedpABsRstx8HrmjTVpi1+fM5iS7PxpUur6YYAvYDZADskpKD ajMtLHTa8Mu6goxWEwk8gpH0DhryYmZmtri9VTFi/p8F2sht+A9K8hfVXkQrSlH4oMaC Sd7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l+Xjh6iU8x66C49jS0iNM5Nep7Ik4Wuw5UpHZtQ9cjs=; b=n/AtqZvTNMgC42TVPDCSJofSl2EqoNHiWqdf4UcyU+/JaCplhjldXPTjMnID06xew+ d918bJL6w372uxPhBDC9bHwxhd0Yh8AzsMYzXBXWANSwgFX9NpVAt3ofxl6IcwOZ/o5i Y3LAq4bQ2VctHucDQcHgIaqBDMPMG10/mXGey8rUnk+eh9jsZQDwNwc2pX2FBzmCdZ2K SG2xOAiBI/jo2u0EhFL4flZX2/B01LYYpih+4FUCPz4HbqLk00DVxqKBb3PTJaUoc+xc sBRgW4b43l3mjZHp4bnaGfU0msCs4behp5uW1vokNzpPRiFXlvgdNBtmVC8EzlkycSSY UzxQ== X-Gm-Message-State: AFqh2kr6myPUV5noI7buevh0ilB/q1X87WyD+s8CpBEKwdqNX9efwfpW 3T7ViYAieTI3Ot97AykKzqqKGyvEQa0OHgTecQo= X-Google-Smtp-Source: AMrXdXtqNO34Eis/7e0jwhBctR278s7WpqKtZ71L5n+IduBzMyWGIQMU8cX65m3xQ2ZA8pl3cVHFdg== X-Received: by 2002:aa7:8619:0:b0:581:12c5:1356 with SMTP id p25-20020aa78619000000b0058112c51356mr16333933pfn.30.1674238278375; Fri, 20 Jan 2023 10:11:18 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:17 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 08/41] linux-firmware: upgrade 20221109 -> 20221214 Date: Fri, 20 Jan 2023 08:10:25 -1000 Message-Id: <7c31b7265f5b765f6a21852a90cd4e4eae0c7bd6.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176214 From: Alexander Kanavin License-Update: additional files Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 15f3a9f6c4406ddc00f7dc0ca7e1beafe9c71a9f) Signed-off-by: Steve Sakoman --- ...{linux-firmware_20221109.bb => linux-firmware_20221214.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20221109.bb => linux-firmware_20221214.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20221109.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20221214.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20221109.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20221214.bb index b05b960ebd..c2354e627f 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20221109.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20221214.bb @@ -132,7 +132,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ " # WHENCE checksum is defined separately to ease overriding it if # class-devupstream is selected. -WHENCE_CHKSUM = "ab4ba608dc4b757716871f9be033f0f1" +WHENCE_CHKSUM = "bf7c716d16e48fe118c6209f99b13253" # These are not common licenses, set NO_GENERIC_LICENSE for them # so that the license files will be copied from fetched source @@ -209,7 +209,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw # Pin this to the 20220509 release, override this in local.conf SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae" -SRC_URI[sha256sum] = "c0ddffbbcf30f2e015bddd5c6d3ce1f13976b906aceabda4a57e3c41a3190701" +SRC_URI[sha256sum] = "e793783e92acbde549965521462d1d1327827360664cf242dbda08f075654331" inherit allarch From patchwork Fri Jan 20 18:10: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: 18381 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 EFC44C38159 for ; Fri, 20 Jan 2023 18:11:29 +0000 (UTC) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web10.82043.1674238266670787536 for ; Fri, 20 Jan 2023 10:11:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=je5aHgSP; spf=softfail (domain: sakoman.com, ip: 209.85.210.175, mailfrom: steve@sakoman.com) Received: by mail-pf1-f175.google.com with SMTP id i65so4615422pfc.0 for ; Fri, 20 Jan 2023 10:11:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=tghfiAKJcmtzLTqC4FGGmF3p0tLgw61VGSkJgL7J0jA=; b=je5aHgSPD9cmdsdShdv4sr6c2Vqfy/xBnn15q+jRoe8W7TGQKxFF37syoep6C/k4tf HH5BTk2T6Auti+/voARPHi6X610LI+vXVv2T5VaRdpRM3EXGWEVprJRdY1+4hfYIkJv4 Z6214ozVhmjDNByK7h2/jKzJ25QLY2jFuhlS08uTvN0P7D5ciQNtfUC5/7amat//DDvZ +fYNHf3Y3YqcHw4ExQk3yBFf3ditxlAa44mZNUYOQHU23kEIJkUiA2wBAdsbzNlOzT2S wCu71ig6ivpLBNvLqKyoxp1BcpHdumT1S5y/A5ly6CQoAiht30XjX7S9mH0fR3L7l+h+ zRQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tghfiAKJcmtzLTqC4FGGmF3p0tLgw61VGSkJgL7J0jA=; b=YFujQcYn8hMm/jmY3Vw3OmSdq1wY7HNVstqo+xJ3r5cc2n/DkP39K5aWwODLBIJ47g /qhZ6NjiJ+PNtESS1iogzRW2QMt9udAc9TYxua3q7bglPoJ1QLsuj/lhaZG8/u77aXHG cS7AeZV9S97EhZ5rVnjS4TTIbcFFjwSP3QsxmSrnJjrehNxVOGc3VAvTIKPK58Tg9WBS 7KZfc0/8u1O7iut0pRphJ8Dl/PsNVkcCMkjkisdNTcK67gHozwmAZuv90UUESt1sMERu XXBaG2zxED5NHrirW6EGBZ0s7q0KFUzSH7Z/Q63mE/zW/8OEX5W8ylET5gSByflYDA65 gerA== X-Gm-Message-State: AFqh2koJN0k3/10LvNm0jj47/nzZQngu7koQzXplyHSD3FhUJSiLgO9Y di2hhzMVpudzjnAbCudkO/efjf8kZMY6JBeuoEk= X-Google-Smtp-Source: AMrXdXu+XvuC3ozkQaY16VvjT1zD2GWdZrGz4x95KEP0eNyiDPAZimKzzR1UJowx/pmcRnJa1Sf3tw== X-Received: by 2002:a62:1c4e:0:b0:587:e40c:59e with SMTP id c75-20020a621c4e000000b00587e40c059emr38272437pfc.18.1674238280208; Fri, 20 Jan 2023 10:11:20 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:19 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 09/41] xwayland: upgrade 22.1.5 -> 22.1.7 Date: Fri, 20 Jan 2023 08:10:26 -1000 Message-Id: <1d9aa525d5f239db27486b4b5fe85417d4d729ee.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176215 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit c37ec8b2d91605d6eb5228f0a447fb83f111edc3) Signed-off-by: Steve Sakoman --- .../xwayland/{xwayland_22.1.5.bb => xwayland_22.1.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/xwayland/{xwayland_22.1.5.bb => xwayland_22.1.7.bb} (95%) diff --git a/meta/recipes-graphics/xwayland/xwayland_22.1.5.bb b/meta/recipes-graphics/xwayland/xwayland_22.1.7.bb similarity index 95% rename from meta/recipes-graphics/xwayland/xwayland_22.1.5.bb rename to meta/recipes-graphics/xwayland/xwayland_22.1.7.bb index 51d847a093..dd32bd0111 100644 --- a/meta/recipes-graphics/xwayland/xwayland_22.1.5.bb +++ b/meta/recipes-graphics/xwayland/xwayland_22.1.7.bb @@ -10,7 +10,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz" -SRC_URI[sha256sum] = "e317ac1f119f8321654921761420901e4abd95585a8c763ce26af3b045ac1672" +SRC_URI[sha256sum] = "d53afac6c71953f5cf66d03d289dacd8961da5bd309c1dff125d5955d9db5f76" UPSTREAM_CHECK_REGEX = "xwayland-(?P\d+(\.(?!90\d)\d+)+)\.tar" From patchwork Fri Jan 20 18:10: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: 18378 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 03848C38141 for ; Fri, 20 Jan 2023 18:11:30 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web10.82055.1674238283036518314 for ; Fri, 20 Jan 2023 10:11:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=2MlsmPRy; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id x4so4594339pfj.1 for ; Fri, 20 Jan 2023 10:11:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=OLoBqYPdwrrGyHorDjb6Dsbh6nV6Gy58nM83//E6f5g=; b=2MlsmPRyH8u+NOuVcCxn26lmtgqkpucIwxJ81OgDqW7+Wf3bK2anzosf01VGVNW30x NC2kN4m7496oBRkjF6i1wemBDrbgUevzdzyGx4wR0lV7gq+7Xowk2WHVDjpe5pMhEpkG vwNVu4XaCeVf9pYeVeTlvibqAWH/JZZbnn0NGDQlUEQTaN/r7vVTRdpiraxwqx+y9jGL oaCpfkdB3Y0ZAV4PrlojoGaNM2g5bLfn9rBwkY/x39yF/ccGhQjXShK0vrDfsVdZ4k1l dVVoevExJkb2cx8Z7/D8HKRbzdD0BA7OAnoW0k+faCVyhtLOYP2cCai6e9W8am5xNgPL b7Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OLoBqYPdwrrGyHorDjb6Dsbh6nV6Gy58nM83//E6f5g=; b=lHaex5aS9wIS486WggD72z4mp+5tyj5ckRM70MCAJGIf99g7oV24kaKQo3knKA3BUS i68URXY2kTfcOuZq1L3rgmujrFXgHiuQHrC90Mqch4kWC0KlsFBUYeEhPzxrLkiy6YKj jA6SlLKWsL7ihE+CSNSvjDIzlChEiS8MOySDFQvj2i0tCdE/4Y5n6/VXFbu+6IAb0QlW E022n1L7OIRqwJqudDsb9qWc4UEyRbbgYv88yszwNDeCfQ27QZ1yagw4wMQ+1BSYOOIJ qt2L2j1FNcbDq4VXvEC2lrIzJTlVxfE4XBSK+oM5wjImAALIG6eUhzFomi68uYpc/iQw OU2w== X-Gm-Message-State: AFqh2koP1tJdWf9aB0MHuvyfEnHwWVx8CxJfELruAF6lNnnGOUPOUt8z BwsimmyUoZP52SpcbWheSUvkWCnhEwnKoKbTLpg= X-Google-Smtp-Source: AMrXdXu1nMfNoplHvA2X1hFOxJKQWgF26L3MyF5vgGd9pDclvIGLK1aTJzc0YPsgtECWOJrYDOU9dQ== X-Received: by 2002:a05:6a00:70f:b0:581:1f4b:d1e5 with SMTP id 15-20020a056a00070f00b005811f4bd1e5mr16861422pfl.12.1674238282001; Fri, 20 Jan 2023 10:11:22 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:21 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 10/41] xserver-xorg: upgrade 21.1.4 -> 21.1.6 Date: Fri, 20 Jan 2023 08:10:27 -1000 Message-Id: <51e6efcc077138bb460d17cf1a00c4eb57b0d8aa.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176216 From: Alexander Kanavin Changelog: https://fossies.org/linux/misc/xorg-server-21.1.6.tar.xz/xorg-server-21.1.6/ChangeLog Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 009e8d6a292690a0c355d12be2368a9677c701f5) Signed-off-by: Steve Sakoman --- ...possible-memleaks-in-XkbGetKbdByName.patch | 63 ------------------- ...ntedString-against-request-length-at.patch | 38 ----------- ...-xorg_21.1.4.bb => xserver-xorg_21.1.6.bb} | 4 +- 3 files changed, 1 insertion(+), 104 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-proof-GetCountedString-against-request-length-at.patch rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_21.1.4.bb => xserver-xorg_21.1.6.bb} (80%) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch deleted file mode 100644 index 0e61ec5953..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch +++ /dev/null @@ -1,63 +0,0 @@ -CVE: CVE-2022-3551 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 18f91b950e22c2a342a4fbc55e9ddf7534a707d2 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 13 Jul 2022 11:23:09 +1000 -Subject: [PATCH] xkb: fix some possible memleaks in XkbGetKbdByName - -GetComponentByName returns an allocated string, so let's free that if we -fail somewhere. - -Signed-off-by: Peter Hutterer ---- - xkb/xkb.c | 26 ++++++++++++++++++++------ - 1 file changed, 20 insertions(+), 6 deletions(-) - -diff --git a/xkb/xkb.c b/xkb/xkb.c -index 4692895db..b79a269e3 100644 ---- a/xkb/xkb.c -+++ b/xkb/xkb.c -@@ -5935,18 +5935,32 @@ ProcXkbGetKbdByName(ClientPtr client) - xkb = dev->key->xkbInfo->desc; - status = Success; - str = (unsigned char *) &stuff[1]; -- if (GetComponentSpec(&str, TRUE, &status)) /* keymap, unsupported */ -- return BadMatch; -+ { -+ char *keymap = GetComponentSpec(&str, TRUE, &status); /* keymap, unsupported */ -+ if (keymap) { -+ free(keymap); -+ return BadMatch; -+ } -+ } - names.keycodes = GetComponentSpec(&str, TRUE, &status); - names.types = GetComponentSpec(&str, TRUE, &status); - names.compat = GetComponentSpec(&str, TRUE, &status); - names.symbols = GetComponentSpec(&str, TRUE, &status); - names.geometry = GetComponentSpec(&str, TRUE, &status); -- if (status != Success) -+ if (status == Success) { -+ len = str - ((unsigned char *) stuff); -+ if ((XkbPaddedSize(len) / 4) != stuff->length) -+ status = BadLength; -+ } -+ -+ if (status != Success) { -+ free(names.keycodes); -+ free(names.types); -+ free(names.compat); -+ free(names.symbols); -+ free(names.geometry); - return status; -- len = str - ((unsigned char *) stuff); -- if ((XkbPaddedSize(len) / 4) != stuff->length) -- return BadLength; -+ } - - CHK_MASK_LEGAL(0x01, stuff->want, XkbGBN_AllComponentsMask); - CHK_MASK_LEGAL(0x02, stuff->need, XkbGBN_AllComponentsMask); --- -2.34.1 - diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-proof-GetCountedString-against-request-length-at.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-proof-GetCountedString-against-request-length-at.patch deleted file mode 100644 index 6f862e82f9..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-proof-GetCountedString-against-request-length-at.patch +++ /dev/null @@ -1,38 +0,0 @@ -CVE: CVE-2022-3550 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 11beef0b7f1ed290348e45618e5fa0d2bffcb72e Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 5 Jul 2022 12:06:20 +1000 -Subject: [PATCH] xkb: proof GetCountedString against request length attacks - -GetCountedString did a check for the whole string to be within the -request buffer but not for the initial 2 bytes that contain the length -field. A swapped client could send a malformed request to trigger a -swaps() on those bytes, writing into random memory. - -Signed-off-by: Peter Hutterer ---- - xkb/xkb.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/xkb/xkb.c b/xkb/xkb.c -index f42f59ef3..1841cff26 100644 ---- a/xkb/xkb.c -+++ b/xkb/xkb.c -@@ -5137,6 +5137,11 @@ _GetCountedString(char **wire_inout, ClientPtr client, char **str) - CARD16 len; - - wire = *wire_inout; -+ -+ if (client->req_len < -+ bytes_to_int32(wire + 2 - (char *) client->requestBuffer)) -+ return BadValue; -+ - len = *(CARD16 *) wire; - if (client->swapped) { - swaps(&len); --- -2.34.1 - diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.6.bb similarity index 80% rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.6.bb index aba09afec3..256903ce5f 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.6.bb @@ -2,10 +2,8 @@ require xserver-xorg.inc SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ - file://0001-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch \ - file://0001-xkb-proof-GetCountedString-against-request-length-at.patch \ " -SRC_URI[sha256sum] = "5cc4be8ee47edb58d4a90e603a59d56b40291ad38371b0bd2471fc3cbee1c587" +SRC_URI[sha256sum] = "1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. From patchwork Fri Jan 20 18:10: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: 18379 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 083A0C52D77 for ; Fri, 20 Jan 2023 18:11:30 +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.web11.82155.1674238285685718262 for ; Fri, 20 Jan 2023 10:11:25 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=SXq+StwW; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id s67so4743998pgs.3 for ; Fri, 20 Jan 2023 10:11:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=kzS3yrXOwr4cMV1MDXfBAUi4Wt6olfFIkaTGggxFWRg=; b=SXq+StwWcWYGbowtmha6YUczXAKVwKwJ5BbAgc0X0KJKngvVR2QIb6T/0Ea6+FFQ+Y VM3VpV6lZG8QNYlJzdDIlOR/cYVHpo61XkSvleJLM3UIw4OVZBL6Bz8l4dhPzsiElebG VJN4N39F+bN/BvQPPNrwQzg7UbpSh1S12czrdoZNSA0W1HOh7egkP1tuQ7wn55TUFVBu Mw1QhlD/atru6ZA3tt2NDuxYxidAdlCCAR3ZlKNP+9j1xc4q54gCQWqwU4Z2lZ0O4Hdq YLo53IzJe1WzTzoIo5adqcUOLD2KgMiDmyDJbeR4A3EM85Nwv2+M/VGUAPi1ChQm6Sdr v7wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kzS3yrXOwr4cMV1MDXfBAUi4Wt6olfFIkaTGggxFWRg=; b=dgllO9EewfbdeCDO9oED7RT+bmuN16rIo23135Wv0T/o543khf6lo3uNL+z2L2ZEhu h5FYx9ZUaT4xQoJcQvs/cnvmykACZ7tCU9OCHiwY0oBGx2YHoI69J+jJieSEhpO607XQ ao3EU9Zeuj+b/zeXjcjDyC7hldsmai3a3IPVSIJr3+UQB0XFehFl52rZRRXcNRU61RZY lT4A7sDFSURugzc3cOWpJ71kFKbg0Dnp2RUpaEsChifaR5EumWpTXJp1+pPgSPx4RJLm Ec+ipMUOCLB5Elfc6qrQd0QfR/TcH4Dc+Z5GhKoSS51dDTZARog53e0YoQeTT6t92JT0 guRg== X-Gm-Message-State: AFqh2koYppEaEWnKE7vpKuj1iXknbkO3cKJEhAAoWPTr19kduE+7nu3B ht2OCjMj8LGFCNZLmZk3li805hdQIFtPn5Ya2A8= X-Google-Smtp-Source: AMrXdXuRT+nGxrVQyZJfEYqN2aMqxW1wVE5i7bq3ILsfWXakcgPy/3LTYhnk2b/HJRFaqWt8dRWk+A== X-Received: by 2002:a62:1c45:0:b0:58d:9850:d556 with SMTP id c66-20020a621c45000000b0058d9850d556mr15947282pfc.18.1674238284703; Fri, 20 Jan 2023 10:11:24 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:24 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 11/41] linux-yocto/5.19: fix perf build with clang Date: Fri, 20 Jan 2023 08:10:28 -1000 Message-Id: <5cd80b0fb27560a516b3634e9a98f366883c8047.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176217 From: Bruce Ashfield Integrating the following commit(s) to linux-yocto/5.19: 3326dff489c8 tools: Remove some options from CLANG_CROSS_FLAGS 5b92f7def854 libbpf: Fix build warning on ref_ctr_off b7cd8e00afcd perf python: Account for multiple words in CC Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit b734bd73763548e3991803c03b8bcc3b4bea6432) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.19.bb | 4 ++-- .../linux/linux-yocto-tiny_5.19.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.19.bb | 22 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb index de087eabd4..8fb4a6b665 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "7883e2f6464fb14e4652769c0294b2eef8075f5f" -SRCREV_meta ?= "0cba9aa40445bf59bfa651e1bd43a31c2ca7d524" +SRCREV_machine ?= "8385624e99ac8f15de12a2253e8537dd25fbb082" +SRCREV_meta ?= "239a6c0d3c3b046971909f1e066380465b0c331d" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.19;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb index 20ee864401..92214b4d90 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "aaf4490d1807c49e3e0ceab1372533937ef2c82b" -SRCREV_meta ?= "0cba9aa40445bf59bfa651e1bd43a31c2ca7d524" +SRCREV_machine ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" +SRCREV_meta ?= "239a6c0d3c3b046971909f1e066380465b0c331d" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.19.bb b/meta/recipes-kernel/linux/linux-yocto_5.19.bb index 8d891fe01c..2462f5cac3 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.19.bb @@ -13,17 +13,17 @@ KBRANCH:qemux86 ?= "v5.19/standard/base" KBRANCH:qemux86-64 ?= "v5.19/standard/base" KBRANCH:qemumips64 ?= "v5.19/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "dee954e39057710f00e5b3ea23514d01f3a4d940" -SRCREV_machine:qemuarm64 ?= "aaf4490d1807c49e3e0ceab1372533937ef2c82b" -SRCREV_machine:qemumips ?= "fe2b95c83e022371019027da3dd068ab33576d3f" -SRCREV_machine:qemuppc ?= "aaf4490d1807c49e3e0ceab1372533937ef2c82b" -SRCREV_machine:qemuriscv64 ?= "aaf4490d1807c49e3e0ceab1372533937ef2c82b" -SRCREV_machine:qemuriscv32 ?= "aaf4490d1807c49e3e0ceab1372533937ef2c82b" -SRCREV_machine:qemux86 ?= "aaf4490d1807c49e3e0ceab1372533937ef2c82b" -SRCREV_machine:qemux86-64 ?= "aaf4490d1807c49e3e0ceab1372533937ef2c82b" -SRCREV_machine:qemumips64 ?= "a5f29b9c64f2b3b47f74fee38f298d8a6b17a8b3" -SRCREV_machine ?= "aaf4490d1807c49e3e0ceab1372533937ef2c82b" -SRCREV_meta ?= "0cba9aa40445bf59bfa651e1bd43a31c2ca7d524" +SRCREV_machine:qemuarm ?= "6a3ad6f786482c60fa0619935fe48dbb44673084" +SRCREV_machine:qemuarm64 ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" +SRCREV_machine:qemumips ?= "6722056dc4ccc7ccb7ca6a9d3dd840031c83d66d" +SRCREV_machine:qemuppc ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" +SRCREV_machine:qemuriscv64 ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" +SRCREV_machine:qemuriscv32 ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" +SRCREV_machine:qemux86 ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" +SRCREV_machine:qemux86-64 ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" +SRCREV_machine:qemumips64 ?= "d5bdf10616a90465afaef449feeaf31a51748220" +SRCREV_machine ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" +SRCREV_meta ?= "239a6c0d3c3b046971909f1e066380465b0c331d" # 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 Jan 20 18:10: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: 18380 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 11178C52D11 for ; Fri, 20 Jan 2023 18:11:30 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web11.82158.1674238287507021209 for ; Fri, 20 Jan 2023 10:11:27 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=05yZzu8E; spf=softfail (domain: sakoman.com, ip: 209.85.216.54, mailfrom: steve@sakoman.com) Received: by mail-pj1-f54.google.com with SMTP id z9-20020a17090a468900b00226b6e7aeeaso5694389pjf.1 for ; Fri, 20 Jan 2023 10:11:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=USZ6IYZS32liPCUA5psD4jj04KrCS88Uc5wrU3deh+k=; b=05yZzu8EdRZxB43zAm0p77ogWPfpSGR8DbNqnuyF3uH+vJSOZxC+0CghATAr3JpLzY nmPOPpB0b/8x7JvVmyhXxKI9dytWfgFfeEj0BuaQdDVRJc0pZj+8ZwBrovEk1cVFN+Ta Uo3UazEnxwPahbjt/3AzZOVHtuwQqFErFasYv2b8+Cld6+mV1goAi8mZDWc9Qf+Yx2Ya HOhNOIWaXpYhrBMMmqnQAgBCUfgywx9Z2qZk9oDDzq59I95N/6ooamM/R9GIoAibtDLt sMAqZQrWgtQxqsgKm20XN3PLkjTqKlGgOp19lrOfGUSUk8GV0HomJtSBrBtzmKAe4q1O q+dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=USZ6IYZS32liPCUA5psD4jj04KrCS88Uc5wrU3deh+k=; b=NJD2RXtepE8XaQq2kfoR62VWGdf7XMwxaLvMXqmsJoZM3dmX9tB1DoclCzwZv8Nnlr AzN4x7A+5s2RvfKI5fXpz3HQZ3qkxnW+hqQCbtBXue9QAGMltx8E27tai90PNc9Q3pnX svAPnKGmGhqBFRXhU1ix27T2Th7N4JC3bMRAno+9uuKts93h4cbMZCmFTNw0N7OfPGrw QuDaGgRkGztMfKavuNRjX+G3LQ8uAvot0whurOGERu7I5vLBgL0j/pT16uEEndUsB4Pf yvQTrAe3K+fqAtQXdId2tGZRkhQFbMps5hypK4A+OPvm9fEa066PDE12EdqK6pok4xRa Rg1w== X-Gm-Message-State: AFqh2kq2sqRL0fDmvkBU0oi/AZKeGPoAuEPHt52eE1qWNxWIAAQgMfVI dlToXah6fHxFxPE03vdrKVdy5LyOGe3T85WR73A= X-Google-Smtp-Source: AMrXdXtBs5HvH68OZ0zT944imrjua5GDuA48wCo5It5Mn8iMBmdqH1r2QcSvJVD6BfmfDd/28Rsf2A== X-Received: by 2002:a05:6a20:1bdc:b0:b6:3e6e:af94 with SMTP id cv28-20020a056a201bdc00b000b63e6eaf94mr13746035pzb.32.1674238286414; Fri, 20 Jan 2023 10:11:26 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:26 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 12/41] linux-yocto/5.15: ltp and squashfs fixes Date: Fri, 20 Jan 2023 08:10:29 -1000 Message-Id: <1b1dc1cc57816a01383d7173b63991e3ed001327.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176218 From: Bruce Ashfield Integrating the following commit(s) to linux-yocto/5.15: 1c5699ee85d4 fs: move S_ISGID stripping into the vfs_*() helpers 838f5d0701d8 fs: add mode_strip_sgid() helper d97172683641 squashfs: provide backing_dev_info in order to disable read-ahead Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 474ddb758dd1b327540e48ccfe1500fb4231f30b) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.15.bb | 4 ++-- .../linux/linux-yocto-tiny_5.15.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 24 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index fc1ccd9b39..bd57d7c47e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "a0d36398b257c555381e735cd721cd8479d6762d" -SRCREV_meta ?= "f475b1a9deddbde23f48d7d535abdd5fb133b837" +SRCREV_machine ?= "9860fe27332e09dd4f0f3b303e40377de083be9a" +SRCREV_meta ?= "c2d64b008142d2a2bc9c8cca8a3d579a62275122" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 087c30b5a5..8b83b5a8de 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "1c3448ff6cc6d24d16c6ef6065cb642245cac627" -SRCREV_meta ?= "f475b1a9deddbde23f48d7d535abdd5fb133b837" +SRCREV_machine ?= "86627fc3da74aefec1338724a597356e6b8ad88b" +SRCREV_meta ?= "c2d64b008142d2a2bc9c8cca8a3d579a62275122" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index d5f21daf35..0b373c40fe 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "d3aa5916b2b02966ef37bfe3fc527c99754571ec" -SRCREV_machine:qemuarm64 ?= "a1d364fbe3d8a916426a107f07b89fd0338923c7" -SRCREV_machine:qemumips ?= "904de7b55a7e8edf4cd894fb0558efee799a314a" -SRCREV_machine:qemuppc ?= "35d547b91124bef128a13402190ca05f54a2392e" -SRCREV_machine:qemuriscv64 ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" -SRCREV_machine:qemuriscv32 ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" -SRCREV_machine:qemux86 ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" -SRCREV_machine:qemux86-64 ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" -SRCREV_machine:qemumips64 ?= "ae8ab2e3acaf9e14cd75a6c96f1ba43c66a1babd" -SRCREV_machine ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" -SRCREV_meta ?= "f475b1a9deddbde23f48d7d535abdd5fb133b837" +SRCREV_machine:qemuarm ?= "4915b05912ee7d15224eb9064ca63678f0bc6815" +SRCREV_machine:qemuarm64 ?= "660bf605998f60fd77f24d3316b95b14ef2fa035" +SRCREV_machine:qemumips ?= "38bf282c052b70c1c6dd79dc6ae49da1ec1c7de8" +SRCREV_machine:qemuppc ?= "ac4a5d99364cede21dc1838213f7fb29e1735969" +SRCREV_machine:qemuriscv64 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" +SRCREV_machine:qemuriscv32 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" +SRCREV_machine:qemux86 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" +SRCREV_machine:qemux86-64 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" +SRCREV_machine:qemumips64 ?= "2923c39cc815e2109c9bfc0985adcd8d342fc415" +SRCREV_machine ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" +SRCREV_meta ?= "c2d64b008142d2a2bc9c8cca8a3d579a62275122" # 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 ?= "509a32764e1a5692935c4f26ed96fbe94c480186" +SRCREV_machine:class-devupstream ?= "71e496bd338221709b180b60ba419fa542c2b320" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" From patchwork Fri Jan 20 18:10: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: 18377 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 06DE7C38A23 for ; Fri, 20 Jan 2023 18:11:30 +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.82160.1674238289277330223 for ; Fri, 20 Jan 2023 10:11:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=54D+5CNF; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id d10so4720597pgm.13 for ; Fri, 20 Jan 2023 10:11:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=nI4uP1NEjxAVdyfD0n6EL4sAFLcpdoUDWpnURSJsalg=; b=54D+5CNFzPTFjypNqSf6mk7IqjD4S3sH1iU/t4T8GE6df+7MMC1TZfImtznUHQCuMK lDW69YthTXyFSmeWv59vivBjFYONJfidkhN90gZgwoMblLefEOUZeCwgZSF856UBe3Ec uQzaVzKDuebDqiyfjUHsfO0QieK4M+C7qKrguqTb9FUJaBZxEUHDpymfYKdgCGx9IN7M XFB5/MdgDMIkTa7Dy3TeMaACPWu3KmpwIssTpzeZ8uZ1IElk3+qYmSPicve2GBoRoRzM fY91thlanaZF+MN0ODelgn01WMS2+yT+vYPZHDvg16hty6wEK99c7Zy4j8xQB8jgSfsL mGBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nI4uP1NEjxAVdyfD0n6EL4sAFLcpdoUDWpnURSJsalg=; b=TUmkf99V/FBIlsf6NJ8xiJehaAuumAiyFX/rPEhbJNMqTDv7+0etXMNA9WWoIBKqLy TRAUeqBNmPBUoxkjFXTYO8YlAwGII1TgX+cRG7Tnw/5Xic22vzyD135VqZ7kTTZZ0mKy hJYa6FnpICzufZfP8/rDbzqrngxAwDOkcIVRhycM8uXuIvImm9iBhRNqS0LbPqT1BpmP 6ev8TfMSRGht9IYYp1f2laBJxknN+8D5Tk7YfO+49Y/GUEw88DybIQVonH7cNt6L7z1s TOliPcfk5oc2LjKeK8cWYY8+gHqMzm8qnMY57N3HWQtyYpu3G3RAiqj92HnE+AFMbRUX Di2A== X-Gm-Message-State: AFqh2kp6cbbBtLTG45PL6CGvYOfs5OzOprWktk5BicJOEkASaiTXI3Kl if94qO33y/6dvQ/wR+M4tc4YzircN38bm7ZC/Vw= X-Google-Smtp-Source: AMrXdXuChyc0vO/dJTCBVexDEeDHG3/sgLv6FPG65TbWcVyG5K5MEKtxf8AFK8kNRBhKV+USACs8CQ== X-Received: by 2002:a62:1d56:0:b0:58d:9251:b2a6 with SMTP id d83-20020a621d56000000b0058d9251b2a6mr25802293pfd.1.1674238288239; Fri, 20 Jan 2023 10:11:28 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:27 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 13/41] linux-yocto/5.15: fix perf build with clang Date: Fri, 20 Jan 2023 08:10:30 -1000 Message-Id: <9ec76fefc8b3bd4fff31fe8958de6f51d4b1f139.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176219 From: Bruce Ashfield Integrating the following commit(s) to linux-yocto/5.15: 4c5a089621a8 perf python: Account for multiple words in CC Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 1cf78a856beb42a2d68e6c49bfdbc33fea68ebb5) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.15.bb | 4 ++-- .../linux/linux-yocto-tiny_5.15.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 22 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index bd57d7c47e..63294f5bb6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "9860fe27332e09dd4f0f3b303e40377de083be9a" -SRCREV_meta ?= "c2d64b008142d2a2bc9c8cca8a3d579a62275122" +SRCREV_machine ?= "dcd3b533c5f6bc4698d5b09aa83ce9a4695df3b0" +SRCREV_meta ?= "66de7a6f2687cdaf5169ce5b57dd35f508be1682" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 8b83b5a8de..12e462228f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "86627fc3da74aefec1338724a597356e6b8ad88b" -SRCREV_meta ?= "c2d64b008142d2a2bc9c8cca8a3d579a62275122" +SRCREV_machine ?= "c7e10f06a33a546bcdd0b2e2909459b7572b5443" +SRCREV_meta ?= "66de7a6f2687cdaf5169ce5b57dd35f508be1682" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 0b373c40fe..4e341713f6 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,17 +13,17 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "4915b05912ee7d15224eb9064ca63678f0bc6815" -SRCREV_machine:qemuarm64 ?= "660bf605998f60fd77f24d3316b95b14ef2fa035" -SRCREV_machine:qemumips ?= "38bf282c052b70c1c6dd79dc6ae49da1ec1c7de8" -SRCREV_machine:qemuppc ?= "ac4a5d99364cede21dc1838213f7fb29e1735969" -SRCREV_machine:qemuriscv64 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" -SRCREV_machine:qemuriscv32 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" -SRCREV_machine:qemux86 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" -SRCREV_machine:qemux86-64 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" -SRCREV_machine:qemumips64 ?= "2923c39cc815e2109c9bfc0985adcd8d342fc415" -SRCREV_machine ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" -SRCREV_meta ?= "c2d64b008142d2a2bc9c8cca8a3d579a62275122" +SRCREV_machine:qemuarm ?= "e5f2cf3560139bbaad54796c323d60e66cc19374" +SRCREV_machine:qemuarm64 ?= "d8835a4d4e9d4ea835316cd1843d62e30c5fef33" +SRCREV_machine:qemumips ?= "0f802d6525c21abe586c833074fece3e665a9ed9" +SRCREV_machine:qemuppc ?= "84f529230ca9f2ec20517821f7422d62e43ab808" +SRCREV_machine:qemuriscv64 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" +SRCREV_machine:qemuriscv32 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" +SRCREV_machine:qemux86 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" +SRCREV_machine:qemux86-64 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" +SRCREV_machine:qemumips64 ?= "ea2140a5f0cf7b8351982f60d3b30a4657ab0919" +SRCREV_machine ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" +SRCREV_meta ?= "66de7a6f2687cdaf5169ce5b57dd35f508be1682" # 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 Jan 20 18:10: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: 18383 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 00B5FC25B4E for ; Fri, 20 Jan 2023 18:11:40 +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.web11.82163.1674238291055001969 for ; Fri, 20 Jan 2023 10:11:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=orwS/f5z; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id 141so4774400pgc.0 for ; Fri, 20 Jan 2023 10:11:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3EmITKenhkSbksC2yCwVGjaIbMSObydjcWXokvDyJSA=; b=orwS/f5zxxDdUTRmCg4RM9SaCGbX2C73SLRvWLKds23Obv8Jpz/BrMhQz/5/+JKQzl 9e2e4yTJuyx/rM48W+9JJiNRGrP57doe3Y9xcLl4l4MlJGI422mgrVw8qZfEpD/rfQQ6 0eAniPyM6ASJCR+T7SDCf8yKRz3oCv94NWuLoJLIdMct9a3EbNguLtAzcleHUjN8+KFN kGy/dPPYNJl6KEi6RvvHsZ3WLbDsDylbvl0hN/ynmIqFJWoHct16c7mfz0OKWGX8qYjv PRCOrGHLRNILHQt02Nu3dk1zOVsyhrWkTIEjp3cH64+mrDUD/FtYA5xhrTBR0T+zWwdF sX0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3EmITKenhkSbksC2yCwVGjaIbMSObydjcWXokvDyJSA=; b=HTJH+1BsELKisURuNLb/N3lMZKhjLI8g48k6jsM/7KKxzB0TkyMCKG7PL6QGAsyprV 9fhVp3GCrLgNloAFXfv0oHan3cQl3StDE/EiEoVSohyLinp7aJ1LeKah4+v4eXWtdS9n gNLuALcV+tbxeloGpPTqjBkDsFTq01AvK02EUHMj9tbq4AiDDRZ7wfLTkvvPrfudeynL B89PaSIPEGM+6ZOsQ9FYOx50CAPTAkmjIirdmKLNKSTm0NFGRXbSra5/QJi0II/gdAZP 9k17YV5p/L6siyS/Ia+j+Yzu9gNQndLCbbIJdHUSaPXY+1KUVpJj0x04Rl26/kwTNLCF mhhg== X-Gm-Message-State: AFqh2kqjDcmYkuqTz0N1mTMcTxzCUtIMhwXTQH5YfH+uFrIhsd0Iabqa qo8hh3ECObkp5grYU65TrHOcHmxgsa5CBNyb+FY= X-Google-Smtp-Source: AMrXdXuFZEqsaBLPo6Q8eRGmTSpwc5myzeP57VsYoPOebdTH5dEinD4nZmr0Go7XJZWiwEWPKbqnJg== X-Received: by 2002:a62:86c8:0:b0:581:b3f4:21f8 with SMTP id x191-20020a6286c8000000b00581b3f421f8mr7986550pfd.31.1674238290021; Fri, 20 Jan 2023 10:11:30 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:29 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 14/41] linux-yocto/5.15: libbpf: Fix build warning on ref_ctr_off Date: Fri, 20 Jan 2023 08:10:31 -1000 Message-Id: <94448553f0e6c5f7efd08febb973967186ae3372.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176220 From: Bruce Ashfield Integrating the following commit(s) to linux-yocto/5.15: da5513f30187 libbpf: Fix build warning on ref_ctr_off Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit eb75d561256c794baf6c89c1975967343145da87) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.15.bb | 4 ++-- .../linux/linux-yocto-tiny_5.15.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 24 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index 63294f5bb6..3dac2fbcd2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "dcd3b533c5f6bc4698d5b09aa83ce9a4695df3b0" -SRCREV_meta ?= "66de7a6f2687cdaf5169ce5b57dd35f508be1682" +SRCREV_machine ?= "6a972b54f014ca67588d73f32058c42af0bd856e" +SRCREV_meta ?= "72756ee16d7230f04fb6bbf0bb115e32a9d73d8d" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 12e462228f..3dd2ecdf6f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "c7e10f06a33a546bcdd0b2e2909459b7572b5443" -SRCREV_meta ?= "66de7a6f2687cdaf5169ce5b57dd35f508be1682" +SRCREV_machine ?= "6e85c80a960287ec238f53c91eeade3456044fa3" +SRCREV_meta ?= "72756ee16d7230f04fb6bbf0bb115e32a9d73d8d" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 4e341713f6..dabbb82822 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "e5f2cf3560139bbaad54796c323d60e66cc19374" -SRCREV_machine:qemuarm64 ?= "d8835a4d4e9d4ea835316cd1843d62e30c5fef33" -SRCREV_machine:qemumips ?= "0f802d6525c21abe586c833074fece3e665a9ed9" -SRCREV_machine:qemuppc ?= "84f529230ca9f2ec20517821f7422d62e43ab808" -SRCREV_machine:qemuriscv64 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" -SRCREV_machine:qemuriscv32 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" -SRCREV_machine:qemux86 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" -SRCREV_machine:qemux86-64 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" -SRCREV_machine:qemumips64 ?= "ea2140a5f0cf7b8351982f60d3b30a4657ab0919" -SRCREV_machine ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" -SRCREV_meta ?= "66de7a6f2687cdaf5169ce5b57dd35f508be1682" +SRCREV_machine:qemuarm ?= "24c30a8e9f8385f6d74785aa345f5731321b6c41" +SRCREV_machine:qemuarm64 ?= "c3caed57192735dc74adff939ea35af248a11177" +SRCREV_machine:qemumips ?= "3bed92886dc9177ce0076dada5056cbe83ec11f0" +SRCREV_machine:qemuppc ?= "45cbeb05d362ee51b7836a7faa07958670110c38" +SRCREV_machine:qemuriscv64 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" +SRCREV_machine:qemuriscv32 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" +SRCREV_machine:qemux86 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" +SRCREV_machine:qemux86-64 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" +SRCREV_machine:qemumips64 ?= "2642cdd862a63f5a8c2774f372f3d3424991b1b9" +SRCREV_machine ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" +SRCREV_meta ?= "72756ee16d7230f04fb6bbf0bb115e32a9d73d8d" # 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 ?= "71e496bd338221709b180b60ba419fa542c2b320" +SRCREV_machine:class-devupstream ?= "d68f50bfb00f6288e812be895ea5c77932a4b9dd" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" From patchwork Fri Jan 20 18:10: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: 18386 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 10482C52D11 for ; Fri, 20 Jan 2023 18:11:40 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web11.82165.1674238294080267852 for ; Fri, 20 Jan 2023 10:11:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=3+912Lsz; spf=softfail (domain: sakoman.com, ip: 209.85.210.176, mailfrom: steve@sakoman.com) Received: by mail-pf1-f176.google.com with SMTP id w2so4554623pfc.11 for ; Fri, 20 Jan 2023 10:11:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+lT/0XGXJoahFajuuA/Z3scWJLuBCFNZ5d2uxgk4QK0=; b=3+912Lsz4nZKZPR3U2384MmYYxBkScZy3IQYNDhX12r/16wzxrFobXGphAJTX2eJTR Uv4DIxvL1JiHWEFf0p+d+AJ2H+sjBlmWjTvn26sJf0MZosfGpFM9+TzRtmUIvzeY2jlJ qE4NZ5PPAcrMGPBa6q6CkAxgIMJXfa5grBqM/2hcs+TozNgwapeSfDokyD4FzpfaOt7y z68LDiFLHLAhmpD5T99YV//j61oMD2qABVSu3TGyhh+dD8MiqG6mrK6ztZpcEntYw1aQ iVG7Jin0m5wl20l4zlp7+WG7IiIT9R7t/lNgPnjfm973jqTWrvIaI6HPtW0eEyoYma5j FElg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+lT/0XGXJoahFajuuA/Z3scWJLuBCFNZ5d2uxgk4QK0=; b=rXzxm4kvSbLZRgm1dbEjMHa8NERB+wFd/ie+3cJU0duyMQWORB4WuCsgdoqOdZMESa OSYZFgHkqF3f0gqO/udBgzZHQ7wC2u2pbUYkmV94Ej6AHENi5xuuCnXYsySG8xiFLSJI NAFbTkbyeIDLgoeRxRVRJ6o3ljOwPE6oaPF7NutF/8bT+2VPnNn6or1ZL62yU1PTj1R9 BqHGhvYPgonzcsTQfmptKbog1eBffSyey13QVjNp7JME1F+ytAeYanke5UE0cQa3fDkK KMKYjQXrFNku1swmbvhg0xwBrG/GgXU66i5A5E4ue/8iJxjB4b8OJo1czFIO8rnH021z 4TlA== X-Gm-Message-State: AFqh2krRvK1N/pwtdI01bpGoWesCJQeXP0sltzgga2PM3HNJJbNP5B9+ Azd4ia4Anmnu5X0yeCHg21+p9h5XlK0E2J1K7uA= X-Google-Smtp-Source: AMrXdXsRXDePKH3LFEhFsbJlgaoZdNLzBxZ6nzWRH4BgeDLyUGVEzIsN9zYrzGxgEiIP6bNpLjIguw== X-Received: by 2002:a05:6a00:4519:b0:58d:f047:53b7 with SMTP id cw25-20020a056a00451900b0058df04753b7mr9694134pfb.3.1674238292061; Fri, 20 Jan 2023 10:11:32 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:31 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 15/41] linux-yocto/5.15: update to v5.15.84 Date: Fri, 20 Jan 2023 08:10:32 -1000 Message-Id: <310928d806e49d2569fb3c37fbb93b57f1b3dd16.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176221 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: d68f50bfb00f Linux 5.15.84 972707bae3d7 net: fec: properly guard irq coalesce setup 289721fe0993 ASoC: ops: Correct bounds check for second channel on SX controls de0866b94a64 nvme-pci: clear the prp2 field when not used 8bffa95ac19f perf: Fix perf_pending_task() UaF 825bd2af4227 ASoC: cs42l51: Correct PGA Volume minimum value 91582b3a1ab2 net: fec: don't reset irq coalesce settings to defaults on "ip link up" c772dab247f1 can: mcba_usb: Fix termination command argument aa822de7de3b can: sja1000: fix size of OCR_MODE_MASK define 09e08740d78c pinctrl: meditatek: Startup with the IRQs disabled 172a95026f06 libbpf: Use page size as max_entries when probing ring buffer map cf611d786796 ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx() a74b88e17025 ASoC: fsl_micfil: explicitly clear CHnF flags afac1e7d78eb ASoC: fsl_micfil: explicitly clear software reset bit 9d933af8fef3 nfp: fix use-after-free in area_cache_get() e1a4f5880d00 vfs: fix copy_file_range() averts filesystem freeze protection 86e28ed25b00 x86/vdso: Conditionally export __vdso_sgx_enter_enclave() fd6d66840b42 Linux 5.15.83 f895511de9d2 io_uring: Fix a null-ptr-deref in io_tctx_exit_cb() f435c66d2336 io_uring: move to separate directory d9e1e5d8a74c block: move CONFIG_BLOCK guard to top Makefile e5c0bc4ff5b0 can: esd_usb: Allow REC and TEC to return to zero db6343a5b0d9 s390/qeth: fix use-after-free in hsci a56c1cebe4a0 s390/qeth: fix various format strings a6dba316c93e macsec: add missing attribute validation for offload 40500f1f4745 net: mvneta: Fix an out of bounds check b9274dbe3999 net: thunderbolt: fix memory leak in tbnet_open() 7390c70bd431 ipv6: avoid use-after-free in ip6_fragment() 1beb475892f7 net: plip: don't call kfree_skb/dev_kfree_skb() under spin_lock_irq() b08412a9cf26 net: phy: mxl-gpy: fix version reporting dec5abd91abc xen/netback: fix build warning 54d830e24247 dpaa2-switch: Fix memory leak in dpaa2_switch_acl_entry_add() and dpaa2_switch_acl_entry_remove() c7adcbd0fd3f ethernet: aeroflex: fix potential skb leak in greth_init_rings() d962d42d6376 tipc: call tipc_lxc_xmit without holding node_read_lock f3b5dda26cd0 net: dsa: sja1105: fix memory leak in sja1105_setup_devlink_regions() 5dab6fa068d7 ipv4: Fix incorrect route flushing when table ID 0 is used ac566bd5770f ipv4: Fix incorrect route flushing when source address is deleted af4ccae4b704 tipc: Fix potential OOB in tipc_link_proto_rcv() b8ce0e6f9f88 net: hisilicon: Fix potential use-after-free in hix5hd2_rx() 16854177745a net: mdio: fix unbalanced fwnode reference count in mdio_device_release() 6f4798ac9c9e net: hisilicon: Fix potential use-after-free in hisi_femac_rx() 114e65a22189 net: thunderx: Fix missing destroy_workqueue of nicvf_rx_mode_wq 51c04945756a net: microchip: sparx5: Fix missing destroy_workqueue of mact_queue 99eec0a766f9 ip_gre: do not report erspan version on GRE interface 2891957853f2 net: stmmac: fix "snps,axi-config" node property parsing 5cb8f1a784fd gpio/rockchip: fix refcount leak in rockchip_gpiolib_register() b8c2f0392d1d nvme initialize core quirks before calling nvme_init_subsystem 908b2da426fe NFC: nci: Bounds check struct nfc_target arrays d841cc156304 i40e: Disallow ip4 and ip6 l4_4_bytes 625a13850b31 i40e: Fix for VF MAC address 0 5538794dbd42 i40e: Fix not setting default xps_cpus after reset a6b30598fec8 net: mvneta: Prevent out of bounds read in mvneta_config_rss() e6e897d4fe2f xen-netfront: Fix NULL sring after live migration eefd8953a748 octeontx2-pf: Fix potential memory leak in otx2_init_tc() f88acaed07b1 net: mdiobus: fix double put fwnode in the error path cc62d76928e0 net: mdiobus: fwnode_mdiobus_register_phy() rework error handling ea113b570eee net: encx24j600: Fix invalid logic in reading of MISTAT register 8aae746d065c net: encx24j600: Add parentheses to fix precedence a110287ef4a4 mac802154: fix missing INIT_LIST_HEAD in ieee802154_if_add() e046421bed5a selftests: rtnetlink: correct xfrm policy rule in kci_test_ipsec_offload 4fa8988a36d5 net: dsa: sja1105: Check return value b35be171dfe6 net: dsa: hellcreek: Check return value a4c342e645d6 net: dsa: ksz: Check return value edf7284a9829 Bluetooth: Fix not cleanup led when bt_init fails 3322193949ac Bluetooth: 6LoWPAN: add missing hci_dev_put() in get_l2cap_conn() 6c88c764e0c4 vmxnet3: use correct intrConf reference when using extended queues 5ad0d85757f8 vmxnet3: correctly report encapsulated LRO packet 5c014eb0ed6c af_unix: Get user_ns from in_skb in unix_diag_get_exact(). 807a01a32979 drm: bridge: dw_hdmi: fix preference of RGB modes over YUV420 eb96fd3983b2 net: broadcom: Add PTP_1588_CLOCK_OPTIONAL dependency for BCMGENET under ARCH_BCM2835 16eb678bca8e igb: Allocate MSI-X vector when testing 34c6367c946c e1000e: Fix TX dispatch condition 4271515f189b gpio: amd8111: Fix PCI device reference count leak d57b60e9b355 drm/bridge: ti-sn65dsi86: Fix output polarity setting bug f8b29656013c netfilter: ctnetlink: fix compilation warning after data race fixes in ct mark 246bcd05ba6c ca8210: Fix crash by zero initializing data 80dad8df5fc2 ieee802154: cc2520: Fix error return code in cc2520_hw_init() dd9dcfb85c65 drm/vmwgfx: Fix race issue calling pin_user_pages 7b09ba9036b2 netfilter: nft_set_pipapo: Actually validate intervals in fields after the first one 6daaa84b6214 gpiolib: fix memory leak in gpiochip_setup_dev() 1a1075d37108 gpiolib: check the 'ngpios' property in core gpiolib code 70c5515c1c30 gpiolib: improve coding style for local variables 3b714f25fc59 clk: Fix pointer casting to prevent oops in devm_clk_release() c142cba37de2 can: af_can: fix NULL pointer dereference in can_rcv_filter 104bb1f67e3c HID: ite: Enable QUIRK_TOUCHPAD_ON_OFF_REPORT on Acer Aspire Switch V 10 f755d11c55b2 HID: core: fix shift-out-of-bounds in hid_report_raw_event 2d4b310c32d4 HID: hid-lg4ff: Add check for empty lbuf 5e8021ae0865 HID: usbhid: Add ALWAYS_POLL quirk for some mice 5e88c6f4aaa7 net: dsa: sja1105: avoid out of bounds access in sja1105_init_l2_policing() 1074fefce9cc drm/shmem-helper: Avoid vm_open error paths 83e3da8bb92f drm/shmem-helper: Remove errant put in error path 249011f4c3b8 drm/amdgpu/sdma_v4_0: turn off SDMA ring buffer in the s2idle suspend 1e4fe9a1546f drm/vmwgfx: Don't use screen objects when SEV is active f6550976fe22 KVM: s390: vsie: Fix the initialization of the epoch extension (epdx) field fe50a9bbeb1f net: mana: Fix race on per-CQ variable napi work_done a49894a5ac36 Bluetooth: Fix crash when replugging CSR fake controllers 1dee2b504771 Bluetooth: btusb: Add debug message for CSR controllers 3ac29732a2ff mm/gup: fix gup_pud_range() for dax aad8bbd17a1d memcg: fix possible use-after-free in memcg_write_event_control() 6fb8bc29bfa8 media: v4l2-dv-timings.c: fix too strict blanking sanity checks a4c575541eeb Revert "ARM: dts: imx7: Fix NAND controller size-cells" 28abc1145924 soundwire: intel: Initialize clock stop timeout 22d800b378e4 media: videobuf2-core: take mmap_lock in vb2_get_unmapped_area() 5d0fa6fc8899 xen/netback: don't call kfree_skb() with interrupts disabled 4422241ceffc xen/netback: do some code cleanup 0fe29bd92594 xen/netback: Ensure protocol headers don't fall in the non-linear area f01677be31d1 drm/bridge: anx7625: Fix edid_read break case in sp_tx_edid_read() ee2536830b16 cifs: fix use-after-free caused by invalid pointer `hostname` dc62f05f666c rtc: cmos: avoid UIP when reading alarm time 48ea4199af85 rtc: cmos: avoid UIP when writing alarm time 3f52afc6ed93 rtc: mc146818-lib: extract mc146818_avoid_UIP 1a3f8c6cd29d mm/khugepaged: invoke MMU notifiers in shmem/file collapse paths 79ad784c9d21 mm/khugepaged: fix GUP-fast interaction by sending IPI d15cd6de0123 mm/khugepaged: take the right locks for page table retraction 26f084e55466 net: usb: qmi_wwan: add u-blox 0x1342 composition 029a7f1c5d70 9p/xen: check logical size for buffer size b398832893c8 usb: dwc3: gadget: Disable GUSB2PHYCFG.SUSPHY for End Transfer e70a5724400a fbcon: Use kzalloc() in fbcon_prepare_logo() fd3768597d2a regulator: twl6030: fix get status of twl6032 regulators 9f74b9aa8d58 ASoC: soc-pcm: Add NULL check in BE reparenting dae93f4168c4 btrfs: send: avoid unaligned encoded writes when attempting to clone range f54e1edf579d selftests/net: Find nettest in current directory fccd454129f6 ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event 542a563bb751 regulator: slg51000: Wait after asserting CS pin 3d1b5fde360e 9p/fd: Use P9_HDRSZ for header size fe2d44e86e96 ASoC: rt711-sdca: fix the latency time of clock stop prepare state machine transitions e945f3d809ed ARM: dts: rockchip: disable arm_global_timer on rk3066 and rk3188 c3b818c91a11 spi: mediatek: Fix DEVAPC Violation at KO Remove d9f0107be1a9 ASoC: wm8962: Wait for updated value of WM8962_CLOCKING1 register 7ae0262748e5 ARM: 9266/1: mm: fix no-MMU ZERO_PAGE() implementation d81c62e3121f ARM: 9251/1: perf: Fix stacktraces for tracepoint events in THUMB2 kernels 66717ad03b80 fs: use acquire ordering in __fget_light() 1222e2364ac7 ARM: dts: rockchip: rk3188: fix lcdc1-rgb24 node name 996fb29b06b6 arm64: dts: rockchip: fix ir-receiver node names 752138ef89e8 ARM: dts: rockchip: fix ir-receiver node names 8045971e40cd arm: dts: rockchip: remove clock-frequency from rtc 5e9fb8013ac9 arm: dts: rockchip: fix node name for hym8563 rtc 2ed7137e911a arm64: dts: rockchip: keep I2S1 disabled for GPIO function on ROCK Pi 4 series 5a1122e1a896 mmc: mtk-sd: Fix missing clk_disable_unprepare in msdc_of_clock_parse() 282f52c954a8 clk: Provide new devm_clk helpers for prepared and enabled clocks eb94a7a20f3c clk: generalize devm_clk_get() a bit d9790301361c Linux 5.15.82 48642f94311b proc: proc_skip_spaces() shouldn't think it is working on C strings 3eb9213f6612 proc: avoid integer type confusion in get_proc_long 4a4073a2e2fe ipc/sem: Fix dangling sem_array access in semtimedop race 53b9b1201e34 Input: raydium_ts_i2c - fix memory leak in raydium_i2c_send() 571b6bbbf54d char: tpm: Protect tpm_pm_suspend with locks f39891cfe79b Revert "clocksource/drivers/riscv: Events are stopped during CPU suspend" a759057af728 ACPI: HMAT: Fix initiator registration for single-initiator systems da8a794d71ec ACPI: HMAT: remove unnecessary variable initialization 2d16161a2c98 i2c: imx: Only DMA messages with I2C_M_DMA_SAFE flag set 950a05cb15e3 i2c: npcm7xx: Fix error handling in npcm_i2c_init() db3f8da033d9 serial: stm32: Deassert Transmit Enable on ->rs485_config() 45f628f4fd81 serial: stm32: Use TC interrupt to deassert GPIO RTS in RS485 mode c60eae5b1d0b serial: stm32: Factor out GPIO RTS toggling into separate function 041f8dc88292 ipv4: Fix route deletion when nexthop info is not specified 25174d91e4a3 ipv4: Handle attempt to delete multipath route when fib_info contains an nh reference a0ad247e55ea selftests: net: fix nexthop warning cleanup double ip typo 532847b69c29 selftests: net: add delete nexthop route warning test e0783558817d Kconfig.debug: provide a little extra FRAME_WARN leeway when KASAN is enabled 723fa02e0e0a parisc: Increase FRAME_WARN to 2048 bytes on parisc b951ab4b35ba mm: migrate: fix THP's mapcount on isolation c5eda6029cf9 mm: __isolate_lru_page_prepare() in isolate_migratepages_block() bdb613ef179a iommu/vt-d: Fix PCI device refcount leak in dmar_dev_scope_init() b6eea8b2e858 iommu/vt-d: Fix PCI device refcount leak in has_external_pci() 787d81d4eb15 nvme: fix SRCU protection of nvme_ns_head list 12f237200c16 riscv: kexec: Fixup irq controller broken in kexec crash path ac00301adb19 riscv: fix race when vmap stack overflow fa7a7d185ef3 riscv: Sync efi page table's kernel mappings before switching d86d69892545 pinctrl: single: Fix potential division by zero 98b15c706644 ASoC: ops: Fix bounds check for _sx controls f88a6977f8b9 KVM: x86/mmu: Fix race condition in direct_page_fault df4b177b4851 io_uring/poll: fix poll_refs race with cancelation 4b702b7d11ce io_uring: make poll refs more robust 1d58849ac26f io_uring: cmpxchg for poll arm refs release cd1981a8c30d io_uring: fix tw losing poll events 62321dc7b081 io_uring: update res mask in io_poll_check_events 417d5ea6e735 tracing: Free buffers when a used dynamic event is removed 52fc245d150c tracing: Fix race where histograms can be called before the event cb2b0612cd25 tracing/osnoise: Fix duration type 615a996ff397 drm/i915: Never return 0 if not all requests retired 01a2b25ef2cd drm/i915: Fix negative value passed as remaining time ff1591ba33b8 drm/amdgpu: enable Vangogh VCN indirect sram mode ac2d7fa90848 drm/amdgpu: temporarily disable broken Clang builds due to blown stack-frame 57ee7bc4c60a mmc: sdhci: Fix voltage switch delay bb8f8095143e mmc: sdhci-sprd: Fix no reset data and command after voltage switch 4c7681c1a52f mmc: sdhci-esdhc-imx: correct CQHCI exit halt state check 01dbe4db590a mmc: core: Fix ambiguous TRIM and DISCARD arg 738946e35504 mmc: mmc_test: Fix removal of debugfs file 635d0517348e net: stmmac: Set MAC's flow control register to reflect current settings 9132dcdf3bf6 v4l2: don't fall back to follow_pfn() if pin_user_pages_fast() fails 76ad884be092 pinctrl: intel: Save and restore pins in "direct IRQ" mode 41296b85fafa x86/bugs: Make sure MSR_SPEC_CTRL is updated properly upon resume from S3 33021419fd81 nilfs2: fix NULL pointer dereference in nilfs_palloc_commit_free_entry() 2e44dd9a8dd6 tools/vm/slabinfo-gnuplot: use "grep -E" instead of "egrep" b60a8ad771fd error-injection: Add prompt for function error injection 757eb00c4c40 ALSA: dice: fix regression for Lexicon I-ONIX FW810S a1a96a6f302c riscv: mm: Proper page permissions after initmem free 823df3607d8b riscv: vdso: fix section overlapping under some conditions 6e035d5a2a6b hwmon: (coretemp) fix pci device refcount leak in nv1a_ram_new() 7692700ac818 hwmon: (coretemp) Check for null before removing sysfs attrs 9b5836b9c4b0 net: ethernet: renesas: ravb: Fix promiscuous mode after system resumed 0dfb9a566327 sctp: fix memory leak in sctp_stream_outq_migrate() fcb3e0216156 packet: do not set TP_STATUS_CSUM_VALID on CHECKSUM_COMPLETE 04b995e96322 net: tun: Fix use-after-free in tun_detach() 43ca0adf79e5 afs: Fix fileserver probe RTT handling 543d917f691a net: mdiobus: fix unbalanced node reference count dca370e575d9 net: hsr: Fix potential use-after-free 1daec0815655 tipc: re-fetch skb cb after tipc_msg_validate 16a64dc26545 dsa: lan9303: Correct stat name 766086ea8ca7 net: wwan: iosm: fix dma_alloc_coherent incompatible pointer type c667751a4265 net: wwan: iosm: fix kernel test robot reported error 9c584d6d9cfb net: ethernet: nixge: fix NULL dereference 8782b32ef867 net/9p: Fix a potential socket leak in p9_socket_open 6fc9425bff4b net: net_netdev: Fix error handling in ntb_netdev_init_module() 3bc893ef36f9 net: ethernet: ti: am65-cpsw: fix error handling in am65_cpsw_nuss_probe() 7730904f50c7 net: phy: fix null-ptr-deref while probe() failed 59b54f0563b6 wifi: mac8021: fix possible oob access in ieee80211_get_rate_duration dc0853f8b502 wifi: cfg80211: don't allow multi-BSSID in S1G 88a6fe370788 wifi: cfg80211: fix buffer overflow in elem comparison 08fff7aaeb7e aquantia: Do not purge addresses when setting the number of rings 2a7aa52573da qlcnic: fix sleep-in-atomic-context bugs caused by msleep 7b734d26f037 can: m_can: Add check for devm_clk_get ea8dc27bb044 can: m_can: pci: add missing m_can_class_free_dev() in probe/remove methods b1d2a8e02acc can: etas_es58x: es58x_init_netdev(): free netdev when register_candev() e53da04e37e4 can: cc770: cc770_isa_probe(): add missing free_cc770dev() d452a71995cb can: sja1000_isa: sja1000_isa_probe(): add missing free_sja1000dev() 372eb550faa0 net/mlx5e: Fix use-after-free when reverting termination table 839eeab03c83 net/mlx5: Fix uninitialized variable bug in outlen_write() 34feea3bfb37 net/mlx5: DR, Fix uninitialized var warning 3485ef2aabeb net/mlx5: DR, Rename list field in matcher struct to list_node 9fc27d22cdb9 e100: Fix possible use after free in e100_xmit_prepare 0d9f5bd54b91 iavf: Fix error handling in iavf_init_module() b0b2b9050c17 iavf: remove redundant ret variable 69501d820508 fm10k: Fix error handling in fm10k_init_module() 5e3657dede36 i40e: Fix error handling in i40e_init_module() 7109e9410992 ixgbevf: Fix resource leak in ixgbevf_init_module() 196ea810e21c of: property: decrement node refcount in of_fwnode_get_reference_args() 36164db278a8 nvmem: rmem: Fix return value check in rmem_read() e3761831674a bpf: Do not copy spin lock field from user in bpf_selem_alloc 45f6e8186374 hwmon: (ibmpex) Fix possible UAF when ibmpex_register_bmc() fails a90251376c3e hwmon: (i5500_temp) fix missing pci_disable_device() eeb31b828daf hwmon: (ina3221) Fix shunt sum critical calculation 9514b95cac51 hwmon: (ltc2947) fix temperature scaling 0140e079a420 libbpf: Handle size overflow for ringbuf mmap 06d5790e7df5 ARM: at91: rm9200: fix usb device clock id d074f173fbd1 scripts/faddr2line: Fix regression in name resolution on ppc64le ee3d37d79610 bpf, perf: Use subprog name when reporting subprog ksymbol ec02fc0a4101 iio: light: rpr0521: add missing Kconfig dependencies f7419fc42afc iio: health: afe4404: Fix oob read in afe4404_[read|write]_raw e7e76a77aabe iio: health: afe4403: Fix oob read in afe4403_read_raw ebdca90efbb5 drm/amdgpu: Partially revert "drm/amdgpu: update drm_display_info correctly when the edid is read" c365d3c3e512 drm/amdgpu: update drm_display_info correctly when the edid is read df5346466e51 drm/display/dp_mst: Fix drm_dp_mst_add_affected_dsc_crtcs() return code 044da1a371a0 btrfs: qgroup: fix sleep from invalid context bug in btrfs_qgroup_inherit() da86809ab822 btrfs: move QUOTA_ENABLED check to rescan_should_stop from btrfs_qgroup_rescan_worker 5d66eadc1cc3 spi: spi-imx: Fix spi_bus_clk if requested clock is higher than input clock 6b4544a13179 btrfs: free btrfs_path before copying inodes to userspace c7ae3becee72 btrfs: sink iterator parameter to btrfs_ioctl_logical_to_ino acc2f40b980c erofs: fix order >= MAX_ORDER warning due to crafted negative i_size ca9f27448af0 drm/i915/gt: Use i915_vm_put on ppgtt_create error paths c2f2972889eb drm/i915: Create a dummy object for gen6 ppgtt 918002bdbe43 arm64: mte: Avoid setting PG_mte_tagged if no tags cleared or restored e4a7232c917c Linux 5.15.81 5c5c563a0817 cifs: fix missed refcounting of ipc tcon ee2d04f23bbb drm/i915: fix TLB invalidation for Gen12 video and compute engines bef834845d89 drm/amdgpu: always register an MMU notifier for userptr 7901de7aa833 drm/amdgpu: Enable Aldebaran devices to report CU Occupancy e7bf1fe53817 drm/amd/display: No display after resume from WB/CB 5033cba00c71 drm/amd/dc/dce120: Fix audio register mapping, stop triggering KASAN b8dc24590923 btrfs: sysfs: normalize the error handling branch in btrfs_init_sysfs() 914baca57af7 btrfs: use kvcalloc in btrfs_get_dev_zone_info c1e6d4bfdee3 btrfs: zoned: fix missing endianness conversion in sb_write_pointer d88bf6be02de btrfs: free btrfs_path before copying subvol info to userspace f218b404fc0e btrfs: free btrfs_path before copying fspath to userspace fea9397101c1 btrfs: free btrfs_path before copying root refs to userspace 7d0c25b5fe54 genirq: Take the proposed affinity at face value if force==true f17657cce069 irqchip/gic-v3: Always trust the managed affinity provided by the core code 52a93f2dcf6c genirq: Always limit the affinity to online CPUs 599cf4b84526 genirq/msi: Shutdown managed interrupts with unsatifiable affinities 7aed1dd5d221 wifi: wilc1000: validate number of channels e9de501cf70d wifi: wilc1000: validate length of IEEE80211_P2P_ATTR_CHANNEL_LIST attribute 143232cb5a4c wifi: wilc1000: validate length of IEEE80211_P2P_ATTR_OPER_CHANNEL attribute cd9c4869710b wifi: wilc1000: validate pairwise and authentication suite offsets f2fb18d429c3 fuse: lock inode unconditionally in fuse_fallocate() bb1c33bdf409 dm integrity: clear the journal on suspend 20ad31b09e98 dm integrity: flush the journal on suspend 5ca2110ba5e3 gpu: host1x: Avoid trying to use GART on Tegra20 97f47617e813 scsi: iscsi: Fix possible memory leak when device_register() failed 56ab7f237e7e net: usb: qmi_wwan: add Telit 0x103a composition e2e33f213dea tcp: configurable source port perturb table size 269928e5c7bb platform/x86: ideapad-laptop: Fix interrupt storm on fn-lock toggle on some Yoga laptops 17d995dc69c8 platform/x86: hp-wmi: Ignore Smart Experience App event e85bdc78720c zonefs: fix zone report size in __zonefs_io_error() 982fcd83fb16 drm/amdgpu: disable BACO support on more cards ea11f8197dad platform/x86: acer-wmi: Enable SW_TABLET_MODE on Switch V 10 (SW5-017) 09af15e69196 platform/x86: asus-wmi: add missing pci_dev_put() in asus_wmi_set_xusb2pr() ba040bea9deb xen/platform-pci: add missing free_irq() in error path 6815b2087d23 xen-pciback: Allow setting PCI_MSIX_FLAGS_MASKALL too 4c13ddb74f2c ASoC: stm32: dfsdm: manage cb buffers cleanup dd82295a23bc Input: i8042 - apply probe defer to more ASUS ZenBook models e12e121feb63 Input: soc_button_array - add Acer Switch V 10 to dmi_use_low_level_irq[] 9f5c167074d3 Input: soc_button_array - add use_low_level_irq module parameter aaef86eac9e2 Input: goodix - try resetting the controller when no config is set e2223f5fbbb8 serial: 8250: 8250_omap: Avoid RS485 RTS glitch on ->set_termios() 4e208294de45 tools: iio: iio_generic_buffer: Fix read size 0d0e2545fa92 ASoC: Intel: bytcht_es8316: Add quirk for the Nanote UMPC-01 e394cf9d7a83 Input: synaptics - switch touchpad on HP Laptop 15-da3001TU to RMI mode 96b5d1177752 x86/ioremap: Fix page aligned size calculation in __ioremap_caller() d048f7481524 x86/pm: Add enumeration check before spec MSRs save/restore setup 070e3560bf04 x86/tsx: Add a feature bit for TSX control MSR support 1430c98ebbe7 KVM: x86: remove exit_int_info warning in svm_handle_exit 27550a5930bb KVM: x86: add kvm_leave_nested 3e87cb0caa25 KVM: x86: nSVM: harden svm_free_nested against freeing vmcb02 while still in use 6425c590d0cc KVM: x86: forcibly leave nested mode on vCPU reset f42ebf972a9f KVM: x86: nSVM: leave nested mode on vCPU free 7b3c9405b272 mm: vmscan: fix extreme overreclaim and swap floods feb2eda5e11f gcov: clang: fix the buffer overflow issue ea6aa25c9ac0 nilfs2: fix nilfs_sufile_mark_dirty() not set segment usage as dirty 9d97a9fbfc11 usb: dwc3: gadget: Clear ep descriptor last 02632ea4dfaa usb: dwc3: gadget: Return -ESHUTDOWN on ep disable 765ca3e63f37 usb: dwc3: gadget: conditionally remove requests 7945cbf8666a bus: ixp4xx: Don't touch bit 7 on IXP42x 39c039018a2c iio: core: Fix entry not deleted when iio_register_sw_trigger_type() fails 0791a5ddbac2 iio: light: apds9960: fix wrong register for gesture gain f0158b9bfcc2 arm64: dts: rockchip: lower rk3399-puma-haikou SD controller clock frequency 277d19ec283d ext4: fix use-after-free in ext4_ext_shift_extents c9d133100bce usb: cdnsp: fix issue with ZLP - added TD_SIZE = 1 c2ad434cd4b2 usb: cdnsp: Fix issue with Clear Feature Halt Endpoint 1d91c648874e usb: dwc3: exynos: Fix remove() function 0a216625c3ab KVM: arm64: pkvm: Fixup boot mode to reflect that the kernel resumes from EL1 f0044a4a31c9 mmc: sdhci-brcmstb: Fix SDHCI_RESET_ALL for CQHCI 8e6940979bb8 mmc: sdhci-brcmstb: Enable Clock Gating to save power 24b46bfa9661 mmc: sdhci-brcmstb: Re-organize flags 227543ccacf8 nios2: add FORCE for vmlinuz.gz 6a4ea16a6734 init/Kconfig: fix CC_HAS_ASM_GOTO_TIED_OUTPUT test with dash c4a9046c2735 lib/vdso: use "grep -E" instead of "egrep" 5fefdceafb78 s390/crashdump: fix TOD programmable field size 592b6fd74afd net: thunderx: Fix the ACPI memory leak 697eb30a3534 octeontx2-af: Fix reference count issue in rvu_sdp_init() 6ba1687ea102 octeontx2-pf: Add check for devm_kcalloc 26c31e7c73d4 net: enetc: preserve TX ring priority across reconfiguration 0e16bbf616cc net: enetc: cache accesses to &priv->si->hw 68de40f66a5a net: enetc: manage ENETC_F_QBV in priv->active_offloads only when enabled 5c0858e1426b nfc: st-nci: fix incorrect sizing calculations in EVT_TRANSACTION e09243fb160b nfc: st-nci: fix memory leaks in EVT_TRANSACTION dca20b7a1959 nfc: st-nci: fix incorrect validating logic in EVT_TRANSACTION 67d638f8efc4 s390/dasd: fix no record found for raw_track_access 88277853cf8a arcnet: fix potential memory leak in com20020_probe() 1d44ec8507b7 ipv4: Fix error return code in fib_table_insert() 918e83c6bfa7 dccp/tcp: Reset saddr on failure after inet6?_hash_connect(). 8ce9b1c97fce fs: do not update freeing inode i_io_list 8db9e60cdfda netfilter: flowtable_offload: add missing locking c1da3bfca111 netfilter: ipset: restore allowing 64 clashing elements in hash:net,iface 606091b2f6dc dma-buf: fix racing conflict of dma_heap_add() 8af9450befba bnx2x: fix pci device refcount leak in bnx2x_vf_is_pcie_pending() 251bcf6cfb35 regulator: twl6030: re-add TWL6032_SUBCLASS 6258a8f91304 NFC: nci: fix memory leak in nci_rx_data_packet() ffe6021154ea net: sched: allow act_ct to be built without NF_NAT a05c0f9511d0 net: sparx5: fix error handling in sparx5_port_open() 182ef20f0f1c sfc: fix potential memleak in __ef100_hard_start_xmit() 2da022fac96d net: wwan: iosm: use ACPI_FREE() but not kfree() in ipc_pcie_read_bios_cfg() a48b345b87f9 xfrm: Fix ignored return value in xfrm6_init() 19989e163595 xfrm: Fix oops in __xfrm_state_delete() 46d450067fc0 tipc: check skb_linearize() return value in tipc_disc_rcv() 33fb115a76ae tipc: add an extra conn_get in tipc_conn_alloc 4ae907c45fca tipc: set con sock in tipc_conn_alloc ef866d9ea922 net/mlx5: Fix handling of entry refcount when command is not issued to FW 3101318939f5 net/mlx5: Fix FW tracer timestamp calculation 1eaabb5bbbb6 net/mlx5: Do not query pci info while pci disabled 8180099b2aea netfilter: ipset: regression in ip_set_hash_ip.c 448b6273706c Drivers: hv: vmbus: fix possible memory leak in vmbus_device_register() 082c31cb99d8 Drivers: hv: vmbus: fix double free in the error path of vmbus_add_channel_work() 7fdd9daa5b12 macsec: Fix invalid error code set e8fb93a0792c nfp: add port from netdev validation for EEPROM access e44e424ed95f nfp: fill splittable of devlink_port_attrs correctly 527046c13815 net: pch_gbe: fix pci device refcount leak while module exiting f77c84dd5b28 octeontx2-af: debugsfs: fix pci device refcount leak cd581ffd8dda net/qla3xxx: fix potential memleak in ql3xxx_send() a8976074e2cb net: mvpp2: fix possible invalid pointer dereference 3a4cc56cd17d net/mlx4: Check retval of mlx4_bitmap_init c368220e1780 net: ethernet: mtk_eth_soc: fix error handling in mtk_open() d9729437b28f ARM: dts: imx6q-prti6q: Fix ref/tcxo-clock-frequency properties 1c0b6a97c478 ARM: mxs: fix memory leak in mxs_machine_init() ecff08f3c469 iavf: Fix race condition between iavf_shutdown and iavf_remove 31147d4e907c iavf: Do not restart Tx queues after reset task failure 232942b26c54 iavf: Fix a crash during reset task 0600615d010f netfilter: nf_tables: do not set up extensions for end interval 60387731e69f netfilter: conntrack: Fix data-races around ct mark ee3ccd1abbe1 9p/fd: fix issue of list_del corruption in p9_fd_cancel() 131c2eeabc72 net: pch_gbe: fix potential memleak in pch_gbe_tx_queue() f58df483ff37 nfc/nci: fix race with opening and closing da22d7410afd net: dsa: sja1105: disallow C45 transactions on the BASE-TX MDIO bus 38fe0988bd51 rxrpc: Fix race between conn bundle lookup and bundle removal [ZDI-CAN-15975] d92151b4659b rxrpc: Use refcount_t rather than atomic_t 3c33e41fa5b3 rxrpc: Allow list of in-use local UDP endpoints to be viewed in /proc 46cefa268958 net: liquidio: simplify if expression 95500ee0b3bd selftests: mptcp: fix mibit vs mbit mix up f8c4da198eed selftests: mptcp: more stable simult_flows tests 1c0efab08c9b ARM: dts: at91: sam9g20ek: enable udc vbus gpio pinctrl ade662f3f242 tee: optee: fix possible memory leak in optee_register_device() d1dd119134ba bus: sunxi-rsb: Support atomic transfers b1ed61e7066b bus: sunxi-rsb: Remove the shutdown callback 61a41d1abc7c regulator: core: fix UAF in destroy_regulator() a85c0db3f5ad spi: dw-dma: decrease reference count in dw_spi_dma_init_mfld() d9f9b3255b97 regulator: core: fix kobject release warning and memory leak in regulator_register() bd419c7c68bd ASoC: max98373: Add checks for devm_kcalloc f9bc4a18e7d5 scsi: storvsc: Fix handling of srb_status and capacity change events c2153fe2d0c6 x86/hyperv: Restore VP assist page after cpu offlining/onlining b2ddd7623712 ASoC: soc-pcm: Don't zero TDM masks in __soc_pcm_open() dd62cb7e6fd4 ASoC: sgtl5000: Reset the CHIP_CLK_CTRL reg on remove d80ffd4823b6 ASoC: hdac_hda: fix hda pcm buffer overflow issue 10bee7eb2a2f ARM: dts: am335x-pcm-953: Define fixed regulators in root node 8fe533c0f909 af_key: Fix send_acquire race with pfkey_register 0c69a4658e94 xfrm: replay: Fix ESN wrap around for GSO ecc6ce4fdf0d xfrm: fix "disable_policy" on ipv4 early demux 5a792c1d4d77 MIPS: pic32: treat port as signed integer 144452b42143 RISC-V: vdso: Do not add missing symbols to version section in linker script 799970b8cc45 ALSA: usb-audio: add quirk to fix Hamedal C20 disconnect issue 38b09dc14f7c Revert "drm/amdgpu: Revert "drm/amdgpu: getting fan speed pwm for vega10 properly"" 44d50fccf889 nvmet: fix memory leak in nvmet_subsys_attr_model_store_locked 5adc12d9e2b5 arm64/syscall: Include asm/ptrace.h in syscall_wrapper header. 1340f02773ae block, bfq: fix null pointer dereference in bfq_bio_bfqg() 86d4dca4a6ae drm: panel-orientation-quirks: Add quirk for Acer Switch V 10 (SW5-017) b90e6234f57e scsi: scsi_debug: Make the READ CAPACITY response compliant with ZBC cdbba6a4de39 scsi: ibmvfc: Avoid path failures during live migration 6e8124a151bd platform/x86/intel/hid: Add some ACPI device IDs 32735e24f47a platform/x86/intel/pmt: Sapphire Rapids PMT errata fix 83a6823016f2 platform/x86: touchscreen_dmi: Add info for the RCA Cambio W101 v2 2-in-1 f707986a1414 platform/x86: ideapad-laptop: Disable touchpad_switch 5e38740ae545 Revert "net: macsec: report real_dev features when HW offloading is enabled" 26b72202ee26 selftests/bpf: Add verifier test for release_reference() 8395e3f98c4a spi: stm32: fix stm32_spi_prepare_mbr() that halves spi clk for every run d04722f2809c wifi: ath11k: Fix QCN9074 firmware boot on x86 9cc96a20a92a wifi: mac80211: Fix ack frame idr leak when mesh has no route 86f90014e767 wifi: airo: do not assign -1 to unsigned char f5558fbda022 audit: fix undefined behavior in bit shift for AUDIT_BIT af5de982ffc9 riscv: dts: sifive unleashed: Add PWM controlled LEDs ee34a19dbe2a wifi: mac80211_hwsim: fix debugfs attribute ps with rc table support 3513785dc13f wifi: mac80211: fix memory free error when registering wiphy fail 855485d31e2a ceph: fix NULL pointer dereference for req->r_session 729c9ad2940e ceph: Use kcalloc for allocating multiple elements d276fb4a7eb8 binder: validate alloc->mm in ->mmap() handler 5277e3d633a5 x86/sgx: Add overflow check in sgx_validate_offset_length() b5a838ba47f2 x86/sgx: Create utility to validate user provided offset and length 2f6e2de3a528 ceph: avoid putting the realm twice when decoding snaps fails 8bef55d7934d ceph: do not update snapshot context when there is no new snapshot cdee3136c966 iio: pressure: ms5611: fixed value compensation bug 5d6696e79d94 iio: ms5611: Simplify IO callback parameters f0ee88e83ce9 nvme-pci: add NVME_QUIRK_BOGUS_NID for Netac NV7000 a61716cd2401 nvme-pci: disable write zeroes on various Kingston SSD 19b60f336317 nvme-pci: disable namespace identifiers for the MAXIO MAP1001 d537e1930640 nvme-pci: add NVME_QUIRK_BOGUS_NID for Micron Nitro af03ce894c9c nvme: add a bogus subsystem NQN quirk for Micron MTFDKBA2T0TFH c6803faa6a6d drm/display: Don't assume dual mode adaptors support i2c sub-addressing d2284fe43c63 ata: libata-core: do not issue non-internal commands once EH is pending e09583e83e4a ata: libata-scsi: simplify __ata_scsi_queuecmd() a9059e338fc0 cifs: Fix connections leak when tlink setup failed 81d583baa5f1 cifs: support nested dfs links over reconnect dbc0ea91be28 cifs: split out dfs code from cifs_reconnect() b3ce844d234f cifs: introduce new helper for cifs_reconnect() 2ea600b598dd sctp: clear out_curr if all frag chunks of current msg are pruned 1f9f346fbb78 sctp: remove the unnecessary sinfo_stream check in sctp_prsctp_prune_unsent e8915faa9f41 tty: serial: fsl_lpuart: don't break the on-going transfer when global reset bd19013935af serial: fsl_lpuart: Fill in rs485_supported 87c81c19cda1 serial: Add rs485_supported to uart_port c08f4ea79f7a ASoC: fsl_asrc fsl_esai fsl_sai: allow CONFIG_PM=N d1e4288d2a63 ASoC: fsl_sai: use local device pointer 71e496bd3382 Linux 5.15.80 b63ddb3ba61e ntfs: check overflow when iterating ATTR_RECORDs ab6a1bb17e3c ntfs: fix out-of-bounds read in ntfs_attr_find() 5330c423b862 ntfs: fix use-after-free in ntfs_attr_find() 43bbadb7e463 net/9p: use a dedicated spinlock for trans_fd 9357fca9dad7 mm: fs: initialize fsdata passed to write_begin/write_end interface b334ab4c3347 wifi: wext: use flex array destination for memcpy() 0e07032b4b47 9p/trans_fd: always use O_NONBLOCK read/write 7c7b7476b56e gfs2: Switch from strlcpy to strscpy 28275a7c84d2 gfs2: Check sb_bsize_shift after reading superblock a4f1a01b2e81 9p: trans_fd/p9_conn_cancel: drop client lock earlier f7b0e95071bb kcm: close race conditions on sk_receive_queue 27d706b0d394 kcm: avoid potential race in kcm_tx_work b49026d9c86f tcp: cdg: allow tcp_cdg_release() to be called multiple times e41cbf98df22 macvlan: enforce a consistent minimal mtu d5f7f6e63fed Input: i8042 - fix leaking of platform device on module removal c49cc2c059b5 kprobes: Skip clearing aggrprobe's post_handler in kprobe-on-ftrace case 71beab7119d0 scsi: scsi_debug: Fix possible UAF in sdebug_add_host_helper() a636772988ba scsi: target: tcm_loop: Fix possible name leak in tcm_loop_setup_hba_bus() cb7893c85ea8 net: use struct_group to copy ip/ipv6 header addresses 9b8c0c88f414 tracing: Fix warning on variable 'struct trace_array' 73cf0ff9a393 ring-buffer: Include dropped pages in counting dirty patches 35c60b4e8ca7 perf: Improve missing SIGTRAP checking 2ac6276864de serial: 8250_lpss: Use 16B DMA burst with Elkhart Lake b1a27b2aad93 nvme: ensure subsystem reset is single threaded bccece3c3331 nvme: restrict management ioctls to admin 8cddb0d96b9c perf/x86/intel/pt: Fix sampling using single range output 8e2f33c59837 misc/vmw_vmci: fix an infoleak in vmci_host_do_receive_datagram() 9a72a46cb01d docs: update mediator contact information in CoC doc a99a547658e5 mmc: sdhci-pci: Fix possible memory leak caused by missing pci_dev_put() 4a1b6f7839d3 mmc: sdhci-pci-o2micro: fix card detect fail issue caused by CD# debounce timeout fd285d421563 mmc: core: properly select voltage range without power cycle 8a9bae5f1b53 firmware: coreboot: Register bus in module init 052d0e79efe5 iommu/vt-d: Set SRE bit only when hardware has SRS cap c31a792a825a iommu/vt-d: Preset Access bit for IOVA in FL non-leaf paging entries 11edbdee4399 scsi: zfcp: Fix double free of FSF request when qdio send fails fdf87b5b3087 net: phy: marvell: add sleep time after enabling the loopback bit 9648d760edf4 maccess: Fix writing offset in case of fault in strncpy_from_kernel_nofault() fdd57c20d440 Input: iforce - invert valid length check when fetching device IDs 0cafb719bed5 serial: 8250_lpss: Configure DMA also w/o DMA filter 59f6596697f1 serial: 8250: Flush DMA Rx on RLSI 118b52c2ae08 serial: 8250: Fall back to non-DMA Rx if IIR_RDI occurs 6ffce7a92ef5 dm ioctl: fix misbehavior if list_versions races with module loading 2b104973f7fd iio: pressure: ms5611: changed hardcoded SPI speed to value limited 1678d4abb2dc iio: adc: mp2629: fix potential array out of bound access bd22c232ead9 iio: adc: mp2629: fix wrong comparison of channel 656f67061366 iio: trigger: sysfs: fix possible memory leak in iio_sysfs_trig_init() 1bf8c0aff8fb iio: adc: at91_adc: fix possible memory leak in at91_adc_allocate_trigger() afc0aea70261 usb: typec: mux: Enter safe mode only when pins need to be reconfigured 8236628a549d usb: cdns3: host: fix endless superspeed hub port reset ead83b0db81f usb: chipidea: fix deadlock in ci_otg_del_timer cc9e6d8c55c9 usb: add NO_LPM quirk for Realforce 87U Keyboard 70eca1d261b2 USB: serial: option: add Fibocom FM160 0x0111 composition 1b6a54885c40 USB: serial: option: add u-blox LARA-L6 modem b0467d0059bc USB: serial: option: add u-blox LARA-R6 00B modem 95688a8a5735 USB: serial: option: remove old LARA-R6 PID 53dee78ea382 USB: serial: option: add Sierra Wireless EM9191 e7764e88e6c4 USB: bcma: Make GPIO explicitly optional a190a83db284 speakup: fix a segfault caused by switching consoles b3c6edbee48e slimbus: stream: correct presence rate frequencies 6b35ac831555 slimbus: qcom-ngd: Fix build error when CONFIG_SLIM_QCOM_NGD_CTRL=y && CONFIG_QCOM_RPROC_COMMON=m 0f847462fea1 Revert "usb: dwc3: disable USB core PHY management" 23ad214a8665 ALSA: hda/realtek: Fix the speaker output on Samsung Galaxy Book Pro 360 a36b505749c6 ALSA: hda/realtek: fix speakers for Samsung Galaxy Book Pro 02b94885b2fd ALSA: usb-audio: Drop snd_BUG_ON() from snd_usbmidi_output_open() 7176d6f3adb9 drm/amd/display: Add HUBP surface flip interrupt handler e57daa750369 tracing: kprobe: Fix potential null-ptr-deref on trace_array in kprobe_event_gen_test_exit() 3a41c0f2a5c3 tracing: kprobe: Fix potential null-ptr-deref on trace_event_file in kprobe_event_gen_test_exit() 7291dec4f2d1 tracing: Fix race where eprobes can be called before the event 6517b97134f7 tracing: Fix wild-memory-access in register_synth_event() 07ba4f0603ab tracing: Fix memory leak in test_gen_synth_cmd() and test_empty_synth_event() 8b318f3032bf tracing/ring-buffer: Have polling block on watermark 2c21ee020ce4 tracing: Fix memory leak in tracing_read_pipe() 00f74b1a98a2 ring_buffer: Do not deactivate non-existant pages 1bea037a1abb ftrace: Fix null pointer dereference in ftrace_add_mod() fadfcf39fbcd ftrace: Optimize the allocation for mcount entries 5c5f2642898f ftrace: Fix the possible incorrect kernel message 2ab249416244 cifs: add check for returning value of SMB2_set_info_init 5783abda58d6 net: thunderbolt: Fix error handling in tbnet_init() 80e590aeb132 net: microchip: sparx5: Fix potential null-ptr-deref in sparx_stats_init() and sparx5_start() 4a55aec1425f cifs: Fix wrong return value checking when GETFLAGS c8baf1fc248b net/x25: Fix skb leak in x25_lapb_receive_frame() af4b57fa6bd0 net: ag71xx: call phylink_disconnect_phy if ag71xx_hw_enable() fail in ag71xx_open() 61404a182eb5 cifs: add check for returning value of SMB2_close_init d3233f4bf3dd platform/surface: aggregator: Do not check for repeated unsequenced packets 69691714035b platform/x86/intel: pmc: Don't unconditionally attach Intel PMC when virtualized 7d93417d5964 drbd: use after free in drbd_create_device() fc16a2c81a3e bridge: switchdev: Fix memory leaks when changing VLAN protocol 3d90a668c4bc net: hns3: fix setting incorrect phy link ksettings for firmware in resetting process 3f7b2ef8fe92 net: ena: Fix error handling in ena_init() 2540eea1bdc3 net: ionic: Fix error handling in ionic_init_module() c08c13cb13fa xen/pcpu: fix possible memory leak in register_pcpu() 97009f07f217 net: dsa: make dsa_master_ioctl() see through port_hwtstamp_get() shims 88da008e5e2f net: mhi: Fix memory leak in mhi_net_dellink() 8f839715d032 bnxt_en: Remove debugfs when pci_register_driver failed b88713d92bd3 net: caif: fix double disconnect client in chnl_net_open() 6d2403416089 net: macvlan: Use built-in RCU list checking 596230471da3 mISDN: fix misuse of put_device() in mISDN_register_device() 07a6a8cf1712 net: liquidio: release resources when liquidio driver open failed 19feb6cf4136 soc: imx8m: Enable OCOTP clock before reading the register 8c54d706d829 net: stmmac: ensure tx function is not running in stmmac_xdp_release() 6219f46c2b9d net: hinic: Fix error handling in hinic_module_init() 7a05e3929668 mISDN: fix possible memory leak in mISDN_dsp_element_register() 0ee6455c9cfa net: bgmac: Drop free_netdev() from bgmac_enet_remove() 7ff4fa179e4e bpf: Initialize same number of free nodes for each pcpu_freelist 12f178cf05f3 MIPS: Loongson64: Add WARN_ON on kexec related kmalloc failed a4d6e024bea2 MIPS: fix duplicate definitions for exported symbols 44142b652a28 nfp: change eeprom length to max length enumerators f23058dc2398 ata: libata-transport: fix error handling in ata_tdev_add() 67b219314628 ata: libata-transport: fix error handling in ata_tlink_add() e7bb1b7a7bf2 ata: libata-transport: fix error handling in ata_tport_add() 377ff82c33c0 ata: libata-transport: fix double ata_host_put() in ata_tport_add() 494df0b0efe8 arm64: dts: imx8mn: Fix NAND controller size-cells 7178d568f7cc arm64: dts: imx8mm: Fix NAND controller size-cells 8ccf18c82a0a ARM: dts: imx7: Fix NAND controller size-cells e884a6c2d49a drm: Fix potential null-ptr-deref in drm_vblank_destroy_worker() 07e56de8766f drm/drv: Fix potential memory leak in drm_dev_init() 45c300613bee drm/panel: simple: set bpc field for logic technologies displays 779f3f9e0cdc drm/vc4: kms: Fix IS_ERR() vs NULL check for vc4_kms 97e5b508e961 pinctrl: devicetree: fix null pointer dereferencing in pinctrl_dt_to_map 9a77b8557fdb parport_pc: Avoid FIFO port location truncation 5d03c2911c52 siox: fix possible memory leak in siox_device_add() 530e987a0226 arm64: Fix bit-shifting UB in the MIDR_CPU_MODEL() macro d4944497827a bpf: Fix memory leaks in __check_func_call 25521fd2e217 block: sed-opal: kmalloc the cmd/resp buffers 2f21d653c648 scsi: scsi_transport_sas: Fix error handling in sas_phy_add() 7cd28bc410d2 pinctrl: rockchip: list all pins in a possible mux route for PX30 ab79b8dbe21e ASoC: soc-utils: Remove __exit for snd_soc_util_exit() eaa8edd86514 bpf, test_run: Fix alignment problem in bpf_prog_test_run_skb() 33cabe04d2c8 tty: n_gsm: fix sleep-in-atomic-context bug in gsm_control_send ae22294e213a serial: imx: Add missing .thaw_noirq hook 26db1cd5191e serial: 8250: omap: Flush PM QOS work on remove e0db709a58bd serial: 8250: omap: Fix unpaired pm_runtime_put_sync() in omap8250_remove() 83b6d4d6da67 serial: 8250_omap: remove wait loop from Errata i202 workaround 76db05ab7092 serial: 8250: omap: Fix missing PM runtime calls for omap8250_set_mctrl() 2aee616a6b11 ARM: at91: pm: avoid soft resetting AC DLL 188546c78006 ASoC: tas2764: Fix set_tdm_slot in case of single slot 5782896daf65 ASoC: tas2770: Fix set_tdm_slot in case of single slot 34eee4189bce ASoC: core: Fix use-after-free in snd_soc_exit() aa6f8aecbbf2 ARM: dts: at91: sama7g5: fix signal name of pin PB2 487fff700f5f spi: stm32: Print summary 'callbacks suppressed' message 2cec2f65c1e7 arm64: dts: qcom: sm8350-hdk: Specify which LDO modes are allowed 44dbe66bb3ea arm64: dts: qcom: sm8250-xperia-edo: Specify which LDO modes are allowed 8b2eae7def2b arm64: dts: qcom: sm8150-xperia-kumano: Specify which LDO modes are allowed c8e76eeea77c arm64: dts: qcom: sa8155p-adp: Specify which LDO modes are allowed 30571f28bb35 hugetlbfs: don't delete error page from pagecache 14ddbb83c342 KVM: x86/pmu: Do not speculatively query Intel GP PMCs that don't exist yet a9b964ed7cf9 spi: intel: Use correct mask for flash and protected regions f4eb68642ed3 mtd: spi-nor: intel-spi: Disable write protection only if asked 156d0c823c59 ASoC: codecs: jz4725b: Fix spelling mistake "Sourc" -> "Source", "Routee" -> "Route" 5907ff9f2c8f x86/cpu: Add several Intel server CPU model numbers 41e37d04e397 Bluetooth: L2CAP: Fix l2cap_global_chan_by_psm b02a025dd188 btrfs: remove pointless and double ulist frees in error paths of qgroup tests 1c366c206ff2 drm/imx: imx-tve: Fix return type of imx_tve_connector_mode_valid 1c8ded1b3879 i2c: i801: add lis3lv02d's I2C address for Vostro 5568 b432581f19a0 i2c: tegra: Allocate DMA memory for DMA engine 7b0ae4c7b918 firmware: arm_scmi: Cleanup the core driver removal callback 1a8a2fef273d ACPI: x86: Add another system to quirk list for forcing StorageD3Enable 8a03a4a5cf6d NFSv4: Retry LOCK on OLD_STATEID during delegation return 49ca2227c47b btrfs: raid56: properly handle the error when unable to find the missing stripe 0f7bd3a2dfe1 RDMA/efa: Add EFA 0xefa2 PCI ID a42d4363e78f ACPI: scan: Add LATT2021 to acpi_ignore_dep_ids[] 004decd41b32 drm/amd/display: Remove wrong pipe control lock 7779efbb99bf ASoC: rt1308-sdw: add the default value of some registers ef1e4ed85814 selftests/intel_pstate: fix build for ARCH=x86_64 dfd3cc1ef3e2 selftests/futex: fix build for clang 648467236c12 ASoC: Intel: sof_sdw: add quirk variant for LAPBC710 NUC15 64ee750c29da ASoC: codecs: jz4725b: fix capture selector naming 150b74cd0625 ASoC: codecs: jz4725b: use right control for Capture Volume 5352d8b31572 ASoC: codecs: jz4725b: fix reported volume for Master ctl 85134577a7f2 ASoC: codecs: jz4725b: add missed Line In power control bit 5e61dffb16dc spi: intel: Fix the offset to get the 64K erase opcode c697cb2e6663 ASoC: wm8962: Add an event handler for TEMP_HP and TEMP_SPK 569085124d75 ASoC: rt1019: Fix the TDM settings 4160a515c75b ASoC: mt6660: Keep the pm_runtime enables before component stuff in mt6660_i2c_probe 2963ec4535a1 ASoC: wm8997: Revert "ASoC: wm8997: Fix PM disable depth imbalance in wm8997_probe" 30a2f9479c21 ASoC: wm5110: Revert "ASoC: wm5110: Fix PM disable depth imbalance in wm5110_probe" 3bf6da38a292 ASoC: wm5102: Revert "ASoC: wm5102: Fix PM disable depth imbalance in wm5102_probe" 94fa250ea55c mm: shmem: don't truncate page if memory failure happens 003fa195911d mm: hwpoison: handle non-anonymous THP correctly a62b1bc603a1 mm: hwpoison: refactor refcount check handling 3df0eeae4d9a Linux 5.15.79 599b24eedf2a x86/cpu: Restore AMD's DE_CFG MSR after resume 9132fa043f96 net: tun: call napi_schedule_prep() to ensure we own a napi 1dea25e25acd drm/amdkfd: Migrate in CPU page fault use current mm a1c303fbd4dd marvell: octeontx2: build error: unknown type name 'u64' d948b228343a dmaengine: at_hdmac: Check return code of dma_async_device_register c556ecf32a07 dmaengine: at_hdmac: Fix impossible condition 8a941ff34e53 dmaengine: at_hdmac: Don't allow CPU to reorder channel enable 53831f7a13c3 dmaengine: at_hdmac: Fix completion of unissued descriptor in case of errors 14f5462e4a00 dmaengine: at_hdmac: Fix descriptor handling when issuing it to hardware 5482403228be dmaengine: at_hdmac: Fix concurrency over the active list 82ca19414faa dmaengine: at_hdmac: Free the memset buf without holding the chan lock 8fd36e069d65 dmaengine: at_hdmac: Fix concurrency over descriptor 1ee012d452b1 dmaengine: at_hdmac: Fix concurrency problems by removing atc_complete_all() 90c1b07406f0 dmaengine: at_hdmac: Protect atchan->status with the channel lock b5ee1fe06ad7 dmaengine: at_hdmac: Do not call the complete callback on device_terminate_all 9bbf5df0fc8c dmaengine: at_hdmac: Fix premature completion of desc in issue_pending f7d1aaa90319 dmaengine: at_hdmac: Start transfer for cyclic channels in issue_pending e9777b4efcce dmaengine: at_hdmac: Don't start transactions at tx_submit level 4e28674a0ecd dmaengine: at_hdmac: Fix at_lli struct definition 49eba53137f5 cert host tools: Stop complaining about deprecated OpenSSL functions 69e86c6268d5 can: j1939: j1939_send_one(): fix missing CAN header initialization 81fc8f90b885 mm/shmem: use page_mapping() to detect page cache for uffd continue e91451af11f9 mm/memremap.c: map FS_DAX device memory as decrypted 48998c1773a4 mm/damon/dbgfs: check if rm_contexts input is for a real context c736ed854160 udf: Fix a slab-out-of-bounds write bug in udf_find_entry() 2e87eddf5736 mms: sdhci-esdhc-imx: Fix SDHCI_RESET_ALL for CQHCI 91c38504e589 btrfs: zoned: initialize device's zone info for seeding 432c30ba3f56 btrfs: selftests: fix wrong error check in btrfs_free_dummy_root() c9fe4719c662 btrfs: fix match incorrectly in dev_args_match_device f96fd3693631 wifi: ath11k: avoid deadlock during regulatory update in ath11k_regd_update() 8e2b576caf91 platform/x86: hp_wmi: Fix rfkill causing soft blocked wifi cb3ab0e1e074 drm/amdgpu: disable BACO on special BEIGE_GOBY card dc066a78500a drm/i915/dmabuf: fix sg_table handling in map_dma_buf afbd1188382a nilfs2: fix use-after-free bug of ns_writer on remount abc082aac0d9 nilfs2: fix deadlock in nilfs_count_free_blocks() 589da2288197 ata: libata-scsi: fix SYNCHRONIZE CACHE (16) command failure 51ae4579a5d5 vmlinux.lds.h: Fix placement of '.data..decrypted' section 1f8e08ab3269 ALSA: usb-audio: Add DSD support for Accuphase DAC-60 c2451f62b2bd ALSA: usb-audio: Add quirk entry for M-Audio Micro 031d1480a0f4 ALSA: usb-audio: Yet more regression for for the delayed card registration 574f51e4aa40 ALSA: hda/realtek: Add Positivo C6300 model quirk 7140d7aaf93d ALSA: hda: fix potential memleak in 'add_widget_node' f6d7a487aabd ALSA: hda/ca0132: add quirk for EVGA Z390 DARK 1ccd55b3901b ALSA: hda/hdmi - enable runtime pm for more AMD display audio 29100c674208 mmc: sdhci-esdhc-imx: use the correct host caps for MMC_CAP_8_BIT_DATA 3dce99e2eb06 mmc: sdhci-tegra: Fix SDHCI_RESET_ALL for CQHCI 9d6bd33e6aeb mmc: sdhci_am654: Fix SDHCI_RESET_ALL for CQHCI ad01f16ca90c mmc: sdhci-of-arasan: Fix SDHCI_RESET_ALL for CQHCI 1aa78c1d013c mmc: cqhci: Provide helper for resetting both SDHCI and CQHCI c198524a99cb MIPS: jump_label: Fix compat branch range check 9713ceffa40a arm64: efi: Fix handling of misaligned runtime regions and drop warning 518e49f0590d riscv: fix reserved memory setup d07c3d7491b4 riscv: vdso: fix build with llvm cc36c7fa5d93 riscv: process: fix kernel info leakage a8d67367ab33 net: macvlan: fix memory leaks of macvlan_common_newlink 7b194dd32b13 ethernet: tundra: free irq when alloc ring failed in tsi108_open() 7de10342fe14 net: mv643xx_eth: disable napi when init rxq or txq failed in mv643xx_eth_open() 88e1dd2d9291 ethernet: s2io: disable napi when start nic failed in s2io_card_up() 3652f1f8d3ea net: atlantic: macsec: clear encryption keys from the stack fca3b0a1fd3e net: phy: mscc: macsec: clear encryption keys when freeing a flow 60a0af8813fd stmmac: dwmac-loongson: fix missing of_node_put() while module exiting ee4a9bd2c7f4 stmmac: dwmac-loongson: fix missing pci_disable_device() in loongson_dwmac_probe() 4a8770eebc39 stmmac: dwmac-loongson: fix missing pci_disable_msi() while module exiting 83196d8dc5a8 cxgb4vf: shut down the adapter when t4vf_update_port_info() failed in cxgb4vf_open() 49d8a6e24a34 mctp: Fix an error handling path in mctp_init() 29961d2332a5 stmmac: intel: Update PCH PTP clock rate from 200MHz to 204.8MHz 8604bebc5c32 stmmac: intel: Enable 2.5Gbps for Intel AlderLake-S 7dec6dae2b61 net: cxgb3_main: disable napi when bind qsets failed in cxgb_up() 960f9d30def3 net: cpsw: disable napi in cpsw_ndo_open() 1360778fdb6f net/mlx5e: E-Switch, Fix comparing termination table instance f13e9ebd2925 net/mlx5: Allow async trigger completion execution on single CPU systems 48b73b46a5b0 net/mlx5: Bridge, verify LAG state when adding bond to bridge 13b1ea861e8a net: wwan: iosm: fix memory leak in ipc_pcie_read_bios_cfg 7e4dcacb4dd6 net: nixge: disable napi when enable interrupts failed in nixge_open() 409731df6310 net: marvell: prestera: fix memory leak in prestera_rxtx_switch_init() 77ff31cba9a6 netfilter: Cleanup nft_net->module_list from nf_tables_exit_net() e62cb1c093d6 netfilter: nfnetlink: fix potential dead lock in nfnetlink_rcv_msg() 0bd20318da08 perf tools: Add the include/perf/ directory to .gitignore a733671e388c perf stat: Fix printing os->prefix in CSV metrics output c36e9e2c4aff drivers: net: xgene: disable napi when register irq failed in xgene_enet_open() 4689bd3a1b23 net: lapbether: fix issue of invalid opcode in lapbeth_open() 1dd27541aa2b dmaengine: ti: k3-udma-glue: fix memory leak when register device fail 992e966caf57 dmaengine: mv_xor_v2: Fix a resource leak in mv_xor_v2_remove() 9766af75ba5a dmaengine: pxa_dma: use platform_get_irq_optional 301caa06091a tipc: fix the msg->req tlv len check in tipc_nl_compat_name_table_dump_header 6a264203dbdb net: broadcom: Fix BCMGENET Kconfig e7871b9a21ae net: stmmac: dwmac-meson8b: fix meson8b_devm_clk_prepare_enable() 261178a1c262 can: af_can: fix NULL pointer dereference in can_rx_register() 2acb2779b147 ipv6: addrlabel: fix infoleak when sending struct ifaddrlblmsg to network 13ecaa6832fb tcp: prohibit TCP_REPAIR_OPTIONS if data was already sent bc79cb9fb006 drm/vc4: Fix missing platform_unregister_drivers() call in vc4_drm_register() 2845bc9070ce net: wwan: mhi: fix memory leak in mhi_mbim_dellink 2ce2348c2858 net: wwan: iosm: fix memory leak in ipc_wwan_dellink 7b6bc50f65e9 hamradio: fix issue of dev reference count leakage in bpq_device_event() f59adebb8c28 net: lapbether: fix issue of dev reference count leakage in lapbeth_device_event() 119407dc329a KVM: s390: pv: don't allow userspace to set the clock under PV 500bcd3a99ea phy: ralink: mt7621-pci: add sentinel to quirks table 151dc8087b56 capabilities: fix undefined behavior in bit shift for CAP_TO_MASK 435c7ddfd510 net: fman: Unregister ethernet device on removal 3a504d6d96ea bnxt_en: fix potentially incorrect return value for ndo_rx_flow_steer ac257c43fa61 bnxt_en: Fix possible crash in bnxt_hwrm_set_coal() d7569302a7a5 net: tun: Fix memory leaks of napi_get_frags 430d1f4964dd octeontx2-pf: NIX TX overwrites SQ_CTX_HW_S[SQ_INT] ec0db81883b4 octeontx2-pf: Use hardware register for CQE count b89a0d8859ae macsec: clear encryption keys from the stack after setting up offload eeba7f07a0cb macsec: fix detection of RXSCs when toggling offloading 3070a880eb03 macsec: fix secy->n_rx_sc accounting e957555a3694 macsec: delete new rxsc when offload fails ad25a115f508 net: gso: fix panic on frag_list with mixed head alloc types 466ce46f251d bpf: Fix wrong reg type conversion in release_reference() 35d8130f2ad0 bpf: Add helper macro bpf_for_each_reg_in_vstate 61274498fbf8 bpf, sock_map: Move cancel_work_sync() out of sock lock 32b5dd03beeb bpf: Fix sockmap calling sleepable function in teardown path e9915581899c bpf, sockmap: Fix sk->sk_forward_alloc warn_on in sk_stream_kill_queues 5ad95d71344b HID: hyperv: fix possible memory leak in mousevsc_probe() 6dcdd1b68b7f bpftool: Fix NULL pointer dereference when pin {PROG, MAP, LINK} without FILE 2fc902245c82 wifi: mac80211: Set TWT Information Frame Disabled bit as 1 95adbd2ac8de bpf, sockmap: Fix the sk->sk_forward_alloc warning of sk_stream_kill_queues 06615967d488 bpf, verifier: Fix memory leak in array reallocation for stack state 4335a82c4f7b soundwire: qcom: check for outanding writes before doing a read ae4dad2e5374 soundwire: qcom: reinit broadcast completion 38c9fa2cc6bf wifi: cfg80211: fix memory leak in query_regdb_file() 2c6ba0a7872b wifi: cfg80211: silence a sparse RCU warning 921738c280ab phy: stm32: fix an error code in probe fa722006f762 hwspinlock: qcom: correct MMIO max register for newer SoCs 3c1bb6187e56 drm/amdkfd: Fix NULL pointer dereference in svm_migrate_to_ram() b1f852277171 drm/amdkfd: handle CPU fault on COW mapping 36770c045aba drm/amdkfd: avoid recursive lock in migrations back to RAM 93a5de7e8843 fuse: fix readdir cache race 1920cf94545a thunderbolt: Add DP OUT resource when DP tunnel is discovered 47dbf2496990 thunderbolt: Tear down existing tunnels when resuming from hibernate Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit ee40eebc70d1d09c758eeba2ff6de969fb717a0b) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index 3dac2fbcd2..dd9f940c7c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -17,7 +17,7 @@ SRCREV_meta ?= "72756ee16d7230f04fb6bbf0bb115e32a9d73d8d" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.15.78" +LINUX_VERSION ?= "5.15.84" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 3dd2ecdf6f..8aa2ee14f2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.15.78" +LINUX_VERSION ?= "5.15.84" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index dabbb82822..f28dae716b 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -38,7 +38,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.15.78" +LINUX_VERSION ?= "5.15.84" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Fri Jan 20 18:10: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: 18385 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 006FEC05027 for ; Fri, 20 Jan 2023 18:11:40 +0000 (UTC) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mx.groups.io with SMTP id smtpd.web11.82166.1674238294940872625 for ; Fri, 20 Jan 2023 10:11:35 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=z5wSHWsl; spf=softfail (domain: sakoman.com, ip: 209.85.210.171, mailfrom: steve@sakoman.com) Received: by mail-pf1-f171.google.com with SMTP id s3so4558199pfd.12 for ; Fri, 20 Jan 2023 10:11:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=jPqhW3uImt4Ba8Os84yacJdGrkkubgI0PrgHvwKD2ik=; b=z5wSHWslH+I59bc8a+NbJbe4yz7NL8impGu9QayVvmNi3XVOupCZ+wcIqu5wMjv7Qy F5saqWFrxMGQ/2qJXA22bpV7biszOeoS6lpZICGa7u1M+rLJlP+hSMRjic8d1g7qEjvU 0eYOeyq+X8U7FAtcvrOLgVXbdHiMBJX2bFjk6M++8HIydIbH1vbf6/NEp0G3IK/FbwKy /QyfWsci8lXjpZtXIMXUta9TI2eUtHn8queBWIGMkrFbbe8YAdC2U3Y8YNiwBOfatoQ9 s0abse7eOubS3ysOPcfHzXQkq/g9luIzqseeg0HGSp/DPAYkZqt0oqDEHHZToDN58sEF 4P7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jPqhW3uImt4Ba8Os84yacJdGrkkubgI0PrgHvwKD2ik=; b=oy8BDcfM4ltfyLOINn4F+BVSuCxOWe0GnuknT8yHn3Y21AWqTfUkYBHJjGLyYjPzsF OWZNaLqY/nLN5QNViITSdAYszFwbRdunLd9CM14511mEJU05JU1ciZVKPwxkCCgmlC7m +BV63me4Gec2b4vQEONVdMSSvMXS7jW5vC/G7VGhLarB/Yuo5zI4M/nq6O4mSfwhT5Qe 2far0/bKBAPqUaFay8KSkIukxcUDvQUm1xHWzoFMoq5Ek9uN2jFqiZOQxSJFIL/Ax+Mn v8svhJGfhCFE8WY0J3k+9Q8n0sUka802NGNtt3Qgd/WykIMdQZ2VV00gZpynrXzYEgSD FCsQ== X-Gm-Message-State: AFqh2kpJsHhCxxGy0UYisqNmxfBNzgvX0qT9oBiiXnl5G/5aslRjOtjN SH325T6S6ww9XT64szi/ALQrL4uT5SPAX4eed9A= X-Google-Smtp-Source: AMrXdXv2AAygGFnzJoPMbKspu01wcAl/C2wEm4Qqen+g+ou8MsGUZrlvMGOJCRH6V7GyM+6do8869A== X-Received: by 2002:aa7:880b:0:b0:58d:abd5:504a with SMTP id c11-20020aa7880b000000b0058dabd5504amr14815010pfo.31.1674238294000; Fri, 20 Jan 2023 10:11:34 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:33 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 16/41] linux-yocto/5.15: powerpc: Fix reschedule bug in KUAP-unlocked user copy Date: Fri, 20 Jan 2023 08:10:33 -1000 Message-Id: <665855d33fd179e6890173b936673b414df9847f.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176222 From: Bruce Ashfield Integrating the following commit(s) to linux-yocto/5.15: f100c753aa1f powerpc: Fix reschedule bug in KUAP-unlocked user copy Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit b457e6976e9e64a737517f9d9142ab290cdce214) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.15.bb | 4 ++-- .../linux/linux-yocto-tiny_5.15.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 22 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index dd9f940c7c..122fc0feac 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "6a972b54f014ca67588d73f32058c42af0bd856e" -SRCREV_meta ?= "72756ee16d7230f04fb6bbf0bb115e32a9d73d8d" +SRCREV_machine ?= "e53e73b907707b92b3433de7c9c776aa504b2d0b" +SRCREV_meta ?= "e77e5259a3d11efe417b164a0f3341c07ba2bc46" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 8aa2ee14f2..f060e22e84 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "6e85c80a960287ec238f53c91eeade3456044fa3" -SRCREV_meta ?= "72756ee16d7230f04fb6bbf0bb115e32a9d73d8d" +SRCREV_machine ?= "ae2415ee19511e205a983bc8024700c1f794076a" +SRCREV_meta ?= "e77e5259a3d11efe417b164a0f3341c07ba2bc46" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index f28dae716b..bb48e158ab 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,17 +13,17 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "24c30a8e9f8385f6d74785aa345f5731321b6c41" -SRCREV_machine:qemuarm64 ?= "c3caed57192735dc74adff939ea35af248a11177" -SRCREV_machine:qemumips ?= "3bed92886dc9177ce0076dada5056cbe83ec11f0" -SRCREV_machine:qemuppc ?= "45cbeb05d362ee51b7836a7faa07958670110c38" -SRCREV_machine:qemuriscv64 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" -SRCREV_machine:qemuriscv32 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" -SRCREV_machine:qemux86 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" -SRCREV_machine:qemux86-64 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" -SRCREV_machine:qemumips64 ?= "2642cdd862a63f5a8c2774f372f3d3424991b1b9" -SRCREV_machine ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" -SRCREV_meta ?= "72756ee16d7230f04fb6bbf0bb115e32a9d73d8d" +SRCREV_machine:qemuarm ?= "8c0f02ba7db6a463ca3aef969441906706edb350" +SRCREV_machine:qemuarm64 ?= "42a14881ba8145b2d1bdfc019c603abe79aeafd4" +SRCREV_machine:qemumips ?= "1ea321a5c9c66edba818ddffcef2aa9910de552e" +SRCREV_machine:qemuppc ?= "14da484e7f2fc95e10abb4db96bc5fd6b444cb60" +SRCREV_machine:qemuriscv64 ?= "f100c753aa1f9638bfd476da0498b09fdee569d6" +SRCREV_machine:qemuriscv32 ?= "f100c753aa1f9638bfd476da0498b09fdee569d6" +SRCREV_machine:qemux86 ?= "f100c753aa1f9638bfd476da0498b09fdee569d6" +SRCREV_machine:qemux86-64 ?= "f100c753aa1f9638bfd476da0498b09fdee569d6" +SRCREV_machine:qemumips64 ?= "8db5fd5c032f44486ef52f34724d0452aa3a6fea" +SRCREV_machine ?= "f100c753aa1f9638bfd476da0498b09fdee569d6" +SRCREV_meta ?= "e77e5259a3d11efe417b164a0f3341c07ba2bc46" # 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 Jan 20 18:10: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: 18384 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 0EE61C38141 for ; Fri, 20 Jan 2023 18:11:40 +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.web10.82064.1674238296753883379 for ; Fri, 20 Jan 2023 10:11:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=i4O0rQFZ; spf=softfail (domain: sakoman.com, ip: 209.85.215.173, mailfrom: steve@sakoman.com) Received: by mail-pg1-f173.google.com with SMTP id 7so4753285pga.1 for ; Fri, 20 Jan 2023 10:11:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=amK7+9RGJrXO63B5XF+wLvo1Wywfomxbxr9hVYox2sY=; b=i4O0rQFZ8m+msVtYlDsmCKJe6e+ZgWZk1uIoVa1+zsizQHNSfBIme6TZZzxxFVZF1n EFG8FKVFAPhqYVCr0xbt74f8hRmtx6qfgyOYF2PwMc2yKbk2Q1FFw5Xt+mcvMa1TZA7+ hCrf8JgA28OWuiV2F4rKhrlgBb9mK8ljSyxsnb4j41erfd5Pgvy3oPBWMiJjYpZBR9rc CtkQs+ltmMO1mhi1YN5vFujM8QONQ89lMsQURWyWGSywoqwVY5VBwPt/0CRjDSBfEZUD 4XWw/wyxS8ERG4NErOTI4nhWZ9AsitdPDcnmnMpoBHrhoDUQHOhz4ZXaxnEclQhAQ9rU ILsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=amK7+9RGJrXO63B5XF+wLvo1Wywfomxbxr9hVYox2sY=; b=FEWbczl+9/119SHxw0ZtOrcZkXxXDpiE3e6ObU8gkQtjeW3ngC2nGbJLcF8Yknr7hB cpztEp2QvihErg9j3LjzE8huNebunBI59wC2cE9HHE+jI6Ll0k33GaTmuCsnBh/G11p4 ZDay8GCMNAUZUn1Nvwnbqyq/MqYWFAWojcuptuNDV1z4GihrRiQr0KFxFCIhx9cx73uW J1zZ8sN/rVgRJ7OIHnuggo62VlHau/d+N1OsCkJDTSIli398jiVuiwrXMMI6FrdOLAyE UDz+aTGMEpJ+2u+PHY+ARQ92urVcpz3hsGgWd3im/6qOfg+mWSmxk3mwT2/8cekcDkXo zKGQ== X-Gm-Message-State: AFqh2koFxu/5TncaIb5EPY1AEi7rxVdJDyvVgGZYEpc/R+POVKdwZQRI PyAMwB4qlNDSJfK77GtwccZwBbP6MxXHrXViUC8= X-Google-Smtp-Source: AMrXdXusISuB6mqReyZ3dU7jxVpdbbgn+Riii0vFSfyGDWSGzyUYAWz6BtOi2j89swYX9wvjWPF8PA== X-Received: by 2002:a62:bd08:0:b0:58d:be61:4859 with SMTP id a8-20020a62bd08000000b0058dbe614859mr14410523pff.11.1674238295776; Fri, 20 Jan 2023 10:11:35 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:35 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 17/41] linux-yocto/5.19: powerpc: Fix reschedule bug in KUAP-unlocked user copy Date: Fri, 20 Jan 2023 08:10:34 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176223 From: Bruce Ashfield Integrating the following commit(s) to linux-yocto/5.19: 84f2f8e7a625 powerpc: Fix reschedule bug in KUAP-unlocked user copy Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 438b3523625807e2deca1797ce20649531270676) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.19.bb | 2 +- .../linux/linux-yocto-tiny_5.19.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.19.bb | 20 +++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb index 8fb4a6b665..f4d205e613 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "8385624e99ac8f15de12a2253e8537dd25fbb082" +SRCREV_machine ?= "3101c367eab8952721086b545ad37c301b2a7452" SRCREV_meta ?= "239a6c0d3c3b046971909f1e066380465b0c331d" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb index 92214b4d90..95a8a46bbc 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb @@ -14,7 +14,7 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" +SRCREV_machine ?= "84f2f8e7a625aae0fa9e7027a2e774b99b646cf7" SRCREV_meta ?= "239a6c0d3c3b046971909f1e066380465b0c331d" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.19.bb b/meta/recipes-kernel/linux/linux-yocto_5.19.bb index 2462f5cac3..5baa0c1130 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.19.bb @@ -13,16 +13,16 @@ KBRANCH:qemux86 ?= "v5.19/standard/base" KBRANCH:qemux86-64 ?= "v5.19/standard/base" KBRANCH:qemumips64 ?= "v5.19/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "6a3ad6f786482c60fa0619935fe48dbb44673084" -SRCREV_machine:qemuarm64 ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" -SRCREV_machine:qemumips ?= "6722056dc4ccc7ccb7ca6a9d3dd840031c83d66d" -SRCREV_machine:qemuppc ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" -SRCREV_machine:qemuriscv64 ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" -SRCREV_machine:qemuriscv32 ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" -SRCREV_machine:qemux86 ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" -SRCREV_machine:qemux86-64 ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" -SRCREV_machine:qemumips64 ?= "d5bdf10616a90465afaef449feeaf31a51748220" -SRCREV_machine ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" +SRCREV_machine:qemuarm ?= "f30404d233fc4cc461a0800fd635f4e9650a20a5" +SRCREV_machine:qemuarm64 ?= "84f2f8e7a625aae0fa9e7027a2e774b99b646cf7" +SRCREV_machine:qemumips ?= "ceaf2134635845794c24b750f15004096a597256" +SRCREV_machine:qemuppc ?= "84f2f8e7a625aae0fa9e7027a2e774b99b646cf7" +SRCREV_machine:qemuriscv64 ?= "84f2f8e7a625aae0fa9e7027a2e774b99b646cf7" +SRCREV_machine:qemuriscv32 ?= "84f2f8e7a625aae0fa9e7027a2e774b99b646cf7" +SRCREV_machine:qemux86 ?= "84f2f8e7a625aae0fa9e7027a2e774b99b646cf7" +SRCREV_machine:qemux86-64 ?= "84f2f8e7a625aae0fa9e7027a2e774b99b646cf7" +SRCREV_machine:qemumips64 ?= "acf9ebb1e7d1ceb61a89ec33ca4cc3613287630b" +SRCREV_machine ?= "84f2f8e7a625aae0fa9e7027a2e774b99b646cf7" SRCREV_meta ?= "239a6c0d3c3b046971909f1e066380465b0c331d" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll From patchwork Fri Jan 20 18:10: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: 18382 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 0FF3EC38A23 for ; Fri, 20 Jan 2023 18:11:40 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web11.82168.1674238298447382727 for ; Fri, 20 Jan 2023 10:11:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=NpOZ3cO5; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id i1so4590017pfk.3 for ; Fri, 20 Jan 2023 10:11:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=h20WBHZBRVmUQ33hdkh3xKKWedDLPonrG+B5mP1xWD8=; b=NpOZ3cO5FrgmTW5+Q4DqT3JlA+SxPyIxob5AY080MZImyUD1dc1l6yzZFyrVTYIe6k H+K6LLPebgmmLFF70UJbyHd4bDMpvCTRwjM7BpQlX6nX8HgfflRnPmRAyD/R/sw99g// U3Q5iy8JhwFDyOFcyBK770A2jdd4VE4NHSbeZ9CDuqErdHbDlSga4Rxabs41GX10aJfS i4XxsNFaakEMNPxFUydAEnthdt+8ejFvHjGjOba7/YJStVZl11lxIWn6dtgMm2UmvHqd FWgLrju295urOHLUm0a/GaMQg4siju6zVSJGoL6+nnXil1q9WoFGDp6yQ6w1kKfGdf+x 07LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h20WBHZBRVmUQ33hdkh3xKKWedDLPonrG+B5mP1xWD8=; b=XtXngQhkJXUoj23DNqM02DK8C1J7FiAb/cFnYDVr0veEdmnnTL6MfdkTSYieX76H1O VipoH+Q58aGWr2bz1PUgG6sUIvGs73NLsW7ZPbzcZiSJrPiDuLArfnXCFxoC08Jxq4eB NsSVQz4R+WHHcXJAdF3JYKiQVzOwu8WdYVH0RopRWgyxtkfqrVdN8ExY6fx65epKcjuk cftnAiw9xCncaM0bYsVeJgIZksA+ymGWPCPXhURPE0UL87UULIdRCWBs97UCjTOEzF3c 6qXwaC3iLEMCLA42BCWWL1EKfEoQcpek8cGDfDkWMQrXXlKGPNBYWCNpC5JeW8U92Zwi DlZQ== X-Gm-Message-State: AFqh2krRDmDg30Gxe97lbzbPUHxNzCiiD5HDKHCWVbY0rN6ir0qnFLfi svlegn9C0n00kaH8iZGEYopw/gyevH4q350FaAI= X-Google-Smtp-Source: AMrXdXtCmAaP8yNOiXG1tLtUry+wGoYrqGBZxoUzPFSK1/x+ccVe/i3inINBsxP9Dm8s9j6pxzkFXQ== X-Received: by 2002:a62:6441:0:b0:585:f9c5:6e91 with SMTP id y62-20020a626441000000b00585f9c56e91mr16726102pfb.29.1674238297530; Fri, 20 Jan 2023 10:11:37 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:37 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 18/41] git: Upgrade to 2.37.4 Date: Fri, 20 Jan 2023 08:10:35 -1000 Message-Id: <44449a519fd157dab26eeb47dff84e16dc78d43d.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176224 From: Lee Chee Yang upgrade include fixes for CVE-2022-39253 CVE-2022-39260 Release notes: https://github.com/git/git/blob/master/Documentation/RelNotes/2.37.4.txt Signed-off-by: Lee Chee Yang Signed-off-by: Steve Sakoman --- meta/recipes-devtools/git/{git_2.37.3.bb => git_2.37.4.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/git/{git_2.37.3.bb => git_2.37.4.bb} (98%) diff --git a/meta/recipes-devtools/git/git_2.37.3.bb b/meta/recipes-devtools/git/git_2.37.4.bb similarity index 98% rename from meta/recipes-devtools/git/git_2.37.3.bb rename to meta/recipes-devtools/git/git_2.37.4.bb index 2eed85e807..2205a50d16 100644 --- a/meta/recipes-devtools/git/git_2.37.3.bb +++ b/meta/recipes-devtools/git/git_2.37.4.bb @@ -165,4 +165,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "181f65587155ea48c682f63135678ec53055adf1532428752912d356e46b64a8" +SRC_URI[tarball.sha256sum] = "a638c9bf9e45e8d48592076266adaa9b7aa272a99ee2aee2e166a649a9ba8a03" From patchwork Fri Jan 20 18:10: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: 18388 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 F1A10C05027 for ; Fri, 20 Jan 2023 18:11:49 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web10.82047.1674238270372454591 for ; Fri, 20 Jan 2023 10:11:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=7a7UTbTU; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id 200so4582694pfx.7 for ; Fri, 20 Jan 2023 10:11:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=2WcwEuDcVSRp0+ES+TOGsCdoM9W2pwo69wqOnORfv+0=; b=7a7UTbTULLi6sMA3uDEsh9QJjWDnzqYNz+8yrHIZpRX9xCbVDGyiBxcykI4GwaEEV9 LdNvEemBjpTLiSruynjWVBYT/2yG22yfFDHBI/e6HbZdzf0tYUZ41qNzxmpxoDMlSj22 HwvwwpbW3eYdcrGzEoEVvpKknoSSQlGWk0WlVWj6tQlkQgrd0Yvzai5nzuH2OVBz7vHV 1be5Qc/bOFi4naLMx4mHeAriAn05mNNEvWfoVXKxDF3fgSXoDe5YRFKhoufdCqlPNSFw JmlGQ9vqfG66LNzwD5p+5fIr6Q9F30Y3cAOOCgQjsMpA4VnC4r5wA8DK/57CUH2/bDuX eZ3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2WcwEuDcVSRp0+ES+TOGsCdoM9W2pwo69wqOnORfv+0=; b=mzvZYy1AVJSmmrA0lsCqmCGFHljegPkf2bGsVDUQRXJQEwiyEgAykJyHy47PK252op rNDuvHkjZVeupzz8BgjdpPbUgpnlLsQAloXhW/LVM5X2AWg2G/W1JHrWncNVRjKf0auY jIFVn6zeiJnceqtlVU2tJrtViw7v+VmPr7ZP56nHnt9dxZQeYnIQ2r4JCflcePYhD9nl 8Wcg7EyPqHxkve/wUN5XuXXqx1Dri8up6XjvAI2xRXvznv+c9pUWlGDx0e8XHM+vOEAU VmNnxfUV0Quq9dcW9ARR543+WdfCeeduxz0kUlJyx2OMj2U2vwkj336XopXQEwmbaXG+ xwpA== X-Gm-Message-State: AFqh2kp4NbOnrzI1Xzev3cXaqbQVeUH5GI1ePDANQc32sn/N3oxOrzpE cWG3Q7EY7Ut1MiH0MAACk1DbOBZ4WCI3RZUkWno= X-Google-Smtp-Source: AMrXdXvdw5MOYBMPYSJH0UtjcWyGictcpVsjGVyz7iV75nkJgjUM/MX+QekwIOkTndneR28sx0Vrxw== X-Received: by 2002:aa7:8a0e:0:b0:58d:9850:d55f with SMTP id m14-20020aa78a0e000000b0058d9850d55fmr15831510pfa.21.1674238299329; Fri, 20 Jan 2023 10:11:39 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:38 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 19/41] vim: upgrade 9.0.0947 -> 9.0.1211 Date: Fri, 20 Jan 2023 08:10:36 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176226 From: Randy MacLeod Includes fixes for: https://nvd.nist.gov/vuln/detail/CVE-2023-0049 https://nvd.nist.gov/vuln/detail/CVE-2023-0051 https://nvd.nist.gov/vuln/detail/CVE-2023-0054 https://nvd.nist.gov/vuln/detail/CVE-2023-0288 Signed-off-by: Randy MacLeod Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 1c51068c78d12ee02789a6dbecf5e7e91d141af5) Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index d86841efaa..9bc6881fce 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -20,8 +20,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".0947" -SRCREV = "cc762a48d42b579fb7bdec2c614636b830342dd5" +PV .= ".1211" +SRCREV = "f7d1c6e1884c76680980571f1cf15e0928d247b5" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Fri Jan 20 18:10: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: 18390 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 01E78C38141 for ; Fri, 20 Jan 2023 18:11:50 +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.web10.82068.1674238302064157565 for ; Fri, 20 Jan 2023 10:11:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=RUpUJo3c; spf=softfail (domain: sakoman.com, ip: 209.85.215.173, mailfrom: steve@sakoman.com) Received: by mail-pg1-f173.google.com with SMTP id e10so4732455pgc.9 for ; Fri, 20 Jan 2023 10:11:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cpv/XDBHtS8wKZqUIwlN4eLfBc+HrTl6dT8rhFOePeI=; b=RUpUJo3ccwzQwp45B+HwHsDA1qnKhcPObAMCegdqDsraWAEY8iCxU2UvZXma+de2Rs glssH5Q3ZwCYNwDg//vM4t7RpW4NYZbcAU94bbqVWWuFDtBHoA44Soy2vN2XWKUr6i9E A7doJ7aFHf8k0U5JEkU+qJzpAR46Dxbl0YzQi3qlsb4CWj+i5k4Qn983GKbACmBjQM1y 5lFjgN62OzzFyQ7kZ6wCiamGVsz4K/KYaFAN3tIrVzHsaqxHENDr04d+wetXsSTyeT92 i5Bf7KDmCZcx/jRseurJ5mJLb8Wz2OYQyKjmtKb6Iv5U4chmRGQBxx6Yv9293vh3lGul HXcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cpv/XDBHtS8wKZqUIwlN4eLfBc+HrTl6dT8rhFOePeI=; b=Fu9JVEBM9kn2Tlk4FSIwHJDZ0RihPGWCJzYjm+v2vMsWZqXkXm6G9gWMJ+K767VQDu 91bA2Zj5cNqgPycPxQQ6UHjd97ECI8+zA4hZJk6n6e9RI83JJgxfLL8nPp5NiCjMGIgf X+Z7I4mQu/fdcyVlzac9AwQR268q1nCBo9ziLQijWldGkeScPzHkKb4qAaVpSxD3IGIJ M6KJpgWAJ4wkzmSw364/PlDun3ymyXpvO16N7Wnl3qxiTb89YOdt/ADB3X3ah4ewBQ56 WbyjKLExyNHkvzmWGTeE4bBk8+IL0ryg+zeKGFB9hVgOX7/KhpToNOVqt2PPUAINsFIX KruQ== X-Gm-Message-State: AFqh2kr/rdOmydSkX6NTjbtgVt8NlSXjatJvOoKPITpuse0tLh6OFvSA ynjq/0ffub2IrF/z02li3Ki0xkEIWpDKr018C34= X-Google-Smtp-Source: AMrXdXvdYeoqsqALJM6tQxEccsCajV2hoca8yczSGzwxI+2A3xbJIjHBZohmupLOZQGJGlVb1oTgMA== X-Received: by 2002:a62:1b8a:0:b0:56c:318a:f83b with SMTP id b132-20020a621b8a000000b0056c318af83bmr13009302pfb.13.1674238301161; Fri, 20 Jan 2023 10:11:41 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:40 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 20/41] uninative: Upgrade to 3.8.1 to include libgcc Date: Fri, 20 Jan 2023 08:10:37 -1000 Message-Id: <5ce29be1bc64d6372e94cd11fce1711b267e127f.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176227 From: Michael Halstead Including libgcc solves issues with libpthread. Signed-off-by: Michael Halstead Signed-off-by: Richard Purdie (cherry picked from commit 36eb46589fb01374d4738a2c376386c68d06aa83) Signed-off-by: Steve Sakoman --- meta/conf/distro/include/yocto-uninative.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/conf/distro/include/yocto-uninative.inc b/meta/conf/distro/include/yocto-uninative.inc index 7012db441b..51c0cdee43 100644 --- a/meta/conf/distro/include/yocto-uninative.inc +++ b/meta/conf/distro/include/yocto-uninative.inc @@ -7,9 +7,9 @@ # UNINATIVE_MAXGLIBCVERSION = "2.36" -UNINATIVE_VERSION = "3.7" +UNINATIVE_VERSION = "3.8.1" UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/${UNINATIVE_VERSION}/" -UNINATIVE_CHECKSUM[aarch64] ?= "6a29bcae4b5b716d2d520e18800b33943b65f8a835eac1ff8793fc5ee65b4be6" -UNINATIVE_CHECKSUM[i686] ?= "3f6d52e64996570c716108d49f8108baccf499a283bbefae438c7266b7a93305" -UNINATIVE_CHECKSUM[x86_64] ?= "b110bf2e10fe420f5ca2f3ec55f048ee5f0a54c7e34856a3594e51eb2aea0570" +UNINATIVE_CHECKSUM[aarch64] ?= "3f15d420049b21854bd7a8843da0f42f17064559492c8b752d7a6f998ff5ea65" +UNINATIVE_CHECKSUM[i686] ?= "a6dcf316d738ade2e5e463bd3b33a270b4bfc25bba41770ad5cbdc3b0e24044c" +UNINATIVE_CHECKSUM[x86_64] ?= "5fab9a5c97fc73a21134e5a81f74498cbaecda75d56aab971c934e0b803bcc00" From patchwork Fri Jan 20 18:10: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: 18387 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 03618C38159 for ; Fri, 20 Jan 2023 18:11:50 +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.82160.1674238289277330223 for ; Fri, 20 Jan 2023 10:11:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=wiylqW87; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id d10so4721102pgm.13 for ; Fri, 20 Jan 2023 10:11:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=82/0DiTxSU1FLhRxGfPYsToGx79taFLAX7mybjUGXbk=; b=wiylqW87OoSyuHXzC4Cl5zUa8k8NK2mAmUaihpBv3GH5fWYgt9sLBjfGU1K1J0vMxU SdHiHQTt9iv9aAG/9rok1YpTIJBBqAd+zHmRrZjdLu9329dP8YeyPxMPD7SEZivuIVgb 2rCWfJs7D8Wiq0AnhvM3B7vTCjdUUVctyFH3BesnkxshCtIQrRBLgk3afDFcjuz3Kzfq y3aLQ0DLFw1tRY42ELESx0RYrMCNJUD3eIVHZKx1R5AkO+21EuYti9B3kzsZ/NLRolb6 9LPyCq3RXnsSCA/oU99JKeVAkyUF7wvhnD61bE8bjsrShCcVjS0S20D5upYA36WpOBL8 6VKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=82/0DiTxSU1FLhRxGfPYsToGx79taFLAX7mybjUGXbk=; b=zSGewHXylsCySrBTfDDokE64bW/J27TfpIKaAlF/SFM5RpY5eSf5SefH/SFCiy/8Dg A4y+6ivVVeDEq10U1ZRVv+eSxF1V4PdM49FFg/VdcM/WOxqWZcfOB35iBmVKqvZ2Sriz pe9ADVFANujN9UkDvjD21F/CKIjcB6jiFMwT09ExlT4hw1S1tHE6eEplOVEH32Lbyckd Caw/yRkhSfSl4md4cx81paFfczLFHr7I2j3Ss1OjZx2XEtdFBTIFzkR2TXMKaqCHPjgw x8VGUi3+eFo6Zeq1ZeIQ/WF0cZ4DEb/dn3ZMczz/NAjlk6eDUbc9hUMxvXLoe3nqLDAs +OqA== X-Gm-Message-State: AFqh2kqZwgTxhwV0vH36E7W0t8sXxnkO8IU7lu0LAEQ8mz0xeHqTGYoP 5hKBsNRtTsbr3v96EOu3wqYCp28TZRpxOc7Q5ms= X-Google-Smtp-Source: AMrXdXtupSmHeg1/SP6JuGJCY4rL7xxXDWphbdDqwMlQQ3Oam45khW6CSFrPCkh7aRE/5lD420WcTw== X-Received: by 2002:aa7:9d92:0:b0:58a:aaa3:f72e with SMTP id f18-20020aa79d92000000b0058aaaa3f72emr38942158pfq.6.1674238302864; Fri, 20 Jan 2023 10:11:42 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:42 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 21/41] mesa-gl: gallium is required when enabling x11 Date: Fri, 20 Jan 2023 08:10:38 -1000 Message-Id: <62cd3870fd257484c3be584229c668d095395780.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176228 From: Carlos Alberto Lopez Perez Otherwise Meson will fail wit this error: - meson.build:555:6: ERROR: Problem encountered: xlib based GLX requires at least one gallium driver Related: https://github.com/agherzan/meta-raspberrypi/pull/1119 Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit e7ee2dd98148e5104c52735a9a43e519dc24abfd) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb b/meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb index f2bc8f6b5b..c7c7aa7ac3 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb @@ -8,6 +8,6 @@ S = "${WORKDIR}/mesa-${PV}" # At least one DRI rendering engine is required to build mesa. # When no X11 is available, use osmesa for the rendering engine. -PACKAGECONFIG ??= "opengl ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}" -PACKAGECONFIG:class-target = "opengl ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}" +PACKAGECONFIG ??= "opengl gallium ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}" +PACKAGECONFIG:class-target = "opengl gallium ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}" From patchwork Fri Jan 20 18:10: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: 18389 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 0A2E2C25B4E for ; Fri, 20 Jan 2023 18:11:50 +0000 (UTC) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mx.groups.io with SMTP id smtpd.web11.82166.1674238294940872625 for ; Fri, 20 Jan 2023 10:11:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=lP6rvsmB; spf=softfail (domain: sakoman.com, ip: 209.85.210.171, mailfrom: steve@sakoman.com) Received: by mail-pf1-f171.google.com with SMTP id s3so4558585pfd.12 for ; Fri, 20 Jan 2023 10:11:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LJLh7qxLPoyGnlcWXDK79WXgvLQAm7GaNrdRYLuyZFM=; b=lP6rvsmBe++61OYmTY7x8v+615UNXXqeYvmiVIkfRbAr9GFQe/9FyUwEvgmcfIRuMV 0IJSwMkW939FJCT49UvRR0le4t1rzXv0SS/XtX4nQnyaPVliLb1IBV8RGxSPArJlSkf2 p4bizZLQcjmW4JRvbNkcqYZOf58SffGUDfg5uBuU6Yb0QHTEELLtNtOOCK4U2RL+RaLD bI4Q6nmSZoS2b4YG3eTNen7SMrXMXkdiRxi1hoCuYDhNuHEmDCt3/TnnOe3/ARvCX8Vg 3H5L+tScwPcZvw+4U0jyObXxgTeaNTQU9m+bdyq0S4+2c0lOGfFJCQqEod3KWFZfrSvR 2WCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LJLh7qxLPoyGnlcWXDK79WXgvLQAm7GaNrdRYLuyZFM=; b=IsFO34hGldcgaDFqcxHEL+MJmhsRj4GJ9FdYxRGpoaXfgnBdnxcwszVDmGrjPJsdAF 4C9i8/+W/UlQYc1cNOmAQHSFAbhWDg1xEamd44GqDB+bcDlWRCO86bvV6CgPM5buM1ap +oT+qJY4yJxmqPRIj7YnTeL5GrNFEuJHo/umBhVl9fkI5PE/I77gFB9+qRtqrupREG/g mbujfbiNE5UF3IrO3hgRkUO3iRSsUYbjymvzrHP5iDK1azJLXMx5ia6mcvKGkOq0Xa63 kAGnCqRRXm25llaSj/ilNZGJ7HpfAA10vINwQePjXUiwqICWDub1VdQdYVDmCsiWbsLt Es8Q== X-Gm-Message-State: AFqh2kqW7byfyZ/dRXL/yuSIm0WJ/SOKvIrkEOdedN17XsSvgI8T+3Vs dElTV5PoNQKcFA0e6XeRRrCiqHvCLkVAEE9g8CA= X-Google-Smtp-Source: AMrXdXtF5IWvUDQ4P3EVyu9q/4u8VYGhPQfz674xRQZRVUL1X8CS1mfA4t31PI9OHj0JIlcxxCNKFQ== X-Received: by 2002:aa7:91c1:0:b0:58a:fddd:9b1d with SMTP id z1-20020aa791c1000000b0058afddd9b1dmr15455963pfa.10.1674238304636; Fri, 20 Jan 2023 10:11:44 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:44 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 22/41] bitbake-layers: fix a typo Date: Fri, 20 Jan 2023 08:10:39 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176229 From: Enguerrand de Ribaucourt Signed-off-by: Enguerrand de Ribaucourt Signed-off-by: Richard Purdie (cherry picked from commit fab3aa7b1b7003bb03678c5cfc62ad2b597f0932) Signed-off-by: Steve Sakoman --- meta/lib/bblayers/makesetup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/bblayers/makesetup.py b/meta/lib/bblayers/makesetup.py index 22f89d81a4..834e9338bc 100644 --- a/meta/lib/bblayers/makesetup.py +++ b/meta/lib/bblayers/makesetup.py @@ -46,7 +46,7 @@ class MakeSetupPlugin(LayerPlugin): return describe.strip() def make_repo_config(self, destdir): - """ This is a helper function for the writer plugins that discovers currently confugured layers. + """ This is a helper function for the writer plugins that discovers currently configured layers. The writers do not have to use it, but it can save a bit of work and avoid duplicated code, hence it is available here. """ repos = {} From patchwork Fri Jan 20 18:10: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: 18392 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 114ACC52D77 for ; Fri, 20 Jan 2023 18:11:50 +0000 (UTC) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mx.groups.io with SMTP id smtpd.web11.82173.1674238307386370032 for ; Fri, 20 Jan 2023 10:11:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=A0dkQCJP; spf=softfail (domain: sakoman.com, ip: 209.85.215.178, mailfrom: steve@sakoman.com) Received: by mail-pg1-f178.google.com with SMTP id q9so4744088pgq.5 for ; Fri, 20 Jan 2023 10:11:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=/1xhLQE0nsT1eqPY+iR7affXdvGwgFgtnJYpg4GNZWA=; b=A0dkQCJPcrMJ+TiR6hDjOr7ZyuIUTC/ZVNYZbdh6NRZeQTrml/cZNrhQvz5Tny9OK0 RHmkqpceZYsO4t6cD+QGpVGi/Cr8als92aBCgO9tBYZYvDuRFIi2QxvUzJ6QIitFz7gy 3YW0xwH+2cfQ5e81qQzb9pu+QlN2Blqh6iJeexh9iAs2ubz5+jhMx4eZ5jDS8l8t2g+V EdepKib6AjlCHcXF5BC+30pdSWpRhvPw+BU1ZAxKyBosxCr4/9y169z1m7DSh6uKyScD c1XhUxnYwFca9SH37x8Bs2ghQBpuN+BYdu5o4k8RQ4zsAv0nDZ4TBoMCFk/ByuZPUXCD Fxzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/1xhLQE0nsT1eqPY+iR7affXdvGwgFgtnJYpg4GNZWA=; b=JjsnY/9uUrggP0AnJnQICJZQAxBEsuoiZIfiNWPkOq3IuldEZxBvTh+FNIMIx87c1F aWyp+BBka9/mge21E+xdaCtDi01DXnmpE37vsJfIRNNeQ4Y32fWMH6OKDKg4rr4Y41NV Tt7k9+s016xpANoXZmSEabuuWbb4qaAB8Jvt9wUolbWegThdchnoIgqUvdGKQZJ/nvz+ rv+CTvaOx9DzbX/MontGcgc2NIvhYGPNdEMNcz7N4J0pfIxDGqeEsnYxatscLFE0WbEn iEET8qWbPMjW78kckO+JjHui75hr2ZU9jJvITLVBGcHXV4HtAdnUbR/GSuosMVH/+cux l9bw== X-Gm-Message-State: AFqh2kpRrBqRHC1fHmi4ALguZkXghnqTNmilaHF3xfVVoIlH9wxRR5a6 ymn+PjvLCyn3KLfMugZng8Jzziip0s8gNWEm1MA= X-Google-Smtp-Source: AMrXdXsFm+NdpiaVmAPTz0Jsy44cXDnzABFAMb+I9sNsnmuuWiwLG0MrExla2QuSD5lpkW15EffWKw== X-Received: by 2002:a62:1448:0:b0:58d:9588:890b with SMTP id 69-20020a621448000000b0058d9588890bmr22396900pfu.0.1674238306391; Fri, 20 Jan 2023 10:11:46 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:46 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 23/41] classes: image: Set empty weak default IMAGE_LINGUAS Date: Fri, 20 Jan 2023 08:10:40 -1000 Message-Id: <10cbde44012320f3cd203ff7d36f7594c8b36090.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176230 From: Alex Kiernan This is already set in default-distrovars.inc and so this assignment will almost never succeed. Rather than leaving it to confuse, set an empty weak default. Signed-off-by: Alex Kiernan Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit eb402948158659da7de0fbbb1bb403c8dad06e2b) Signed-off-by: Steve Sakoman --- meta/classes-recipe/image.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass index e387645503..d4bf02784a 100644 --- a/meta/classes-recipe/image.bbclass +++ b/meta/classes-recipe/image.bbclass @@ -182,8 +182,7 @@ python () { IMAGE_POSTPROCESS_COMMAND ?= "" -# some default locales -IMAGE_LINGUAS ?= "de-de fr-fr en-gb" +IMAGE_LINGUAS ??= "" LINGUAS_INSTALL ?= "${@" ".join(map(lambda s: "locale-base-%s" % s, d.getVar('IMAGE_LINGUAS').split()))}" From patchwork Fri Jan 20 18:10:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 18391 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 10FE7C38A23 for ; Fri, 20 Jan 2023 18:11:50 +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.web11.82155.1674238285685718262 for ; Fri, 20 Jan 2023 10:11:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=tU7hVQXd; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id s67so4744928pgs.3 for ; Fri, 20 Jan 2023 10:11:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=wwdCy/pawgWl0xkc6kuw3HjFWm2sgBMxcCOwBgOjufs=; b=tU7hVQXdjG45KtKagAcydHiCImS7Lqco+DU39B7IHCwCoKeqwRmYlRFHfuk6X0osSA khGY8JO62w9vB/4Rq9F6GIkNFeMfzHZNKTl5lZHwi1h/fT0GF6rwmfYL9OlL/bsBHp+M uPVIGbBnNhclfp31WTcgN7S7vj3xqITwYtQbP/2F6NXsm1uTM83ljhlGUKQ7J2kiPaMm 3i/aeORF13j2AfvhzVbXi5dmqkLGcyEjjLEfIw415cKX4fHAMQDvCgGGGIh4asdNVwwy bTfuiEnXeUFrYX+H4fcdmVHR681okvMjwKgvTyWRHku0X7WCigIN6IhCPeNsPIfwbjVA FWiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wwdCy/pawgWl0xkc6kuw3HjFWm2sgBMxcCOwBgOjufs=; b=nkCEl8OBHeZJq/k/O3BA1RywJbm+I2/Ns9eNxXG/PkLNTwpeOXbbg2CSZ+vM1jhipQ XlhOv/Ckia62vKQh3L7t83JiW67zq6T/4DAtOh7stWmJVF2G/+Aad59Utq9ohbTbFiN3 HyJwwS1Zw3zJGBFUP2AsT4URvScbPualQbVpuYKMibYucPN7OennMCGv/vLwjiKf0iy2 M4d/j315OgP5cnNqt9AxcQm4Pa78yYIFK5mMARmORDMq2lCx7Zmn91lIhrG2XuXKBAL7 k3WxQxn0pCOmvu9kSCpIEzognpGgdfg3btBEImADO5lRPRrJ4xp6k4AUQ7yHVUumQWki PZbA== X-Gm-Message-State: AFqh2krvmdc+5GJWPcerAdIPXlPL9fAXcfA9TQhofVp/OcXWo96fDeS4 wh+WoeQiDNo0dhfs2nEZdFgAluUaCxLE7XVFwto= X-Google-Smtp-Source: AMrXdXsA74OR2eq3mX/Jzs0BGgoKp5+STPRNG9gWGu6EmOT1TbOElqEEwdQbkMNVzaF6gt08SeMHZA== X-Received: by 2002:aa7:9d92:0:b0:58a:aaa3:f72e with SMTP id f18-20020aa79d92000000b0058aaaa3f72emr38942481pfq.6.1674238308147; Fri, 20 Jan 2023 10:11:48 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:47 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 24/41] busybox: always start do_compile with orig config files Date: Fri, 20 Jan 2023 08:10:41 -1000 Message-Id: <6b38515e148cfd6657d8e10ffb6dc49abfea0c9f.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176231 From: Antonin Godard When compiling busybox a second time (e.g. with `compile -f`), busybox can use an altered autoconf.h file for compiling, which can ultimately produces different and unwanted binaries. This can produce errors like this one: ERROR: busybox-1.35.0-r0 do_package: Error executing a python function in exec_func_python() autogenerated: The stack trace of python calls that resulted in this exception/failure was: File: 'exec_func_python() autogenerated', lineno: 2, function: 0001: *** 0002:ptest_update_alternatives(d) 0003: File: '…/poky/meta/classes/ptest.bbclass', lineno: 100, function: ptest_update_alternatives 0096: for alt_name, alt_link, alt_target, _ in alternatives: 0097: # Some alternatives are for man pages, 0098: # check if the alternative is in PATH 0099: if os.path.dirname(alt_link) in bin_paths: *** 0100: os.symlink(alt_target, os.path.join(ptest_bindir, alt_name)) 0101:} 0102: 0103:do_configure_ptest_base[dirs] = "${B}" 0104:do_compile_ptest_base[dirs] = "${B}" Exception: FileExistsError: [Errno 17] File exists: '/bin/busybox.suid' -> '…/busybox/1.35.0-r0/package/usr/lib/busybox/ptest/bin/login' This happens because ALTERNATIVE:busybox contains `/bin/login` twice, initially that's because `/bin/login` is present in both busybox.links.suid and busybox.links.nosuid. The reason for that is because of the altered autoconf.h. Steps to reproduce above error: bitbake busybox -c clean bitbake busybox -c package -f bitbake busybox -c compile -f bitbake busybox -c package -f This patch guards against potential bugs by: - making a backup of .config and autoconf.h that have matching timestamps. - make sure do_compile always starts with these files. - restore .config and autoconf.h at the end of do_compile. Signed-off-by: Richard Purdie (cherry picked from commit 6b4a0f063edcfe0a5a4f418842e86ac0c46d9cad) Signed-off-by: Steve Sakoman --- meta/recipes-core/busybox/busybox.inc | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 5f1c473d5e..dff4a5dec9 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -138,19 +138,23 @@ do_configure () { do_prepare_config merge_config.sh -m .config ${@" ".join(find_cfgs(d))} cml1_do_configure + + # Save a copy of .config and autoconf.h. + cp .config .config.orig + cp include/autoconf.h include/autoconf.h.orig } do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS export KCONFIG_NOTIMESTAMP=1 + # Ensure we start do_compile with the original .config and autoconf.h. + # These files should always have matching timestamps. + cp .config.orig .config + cp include/autoconf.h.orig include/autoconf.h + if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then # split the .config into two parts, and make two busybox binaries - if [ -e .config.orig ]; then - # Need to guard again an interrupted do_compile - restore any backup - cp .config.orig .config - fi - cp .config .config.orig oe_runmake busybox.cfg.suid oe_runmake busybox.cfg.nosuid @@ -187,15 +191,18 @@ do_compile() { bbfatal "busybox suid binary incorrectly provides /bin/sh" fi - # copy .config.orig back to .config, because the install process may check this file - cp .config.orig .config # cleanup - rm .config.orig .config.app.suid .config.app.nosuid .config.disable.apps .config.nonapps + rm .config.app.suid .config.app.nosuid .config.disable.apps .config.nonapps else oe_runmake busybox_unstripped cp busybox_unstripped busybox oe_runmake busybox.links fi + + # restore original .config and autoconf.h, because the install process + # may check these files + cp .config.orig .config + cp include/autoconf.h.orig include/autoconf.h } do_install () { From patchwork Fri Jan 20 18:10: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: 18397 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 EF54CC05027 for ; Fri, 20 Jan 2023 18:11:59 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web11.82175.1674238310877392295 for ; Fri, 20 Jan 2023 10:11:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=cn/fmw+g; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id u1-20020a17090a450100b0022936a63a21so9810496pjg.4 for ; Fri, 20 Jan 2023 10:11:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7/H5Xlm9gGwxSkdWN+IOKnneyW90GPw8Al2FdBlzfII=; b=cn/fmw+gyBIwkU42Vf1ImIYf5pM06dlBRMtrgYd+dx5hvZgMwXzxFjbpUe+Ir+b6Si VEiIfYAxqGfKlNAasKklS9kQzQKFb715mlg2JxZIS+IVxcwyWtQNrcnd1ahfb+WFRxWv wRfNbaHLPwK4rCLYsZiWwa/O2xzZVci4+dushUj4Mtt38Fy0uTrUEM7g78yzhRu1nc1U IWGktYN0YH7TsTwWJ3FyC/H2f5evoBkaGS5l6VYk1cRtjiUu3Ge8GUmkrlJOzFg3XJSW epPgueCEy55RJs+TzXENsEbfApRSZ3E3YmqIg2KXW0jY3TGuOoBGWjnq+wz3F3KFqXzG Lmvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7/H5Xlm9gGwxSkdWN+IOKnneyW90GPw8Al2FdBlzfII=; b=bPOuZZ8UlJmoDnteeHhS8vBHWflfo1Lz13EXSlfYijiIyyvqDrImFjnWvW7g7C41B2 +yYcZTk3BzwUO7RgLQiCtnKpCZlZmEfIGOvKx9M/b9P1azVU8GNQqTK8KTAh0OfQNbT7 NdGCzfxjJfb9YR1EcydAkjkOZHIIq/cBurh7ZyEaG6WTcCRcVOBnfLWqF/xjtwJrYtUy DriB1RNXgv9xuwNbE5VmJIQNfkFGgliDXV7XM9+4Nl6k1DnVu5Zs0TVw1dZu76d0jEsu lLaZCMM+AJ6UGU/X5F6FNq500XIruAezQIRfpc14ti5b5+4attLxvZwbbqjJOPPoODP0 iE1g== X-Gm-Message-State: AFqh2kqwL6dYm2xJou0DEMmgIvJKLZIWvjr1ydeAOhuWYznJtJz8Z4ur ewL70egKXmS/0OPPOT5exPmNw3XVkJepdGHpSsE= X-Google-Smtp-Source: AMrXdXtJuhRmjeIBaTgmiX5TQSB2LZ+q/gf8m+QXT/s8BdeGXPqUmrePBY8bD2cE9+omkMaJMbedkQ== X-Received: by 2002:a05:6a21:99a7:b0:b5:d781:ca7 with SMTP id ve39-20020a056a2199a700b000b5d7810ca7mr21994985pzb.3.1674238309902; Fri, 20 Jan 2023 10:11:49 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:49 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 25/41] busybox: rm temporary files if do_compile was interrupted Date: Fri, 20 Jan 2023 08:10:42 -1000 Message-Id: <30cf3640bf18c8ec48d69c566938b38d8561d368.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176232 From: Antonin Godard To avoid working with undeterministic config files, remove all the temporary files to start from scratch. Signed-off-by: Richard Purdie (cherry picked from commit 74cd440c4e3df0ed3b81cf5c60a3f92e0dd3fe6c) Signed-off-by: Steve Sakoman --- meta/recipes-core/busybox/busybox.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index dff4a5dec9..62dc839245 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -154,6 +154,9 @@ do_compile() { cp include/autoconf.h.orig include/autoconf.h if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then + # Guard againt interrupted do_compile: clean temporary files. + rm -f .config.app.suid .config.app.nosuid .config.disable.apps .config.nonapps + # split the .config into two parts, and make two busybox binaries oe_runmake busybox.cfg.suid oe_runmake busybox.cfg.nosuid From patchwork Fri Jan 20 18:10: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: 18393 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 02D76C38159 for ; Fri, 20 Jan 2023 18:12:00 +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.web10.82064.1674238296753883379 for ; Fri, 20 Jan 2023 10:11:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=hyD9qglD; spf=softfail (domain: sakoman.com, ip: 209.85.215.173, mailfrom: steve@sakoman.com) Received: by mail-pg1-f173.google.com with SMTP id 7so4753852pga.1 for ; Fri, 20 Jan 2023 10:11:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=diy5Jin0q7Z7DdN6FbhBaFSuodcOkKd8UZPBoBSag9g=; b=hyD9qglDXl4+bUESvOksNurvFUa687G+qCk+XinI2c8f3ODfJimL5g0uipQfv78T6B EF6cxkDcQcVwIcZsd39PPXL25AftNMkBZ/XMg+CcPs5MEONwUnEGtYni5Kv+uW0g8iYV Gp0O/4ukHSPuhUmS4qm9Q5avR1idsJVbnVyZW+cam3bpg/Pjqzu4SUGOw9jQh9gS/6Ao p7RK6n+V2ZmHokUH4fsuiGqu44WP5ro6xZW6Wbh+9d7wLgPH2fWJArTnARw8DrG9sdKF 83SVKdJYcTQ2ry/QTxMdrsW/jT54kOJJoc9wIQaPcjbWBaU1nMcoNzWurDWbHsOnuoKz f8ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=diy5Jin0q7Z7DdN6FbhBaFSuodcOkKd8UZPBoBSag9g=; b=HwXZY8rBp7MPrYHBumPOF3m7vBHeWKd1O+KnA94yt65tJK+l+oQb9XWvr67gudSEgH u6ZUxGbfw6EAAkkO5hEEsBrDKUyQSph5yJy52XdKhJuvRELZaoHoCTuscUHWBDrgXbWn GyEHWZS9vSDM2ez/zrXXiQUT4Tj3IVZj+mSkeRaJ1tnGvRY3Bfsrf9lVTcqE7/dNha4P y1oo3nQ2lBpGzzzOEOxj7CI0mlTfQlrTkHQlxzQo3ipDOtGka3ZBCNYo5wNsuST155fz tqeZp6N5Ug3/MIQnHcbB6VTMVs5laIlQBKH2itKadISTAr6aEMJdBIRGf36/gftA63cJ ei+Q== X-Gm-Message-State: AFqh2kpjSvB3Nt8OPIybydJKUnVfWSG/B1PgZcBJqzsQTQPn9GK8/exT vhsHUX5haI+Nq7Xvl69PLh5k2Kb3hic9urVD37Y= X-Google-Smtp-Source: AMrXdXtDnlUm/AvEz1e7szP9Ps+FSwPE1RRUaK8lnf8s+uHBO7SDkKl9MwbwjlOBHMy1oI+4PET7ng== X-Received: by 2002:a62:388e:0:b0:58b:cacd:35f with SMTP id f136-20020a62388e000000b0058bcacd035fmr16081543pfa.32.1674238311719; Fri, 20 Jan 2023 10:11:51 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:51 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 26/41] kernel-fitimage: Adjust order of dtb/dtbo files Date: Fri, 20 Jan 2023 08:10:43 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:12:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176233 From: Sandeep Gundlupet Raju The dtb files must be before the dtbo files, otherwise the overlays may not be applied correctly. From Bruce Ashfield: We can split between dtbs and dtbos, they just need to be sorted for reproducibility reasons. Of course, this was only working by luck previously (before the sort), since it has always been gathering dtbs and dtbo's with find, depending on filesystem ordering for the order in the fitimage). Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Steve Sakoman --- meta/classes-recipe/kernel-fitimage.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes-recipe/kernel-fitimage.bbclass b/meta/classes-recipe/kernel-fitimage.bbclass index 8ddebf8dd8..06cdc4f1ec 100644 --- a/meta/classes-recipe/kernel-fitimage.bbclass +++ b/meta/classes-recipe/kernel-fitimage.bbclass @@ -546,10 +546,11 @@ fitimage_assemble() { if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then dtbcount=1 - for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n' | sort); do + for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" -name '*.dtb' -printf '%P\n' | sort) \ + $(find "${EXTERNAL_KERNEL_DEVICETREE}" -name '*.dtbo' -printf '%P\n' | sort); do DTB=$(echo "$DTB" | tr '/' '_') - # Skip DTB if we've picked it up previously + # Skip DTB/DTBO if we've picked it up previously echo "$DTBS" | tr ' ' '\n' | grep -xq "$DTB" && continue DTBS="$DTBS $DTB" From patchwork Fri Jan 20 18:10: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: 18396 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 00BD0C38141 for ; Fri, 20 Jan 2023 18:12:00 +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.web10.82076.1674238314528266940 for ; Fri, 20 Jan 2023 10:11:54 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=2AhNAkYE; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id v3so4751220pgh.4 for ; Fri, 20 Jan 2023 10:11:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Gh813h5cftB1CuIO7OSeJeVfR0fI+DH4kYWPF/rT654=; b=2AhNAkYE5u/hxb9WnyOg+D2pDDuWjNx1W49Qx/TXKNcsaS5gnsUI2vUuhwf/xw6S/Y 2k8r1oh5gPd5lUyxh+4T+cQswpuHcOl2L9SqR+w0ch4xsGiBGnk7KsMJIU8fyoTAG3mz QBvChAyIdAz/lO5jQBJXczdAzEPJ/693S9Qo7JMPLwQCI5pKzWbe48Sd6NNlBNz7piKD vTuz+P9oNmC/q4S0aKWWW8BEbJDCFd7nNMrPLioIsDRqAhjeor6r75YXEEk5vKTVggrc oKukX3u7bS/Tsm1hRJg42r5GubMRVDE10R0DP3OWwIU5ctPMaU3yJge+hB7ypjJOXwDw RDWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Gh813h5cftB1CuIO7OSeJeVfR0fI+DH4kYWPF/rT654=; b=JyUJhPGhZ98rGkyH/VxLJvAXNaWAsrV8ItO3+v5L9LM7M/ve/lksAMRhpy2c8NmyzA z+0uNfMo48F5974YmjFJoETFzJDBFtsASH8pB8RJMWGVvI3U/LiR8jABpWow5Ij4niJG 7zjcydRMe5iU3b4TJfb7qAizKRRYnzMLNh//ipGVnD4ymA6FI2I0azP83c8Vx16Rf8G6 e4VLb2VmhOUhbNAypoWgNT0SwDQuwqikPw15pSDicVjZdMn8+YZ3PxGV3XMFE+ygSq0l 5rKGeqtqad93p5gYnPbrBlaldx6CanU97D2zWRM/LlfBE2yjCN+uxOUQjnRY6ADiwVN2 JuCg== X-Gm-Message-State: AFqh2kpqPw9EsxUjIB2fITI+qhw1hIxptizU3SkTgLVEmqwnY+V73vSY dFgYYKKST8rNM0+gunT4zJzPDxKdUeWtRPBKXeg= X-Google-Smtp-Source: AMrXdXucmt3mIV3Cz9iIHHBYHBE6/OAOVGhcYzjqhdXxD3rxtw8dVLcySqdNESamuieGXKTAkZJy+g== X-Received: by 2002:a62:1cce:0:b0:58d:c617:8e9f with SMTP id c197-20020a621cce000000b0058dc6178e9fmr16701084pfc.3.1674238313482; Fri, 20 Jan 2023 10:11:53 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:53 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 27/41] kernel-fitimage: Allow user to select dtb when multiple dtb exists Date: Fri, 20 Jan 2023 08:10:44 -1000 Message-Id: <43926dfc527d865f1051299b2dd688770e149b23.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:11:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176234 From: Sandeep Gundlupet Raju Allow user to select the default DTB for FIT image when multiple dtb's exists. From machine.conf or local.conf user can specify the default dtb for FIT image as shown below. FIT_CONF_DEFAULT_DTB = "board-default.dtb" Also fallback to avaialable dtb when FIT_CONF_DEFAULT_DTB doesn't exits or empty. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Steve Sakoman --- meta/classes-recipe/kernel-fitimage.bbclass | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/meta/classes-recipe/kernel-fitimage.bbclass b/meta/classes-recipe/kernel-fitimage.bbclass index 06cdc4f1ec..f6d82ce061 100644 --- a/meta/classes-recipe/kernel-fitimage.bbclass +++ b/meta/classes-recipe/kernel-fitimage.bbclass @@ -73,6 +73,9 @@ FIT_CONF_PREFIX[doc] = "Prefix to use for FIT configuration node name" FIT_SUPPORTED_INITRAMFS_FSTYPES ?= "cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.zst cpio.gz ext2.gz cpio" +# Allow user to select the default DTB for FIT image when multiple dtb's exists. +FIT_CONF_DEFAULT_DTB ?= "" + # Keys used to sign individually image nodes. # The keys to sign image nodes must be different from those used to sign # configuration nodes, otherwise the "required" property, from @@ -375,6 +378,7 @@ fitimage_emit_section_config() { bootscr_line="" setup_line="" default_line="" + default_dtb_image="${FIT_CONF_DEFAULT_DTB}" # conf node name is selected based on dtb ID if it is present, # otherwise its selected based on kernel ID @@ -417,7 +421,17 @@ fitimage_emit_section_config() { # default node is selected based on dtb ID if it is present, # otherwise its selected based on kernel ID if [ -n "$dtb_image" ]; then - default_line="default = \"${FIT_CONF_PREFIX}$dtb_image\";" + # Select default node as user specified dtb when + # multiple dtb exists. + if [ -n "$default_dtb_image" ]; then + if [ -s "${EXTERNAL_KERNEL_DEVICETREE}/$default_dtb_image" ]; then + default_line="default = \"${FIT_CONF_PREFIX}$default_dtb_image\";" + else + bbwarn "Couldn't find a valid user specified dtb in ${EXTERNAL_KERNEL_DEVICETREE}/$default_dtb_image" + fi + else + default_line="default = \"${FIT_CONF_PREFIX}$dtb_image\";" + fi else default_line="default = \"${FIT_CONF_PREFIX}$kernel_id\";" fi From patchwork Fri Jan 20 18:10: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: 18395 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 14066C25B4E for ; Fri, 20 Jan 2023 18:12:00 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web11.82178.1674238316102496611 for ; Fri, 20 Jan 2023 10:11:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=C6lWY3hZ; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id c85so4570411pfc.8 for ; Fri, 20 Jan 2023 10:11:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=VCZhVYhBjeuMCXsyViHrne9wV3yQ/eM829UI+kr8IHQ=; b=C6lWY3hZsyzI8lfu4+xbmNTXrelpUpc6FNJYQM8cHQzp19rpOxqwb3J0NUoeLBFGFC Su3OOXaSVloegR5pQJkqukqqTaZMeTHq83lwjKAb6vK/afF/wAaEQfQacncDmFN7Cugd qOZ6WozX0+bG2M+pF27CP3Ik6ijn//WooLlCKXMw+2AxKSUVF4A+UUL84IeLITbO2SPZ 1rYS5a6Yov1Pz1GGbzjzvPIb7TJ3RN78Fe9Zt0PMjHfLNClUqkhxILYOJ+4LEtJa7h9F dMVBvN1yeKETCElhMLM0Bc28Jt6gKmgK5wCdnLzEV02+2vm3rnmlFKvU65vXkEQ0eBMQ /2gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VCZhVYhBjeuMCXsyViHrne9wV3yQ/eM829UI+kr8IHQ=; b=QJIFXa+zwzRWYoZIXwaixgMEcMfjwBdyxKKmpleXImPIWcRSZVgoOrMgL4q9dVsq/C dqK2R8HnR7XIE6b5BNGf72QCuotdPVGAZQd2go9v1NWQmNUy3PdwFv50EqhKTTobft+K BRHwZJfJ2/n5su93klgnLeQtwROo387hkVj76097YxfYqYfLQdTx+6FXl8s+4aBFXTsV hRdeLNKIvMgAPy5smKNwNMLz2iAoFm5KqjEY7XGc60yJGyrA6ni7UAkHOmMSTrsEmMV1 2NauC0EqAH7MGCCWUPh2Nn8ItlIl3FBeAq0e3NxpaKIhxfWG9UWiXkuwEHrfHWhAL3tX DtGw== X-Gm-Message-State: AFqh2kp8susUFVkFHk4jLzQhHojx7w0z4ZWfzGGeCHqA3uZDsbYiECHw G/xaPgoShgbSy/gQ0sHqmKPuOS6dQoy1UVeTXNg= X-Google-Smtp-Source: AMrXdXsdgMSx0TvXtKGONNxi4T770S2lRXN2yjJjlEE5b+Sc5ylOeB8JjUdC2qfMb9PDErUlkXGe0A== X-Received: by 2002:a05:6a00:1887:b0:58b:c688:6ac0 with SMTP id x7-20020a056a00188700b0058bc6886ac0mr24328336pfh.10.1674238315192; Fri, 20 Jan 2023 10:11:55 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:54 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 28/41] tiff: Add packageconfig knob for webp Date: Fri, 20 Jan 2023 08:10:45 -1000 Message-Id: <02a77676bab5fe36f8209d9eedd38a384d6c0ab5.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:12:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176235 From: Khem Raj tiff-native otherwise falsely detects webp if its installed on build host. This ensures deterministic behavior regardless of host. Signed-off-by: Khem Raj Signed-off-by: Richard Purdie (cherry picked from commit 718c44f282310b2ca85877fed706460ccc1eebea) Signed-off-by: Steve Sakoman --- meta/recipes-multimedia/libtiff/tiff_4.4.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-multimedia/libtiff/tiff_4.4.0.bb b/meta/recipes-multimedia/libtiff/tiff_4.4.0.bb index 970aab5433..831014bff1 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.4.0.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.4.0.bb @@ -45,6 +45,7 @@ PACKAGECONFIG[jbig] = "--enable-jbig,--disable-jbig,jbig," PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg," PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib," PACKAGECONFIG[lzma] = "--enable-lzma,--disable-lzma,xz," +PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp," # Convert single-strip uncompressed images to multiple strips of specified # size (default: 8192) to reduce memory usage From patchwork Fri Jan 20 18:10: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: 18394 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 18C8AC38A23 for ; Fri, 20 Jan 2023 18:12:00 +0000 (UTC) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mx.groups.io with SMTP id smtpd.web11.82181.1674238318084239910 for ; Fri, 20 Jan 2023 10:11:58 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=u6MB5OqW; spf=softfail (domain: sakoman.com, ip: 209.85.215.176, mailfrom: steve@sakoman.com) Received: by mail-pg1-f176.google.com with SMTP id 78so4740759pgb.8 for ; Fri, 20 Jan 2023 10:11:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=e1Dgq3cS9uqfVbGeGT7ikHu39TgI5JHNERaSqW2BFzg=; b=u6MB5OqW1b/KBxHLS5c+MT2uB/AKkrO8Akt1nURiR94tI5SV2NTtagUc/oVbKrao3g QsSV+UpRjbjatijoXWcguf0DbIuExVuzBKguQp0qruJ/Yp7cz4X59Ld3KrSk6sNd25F7 +vvqGZXxxokfeALV2xBs7SLjkvwXgd4Nb0rUo3PJC01zjru8vaPAiupQtgpnio6BeHvo 7ae599uaWtL3fpwZFrBMhWAWznwtmdXTD3hVJt0yldRiGuSV49jzI7c0MUwiq/goO2x/ WU5+PmSb4NoBWpcT4pLxVVRcESnoNs/eY7V5JfbZKkPQhc9Gp/ynr/673pAGkIetphkI 2ufw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e1Dgq3cS9uqfVbGeGT7ikHu39TgI5JHNERaSqW2BFzg=; b=hO+D/h2OZ4t1uWGlBjlRsnP1UeqBENfTMlMz3G6GaRjQqd6NdVBxze2mCeOfqbtjBn AOx+6CFqQ/5YhmUYVY1HihRtDV2igOarNguFnB8PQoh8oBwwpweDBmfgE9DS4IlBU27X s+Iryn0QnfMrunalG9DGjEkgsM4B9pJLWwWhzzGnTbeG1JYr0P0alw9xakTh8H5sdU1K IqO2nF7/6H4FGbYWZq9AYwhD7azJaMkIE1g1sy/o5AW9WFvoO0VtIYF6geXhIzbB3B2W ghbAnrAZEaeS0M/kL2MIIDOwou1Kt9eBdwz9TZpY6ktcPXHE5eBnjnGmYMrD8oQMi/A5 014Q== X-Gm-Message-State: AFqh2kpMaxkavyveYXvfF7+KKUwDUtYKpuPoGaBiTXQriyf9btoYKy8u 7blfrtcmmqxKAqFx2fQGn9h66jdA/1JKHxnFMac= X-Google-Smtp-Source: AMrXdXsf1EZwxfiFiwNjebbThn+MKqWwtf/J5dWf3EjwzerBgymE8mPnvn0SbzbPilaI9I15JSM4Hw== X-Received: by 2002:a05:6a00:4088:b0:58d:9ad6:6ae7 with SMTP id bw8-20020a056a00408800b0058d9ad66ae7mr17843277pfb.19.1674238317039; Fri, 20 Jan 2023 10:11:57 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:56 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 29/41] oeqa/selftest/debuginfod: improve testcase Date: Fri, 20 Jan 2023 08:10:46 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:12:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176236 From: Ross Burton Primarily, before running the debuginfod-find tool, check that the debuginfod server has finished sweeping the deploy directory. If we make the request too soon then there's a rare chance that we run the client before it has scanned the right packages, and the log gets swamped with warnings from sqlite due to a race. Also: - unset DEBUGINFOD_URLS so the debuginfod doesn't proxy to an upstream server provided by the host distro - Lower concurrency to reduce system load and handle systems with lower maximum open file counts but lots of cores (as the concurrency means cores*2*2 open files) - Set the refresh times to 0 so we never rescan during the test - Only scan the packages for the format which the image is using - Log the commands that are being invoked Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit d65729748253eaa640333198ca8aec05946cb9e8) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/debuginfod.py | 67 +++++++++++++++++++--- 1 file changed, 59 insertions(+), 8 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/debuginfod.py b/meta/lib/oeqa/selftest/cases/debuginfod.py index 3c40119282..37f51760fb 100644 --- a/meta/lib/oeqa/selftest/cases/debuginfod.py +++ b/meta/lib/oeqa/selftest/cases/debuginfod.py @@ -12,6 +12,36 @@ from oeqa.utils.commands import bitbake, get_bb_var, runqemu class Debuginfod(OESelftestTestCase): + + def wait_for_debuginfod(self, port): + """ + debuginfod takes time to scan the packages and requesting too early may + result in a test failure if the right packages haven't been scanned yet. + + Request the metrics endpoint periodically and wait for there to be no + busy scanning threads. + + Returns True if debuginfod is ready, False if we timed out + """ + import time, urllib + + # Wait a minute + countdown = 6 + delay = 10 + + while countdown: + time.sleep(delay) + try: + with urllib.request.urlopen("http://localhost:%d/metrics" % port) as f: + lines = f.read().decode("ascii").splitlines() + if "thread_busy{role=\"scan\"} 0" in lines: + return True + except urllib.error.URLError as e: + self.logger.error(e) + countdown -= 1 + return False + + def test_debuginfod(self): self.write_config( """ @@ -25,29 +55,50 @@ CORE_IMAGE_EXTRA_INSTALL += "elfutils" cmd = [ os.path.join(native_sysroot, "usr", "bin", "debuginfod"), "--verbose", + # In-memory database, this is a one-shot test "--database=:memory:", + # Don't use all the host cores + "--concurrency=8", + "--connection-pool=8", + # Disable rescanning, this is a one-shot test + "--rescan-time=0", + "--groom-time=0", get_bb_var("DEPLOY_DIR"), ] - for format in get_bb_var("PACKAGE_CLASSES").split(): - if format == "package_deb": - cmd.append("--scan-deb-dir") - elif format == "package_ipk": - cmd.append("--scan-deb-dir") - elif format == "package_rpm": - cmd.append("--scan-rpm-dir") + + format = get_bb_var("PACKAGE_CLASSES").split()[0] + if format == "package_deb": + cmd.append("--scan-deb-dir") + elif format == "package_ipk": + cmd.append("--scan-deb-dir") + elif format == "package_rpm": + cmd.append("--scan-rpm-dir") + else: + self.fail("Unknown package class %s" % format) + # Find a free port with socketserver.TCPServer(("localhost", 0), None) as s: port = s.server_address[1] cmd.append("--port=%d" % port) try: - debuginfod = subprocess.Popen(cmd) + # Remove DEBUGINFOD_URLS from the environment so we don't try + # looking in the distro debuginfod + env = os.environ.copy() + if "DEBUGINFOD_URLS" in env: + del env["DEBUGINFOD_URLS"] + + self.logger.info(f"Starting server {cmd}") + debuginfod = subprocess.Popen(cmd, env=env) with runqemu("core-image-minimal", runqemuparams="nographic") as qemu: + self.assertTrue(self.wait_for_debuginfod(port)) + cmd = ( "DEBUGINFOD_URLS=http://%s:%d/ debuginfod-find debuginfo /usr/bin/debuginfod" % (qemu.server_ip, port) ) + self.logger.info(f"Starting client {cmd}") status, output = qemu.run_serial(cmd) # This should be more comprehensive self.assertIn("/.cache/debuginfod_client/", output) From patchwork Fri Jan 20 18:10:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 18398 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 1D392C52D77 for ; Fri, 20 Jan 2023 18:12:00 +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.web10.82064.1674238296753883379 for ; Fri, 20 Jan 2023 10:11:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=1vqYIZkV; spf=softfail (domain: sakoman.com, ip: 209.85.215.173, mailfrom: steve@sakoman.com) Received: by mail-pg1-f173.google.com with SMTP id 7so4754123pga.1 for ; Fri, 20 Jan 2023 10:11:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=InNeuFFkLL9tZzv2NPLeYT9pTJGXQWoavXY/mE4gxpE=; b=1vqYIZkVIOgM9EPyW7Pi9ajsffE5e7eTgiyW8GXYLYxBtepUpSZ5BQfvABe+hIP2Zx B7gjh3qS2D4QQosa/fqEc1XWZVFdcEBS5ur6fYoEi74uoZS1PiAEOUVebzYBa3O2qJO5 XTnTy4mgAacuP3m567HeRZgo34FkiQ99nBPp1+OMtqqkDL/Iyi7l3hl9Kcld3bCWjdKg 85M7rP/Ath7Q40hqKtr63hnOoTQ001kSijXKZNPzMTACUEJL5CXHrda8wzC2m6EHiVzY anvOePMeCBw+QAsNmzLemdm4jLGNYayM+IhNMjGEf3x6u1XVRdVbJMRegPHDZStwklAq 4WiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=InNeuFFkLL9tZzv2NPLeYT9pTJGXQWoavXY/mE4gxpE=; b=dWnc72VmwWTC12B3OBVrBbTasjsDek/uJ7FVAwEds+Q3uFovwJmH0D/pdaS1O2143O rR+d9mHXMX2D8ZU5yVub1of4HuVmQSJWV6MPJNzxCNU8PjvEewmcbm+atEnewHrCnosR ejyALzvHiqfQQtZcZHP+Fw+/yKNEzUoRtQwuBBdg4SWALdO29JisKO3k8LQVu8jxR9rU UDG2jj2wyO1fDIHVbrQeKzWByRxK26zuH1kJuSKFVpbPE0AJXoOuWAs7rSD+91535gDC YbijK49Ak9T+QQkGMWizXvpOL01SsQKUZtCnBRHqwTd7wv4tQueP0iyn7CK4p9Gq8JYT XeVQ== X-Gm-Message-State: AFqh2kqI+jMqqDFUUhLX2o//uKJE77rEY0/LllAKTPcaT1iERYYNfrB3 y13M7bYPiA+E1DJJMpYg5jAbW5Utsyk9Zcg0Nh0= X-Google-Smtp-Source: AMrXdXtiCfqkKY/Fd2vereP8k1zrNQq8DWWacLd/4qPs2c2Svs8tESJXoSTiY8cMR4vVemjkxkAc2w== X-Received: by 2002:a05:6a00:44cc:b0:58a:fdc8:92bf with SMTP id cv12-20020a056a0044cc00b0058afdc892bfmr16168441pfb.2.1674238318838; Fri, 20 Jan 2023 10:11:58 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:11:58 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 30/41] harfbuzz: remove bindir only if it exists Date: Fri, 20 Jan 2023 08:10:47 -1000 Message-Id: <687f371fc99833b878f3cfdb006aca9e238d9909.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:12:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176237 From: Petr Kubizňák In some scenarios (e.g. when "glib" removed from PACKAGECONFIG), "${D}${bindir}" might not exist which caused `rmdir` to fail. Signed-off-by: Petr Kubizňák Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 21261072cbe0056e85550a0710de142fab8943e4) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb index 4905e8e2ad..8e06acc011 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb @@ -32,9 +32,9 @@ PACKAGES =+ "${PN}-icu ${PN}-icu-dev ${PN}-subset" LEAD_SONAME = "libharfbuzz.so" do_install:append() { - # If no tools are installed due to PACKAGECONFIG then this directory is - #still installed, so remove it to stop packaging wanings. - rmdir --ignore-fail-on-non-empty ${D}${bindir} + # If no tools are installed due to PACKAGECONFIG then this directory might + # still be installed, so remove it to stop packaging warnings. + [ ! -d ${D}${bindir} ] || rmdir --ignore-fail-on-non-empty ${D}${bindir} } FILES:${PN}-icu = "${libdir}/libharfbuzz-icu.so.*" From patchwork Fri Jan 20 18:10: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: 18403 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 08F5FC38159 for ; Fri, 20 Jan 2023 18:12:10 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web10.82047.1674238270372454591 for ; Fri, 20 Jan 2023 10:12:01 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=RKprEnqC; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id 200so4583421pfx.7 for ; Fri, 20 Jan 2023 10:12:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=R75sAYVtD09sADc4/LsogHekAk2rJFMN9psKMbpzlJM=; b=RKprEnqCxeIuXoVw6X2XXVcLNyWvOTsP/NDdaFVgAp0dbrqtVyclikJMHursuiOR6l M4gPszISAIhmd/cbeHeg71cYz94MhP9dqeoEWP8UtcbDkhHU1Fx/RI4F1iFtG0NNoCgZ aXBjU+G5aFjYtEY1UxeB/pBAC5MT1+842XxRVPX48o7KrDmU7uVUQPOGVr4BtM4VYm/F mLtZHUvnXkP0XRzMaIfe82ifLCtmhqSMJzZyCyYu4BE8M/gwup4TuZwYIzXFQrANidly +JcMAchh4CU1RRddC1Z6mEWCcMo20w54EY59Qa9rB4yxOEsj4+pkgZbrYvoZ7ZMuIdkl pHRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R75sAYVtD09sADc4/LsogHekAk2rJFMN9psKMbpzlJM=; b=SLyth6jRDcoUIzKvK3cTUPePxgfLrtrbs9tS5gL3O++PYk878bb9bocCb6ZyPb2e8u caKucOnule8ZyIeSzvQKrZrLH7g5qoM0Hej3aZ9hH0VRquphrl3nIckTW83gFQL/QAJT S+WgPNDOR/mJ/tPyRHLtK0Lm17AhM8jk0A2vg67ABVSjF1yB5b+6hZPn4C/+wIFA/Bh2 2GXSHdkblduers5HthCC8LipHa4ccWoTmQYgPU2gUQRp1gy32UXlxKacH+JEQtyYMuZA xhalt895U6216oL1SZAi0x4mWSZ3/AxQoghtnU3eYF2OmQKYZI3+3mK7TQodULELg60a 9VCg== X-Gm-Message-State: AFqh2krmxJmJE2vuUgD5wpVAhGuLvj/2PRLaiTWoaLqWoQN2FY33q38r bsoRPpELWXs9UMSUsLYigfQpxarGqYACLYSGbzc= X-Google-Smtp-Source: AMrXdXtviMP2l8eKqxUMXPKdm7PApwSrnPonppNXe0tV7by/nMP5w5WTKm7M/jWch1wY4exlfCp8jA== X-Received: by 2002:a05:6a00:2913:b0:58e:1b58:56ec with SMTP id cg19-20020a056a00291300b0058e1b5856ecmr2189770pfb.16.1674238320723; Fri, 20 Jan 2023 10:12:00 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.11.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:12:00 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 31/41] rust: Do not use default compiler flags defined in CC crate Date: Fri, 20 Jan 2023 08:10:48 -1000 Message-Id: <94939f608c6984e3a92999a384a03a35c2b34ed6.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:12:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176238 From: Anton Antonov Rust crates build dependecy C libraries using "CC" crate. This crate adds some default compiler parameters depending on target arch. For some targets these parameters conflict with the parameters defined by OE. Warnings/errors like this can be seen in the case: cc1: error: switch '-mcpu=cortex-a15' conflicts with switch '-march=armv7-a+fp' [-Werror] Lets use only the OE parameters by exporting CRATE_CC_NO_DEFAULTS. https://github.com/rust-lang/cc-rs#external-configuration-via-environment-variables This patch fixes https://bugzilla.yoctoproject.org/show_bug.cgi?id=14947 Signed-off-by: Anton Antonov Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 0c07089bdf7e0d7d8f37552db0bcd75f860979d9) Signed-off-by: Steve Sakoman --- meta/classes-recipe/rust-common.bbclass | 28 +++++++++++++------ .../classes-recipe/rust-target-config.bbclass | 16 +++++++++++ 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/meta/classes-recipe/rust-common.bbclass b/meta/classes-recipe/rust-common.bbclass index 93bf6c8be6..5e70007377 100644 --- a/meta/classes-recipe/rust-common.bbclass +++ b/meta/classes-recipe/rust-common.bbclass @@ -94,7 +94,7 @@ RUST_BUILD_ARCH = "${@oe.rust.arch_to_rust_arch(d.getVar('BUILD_ARCH'))}" # Rust additionally will use two additional cases: # - undecorated (e.g. CC) - equivalent to TARGET # - triple suffix (e.g. CC:x86_64_unknown_linux_gnu) - both -# see: https://github.com/alexcrichton/gcc-rs +# see: https://github.com/rust-lang/cc-rs # The way that Rust's internal triples and Yocto triples are mapped together # its likely best to not use the triple suffix due to potential confusion. @@ -125,12 +125,22 @@ create_wrapper_rust () { shift extras="$1" shift + crate_cc_extras="$1" + shift cat <<- EOF > "${file}" #!/usr/bin/env python3 import os, sys orig_binary = "$@" extras = "${extras}" + + # Apply a required subset of CC crate compiler flags + # when we build a target recipe for a non-bare-metal target. + # https://github.com/rust-lang/cc-rs/blob/main/src/lib.rs#L1614 + if "CRATE_CC_NO_DEFAULTS" in os.environ.keys() and \ + "TARGET" in os.environ.keys() and not "-none-" in os.environ["TARGET"]: + orig_binary += "${crate_cc_extras}" + binary = orig_binary.split()[0] args = orig_binary.split() + sys.argv[1:] if extras: @@ -154,22 +164,22 @@ do_rust_create_wrappers () { mkdir -p "${WRAPPER_DIR}" # Yocto Build / Rust Host C compiler - create_wrapper_rust "${RUST_BUILD_CC}" "" "${BUILD_CC}" + create_wrapper_rust "${RUST_BUILD_CC}" "" "${CRATE_CC_FLAGS}" "${BUILD_CC}" # Yocto Build / Rust Host C++ compiler - create_wrapper_rust "${RUST_BUILD_CXX}" "" "${BUILD_CXX}" + create_wrapper_rust "${RUST_BUILD_CXX}" "" "${CRATE_CC_FLAGS}" "${BUILD_CXX}" # Yocto Build / Rust Host linker - create_wrapper_rust "${RUST_BUILD_CCLD}" "" "${BUILD_CCLD}" "${BUILD_LDFLAGS}" + create_wrapper_rust "${RUST_BUILD_CCLD}" "" "" "${BUILD_CCLD}" "${BUILD_LDFLAGS}" # Yocto Build / Rust Host archiver - create_wrapper_rust "${RUST_BUILD_AR}" "" "${BUILD_AR}" + create_wrapper_rust "${RUST_BUILD_AR}" "" "" "${BUILD_AR}" # Yocto Target / Rust Target C compiler - create_wrapper_rust "${RUST_TARGET_CC}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CC}" "${WRAPPER_TARGET_LDFLAGS}" + create_wrapper_rust "${RUST_TARGET_CC}" "${WRAPPER_TARGET_EXTRALD}" "${CRATE_CC_FLAGS}" "${WRAPPER_TARGET_CC}" "${WRAPPER_TARGET_LDFLAGS}" # Yocto Target / Rust Target C++ compiler - create_wrapper_rust "${RUST_TARGET_CXX}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CXX}" "${CXXFLAGS}" + create_wrapper_rust "${RUST_TARGET_CXX}" "${WRAPPER_TARGET_EXTRALD}" "${CRATE_CC_FLAGS}" "${WRAPPER_TARGET_CXX}" "${CXXFLAGS}" # Yocto Target / Rust Target linker - create_wrapper_rust "${RUST_TARGET_CCLD}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CCLD}" "${WRAPPER_TARGET_LDFLAGS}" + create_wrapper_rust "${RUST_TARGET_CCLD}" "${WRAPPER_TARGET_EXTRALD}" "" "${WRAPPER_TARGET_CCLD}" "${WRAPPER_TARGET_LDFLAGS}" # Yocto Target / Rust Target archiver - create_wrapper_rust "${RUST_TARGET_AR}" "" "${WRAPPER_TARGET_AR}" + create_wrapper_rust "${RUST_TARGET_AR}" "" "" "${WRAPPER_TARGET_AR}" } diff --git a/meta/classes-recipe/rust-target-config.bbclass b/meta/classes-recipe/rust-target-config.bbclass index 2710b4325d..9158b1918e 100644 --- a/meta/classes-recipe/rust-target-config.bbclass +++ b/meta/classes-recipe/rust-target-config.bbclass @@ -401,3 +401,19 @@ python do_rust_gen_targets () { addtask rust_gen_targets after do_patch before do_compile do_rust_gen_targets[dirs] += "${RUST_TARGETS_DIR}" +# For building target C dependecies use only compiler parameters defined in OE +# and ignore the CC crate defaults which conflicts with OE ones in some cases. +# https://github.com/rust-lang/cc-rs#external-configuration-via-environment-variables +# Some CC crate compiler flags are still required. +# We apply them conditionally in rust wrappers. + +CRATE_CC_FLAGS:class-native = "" +CRATE_CC_FLAGS:class-nativesdk = "" +CRATE_CC_FLAGS:class-target = " -ffunction-sections -fdata-sections -fPIC" + +do_compile:prepend:class-target() { + export CRATE_CC_NO_DEFAULTS=1 +} +do_install:prepend:class-target() { + export CRATE_CC_NO_DEFAULTS=1 +} From patchwork Fri Jan 20 18:10: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: 18400 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 F0EA1C25B4E for ; Fri, 20 Jan 2023 18:12:09 +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.web11.82155.1674238285685718262 for ; Fri, 20 Jan 2023 10:12:03 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=TDGQ+aCs; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id s67so4745448pgs.3 for ; Fri, 20 Jan 2023 10:12:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=a+OxFmI08dS0RlLT+2RJrGEMcYrzSZcn3NoUADWpICc=; b=TDGQ+aCs6MwrdnyGo7mIsbGe5RYre2puWcijZBcPAV7gGVP0EWXWXwVhfCeoI6sS6d L13wYKKHup72vLEnXb53nWm0HjgyHsoE5heg97SYCrakpDSB394ZUro1kUmszT025tMC ltX6Z7ijjEyQnovVusrSBP1OtU7/g0KEm0hSJDXQBZ7U0dlkCbtT8X4YnLPRKmY70PBr SqjQ8t3faPAqSJyROZgOIf7VPTBXsqjgBuWXAUxBWjafgtb3QdokYsIUee5JZAD65hKU I1nrLPB5mBvmlZ4WUMXA2+wZLqffxHiJU4lpxhJJGE79EHeVY7X1xeDQJeSYVv5iJBwk rnug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a+OxFmI08dS0RlLT+2RJrGEMcYrzSZcn3NoUADWpICc=; b=dnUTypRgH1IBbyh2BM0IRjv7Yc1JAKrtVZ3bLqjRfhFMUOnVsD4n4pvX2mNf+6ARQT eWreL5R6QF0qw3w3KMgSiqCjFqffRPA47vfGWFZE+GNEtiow1o/aFtc+OBZ3wAhaBD/p mKhB8hx/snylJ2u+YeNOqE7+HlWsHsPfDy8Zj07b3L1FtlfR2i7Ilwh4zeu7zG4SPzQm 2aduzDhe9BNKxWbapTAU8neOLL6QD2V/M6mOngyhPy5OY1w8Z43Abp2LtyBs7W5SFj7W s0aXdzI20fpzxOvPMqhrigJH3uOPz744xXuY2UbVWQLzL1AIdC/44RUTW+8Pf98wuZK1 8qWQ== X-Gm-Message-State: AFqh2krvpCXW4rGFBWReLXpaDJ7CEqk+u6GW/eZfmY4mPNVe34bGhZZF apVF3blpGJqinObwXdWx57N30Y6wM9Xqp0CsGzY= X-Google-Smtp-Source: AMrXdXtTX1wmwIYeX4xSolyaLJZMQSiMNb6SHMVQo8w2ghWFnVdzvkM1G7lnflB6uAoTyX5pHzIRcw== X-Received: by 2002:a05:6a00:26e3:b0:58b:c4b4:86e3 with SMTP id p35-20020a056a0026e300b0058bc4b486e3mr25165099pfw.24.1674238322684; Fri, 20 Jan 2023 10:12:02 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.12.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:12:02 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 32/41] librsvg: enable vapi build Date: Fri, 20 Jan 2023 08:10:49 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:12:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176239 From: Markus Volk Otherwise gnome-chess will fail like this: | error: Package `librsvg-2.0' not found in specified Vala API directories or GObject-Introspection GIR directories | Compilation failed: 1 error(s), 0 warning(s) Signed-off-by: Markus Volk Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit ed814eff90677f894d9eb480d8d4389c64a35820) Signed-off-by: Steve Sakoman --- meta/recipes-gnome/librsvg/librsvg_2.54.5.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb b/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb index fc52ae61c5..b2e93a2684 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb @@ -42,6 +42,8 @@ do_configure[postfuncs] += "cargo_common_do_configure" inherit rust-target-config +EXTRA_OECONF:class-target = "--enable-vala" + # rust-cross writes the target linker binary into target json definition without any flags. # This breaks here because the linker isn't going to work without at least knowing where # the sysroot is. So copy the json to workdir, and patch in the path to wrapper from rust class From patchwork Fri Jan 20 18:10: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: 18402 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 09035C52D77 for ; Fri, 20 Jan 2023 18:12:10 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web10.82081.1674238325522008280 for ; Fri, 20 Jan 2023 10:12:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=5wkZsasB; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id t12-20020a17090aae0c00b00229f4cff534so1824476pjq.1 for ; Fri, 20 Jan 2023 10:12:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=D2mKmSR8Nx5VcP081dVhF/n6zDOqcZQIVnoclGbVGTA=; b=5wkZsasBLpRPSVnl5mkFTKOvdo1hXK7moJ/mcYuCXQUnp2E8zB9KWepyUUgPIFR85K Z5HQiPRW4wyV1kOAZoOz/fHDrH8yxhxG9pUyHUrJq6cQsInUlrgj9vSe46Mfh+/cilqX QMuXJXfy+gEVt11tLulESLE4T5CNjR4lkb1xpCKC1p/NK6fiNic1nfaZuDgHKkpQO3ib tRYyURJdBKZZSLWm57au7ZWPpzxjsWPX9H6X/9gRV7gvG7e8R2Si/KCt6ODjBpLDDhSQ hiKNq925g3x/l/HJmjRUcCII+tHvBNB+sBfPZkMM+g5IzheW4rpBbb8wO9Zd0Fcg31pj m0RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D2mKmSR8Nx5VcP081dVhF/n6zDOqcZQIVnoclGbVGTA=; b=sB6P5BDGudTXr3irnscIr72LtfVDucbyd/tm/6V9MJB6MPOKcaA4wQ8OizLbbEorf/ xGbuSOCVGaiGSY4cBSwuEkFUMCuysYfIblTd7i6/6pigjdC9Byccab5QbHpN502xu1dh mtx/FbI6kJiWeun0L6rOBpKsvMaaQqTBxqK65/M6zk+TnmgR8ui+W5w3C6TNqPBP4qR1 PGaLzF/gE7GLa/Bs+m6NaYO3j2A5A6WxEqL1muSJxtFUC1WFpE+8mfYAlWMKX6VA599d EOqTSJCVdjqewB9t+5kzojflOFmFpzakYg4JniUxwl2sM3AKPtq7gBziAO4p++Qkqctm SvQg== X-Gm-Message-State: AFqh2kprczhIZ5CVJwpjxunOtOGrsyRovdZEGEjmVYclBh6TR3BdCHdc Xyw+Cxu3mcUxTjA8pWYTKzYp8Qed8WNgO+NlXl8= X-Google-Smtp-Source: AMrXdXuZlXO9T5+jOnDqIRBd36w3iRljCeyPMnJofVjRoVlVnBsKyYOci9fS9oaJSB5IdqnQoS6GqA== X-Received: by 2002:a05:6a20:c705:b0:b8:827c:42c0 with SMTP id hi5-20020a056a20c70500b000b8827c42c0mr14925047pzb.61.1674238324543; Fri, 20 Jan 2023 10:12:04 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.12.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:12:04 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 33/41] opkg: ensure opkg uses private gpg.conf when applying keys. Date: Fri, 20 Jan 2023 08:10:50 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:12:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176240 From: Charlie Johnston Currently, the opkg-key utility calls gpg with --no-options, which uses /dev/null as the configuration file. This means any configurations in /etc/opkg/gpg/gpg.conf were being ignored. This change applies a patch to remove the --no-options flag. Signed-off-by: Charlie Johnston Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 3699096f3214e77fe4aa1daebe85308d02940f2f) Signed-off-by: Steve Sakoman --- ...emove-no-options-flag-from-gpg-calls.patch | 34 +++++++++++++++++++ meta/recipes-devtools/opkg/opkg_0.6.1.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-devtools/opkg/opkg/0002-opkg-key-remove-no-options-flag-from-gpg-calls.patch diff --git a/meta/recipes-devtools/opkg/opkg/0002-opkg-key-remove-no-options-flag-from-gpg-calls.patch b/meta/recipes-devtools/opkg/opkg/0002-opkg-key-remove-no-options-flag-from-gpg-calls.patch new file mode 100644 index 0000000000..f216950002 --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg/0002-opkg-key-remove-no-options-flag-from-gpg-calls.patch @@ -0,0 +1,34 @@ +From a658e6402382250f0164c5b47b744740e04f3611 Mon Sep 17 00:00:00 2001 +From: Charlie Johnston +Date: Fri, 30 Dec 2022 15:21:14 -0600 +Subject: [PATCH] opkg-key: Remove --no-options flag from gpg calls. + +The opkg-key script was always passing the --no-options +flag to gpg, which uses /dev/null as the options file. +As a result, the opkg gpg.conf file was not getting +used. This change removes that flag so that gpg.conf +in the GPGHOMEDIR for opkg (currently /etc/opkg/gpg/) +will be used if present. + +Upstream-Status: Accepted [https://git.yoctoproject.org/opkg/commit/?id=cee294e72d257417b5e55ef7a76a0fd15313e46b] +Signed-off-by: Charlie Johnston +--- + utils/opkg-key | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/opkg-key b/utils/opkg-key +index e395a59..8645ebc 100755 +--- a/utils/opkg-key ++++ b/utils/opkg-key +@@ -53,7 +53,7 @@ else + exit 1 + fi + +-GPG="$GPGCMD --no-options --homedir $GPGHOMEDIR" ++GPG="$GPGCMD --homedir $GPGHOMEDIR" + + # Gpg home dir isn't created automatically when --homedir option is used + if [ ! -e "$GPGHOMEDIR" ]; then +-- +2.30.2 + diff --git a/meta/recipes-devtools/opkg/opkg_0.6.1.bb b/meta/recipes-devtools/opkg/opkg_0.6.1.bb index 50c9451a57..712f066f0e 100644 --- a/meta/recipes-devtools/opkg/opkg_0.6.1.bb +++ b/meta/recipes-devtools/opkg/opkg_0.6.1.bb @@ -15,6 +15,7 @@ PE = "1" SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ file://opkg.conf \ file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \ + file://0002-opkg-key-remove-no-options-flag-from-gpg-calls.patch \ file://run-ptest \ " From patchwork Fri Jan 20 18:10: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: 18401 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 0F75CC52D11 for ; Fri, 20 Jan 2023 18:12:10 +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.web11.82184.1674238327344929246 for ; Fri, 20 Jan 2023 10:12:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=To6ejj7R; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id g68so4729203pgc.11 for ; Fri, 20 Jan 2023 10:12:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=f0D7WZ/G3EN83TwhNEsHPQkcMNdzzg7sAC4hiYjdSB8=; b=To6ejj7R9bzQN/p3Dp/+gFo8b5je4AWgi2r9AwlJoLFwoAogbAmCWzh7iwBRRoohDr k0RFAGqcyfU54fR8s+MKDwGYifGfb4JJ96+Ez16WH9Ete36l41eJkzo7EWAjkUKCBoSN 6/IvtrGO6LRNUD7VL0HcQ4IrJeCYzjtAH65Uh4Oj/K9kAJfdms09cYRNofRkzXtBeQpa qY5A9op6wJfLn0BbPMA0kHWcurNcg9q63xV5MNwFKgJeKwqWpT5SsNnDBMgDsqCrQXwP zpbH47JsRchl/etJhhh+d+xGhFK1heVMR9Twv9wWdIOoQ6bXX2wx0WEuSueq0cOOs9Qf go3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f0D7WZ/G3EN83TwhNEsHPQkcMNdzzg7sAC4hiYjdSB8=; b=ii0ErH0PtWkmbyp8G4tFyI4Vy2uASf0NYpHfyr9f9lwMz8a3+Ywfei9xjSulFbPelL yOcPhdZBBtecqo7VGJvzuemFCuvU1uE2UJQEbi7I9ibNvNzgLXCNMKVxI0uJP/lH9LaU SzR5ZHAcZAPnoVGo3Zyb8Uvk0ILaoosMJ6m+3i6Ucpy2v5g3bn888c8EPXOQugG6dns+ YmNWcugzXZ2/zD1Fwl009QS62iXbnPKcDlJdUUCrBRBO3CAgoXbOlROPsv7Yem9n/+zI l/S2UCxE6PJ4RQ4S1wagYXXha4F32Pw+g/AXOnjrhOGK0bXsQgm/AYhm13ZWqE4Q9T5I CcWg== X-Gm-Message-State: AFqh2krjwviB8hXdPRs1UiO4RSgQUgltgZfqplEUMpXSgyDj7lUYICJm qrzDmii8fXR0s46yC0EPjT8+YfLkIr26U00soOQ= X-Google-Smtp-Source: AMrXdXu9QfdAfw9sf/1PIP6RWY1EI3RQga/kbT6CPaNK0laesnYafVFxijMCEOOV+iSNrtjy8z1BsQ== X-Received: by 2002:a62:6441:0:b0:585:f9c5:6e91 with SMTP id y62-20020a626441000000b00585f9c56e91mr16727886pfb.29.1674238326312; Fri, 20 Jan 2023 10:12:06 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.12.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:12:05 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 34/41] libpng: Enable NEON for aarch64 to enensure consistency with arm32. Date: Fri, 20 Jan 2023 08:10:51 -1000 Message-Id: <27a58c11536bc0e804904c2dd97820973d0b9a2f.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:12:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176241 From: leimaohui NEON is enabled for aarch64 by default, so, to ensure consistency with arm32, reference to libpng-1.6.38/configure, added enable_hardware_optimizations option for aarch64. Signed-off-by: Lei Maohui Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 12e68d5824849fa20f0e3fe8fc1921da111bb6fb) Signed-off-by: Steve Sakoman --- meta/recipes-multimedia/libpng/libpng_1.6.39.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.39.bb b/meta/recipes-multimedia/libpng/libpng_1.6.39.bb index d9dcf379e9..a6c229f5cf 100644 --- a/meta/recipes-multimedia/libpng/libpng_1.6.39.bb +++ b/meta/recipes-multimedia/libpng/libpng_1.6.39.bb @@ -22,7 +22,9 @@ BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config" inherit autotools binconfig-disabled pkgconfig # Work around missing symbols -EXTRA_OECONF:append:class-target = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off", d)}" +ARMNEON = "${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off", d)}" +ARMNEON:aarch64 = "--enable-hardware-optimizations=on" +EXTRA_OECONF += "${ARMNEON}" PACKAGES =+ "${PN}-tools" From patchwork Fri Jan 20 18:10: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: 18399 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 01C48C38A23 for ; Fri, 20 Jan 2023 18:12:10 +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.web10.82084.1674238329115182417 for ; Fri, 20 Jan 2023 10:12:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=QjHmrgl5; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id b12so4740677pgj.6 for ; Fri, 20 Jan 2023 10:12:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7pPxzGfzFCmHfkSMPFqAX2NLJAPD7DaR/PENfBt0xG4=; b=QjHmrgl5RXV/ATz/G6ZV6AbukFJ4PDMcNGIB+weGjnZ5VH/Y5VZ51tZBIYa+ujgETx YAVAtqsIvH7pu/mVEdP/+oXvOdpoCg2alD7PKDgyl3sPAXfmgEt9/Ue5ZPhvT6Ddn9Fr wqqkZ9vVtYQ6cCY8O5gfIXSeKQSa6jwfiVsOoSadDfTfQpYGvKtg+QI5F3VcApffOiuD fYf7Ai0nqLFIqRtY7CNdhuGg0IH/nKRnXo+cMYhmoEC/nwpqsGXkIkiwsOBWG5nKwBjy +t1ec1gEt7wLoCjSgQm/f+q02ykiyYnvVm+hcwolAjFn9gUFOGg/mJoGe2DndJ/qeJYe 4QDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7pPxzGfzFCmHfkSMPFqAX2NLJAPD7DaR/PENfBt0xG4=; b=fsjbHm8cQAu1HMh0TqHbpn5m/695EPjyxTyeB7ic9mO2N4tpxZbyLmiLg/Q8pzEinU 0jPDfH5TMgBKxh972V7nwG+2Z4UDS6/TjPmssChuA0iUdXOhpIkW2Gw81h1oSMoZZ7ph 4nB8994gLOnkxP2SLp6/dr3KWOn0GcLMA7gGeG2DgDCJGcuOSllYplFlZ3qTQRdLmCOp MvY0rHmN1rCHF2Y4b2B9+rylak0DqQQEnF5dhWuhwsB2d/NmI0mgk96FHu6M3KRjS+CT 2SBpBELC4+1iKcJ8DBhjD4m2p+yxTe+yNQA/XRekGL7k9Btw06YraiCJR/Lm58N+VgIv DuKA== X-Gm-Message-State: AFqh2kphT0ykHnDJ56YLUoM1eOrA32ItexGfL4cLdHRdxqwyR/Ng6fDM bDu5oxDXLFySaTgkbaAVWuYpk4Cb/91nFR7KydI= X-Google-Smtp-Source: AMrXdXsX7fVJQRNKAlyFE8pAEEmCCcABOxai6a8wmIoTSaOTlXQwCxF6XVGtrEKsAnX0w5h5IvfDWw== X-Received: by 2002:aa7:8c51:0:b0:58d:8d88:447b with SMTP id e17-20020aa78c51000000b0058d8d88447bmr14110566pfd.2.1674238328097; Fri, 20 Jan 2023 10:12:08 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.12.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:12:07 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 35/41] dhcpcd: backport two patches to fix runtime error Date: Fri, 20 Jan 2023 08:10:52 -1000 Message-Id: <82b7967721db08f925193a1c36232cafd0dab506.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:12:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176242 From: Chen Qi In case of nodistro, dhcpcd gives us 'Bad system call' error and exits. This is because there are syscalls that should be allowed but not in privsep. Backport two patches to fix this issue. Signed-off-by: Chen Qi Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit f1e6a0c16d6685096ec9313301aa431e73d02c07) Signed-off-by: Steve Sakoman --- .../dhcpcd/dhcpcd_9.4.1.bb | 2 ++ ...low-getrandom-sysctl-for-newer-glibc.patch | 30 ++++++++++++++++++ ...sep-Allow-newfstatat-syscall-as-well.patch | 31 +++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 meta/recipes-connectivity/dhcpcd/files/0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch create mode 100644 meta/recipes-connectivity/dhcpcd/files/0002-privsep-Allow-newfstatat-syscall-as-well.patch diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb index 1d03de09c8..5cf77fa0f6 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb @@ -14,6 +14,8 @@ UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/" SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \ file://0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch \ + file://0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch \ + file://0002-privsep-Allow-newfstatat-syscall-as-well.patch \ file://dhcpcd.service \ file://dhcpcd@.service \ " diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch b/meta/recipes-connectivity/dhcpcd/files/0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch new file mode 100644 index 0000000000..68ab93416a --- /dev/null +++ b/meta/recipes-connectivity/dhcpcd/files/0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch @@ -0,0 +1,30 @@ +From c6cdf0aee71ab4126d36b045f02428ee3c6ec50b Mon Sep 17 00:00:00 2001 +From: Roy Marples +Date: Fri, 26 Aug 2022 09:08:36 +0100 +Subject: [PATCH 1/2] privsep: Allow getrandom sysctl for newer glibc + +Fixes #120 + +Upstream-Status: Backport [c6cdf0aee71ab4126d36b045f02428ee3c6ec50b] +Signed-off-by: Chen Qi +--- + src/privsep-linux.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index b238644b..479a1d82 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -300,6 +300,9 @@ static struct sock_filter ps_seccomp_filter[] = { + #ifdef __NR_getpid + SECCOMP_ALLOW(__NR_getpid), + #endif ++#ifdef __NR_getrandom ++ SECCOMP_ALLOW(__NR_getrandom), ++#endif + #ifdef __NR_getsockopt + /* For route socket overflow */ + SECCOMP_ALLOW_ARG(__NR_getsockopt, 1, SOL_SOCKET), +-- +2.17.1 + diff --git a/meta/recipes-connectivity/dhcpcd/files/0002-privsep-Allow-newfstatat-syscall-as-well.patch b/meta/recipes-connectivity/dhcpcd/files/0002-privsep-Allow-newfstatat-syscall-as-well.patch new file mode 100644 index 0000000000..c5d2cba305 --- /dev/null +++ b/meta/recipes-connectivity/dhcpcd/files/0002-privsep-Allow-newfstatat-syscall-as-well.patch @@ -0,0 +1,31 @@ +From 7625a555797f587a89dc2447fd9d621024d5165c Mon Sep 17 00:00:00 2001 +From: Roy Marples +Date: Fri, 26 Aug 2022 09:24:50 +0100 +Subject: [PATCH 2/2] privsep: Allow newfstatat syscall as well + +Allows newer glibc variants to work apparently. +As reported in #84 and #89. + +Upstream-Status: Backport [7625a555797f587a89dc2447fd9d621024d5165c] +Signed-off-by: Chen Qi +--- + src/privsep-linux.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index 479a1d82..6327b1bc 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -328,6 +328,9 @@ static struct sock_filter ps_seccomp_filter[] = { + #ifdef __NR_nanosleep + SECCOMP_ALLOW(__NR_nanosleep), /* XXX should use ppoll instead */ + #endif ++#ifdef __NR_newfstatat ++ SECCOMP_ALLOW(__NR_newfstatat), ++#endif + #ifdef __NR_ppoll + SECCOMP_ALLOW(__NR_ppoll), + #endif +-- +2.17.1 + From patchwork Fri Jan 20 18:10: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: 18407 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 F09D0C05027 for ; Fri, 20 Jan 2023 18:12:19 +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.web10.82064.1674238296753883379 for ; Fri, 20 Jan 2023 10:12:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=lT/R70Ux; spf=softfail (domain: sakoman.com, ip: 209.85.215.173, mailfrom: steve@sakoman.com) Received: by mail-pg1-f173.google.com with SMTP id 7so4754532pga.1 for ; Fri, 20 Jan 2023 10:12:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=gio/K1ByLVqPetjL+8Gu1fhJYYd3Tl0i1kTcQYzf69Q=; b=lT/R70Ux9a07Fw/F/jqixLGHEgYGTQ35JJQ1gi0bPRDBFxe+Wt7KncQRP7eym4Ej4M qOr8FqyK9TB3zpS5BCJjXWLtjCaSNWZfbmgiAyASGtXWprbLocm/nwwSwu7F9Bwzln5k wGTIFaOYsVFB3QO4+OMX7Cd6aXKVbRjJeCBOQ+LGJqXSOTLwWQNFx02j5i8MlcSHHmQv 0lrFVNlBmvKjfukEOjoOjCi8tMlDh9Gr+5USdR9Woi4mH8s6AYo/Vq76ONCdp3NlmLVF nC/QuXYjxJ52c98yMHAq6SXD5+p8avKIyoGhl0wS0Y8/e6wh9kOkjTbBZohbSCDbeXa4 5Zlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gio/K1ByLVqPetjL+8Gu1fhJYYd3Tl0i1kTcQYzf69Q=; b=KuLWPcbXhIJ2/3jBa2JCdO0SjTu7/Ry73stShp3IiV2ekV5pnGoX2V/fG8U8XzqN0A V4VCg0pzuvCqqLv6fl6hnXl6KhurhizJ76oAPIy8/KgIIpV3fEqpPdM0ba8L5RQ5I1xl H5GjLGz+ZKLbQv18NV9yoWG5y6oo0rro4Kuk+otZO7CbZzFgNwFC33+yFGpBQHQ6r9tg BzrQG1POYMiNCGY2jwDZx+G6TMKrTX70FgJbQIxDMP/R4iwlCi6TqifvuGX2LGNKPKSI FA3cHuUN9+k6QTXgAHlxT0BLLR93QZukbSb0VsZ+6REkRlBUFiJ5H9k3eIw9imUzAIrf /xGA== X-Gm-Message-State: AFqh2kpTaMrR9jedpZMGUSXHYOXdKWRzxXxwNR0x9xzCtP51m4yM2IPv 22LeUoK8LmeaYZUimmhBnkfBsq97D1YXbiyDIBQ= X-Google-Smtp-Source: AMrXdXuIhHKYjzdyvox0xeEKLXLh+jEXTudWJyLMZrnLZM/cbTTeCRpCnws9rYzocIs3CTF9oozLTw== X-Received: by 2002:a62:1448:0:b0:58d:9588:890b with SMTP id 69-20020a621448000000b0058d9588890bmr22398244pfu.0.1674238329891; Fri, 20 Jan 2023 10:12:09 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.12.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:12:09 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 36/41] libseccomp: fix typo in DESCRIPTION Date: Fri, 20 Jan 2023 08:10:53 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:12:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176243 From: Chen Qi Fix typo in DESCRIPTION: and -> an. Signed-off-by: Chen Qi Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 349e63045298054f9454025d793c67284fce750b) Signed-off-by: Steve Sakoman --- meta/recipes-support/libseccomp/libseccomp_2.5.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/libseccomp/libseccomp_2.5.4.bb b/meta/recipes-support/libseccomp/libseccomp_2.5.4.bb index e89b8f7f4b..505c21917b 100644 --- a/meta/recipes-support/libseccomp/libseccomp_2.5.4.bb +++ b/meta/recipes-support/libseccomp/libseccomp_2.5.4.bb @@ -1,5 +1,5 @@ SUMMARY = "interface to seccomp filtering mechanism" -DESCRIPTION = "The libseccomp library provides and easy to use, platform independent,interface to the Linux Kernel's syscall filtering mechanism: seccomp." +DESCRIPTION = "The libseccomp library provides an easy to use, platform independent, interface to the Linux Kernel's syscall filtering mechanism: seccomp." HOMEPAGE = "https://github.com/seccomp/libseccomp" SECTION = "security" LICENSE = "LGPL-2.1-only" From patchwork Fri Jan 20 18:10: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: 18404 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 03148C38159 for ; Fri, 20 Jan 2023 18:12:20 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web11.82178.1674238316102496611 for ; Fri, 20 Jan 2023 10:12:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=TpZKbF5n; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id c85so4571025pfc.8 for ; Fri, 20 Jan 2023 10:12:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=SG94ihhs13PxbjE7GKLcnIHJzIbmsprKdjR0CMpSUAo=; b=TpZKbF5nT9u0yfvjD9UnEQozCwniqLcWF/VXUees1bDpivaBXTm602CHfBKzk37sdr +s7eGSrXzHJmHLo9D2nyALMCkH/0cByRHYyQE8MSzHUvPRubPXoPqyY7cKZCJdln6FUe YTpZNlo4kTIYtColxQNYoaLqZhffreYPvPnPEvHq4mOGmjydOn9LxjMlrvzWTSy8+v+Y kQURgEsNWqP56f+yGYeBucPui/Wq8axsOBhkFKS6/CmJudgIITySSQe+hKXlDxvKaeHG gbC5Dy6iPw04YQvWBP2Puqsi+zDMgLrnN/BulnljpVNr0jtkDJKYMt8UqG/8sgHMTODh g33w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SG94ihhs13PxbjE7GKLcnIHJzIbmsprKdjR0CMpSUAo=; b=eHEzTfvAMod5Q6hRIQ1fY3lE28rc3Qh0qKuNLnodIAPKmV2iaevJbT8aVQp1bMMIKE 2fMgpIbMnTjBRTUa3gbusDvvf1dYy0uoY7WWxpjaYSA1YAGZF6NcJ6+W3jH4mgSH+WA2 ooUbmLXHKLzZ0dNoUwB7ai/6fFOHQHd2hr8iFDfonOIaaH2JajB3iVGbDZghhWSAjsKj GKwtB9TU0vJ5NHf/18rB3VSukn7JkuwXRhwOzQ0Ex/P6I57CNG6cF7M6L26/UZIpz6sA p8z+cdDUMeC0V8zHHRDP3UNwJJzBKMEpIzb/mMB29h1V9jbsD0JXG8ne7/2nTq/z9HcG fy6g== X-Gm-Message-State: AFqh2krR2gqHqLO5L23VIkZUewX1AZk5xbABZN1v5Wozp1MwgnX6Q7vg uHjuZ6/j2vFwOhXvH6lNFTyqJgXY6OZbSNd/iqk= X-Google-Smtp-Source: AMrXdXsHWbOFksJ4xBTNS2nCKt8zPaKFjNd93mU3H1Z6A8tLq4Dee6q0KEsNQOLeigDA6MeXl52gnw== X-Received: by 2002:a05:6a00:1887:b0:58d:c022:d60d with SMTP id x7-20020a056a00188700b0058dc022d60dmr22105910pfh.18.1674238331756; Fri, 20 Jan 2023 10:12:11 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.12.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:12:11 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 37/41] toolchain-scripts: compatibility with unbound variable protection Date: Fri, 20 Jan 2023 08:10:54 -1000 Message-Id: <00356d24516a34860e12975e4652e483edcae611.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:12:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176244 From: Jan Kircher Fixed an error when Bash's unbound variable protection is enabled (set -u) and variable "LD_LIBRARY_PATH" does not exist. Signed-off-by: Jan Kircher Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 85685370b0ad93291cda59fb091a15eeecf5e0d5) Signed-off-by: Steve Sakoman --- meta/classes-recipe/toolchain-scripts.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/toolchain-scripts.bbclass b/meta/classes-recipe/toolchain-scripts.bbclass index 3cc823fe63..fa658a6596 100644 --- a/meta/classes-recipe/toolchain-scripts.bbclass +++ b/meta/classes-recipe/toolchain-scripts.bbclass @@ -37,7 +37,7 @@ toolchain_create_sdk_env_script () { echo '# http://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html#AEN80' >> $script echo '# http://xahlee.info/UnixResource_dir/_/ldpath.html' >> $script echo '# Only disable this check if you are absolutely know what you are doing!' >> $script - echo 'if [ ! -z "$LD_LIBRARY_PATH" ]; then' >> $script + echo 'if [ ! -z "${LD_LIBRARY_PATH:-}" ]; then' >> $script echo " echo \"Your environment is misconfigured, you probably need to 'unset LD_LIBRARY_PATH'\"" >> $script echo " echo \"but please check why this was set in the first place and that it's safe to unset.\"" >> $script echo ' echo "The SDK will not operate correctly in most cases when LD_LIBRARY_PATH is set."' >> $script From patchwork Fri Jan 20 18:10: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: 18408 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 02EDAC38141 for ; Fri, 20 Jan 2023 18:12:20 +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.web10.82089.1674238334505199985 for ; Fri, 20 Jan 2023 10:12:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=MaF9Su3/; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id i1so4591284pfk.3 for ; Fri, 20 Jan 2023 10:12:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=x7hGhjN5K1el0MQ35A6PxysOP1eSge+r2wHaRY5kymg=; b=MaF9Su3/i5e6zFxkP3EdAVyg+vZhamOFEHvVBsBdDjAJoHHrIJY8mWZK51O6jkt0Xc vkORQ91egrp18pqvzZa0FCyxj5pCHH2ftanoSSGqwDxzbU7oOjeWc6flhL6ilAp3vorY zDVHGUx7g2Ln9dTepHJXd0mbwxPeYuag0benEmJCBkYehgbdXu3TGu2zvvbvTBTENYPA g+r64vx7d+luUJxlcyfJEalGoH0a6e+a5CtG+yYaV/NHHUlhdHFFUVvb7kEZfU7XJ9Vx icHsFsSR/9VUJiuCUCIjrVS/vnf31bCp91tk0PNXoITy5Br7fEDOhFSd564I04dYaL6D EYYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x7hGhjN5K1el0MQ35A6PxysOP1eSge+r2wHaRY5kymg=; b=GZWsDuLtMAFJkiGWOJrVR1AWFuPtu492t96hXioh52sozqSYCvz/y6SoJH5jbCX/vE cSIH3cqSnsJ9px2p1Nwq/QVmlmsZ0T5XK6iFHu32Svkfqs33W81WDxLNgjxY6S1wttN1 z22mvF83ALkSKXM4QJ/vBSvPT0258cI2WCZ35ixWjPabQTS2f9Z7ARn+ZUIEQ0PaAf6w WxKSzEauB8Y2dqc1QDzFPBQM+MXGODg003JcQsTGJmVwUfaLpXNOgv2ZPA9cmeecvckr fvDgWTKuVVIHswkEFQ3SMO1ltulyxro9FIXZ/4P655cRli6V6CZs9Fkyyjjf/fBVER8v +k1A== X-Gm-Message-State: AFqh2krzmWx34YI7sJShPj5uwDsxZUMj5YMmkS1WvaHKLzT4GQ2ZPiwA 8H4IboO/QScAo47K0CfNwVFhNqbwVCw1i7ZQhe4= X-Google-Smtp-Source: AMrXdXtH4BSVtUULgcF6h9wE9PBwifrUaC6h16xnjDQD2g0zWi6QxczCZqoo/qTmw0dwJlxbG2YFwQ== X-Received: by 2002:aa7:9461:0:b0:57f:ef11:acf6 with SMTP id t1-20020aa79461000000b0057fef11acf6mr15825306pfq.8.1674238333497; Fri, 20 Jan 2023 10:12:13 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.12.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:12:13 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 38/41] curl: don't enable debug builds Date: Fri, 20 Jan 2023 08:10:55 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:12:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176245 From: Ross Burton In oe-core 27824261 --enable-debug was added to the configure arguments to turn on debugging symbols. However, enabling debug mode does more than turn on debugging symbols and introduces some codepaths that can be controlled with environment variables. Bluntly, the curl maintainer says that --enable-debug should not be used in production: https://curl.se/mail/lib-2023-01/0039.html I did a build and verified that the curl-dbg package doesn't massively shrink, so the debug symbols are still being built. Remove the debug options and hide them behind a PACKAGECONFIG, with a comment that it should not be used in production. Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 3ed3b2ffeeaa5d888f77dd30cb8cd81d3275398a) Signed-off-by: Steve Sakoman --- meta/recipes-support/curl/curl_7.85.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/curl/curl_7.85.0.bb b/meta/recipes-support/curl/curl_7.85.0.bb index 1e47e9fac5..846cdacb41 100644 --- a/meta/recipes-support/curl/curl_7.85.0.bb +++ b/meta/recipes-support/curl/curl_7.85.0.bb @@ -38,6 +38,8 @@ PACKAGECONFIG:class-nativesdk = "ipv6 openssl proxy random threaded-resolver ver PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" +# Don't use this in production +PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher," @@ -74,9 +76,7 @@ EXTRA_OECONF = " \ --enable-crypto-auth \ --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ --without-libpsl \ - --enable-debug \ --enable-optimize \ - --disable-curldebug \ ${@'--without-ssl' if (bb.utils.filter('PACKAGECONFIG', 'gnutls mbedtls nss openssl', d) == '') else ''} \ " From patchwork Fri Jan 20 18:10:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 18406 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 1211CC52D11 for ; Fri, 20 Jan 2023 18:12:20 +0000 (UTC) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mx.groups.io with SMTP id smtpd.web11.82173.1674238307386370032 for ; Fri, 20 Jan 2023 10:12:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Y8VCNYtH; spf=softfail (domain: sakoman.com, ip: 209.85.215.178, mailfrom: steve@sakoman.com) Received: by mail-pg1-f178.google.com with SMTP id q9so4745174pgq.5 for ; Fri, 20 Jan 2023 10:12:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LvHZENQ6fLe7D2fhJ5hJuB522YhhU2pIKLPRoqq72D0=; b=Y8VCNYtH1k+P8jZjT0iy5xYfTwnf7KEiK7fWUpuBm/Vq6X8gwN86yOhEiTupkuKQnQ RQI8g+DWWuNDG336rlLcSv4tjPNXlJdx6e8vkGYxJ1DnFHaZu/vUmM2/MOZTiXcEkq49 6vjHAU7KjeQj/FZATIrRDqeGa50iur5wJ75wwX4zUOo2bEZkWl1HwvD/LwHCaphoIdwI Sg2S+hyoUnsp8PlqkDxZI7uMiEKJk6PnHUm7WQtHD2EMkW3HAWIbo4UdpRHkO9i9M/nA L2Fgu4eYR/frRD5QznOqhUPms2p0azU6j73JmahAnx9Z4sIVdm/svNHSib6dcJJRnHdu vqKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LvHZENQ6fLe7D2fhJ5hJuB522YhhU2pIKLPRoqq72D0=; b=68uwZj0wjzFy3jUrqa7YsyEw6DbKaWYHofq7/pINYwAJhSp49T2Z/947yLwujGdTgL FhAxGUiG0QOng+j4hVIJSb44l5e2LA1mvsdVMq+Ha5qByE/uKcOtMMToNk2w4EqgRhkX c9s7fFl9xwia5n8JGSNJ3/HGHauMBQZ56dKJe5clbaQYv9ogdH6pvtnBwxADwmQXdA9W VIwygmFTUFFRHO0tvOKTX+/gcdV74FmMI5mjqRQktO3f4fe+90MREehUrowKY1L5bw2t cPbXC8QsOzNbrl9q8R0TIBsBKCZzAv4uWrPYR5DIjsF9+NFrvJGGykjVmqbG29dND6Wk 5aZQ== X-Gm-Message-State: AFqh2kqfdxWGhKfk4NYnTWfG0mZHJAODm5VRluHNfdmUZgpVtCFSPOPe 3ygAR8jo2pti4806BNyD//cymOusUtw+nxse7To= X-Google-Smtp-Source: AMrXdXuOWr8vLEAVa/DaVex8f0WOvvIyEMLeKboY2nGJogNfisz/y6gGHZHFEROnIguSkhV/+mrhTw== X-Received: by 2002:aa7:9614:0:b0:58b:b9cc:5724 with SMTP id q20-20020aa79614000000b0058bb9cc5724mr30575971pfg.15.1674238335267; Fri, 20 Jan 2023 10:12:15 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.12.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:12:14 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 39/41] at: Change when files are copied Date: Fri, 20 Jan 2023 08:10:56 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:12:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176246 From: Saul Wold The create_spdx code relies on patched code, if files are changed or added during the do_configure phase they will be missed by the create_spdx process. So we need to ensure files modifications/additions happen in the do_patch phase. Signed-off-by: Saul Wold Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 227c46fe48b64de7574f7b6b407b8c13be71b392) Signed-off-by: Steve Sakoman --- meta/recipes-extended/at/at_3.2.5.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/at/at_3.2.5.bb b/meta/recipes-extended/at/at_3.2.5.bb index 87a436173f..c0c876a644 100644 --- a/meta/recipes-extended/at/at_3.2.5.bb +++ b/meta/recipes-extended/at/at_3.2.5.bb @@ -52,8 +52,10 @@ INITSCRIPT_PARAMS = "defaults" SYSTEMD_SERVICE:${PN} = "atd.service" -do_configure:prepend() { - cp -f ${WORKDIR}/posixtm.[ch] ${S} +do_patch[postfuncs] += "copy_posix_files" + +copy_posix_files() { + cp -f ${WORKDIR}/posixtm.[ch] ${S} } do_install () { From patchwork Fri Jan 20 18:10:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 18409 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 13171C38A23 for ; Fri, 20 Jan 2023 18:12:20 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web11.82193.1674238337957449331 for ; Fri, 20 Jan 2023 10:12:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=BmESSGY4; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id z31so1476101pfw.4 for ; Fri, 20 Jan 2023 10:12:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PFddCWv98KrixbiDx5i3p7H+g+JZiEprfhtXMDS1BF8=; b=BmESSGY4ZpLMFgAYm/cwm3OFlJxf8uwE1raTjx+kt4xYvLyFxLOIrdw2g5LdL6ByF2 5LiCSaVAdtkM0VrdjhfD8mSjM+v8uI2gR2nixWBwWI8yc4Z+g1FwX8Ojie4SAd9yjoeR RWsZh201HBNPOkDEBK/Y3BVe8nCIZfrBvqa1+W7XHBfcajE8sJkbNTt2rxmupKHMB6ri 033spdpM4PFsTeoQGUxDsP0XwgO7/zjPLpqcWyzYZFjGnN4mv6nWR18zx45sNe7ZW7+4 KPy6BGKx8V/4Ac4tG/GZ6eZ8vf4+SnczpOZdrC511ccIwEfpRQ3R0a8fuTXvrlbfRYQe UHLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PFddCWv98KrixbiDx5i3p7H+g+JZiEprfhtXMDS1BF8=; b=NfpoVZ8MbeVcr/X1VUlxZlKc1LGitTFw0XttLhHEWWOF6AhQszI1pjLDxkKfmn/Bq3 5ezYJhEYYOGq2fnbM67nmugBb0yic0JDgAK9MQ7epEG9k3OV1Qr/azn83V1eYBL+rzPN +ltNdJNGWH20khg6aggR9So7XyV7Y7/ryETz7gqaMcEoeV1P4evQPMe5XlMDG77Dd510 9i/6eoUi9NYQocJJPBkFTWxwujqtPZehUF6RJa5HFj/3p2CyL8iemFMW2tCEMGOgValV JUl/2PkvJsyJy9sInN/ig8iHY/7FbeU3r6MsrU1YqXwqoJLXyDmXHtdAF5bijWsFYdwT g1fA== X-Gm-Message-State: AFqh2koWTLVYv4SKXd3MugRfQIBjlYsQAdU1uCRhwUSw5wW/JAz8UbLc 3xxtRRzZKHXzeMPIfqqmAhB+AbgmC1lyBhLjIiA= X-Google-Smtp-Source: AMrXdXtI44RL9Q98exTeyFz7sEqNIWJfHT3oZGtOaurQRywSyAz5D1FAx7XNApNlP2EztcosK/UBzQ== X-Received: by 2002:a62:e80e:0:b0:576:1c37:5720 with SMTP id c14-20020a62e80e000000b005761c375720mr17708953pfi.4.1674238337064; Fri, 20 Jan 2023 10:12:17 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.12.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:12:16 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 40/41] lib/oe/reproducible: Use git log without gpg signature Date: Fri, 20 Jan 2023 08:10:57 -1000 Message-Id: <1075cdeae6af392acddb8c975ac4facc91a5ccde.1674238148.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:12:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176247 From: Benoît Mauduit Previously, if "showSignature" is present in user gitconfig, parsing of the timestamp will fail. Ideally we should replace this command with a git plumbing command. Signed-off-by: Benoît Mauduit Signed-off-by: Alexandre Belloni (cherry picked from commit 3bd6f78f79b3d3e87d8db1e11f58d8021f929843) Signed-off-by: Steve Sakoman --- meta/lib/oe/reproducible.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/reproducible.py b/meta/lib/oe/reproducible.py index 04a1810d4f..9ac75c02e3 100644 --- a/meta/lib/oe/reproducible.py +++ b/meta/lib/oe/reproducible.py @@ -115,7 +115,8 @@ def get_source_date_epoch_from_git(d, sourcedir): return None bb.debug(1, "git repository: %s" % gitpath) - p = subprocess.run(['git', '--git-dir', gitpath, 'log', '-1', '--pretty=%ct'], check=True, stdout=subprocess.PIPE) + p = subprocess.run(['git', '-c', 'log.showSignature=false', '--git-dir', gitpath, 'log', '-1', '--pretty=%ct'], + check=True, stdout=subprocess.PIPE) return int(p.stdout.decode('utf-8')) def get_source_date_epoch_from_youngest_file(d, sourcedir): From patchwork Fri Jan 20 18:10:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 18405 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 116BEC25B4E for ; Fri, 20 Jan 2023 18:12:20 +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.web11.82155.1674238285685718262 for ; Fri, 20 Jan 2023 10:12:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=I1kSxrLn; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id s67so4746072pgs.3 for ; Fri, 20 Jan 2023 10:12:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=W6zBjQA0FLzsly2EuQhxbEpofKQWSEiqWc9onf5+Nck=; b=I1kSxrLntu2cpO9fFazvfYFoZXV9vnxSLe+xd3bG7B1hfpexRgJV4bpAqGWCUJ4NMP MYYOuPGl9M15KqdEoREpMk8QytbnAfeTjo8sjcqmIkXdR6wxgmcDel07Sh0s3Fth1+Cs NCQS904wtd/Eyr5OYAFI6HZBy50Rqf/ZiRfGv5kJWcKkVezjKxjdD83w+JxyFKU4B+bO oP7Gv3ITh3ey8fiFHRYhYwNBkzsMaMmw3kKfTp9P6p4i4kfQeZz99QRWKVJvH4Csj5V5 Yti+POuMc9+zq7zZqT2oz4D97cceUEo/2A3XKNsA/e+ryewPrUDmaXvx4lTF8TTV4t+1 eliw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=W6zBjQA0FLzsly2EuQhxbEpofKQWSEiqWc9onf5+Nck=; b=q99RfeEeKOSVEeNEh9e6zVoZBxYty4g05HGRWTAm2UXv/ss+Opof8NjxInBG7cpzPN 4e34gSH9bb9UyP7Ro/zI+YMI3M1g6npNORFZDO0ZX1Zz73I+15/eLPbcH8Fj2wkWf7yO Us2i92xJdT/QcWxip4+OiIy0PF337uTQ553RWZ3+DQIywoqTRp8mGzDjzAcSnnRa8wii KddtxRfm0Ebj3kUaCVjJLwkuVqfWPC+7vFhFzwoXQ+3x1rb0j0NEuUkcfeMmiDv3WR86 b8IjYZYp9zioXm7ZfYPftB4srCEIdCYx/fM+exLlLQVikGApoqVp8M+zznQnWUcJ+dvG kBHw== X-Gm-Message-State: AFqh2koANEvv1ezQVqIT8BQqJwNJW1lyUet+WDmAuTYt3wdu7OoH5yqL D0SICfGZZYtK4umD65ESZsiWUjjdIhJLd9LeUH8= X-Google-Smtp-Source: AMrXdXvMHrwEyNnN1BX/uNHSL1g7B6tyUfzGYy+Zqvh1fT0z502qM4a3rhJK9BTzC06jqWtT3AhY5A== X-Received: by 2002:a62:640f:0:b0:581:f301:23fc with SMTP id y15-20020a62640f000000b00581f30123fcmr32405122pfb.12.1674238338817; Fri, 20 Jan 2023 10:12:18 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-5-74.hawaiiantel.net. [72.253.5.74]) by smtp.gmail.com with ESMTPSA id i128-20020a626d86000000b0058db8f8bce8sm8990396pfc.166.2023.01.20.10.12.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 10:12:18 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 41/41] selftest/virgl: use pkg-config from the host Date: Fri, 20 Jan 2023 08:10:58 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Jan 2023 18:12:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176248 From: Alexander Kanavin The check needs to report dri location on the host machine, so pkg-config binary needs to be capable of finding the needed dri.pc file on the host, and therefore needs to know where host .pc files are located. This may not be the case when using pkg-config from buildtools, so this forces usage of host pkg-config. runqemu already does the same PATH tweak, so this simply brings the two in sync. Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit f0521f8a3ba7e15482756529ee7b0a95b3d53e7d) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/runtime_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index fe83b248f3..44f787ef12 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -265,7 +265,7 @@ class TestImage(OESelftestTestCase): except FileNotFoundError: self.fail("/dev/dri directory does not exist; no render nodes available on this machine. %s" %(render_hint)) try: - dripath = subprocess.check_output("pkg-config --variable=dridriverdir dri", shell=True) + dripath = subprocess.check_output("PATH=/bin:/usr/bin:$PATH pkg-config --variable=dridriverdir dri", shell=True) except subprocess.CalledProcessError as e: self.fail("Could not determine the path to dri drivers on the host via pkg-config.\nPlease install Mesa development files (particularly, dri.pc) on the host machine.") qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native')