From patchwork Wed Nov 20 13:56:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52777 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 256A4D63942 for ; Wed, 20 Nov 2024 13:57:24 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web11.13826.1732111034126910237 for ; Wed, 20 Nov 2024 05:57:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=m22GLL68; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-212581a0b33so18142115ad.0 for ; Wed, 20 Nov 2024 05:57:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111033; x=1732715833; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=E2ZoAUDsD9gFrpjf4v57J+FwWvz6UR7XJrYWf7eabN0=; b=m22GLL68WNT1FS11LB4kjUm/eDtezqP4S2Ewajuh+LWJzXy+BM7tRlOfS5gf6Ui/9A VgvsxgZUOV0WJveAIblCXC3ItmBJMC/n/Z18c804uXo4F6EEt6TCreMt2+Tr9MWt3fko gixEksMfP6tkQwwN0tkaAHoF/tp8LRyKrYDc2OG+6GV1WaB/QQYjv+sLZnHl7DIbeQ/U cIxNrYEMxCjoGjy3ZAi+Ym1yhkfGRZ3mpBxCLvWVwfVguzllEHjLaN1o+1lNaon+vFT6 raS3KQm75NQyzGm0LuNCawJJIpHe40qEZVmrNotnRt0rgwz0pPm7ezl3T6L9uFUBC0/j thcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111033; x=1732715833; 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=E2ZoAUDsD9gFrpjf4v57J+FwWvz6UR7XJrYWf7eabN0=; b=DRwm6Gi+EnGZwSUy0D69nxRFNG5Q58FRPB3V0IfhjG2dynqdPhCqidBcepxJNcA8i9 Xfki1yUPDO7izALoL1dDh3ZfM7S2CAz1dgSS9KMXk8wP3q+9U3AWsCBS2hoUPDx7y0HO aMEdrD4TbVEJqf0UhfQ626KH3gbYF8G5AR+TocwImSw89VZkLCRJgT3fjvg1UtWVGH98 5+w+iMCbDzIaLXHI6SKzM7qe0yEQnbc0CA3yD1ElEuka5py1lxcs8RWEM2wqdDP7YkSc YVeewlSC9w4wGpoNaR2Paoj5VSxuTyJFhKzNscXmwcgRS6sLLVgTzbAWUxrD0uXMp0JR PImg== X-Gm-Message-State: AOJu0YzOyrO3pLCHhGPXcGkvqbttliAkofNcQ2fIXmHUHM5nd0JVIRSn TtiO27baXSrCch7QMHx7T/g+iW84zReIVgKJ5Lu50/AwMfugvRWD+k7R6cv2IYQcIrKsAX9aQZv h X-Google-Smtp-Source: AGHT+IHO43x0waBdyk10txDm6AVpeuqCIqSfoEWnjb24dvTbMRkB/k6XfJKLQa+tFTDcXV1ACANeUg== X-Received: by 2002:a17:902:fc46:b0:212:13ec:bb5b with SMTP id d9443c01a7336-2126a3a3118mr33609985ad.13.1732111033424; Wed, 20 Nov 2024 05:57:13 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:13 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 01/31] cve-check: add field "modified" to JSON report Date: Wed, 20 Nov 2024 05:56:33 -0800 Message-Id: <242bf4dcd4f85ec4d212fd68e060cf9fb307e96e.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207425 From: Katawann Added the "modified" field to the JSON export in the cve-check.class. This field captures the last modification date of each CVE, providing more detailed information on changes and updates within the exported data. Signed-off-by: Katawann Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 740b8a0b23c4021d07c3714420e3ea8b46e61454) Signed-off-by: Steve Sakoman --- meta/classes/cve-check.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index a5104f210b..6245594dd7 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -534,6 +534,7 @@ def cve_write_data_json(d, cve_data, cve_status): cve_item["summary"] = cve_data[cve]["NVD-summary"] cve_item["scorev2"] = cve_data[cve]["NVD-scorev2"] cve_item["scorev3"] = cve_data[cve]["NVD-scorev3"] + cve_item["modified"] = cve_data[cve]["NVD-modified"] cve_item["vector"] = cve_data[cve]["NVD-vector"] cve_item["vectorString"] = cve_data[cve]["NVD-vectorString"] if 'status' in cve_data[cve]: From patchwork Wed Nov 20 13:56:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52781 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33197D63943 for ; Wed, 20 Nov 2024 13:57:24 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web11.13829.1732111035916126553 for ; Wed, 20 Nov 2024 05:57:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=rhogiC/8; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-20e576dbc42so58917845ad.0 for ; Wed, 20 Nov 2024 05:57:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111035; x=1732715835; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=vlLYLpdzGpl9yG9M/aQqTTpQdM2uEHM7JTTNx9AOiGc=; b=rhogiC/8AyjOPy8Bopcv4Egy/wDnbSqWcPNXun4L8L6LZkEqQ/jBrKzdNjz8cX9C2u RsMEefMLZVaBo/1bA54c4bpou4l/1fvqZpx4QTY9W8xV8ltPQmWaXeI8qAhw2uMmdMeF zxjB+eV8/EZJzpjZdPUbaXhKXYbk7ezQPMJlTchBSqs1U6kluYw0n4liESbVx+FYV5ek 4TZCyf/JwYmx+fSZBtdOvZ5jkF4hbjpIAVR1i/XEK9cWSVtAgP18gKGWoCozzTYnEFdj Ke0EgP8lw5UslyRyy+Av+K0urEHbfCxtOIAxX0QU7/CTUOHPBUgYEFua5pJxhUGdmJu5 H5NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111035; x=1732715835; 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=vlLYLpdzGpl9yG9M/aQqTTpQdM2uEHM7JTTNx9AOiGc=; b=OLQF19rbf0MkmFHMltDTciUyd2B9SFlUbKO7dvCn80KrzVkimKM0XaPEPPLTG103BB L75OQzOe6iynzAnCTsQxFg//2rMhKZz5R+V+KtrRdHdChHEqUwQfNg3oexyOYmzWdgDf ihSvTwuMznP/5PFr2/8XabmmuTWIyXx7m7hT53pNLMUE4uLcG28j6mf97QUVzqmB+SXL O9M89foCBtuH2tGzdKd6vUz4ji7nS7r5jgtpBWlg1HIA1xwNBm2dj/zH5rICS8GBaYyw 5ddYrpatE29ppbEraDr/DZALqJSoT/+Z/J8TWxAnV0wmKQXf/A3ame/7/x9YmJee0QTd kgCA== X-Gm-Message-State: AOJu0YwMuwi90ruy4MYbGq0hn65ep5NiQ9l3zisQ6++YUKTES/vvTE5m VwcqrfBYIxRlP0JDX7v64ELD4IwLvBW5op8Ol1+fJCOxTVVscyWTTDvwI2CRQWKWaskqlyOPCPP H X-Google-Smtp-Source: AGHT+IF90yZ/4mz/fk7qrVqhIVHYhKUYNKbb1dKQGWNQHk9l5BTf6D6p9D5nvfYtrKBJhk4f8CbE5A== X-Received: by 2002:a17:903:2310:b0:20e:a2f7:8ab9 with SMTP id d9443c01a7336-2126aea848amr25394245ad.27.1732111035100; Wed, 20 Nov 2024 05:57:15 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:14 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 02/31] cve-check: add support for cvss v4.0 Date: Wed, 20 Nov 2024 05:56:34 -0800 Message-Id: <7ce34ce58f83bc02fa2c04bec54e358e8614157e.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207426 From: Peter Marko https://nvd.nist.gov/general/news/cvss-v4-0-official-support CVSS v4.0 was released in November 2023 NVD announced support for it in June 2024 Current stats are: * cvss v4 provided, but also v3, so cve-check showed a value sqlite> select count(*) from nvd where scorev4 != 0.0 and scorev3 != 0.0; 2069 * only cvss v4 provided, so cve-check did not show any sqlite> select count(*) from nvd where scorev4 != 0.0 and scorev3 = 0.0; 260 Signed-off-by: Peter Marko Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie (cherry picked from commit 358dbfcd80ae1fa414d294c865dd293670c287f0) Signed-off-by: Steve Sakoman --- meta/classes/cve-check.bbclass | 10 ++++++---- meta/classes/vex.bbclass | 1 + meta/recipes-core/meta/cve-update-nvd2-native.bb | 14 ++++++++++---- scripts/cve-json-to-text.py | 2 ++ 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 6245594dd7..0c92b87f52 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -31,7 +31,7 @@ CVE_PRODUCT ??= "${BPN}" CVE_VERSION ??= "${PV}" -CVE_CHECK_DB_FILENAME ?= "nvdcve_2-1.db" +CVE_CHECK_DB_FILENAME ?= "nvdcve_2-2.db" CVE_CHECK_DB_DIR ?= "${STAGING_DIR}/CVE_CHECK" CVE_CHECK_DB_FILE ?= "${CVE_CHECK_DB_DIR}/${CVE_CHECK_DB_FILENAME}" CVE_CHECK_DB_FILE_LOCK ?= "${CVE_CHECK_DB_FILE}.lock" @@ -445,9 +445,10 @@ def get_cve_info(d, cve_data): cve_data[row[0]]["NVD-summary"] = row[1] cve_data[row[0]]["NVD-scorev2"] = row[2] cve_data[row[0]]["NVD-scorev3"] = row[3] - cve_data[row[0]]["NVD-modified"] = row[4] - cve_data[row[0]]["NVD-vector"] = row[5] - cve_data[row[0]]["NVD-vectorString"] = row[6] + cve_data[row[0]]["NVD-scorev4"] = row[4] + cve_data[row[0]]["NVD-modified"] = row[5] + cve_data[row[0]]["NVD-vector"] = row[6] + cve_data[row[0]]["NVD-vectorString"] = row[7] cursor.close() conn.close() @@ -534,6 +535,7 @@ def cve_write_data_json(d, cve_data, cve_status): cve_item["summary"] = cve_data[cve]["NVD-summary"] cve_item["scorev2"] = cve_data[cve]["NVD-scorev2"] cve_item["scorev3"] = cve_data[cve]["NVD-scorev3"] + cve_item["scorev4"] = cve_data[cve]["NVD-scorev4"] cve_item["modified"] = cve_data[cve]["NVD-modified"] cve_item["vector"] = cve_data[cve]["NVD-vector"] cve_item["vectorString"] = cve_data[cve]["NVD-vectorString"] diff --git a/meta/classes/vex.bbclass b/meta/classes/vex.bbclass index bb16e2a529..01d4e52051 100644 --- a/meta/classes/vex.bbclass +++ b/meta/classes/vex.bbclass @@ -282,6 +282,7 @@ def cve_write_data_json(d, cve_data, cve_status): cve_item["summary"] = cve_data[cve]["NVD-summary"] cve_item["scorev2"] = cve_data[cve]["NVD-scorev2"] cve_item["scorev3"] = cve_data[cve]["NVD-scorev3"] + cve_item["scorev4"] = cve_data[cve]["NVD-scorev4"] cve_item["vector"] = cve_data[cve]["NVD-vector"] cve_item["vectorString"] = cve_data[cve]["NVD-vectorString"] if 'status' in cve_data[cve]: diff --git a/meta/recipes-core/meta/cve-update-nvd2-native.bb b/meta/recipes-core/meta/cve-update-nvd2-native.bb index 2d23d28c3e..5fbe9095cc 100644 --- a/meta/recipes-core/meta/cve-update-nvd2-native.bb +++ b/meta/recipes-core/meta/cve-update-nvd2-native.bb @@ -255,7 +255,7 @@ def initialize_db(conn): c.execute("CREATE TABLE IF NOT EXISTS META (YEAR INTEGER UNIQUE, DATE TEXT)") c.execute("CREATE TABLE IF NOT EXISTS NVD (ID TEXT UNIQUE, SUMMARY TEXT, \ - SCOREV2 TEXT, SCOREV3 TEXT, MODIFIED INTEGER, VECTOR TEXT, VECTORSTRING TEXT)") + SCOREV2 TEXT, SCOREV3 TEXT, SCOREV4 TEXT, MODIFIED INTEGER, VECTOR TEXT, VECTORSTRING TEXT)") c.execute("CREATE TABLE IF NOT EXISTS PRODUCTS (ID TEXT, \ VENDOR TEXT, PRODUCT TEXT, VERSION_START TEXT, OPERATOR_START TEXT, \ @@ -361,12 +361,18 @@ def update_db(conn, elt): cvssv3 = cvssv3 or elt['cve']['metrics']['cvssMetricV31'][0]['cvssData']['baseScore'] except KeyError: pass + cvssv3 = cvssv3 or 0.0 + try: + accessVector = accessVector or elt['cve']['metrics']['cvssMetricV40'][0]['cvssData']['attackVector'] + vectorString = vectorString or elt['cve']['metrics']['cvssMetricV40'][0]['cvssData']['vectorString'] + cvssv4 = elt['cve']['metrics']['cvssMetricV40'][0]['cvssData']['baseScore'] + except KeyError: + cvssv4 = 0.0 accessVector = accessVector or "UNKNOWN" vectorString = vectorString or "UNKNOWN" - cvssv3 = cvssv3 or 0.0 - conn.execute("insert or replace into NVD values (?, ?, ?, ?, ?, ?, ?)", - [cveId, cveDesc, cvssv2, cvssv3, date, accessVector, vectorString]).close() + conn.execute("insert or replace into NVD values (?, ?, ?, ?, ?, ?, ?, ?)", + [cveId, cveDesc, cvssv2, cvssv3, cvssv4, date, accessVector, vectorString]).close() try: # Remove any pre-existing CVE configuration. Even for partial database diff --git a/scripts/cve-json-to-text.py b/scripts/cve-json-to-text.py index 5531ee5eb6..87a5669987 100755 --- a/scripts/cve-json-to-text.py +++ b/scripts/cve-json-to-text.py @@ -125,6 +125,8 @@ def process_data(filename, data): lines += "CVSS v2 BASE SCORE: %s\n" % issue["scorev2"] if "scorev3" in issue: lines += "CVSS v3 BASE SCORE: %s\n" % issue["scorev3"] + if "scorev4" in issue: + lines += "CVSS v4 BASE SCORE: %s\n" % issue["scorev4"] if "vector" in issue: lines += "VECTOR: %s\n" % issue["vector"] if "vectorString" in issue: From patchwork Wed Nov 20 13:56:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52782 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 446EFD6394A for ; Wed, 20 Nov 2024 13:57:24 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web11.13830.1732111037215335077 for ; Wed, 20 Nov 2024 05:57:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=BIIiecWx; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-211fb27cc6bso41193655ad.0 for ; Wed, 20 Nov 2024 05:57:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111036; x=1732715836; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=dBBzBGnjdiEFtMuFB5ydikN/fGwR6kl2AclzchrWmLo=; b=BIIiecWxLYh+CPt4voM/j/xb3q5cMLwp6TPxZHX6E1ahPA+ApIOhQ0SeEiQok5JJzg jJ+7PnHkyg7MbsGYi2743eARQqya6ryMCyct3FAGOo8FSgj3/yrwfkOC5CwZicpqZF45 ySrVbEcxgKmG7zOOuVb107EaalO/SqkgtY3MNEXMb/xu5C0Yc0F3udefWTb3t6n6F4TF 9FHl5ggibxdZW+DadqD10tU3vGmDQdX8W+2ENAbw0QWt3Ktq+80cjxwX1HoLFMOHPfp2 U3W8k9Wfztq/33z/zRo4CEBHF+yq0EVggAMuAy86MQvMkRZM0mQxJRDx65B3dsSwTVBE C1xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111036; x=1732715836; 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=dBBzBGnjdiEFtMuFB5ydikN/fGwR6kl2AclzchrWmLo=; b=DE0BoYN21Y3Z2Kv0AmSEbHuaqP8kcWxM4n1XhtUwMLTp4cMlpw56WMhVmDOVmdE1oT aI0qor1bC/ZTnjKarhQAr9IOwhwttn82ADOK7cHhsmSoSGAy+FJp8nOtYEbfs6u2A0zM VGS8yj3XY03qEGPJFS5C33kkXRofkGLmvfNNPKw2dvB2+YNObFDfDGMmj0lR/ZawvGHU UXKu+VmNMDxWZhYTXbLwABHOu3n3OkDb4jJ8BCeBzAeCk2Cl/usFNyllFhtjJlRje3V6 NxeNU7lhP6POPwt5f7sYKYgnPrJpELffMdqObDEn0A1S+DFENuQzjatM1+QrBBXnQz4x 5Nng== X-Gm-Message-State: AOJu0YzhgAq2MPr74t1MUmZimZs1iuJYbLEi9t029ERIU1KWRZujEErV +B7HwuJ7RErEF1mv6CISKQvgaFEWnx3BbZgkVvn8iGoouN165Ebf8hliWwexmvrvE03RbTpblky 4 X-Google-Smtp-Source: AGHT+IHPAJkrxEPOnamlYNRjoxSJsk6KalaaFocWZ+h6J/svGGZedh9H4r/ujZ69B/e5LXEB+K9Uug== X-Received: by 2002:a17:902:fc47:b0:212:996:3536 with SMTP id d9443c01a7336-2126ca4eb28mr32577955ad.10.1732111036537; Wed, 20 Nov 2024 05:57:16 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:16 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 03/31] xserver-xorg: upgrade 21.1.13 -> 21.1.14 Date: Wed, 20 Nov 2024 05:56:35 -0800 Message-Id: <68d511dbde5efad9e40ed3918c15bba629130437.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207427 From: Vijay Anusuri Includes security fix CVE-2024-9632 Ref: https://lists.x.org/archives/xorg/2024-October/061765.html Signed-off-by: Vijay Anusuri Signed-off-by: Steve Sakoman --- .../{xserver-xorg_21.1.13.bb => xserver-xorg_21.1.14.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_21.1.13.bb => xserver-xorg_21.1.14.bb} (92%) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.13.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.14.bb similarity index 92% rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.13.bb rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.14.bb index 1f18c22fa8..28c98eb527 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.13.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.14.bb @@ -3,7 +3,7 @@ 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 \ " -SRC_URI[sha256sum] = "b45a02d5943f72236a360d3cc97e75134aa4f63039ff88c04686b508a3dc740c" +SRC_URI[sha256sum] = "8f2102cebdc4747d1656c1099ef610f5063c7422c24a177e300de569b354ee35" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. From patchwork Wed Nov 20 13:56:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52778 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 343A0D63948 for ; Wed, 20 Nov 2024 13:57:24 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web10.13935.1732111038661709270 for ; Wed, 20 Nov 2024 05:57:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=ms/xYJNk; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-20cdb889222so52928105ad.3 for ; Wed, 20 Nov 2024 05:57:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111038; x=1732715838; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=dvN2nF3bynpO9E5Vi9Z641o8yv8xM6mFv+CxxPnJves=; b=ms/xYJNkps1bsc3eqhrAjQLdsggZKZrI+xlIzWYLdPUvRxZ3jogo/FGQsFlFT93F0r CC2C2HjILtQYr7vie0CqXu6qds1uRRUNvsXBDJEE7pPgkNXOgR601iesDlxBphykRErJ oP6L0SdQTlhEFGaRnEdPjZMwHRQ/aWJLxkvaQUXQ0gozt15qpv1W7YDsgcDYOb0fDnXw 07V8YqNzffEi+hNbjHlSA1unHOvkthY9+i9AENRMwQIqT9mGnT5Ei6O6NO4WAE2cB72c 8uGCuFZABSJaZFpuQXcVZv/vGmxF2FzInOfgWRuyCYjBxQ0yqnqKFme3VQ3bZaGINuWB 4SUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111038; x=1732715838; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dvN2nF3bynpO9E5Vi9Z641o8yv8xM6mFv+CxxPnJves=; b=xN7BMrzdO+g/Q1to6g0a27VQzZ/OWNtZkxGR/GfzJLGDyDD6zdyaF09ASr2em6RuhD EWRmIOE5q+vjekkc8PuhiEInx1K/yW0SPm0xFWNROQtLdEEfVLcgjDrT5Ij0jBuvf3gt 6Xc0lj5fivKqqEqCBZMbcA1YC3F4AKFD0cfAi86xGvzwJQcnBYL7JsjpMgi9eU3beoAQ VgE8qFf9VeMb3ltvqLzeOePwmTYcHcpab2XR2PfA5VUzo1ADvrubDiT8HMR/sK9R4wTz ht1DiL6KLioGUvNLlPvRKT06c4s1YMLclW3mPuz9+NQmBfBOIhpuCb8ISbVhJlGElBpQ ew8g== X-Gm-Message-State: AOJu0YyQchLMorx+LabzzFdyUCjy5nt/Ukkr8o0djdVrlmZsGJGCgAHI ze3aCJqDQydP8tO+ktqS9MMgvOYXShocCQsN6yIK9nPAeyO5Om+nCoCA1YIutbkrHjIYBrM9Dxt U X-Google-Smtp-Source: AGHT+IEbdMUnXqwkwF4STvGwooXZCSC0iyJoJ3SUNzWMKi25ovPj2MNDtlKqRAdMF/aCFm/Bs3/mLg== X-Received: by 2002:a17:902:c94c:b0:212:190c:d9e with SMTP id d9443c01a7336-2126a333a9fmr37521765ad.11.1732111037893; Wed, 20 Nov 2024 05:57:17 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:17 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 04/31] tzdata/tzcode-native: upgrade 2024a -> 2024b Date: Wed, 20 Nov 2024 05:56:36 -0800 Message-Id: <42dbdd9157472d98cf1c5b0f493ccf275ed35445.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207428 From: Jinfeng Wang Signed-off-by: Jinfeng Wang Signed-off-by: Richard Purdie (cherry picked from commit b84b29b1827624270cc1698feda2ee87d55c01e4) Signed-off-by: Steve Sakoman --- meta/recipes-extended/timezone/timezone.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/timezone/timezone.inc b/meta/recipes-extended/timezone/timezone.inc index 4734adcc08..adf095280f 100644 --- a/meta/recipes-extended/timezone/timezone.inc +++ b/meta/recipes-extended/timezone/timezone.inc @@ -6,7 +6,7 @@ SECTION = "base" LICENSE = "PD & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" -PV = "2024a" +PV = "2024b" SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode;subdir=tz \ http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata;subdir=tz \ @@ -16,5 +16,5 @@ S = "${WORKDIR}/tz" UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" -SRC_URI[tzcode.sha256sum] = "80072894adff5a458f1d143e16e4ca1d8b2a122c9c5399da482cb68cba6a1ff8" -SRC_URI[tzdata.sha256sum] = "0d0434459acbd2059a7a8da1f3304a84a86591f6ed69c6248fffa502b6edffe3" +SRC_URI[tzcode.sha256sum] = "5e438fc449624906af16a18ff4573739f0cda9862e5ec28d3bcb19cbaed0f672" +SRC_URI[tzdata.sha256sum] = "70e754db126a8d0db3d16d6b4cb5f7ec1e04d5f261255e4558a67fe92d39e550" From patchwork Wed Nov 20 13:56:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52779 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24846D63941 for ; Wed, 20 Nov 2024 13:57:24 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web10.13936.1732111040106093483 for ; Wed, 20 Nov 2024 05:57:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=XX3oZZzs; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-20c8b557f91so21380155ad.2 for ; Wed, 20 Nov 2024 05:57:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111039; x=1732715839; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ncn9TxYFGAZMD/iCV3ZNcaYuq9YHmBSzS4e22wiX23s=; b=XX3oZZzsD0O1ipeOuqm9eHVfRyvJC7VNPRkaHIlku+EQEXt+MhpXvEsF6eYYB7C50J u318w9FUlfvVPGTVvtIJHGN8nKxFzRA5bI/xbcXLNbFoOAaTCYnpPxvSArgUiT+P/ZvY 7y8dZaXjW4BN9HOWnyG9xpVO7Gw2qZdYZFQchMfgvtoq2oUqVN9kVE+uzwqHvcfgmFn/ ysLcw4J4GW47uXaupZbk74kA1dBKI4cRQPfe/VlTxJcGHEp+su+dfLBmZVumn/enmW/V x/NZrBKPhnVLRlde4bvWvaN2zn9BehAhKPKIp+ewJ6j8WXv17CptFwfzuEWTNutX0Zg9 llGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111039; x=1732715839; 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=ncn9TxYFGAZMD/iCV3ZNcaYuq9YHmBSzS4e22wiX23s=; b=miQXN7uQxVJPMNZbvkLb5at8FsIU9r8erZQzAdrPagu7G9thY4eKBmn9iZNscssCZO zZzjMF8BpxEHdfDDYLX3y4FVOVgU4wVIyA/aZpbxpPffVmXMKMxRsbAuzzbQSHA85bi0 ZiUW6uqt7LsypyL1SpPrB/ee/rH7VOc3qlbl5rxN3PlymMCIMqAYmoulm5jGW1DqDIGr SlI9n0kVYFnsOE75s9Z3JgPikQAAB5xn8po6EbJJFnjjHPfS6SjCLODNlqNkGm0nDg2+ lX71kCAdd4fWv5hi8BwkL6ynRgT0AOavRYLfHrVb2OKfmIBL1LKke2755pqGzJ3jj8Dl E26Q== X-Gm-Message-State: AOJu0YzPGB8WuJF9fwUQPVr6DsAXY8Y0MQFkXLpXG/SXo2GCbK1ue4Yz TT5GDSxcc7Z5wA/oWBW5WPQtghKcV3NcFK2N749w7sDdLxfkrSv9nJEoRAbQngmLJ/Da78VQWTD Y X-Google-Smtp-Source: AGHT+IHc1S0EgDM4MxlYlz5DucID8DScGDGqGRzQujbeTt3z6h4Fd23exiF30lbDdMk/iD0zkdnl5w== X-Received: by 2002:a17:903:41c8:b0:212:b2b:6f1d with SMTP id d9443c01a7336-2126c1299f8mr34657005ad.32.1732111039426; Wed, 20 Nov 2024 05:57:19 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:19 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 05/31] wireless-regdb: upgrade 2024.07.04 -> 2024.10.07 Date: Wed, 20 Nov 2024 05:56:37 -0800 Message-Id: <7a840afe98096dfd20983c488c3107df78cb77d8.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207429 From: Wang Mingyu Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie (cherry picked from commit f124bb09a798d94eca5e93387bc361b147ce53f9) Signed-off-by: Steve Sakoman --- ...ireless-regdb_2024.07.04.bb => wireless-regdb_2024.10.07.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2024.07.04.bb => wireless-regdb_2024.10.07.bb} (94%) diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.07.04.bb b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.10.07.bb similarity index 94% rename from meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.07.04.bb rename to meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.10.07.bb index daf5e6dfcd..0e4100fba7 100644 --- a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.07.04.bb +++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.10.07.bb @@ -5,7 +5,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" -SRC_URI[sha256sum] = "9832a14e1be24abff7be30dee3c9a1afb5fdfcf475a0d91aafef039f8d85f5eb" +SRC_URI[sha256sum] = "f76f2bd79a653e9f9dd50548d99d03a4a4eb157da056dfd5892f403ec28fb3d5" inherit bin_package allarch From patchwork Wed Nov 20 13:56:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52780 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33458D63947 for ; Wed, 20 Nov 2024 13:57:24 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web10.13937.1732111041723553129 for ; Wed, 20 Nov 2024 05:57:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Bx3jHVy5; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-20c7ee8fe6bso20286515ad.2 for ; Wed, 20 Nov 2024 05:57:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111041; x=1732715841; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=iF1qL6cU+wL65+BWb0ap1CMsN2m4A+H8CHdy0cUwqnU=; b=Bx3jHVy5mr7gj3wLsBOERYwmTKK6WwcwsnSg1DgNXW4jkRUYmWr6Ee3sP013q0/y6L 7LqzaSZA7cqroXPggTvhF3z3HR+MlwA73GVya1gyN9g5bsVpozzOnRr9PgAFQOdjzS9h lKYojhWnoeqlnb93E+QtyoAdqLnyEFnK9P7Jh6XpFDwkYLPMhfx7F8f+XpAXwKRJM+Sn 0zfUXSrl/8XhNQItp9Ej32JKGgtyf4vJ8ZDLqHToWUrl/z5fXt6IffL3b0lVzYJlFC60 xVlWCBuPdUx1afAKfsYAgIiFwh7z9lwCyL7cFaRA7NMGdTog+rPbGXqwbkyLlqRpuldD 1F9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111041; x=1732715841; 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=iF1qL6cU+wL65+BWb0ap1CMsN2m4A+H8CHdy0cUwqnU=; b=CyDMMjGlqlrQB5PTyZ7L+mxRPd/l2wANI9o307L/sbixp7PObuPWLY7md8D3Tg2fmL 98v8hYnJuxgf3HydLKn+Sd22QTA6cBmX4S18NY6P97QudQiTfE0QTuvWQUhfT0AVMxFB Fqkf/i6367AgJO+61LBkBeE2dskIwJ8fX8c0KAtoEnhQMrUEeFYWjzTGk3Px7TgxA1Su +wIH7cwNDpkIDrB8lR7BfRB0dni7JCydLog9yOchf1UuZvbunIJGUH0L3zDthlHYs4jW ZZBAAB6eRQGfkbwJyh1SA39cOdIBw/xp8e0hnkr4lGWx0RY8lkvR1Wsmterp9GFzP8Vn u9Kw== X-Gm-Message-State: AOJu0Ywcvn4cfQ1BnYBpN8puR9w2ltK9lNsj4z1vL8tVp39JZbskbJR3 K9GNA1N13ERH9Ejv+dco5lAqqNnyOzLAF+Hg/nwTmIt/21sx842hmjUhk1g4lGneCHB52VrdkYc e X-Gm-Gg: ASbGncuLwpkBkeyA8XhRLc3SY4lqDBWieBVf7LEp5VghqpxSBihOZq21m88VoJRgZjE d/N40AG021dTfmBOsyDDfkBk6ydTe/wrZ7fI2vEyLN1+HoWFD+1vt2n3o+40YkhTiFdfXDGogtG Z0zoI6aC75kWz4D91tT5/s1Arloxc+LIdTEob4ZUczv5f3cVQqUqHsmQF872o0l5m/pevDekJDn cidS7ku1bs/J6y94wgUMQHOByCujF9Xr793j2w= X-Google-Smtp-Source: AGHT+IGiycYVlZOvn68ijelPZHNacDBRow/xkkgdgPPnFQuH3dQk6MrywTeE6mL5dlyvK4joBRMljA== X-Received: by 2002:a17:902:ccd2:b0:20c:da66:3875 with SMTP id d9443c01a7336-2126a3e8efamr39088145ad.24.1732111040950; Wed, 20 Nov 2024 05:57:20 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:20 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 06/31] go: upgrade 1.22.6 -> 1.22.7 Date: Wed, 20 Nov 2024 05:56:38 -0800 Message-Id: <6d034099570e38d4b6244ab90b4b78f25b1dcc24.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207430 From: Peter Marko Upgrade to latest 1.22.x release [1]: $ git --no-pager log --oneline go1.22.6..go1.22.7 7529d09a11 (tag: go1.22.7) [release-branch.go1.22] go1.22.7 d4c53812e6 [release-branch.go1.22] go/build/constraint: add parsing limits 2092294f2b [release-branch.go1.22] encoding/gob: cover missed cases when checking ignore depth b232596139 [release-branch.go1.22] go/parser: track depth in nested element lists e87be9833e [release-branch.go1.22] runtime: on AIX, fix call to _cgo_sys_thread_create in _rt0_ppc64_aix_lib 676d6100d8 [release-branch.go1.22] cmd/fix: support go versions with patch release 0a525a3ed0 [release-branch.go1.22] os: fix Chtimes test flakes Fixes CVE-2024-34155, CVE-2024-34156 and CVE-2024-34158 [1] https://github.com/golang/go/compare/go1.22.6...go1.22.7 Signed-off-by: Peter Marko Signed-off-by: Richard Purdie (cherry picked from commit 92d609c49c0870ca10fcc39d52a801109d65a98b) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/go/{go-1.22.6.inc => go-1.22.7.inc} | 2 +- ...o-binary-native_1.22.6.bb => go-binary-native_1.22.7.bb} | 6 +++--- ...cross-canadian_1.22.6.bb => go-cross-canadian_1.22.7.bb} | 0 .../go/{go-cross_1.22.6.bb => go-cross_1.22.7.bb} | 0 .../go/{go-crosssdk_1.22.6.bb => go-crosssdk_1.22.7.bb} | 0 .../go/{go-runtime_1.22.6.bb => go-runtime_1.22.7.bb} | 0 meta/recipes-devtools/go/{go_1.22.6.bb => go_1.22.7.bb} | 0 7 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-devtools/go/{go-1.22.6.inc => go-1.22.7.inc} (89%) rename meta/recipes-devtools/go/{go-binary-native_1.22.6.bb => go-binary-native_1.22.7.bb} (78%) rename meta/recipes-devtools/go/{go-cross-canadian_1.22.6.bb => go-cross-canadian_1.22.7.bb} (100%) rename meta/recipes-devtools/go/{go-cross_1.22.6.bb => go-cross_1.22.7.bb} (100%) rename meta/recipes-devtools/go/{go-crosssdk_1.22.6.bb => go-crosssdk_1.22.7.bb} (100%) rename meta/recipes-devtools/go/{go-runtime_1.22.6.bb => go-runtime_1.22.7.bb} (100%) rename meta/recipes-devtools/go/{go_1.22.6.bb => go_1.22.7.bb} (100%) diff --git a/meta/recipes-devtools/go/go-1.22.6.inc b/meta/recipes-devtools/go/go-1.22.7.inc similarity index 89% rename from meta/recipes-devtools/go/go-1.22.6.inc rename to meta/recipes-devtools/go/go-1.22.7.inc index 834debaf9b..e54a902741 100644 --- a/meta/recipes-devtools/go/go-1.22.6.inc +++ b/meta/recipes-devtools/go/go-1.22.7.inc @@ -15,4 +15,4 @@ SRC_URI += "\ file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ " -SRC_URI[main.sha256sum] = "9e48d99d519882579917d8189c17e98c373ce25abaebb98772e2927088992a51" +SRC_URI[main.sha256sum] = "66432d87d85e0cfac3edffe637d5930fc4ddf5793313fe11e4a0f333023c879f" diff --git a/meta/recipes-devtools/go/go-binary-native_1.22.6.bb b/meta/recipes-devtools/go/go-binary-native_1.22.7.bb similarity index 78% rename from meta/recipes-devtools/go/go-binary-native_1.22.6.bb rename to meta/recipes-devtools/go/go-binary-native_1.22.7.bb index ea4577f20a..aba317fd38 100644 --- a/meta/recipes-devtools/go/go-binary-native_1.22.6.bb +++ b/meta/recipes-devtools/go/go-binary-native_1.22.7.bb @@ -9,9 +9,9 @@ PROVIDES = "go-native" # Checksums available at https://go.dev/dl/ SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "999805bed7d9039ec3da1a53bfbcafc13e367da52aa823cb60b68ba22d44c616" -SRC_URI[go_linux_arm64.sha256sum] = "c15fa895341b8eaf7f219fada25c36a610eb042985dc1a912410c1c90098eaf2" -SRC_URI[go_linux_ppc64le.sha256sum] = "9d99fce3f6f72a76630fe91ec0884dfe3db828def4713368424900fa98bb2bd6" +SRC_URI[go_linux_amd64.sha256sum] = "fc5d49b7a5035f1f1b265c17aa86e9819e6dc9af8260ad61430ee7fbe27881bb" +SRC_URI[go_linux_arm64.sha256sum] = "ed695684438facbd7e0f286c30b7bc2411cfc605516d8127dc25c62fe5b03885" +SRC_URI[go_linux_ppc64le.sha256sum] = "a6441d5da40a961039ec22b0aadbc8b513f52b31bb8919c359a7e2c3c5bcf26a" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux" diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.22.6.bb b/meta/recipes-devtools/go/go-cross-canadian_1.22.7.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross-canadian_1.22.6.bb rename to meta/recipes-devtools/go/go-cross-canadian_1.22.7.bb diff --git a/meta/recipes-devtools/go/go-cross_1.22.6.bb b/meta/recipes-devtools/go/go-cross_1.22.7.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross_1.22.6.bb rename to meta/recipes-devtools/go/go-cross_1.22.7.bb diff --git a/meta/recipes-devtools/go/go-crosssdk_1.22.6.bb b/meta/recipes-devtools/go/go-crosssdk_1.22.7.bb similarity index 100% rename from meta/recipes-devtools/go/go-crosssdk_1.22.6.bb rename to meta/recipes-devtools/go/go-crosssdk_1.22.7.bb diff --git a/meta/recipes-devtools/go/go-runtime_1.22.6.bb b/meta/recipes-devtools/go/go-runtime_1.22.7.bb similarity index 100% rename from meta/recipes-devtools/go/go-runtime_1.22.6.bb rename to meta/recipes-devtools/go/go-runtime_1.22.7.bb diff --git a/meta/recipes-devtools/go/go_1.22.6.bb b/meta/recipes-devtools/go/go_1.22.7.bb similarity index 100% rename from meta/recipes-devtools/go/go_1.22.6.bb rename to meta/recipes-devtools/go/go_1.22.7.bb From patchwork Wed Nov 20 13:56:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52776 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2367CD63940 for ; Wed, 20 Nov 2024 13:57:24 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web11.13833.1732111043349243045 for ; Wed, 20 Nov 2024 05:57:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=nPjXCGXF; spf=softfail (domain: sakoman.com, ip: 209.85.216.46, mailfrom: steve@sakoman.com) Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-2ea68cd5780so2914132a91.3 for ; Wed, 20 Nov 2024 05:57:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111042; x=1732715842; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=zL8+XLybcTzCuyQblf9r5bfxdc0U6oUEkj48auYI1gQ=; b=nPjXCGXFSEpYJRP3wWaYsJHrkaewGinU06ymorpHk8dNaNiSQI0E8MPeT4ctRJNyLi wtbVuc2ERn3Yx5z1FR5LRUcLhBsBolL3jKiWSzm3kqW/MXnjGZ3EKLwO/s3DhCQwGP4d nRvT7DETfqZcr0D+/spNVdcagpbOcnI/1CSLtlzY80yDTdsD4+GZFIEvrqZ13Rw5jO2n 6UTMIT9fpG15HovweqFB91JN5bLI/pnUDrwv56omU9N8YUsRjHLr/ufHg4GPNhdYAT+d CwdJ3bS5x6qSLNspXN5Wd2MbKlwqTaMZXYUDHR7KUbxDNe5455MvClvRYD9ybwqkn9zM D+fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111042; x=1732715842; 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=zL8+XLybcTzCuyQblf9r5bfxdc0U6oUEkj48auYI1gQ=; b=KnC9FT5pgAadB/3A1gHpAZijWaI90PzpAZde6C1gCbYLeFrdlyveJQDSE7ZRNaHJa4 ElZ4e6GngQaC7cr3hhyMeamJWJ7FWjULiD6OHZqzMzWmZaz73e0rv3H1SnFcEv3fqPz2 QOy1nzkqhnpAjgeiwCWlyQvgSgT8sYetnAYszlei7CbpRsoPVtDnrj4CMlXp/aCyCGOM +Ci6y5Kgx02/VvGcmVWzI4wkfz/+hE4hFMvhBWu33sI6YHCw/l859iVaXlWwlNptwBbF M7mm1X04Y2c4q2yuwEjirf4JN05Y/nS5NNauPCyF8ISOwmpTSjy4cEw0lPmAhUHiGOKz AJgg== X-Gm-Message-State: AOJu0YztUJnKZYWY/P0xVmU4HaaFWSIvgR6VzuaTG5wYYVrare3Vripr fSOZK3cmZgGTtvRDY/5VOcactY1TV8UFn+KQB/7QqxDBIg7QGkqjM+aU4DQJXZq/L3N0jkCU7vz W X-Google-Smtp-Source: AGHT+IGaZElU8pucn6XaQm4RpFwVaiiiZnpkoP+VefDy1lJjwuLe0QnfMmbkd15pn+X5IJqkB3CBaQ== X-Received: by 2002:a17:90b:5281:b0:2ea:9f38:9934 with SMTP id 98e67ed59e1d1-2eaca732f8emr2992263a91.21.1732111042533; Wed, 20 Nov 2024 05:57:22 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:22 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 07/31] go: upgrade 1.22.7 -> 1.22.8 Date: Wed, 20 Nov 2024 05:56:39 -0800 Message-Id: <5e33e88bfa2a30b1c661ce9a3ebf6a68140a5768.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207431 From: Peter Marko Upgrade to latest 1.22.x release [1]: $ git --no-pager log --oneline go1.22.7..go1.22.8 aeccd613c8 (tag: go1.22.8) [release-branch.go1.22] go1.22.8 b4086b7c16 [release-branch.go1.22] syscall: skip TestAmbientCapsUserns when restricted, document 6fab4b9a9e [release-branch.go1.22] runtime: size maps.Clone destination bucket array safely 71655f14ce [release-branch.go1.22] cmd/cgo: correct padding required by alignment [1] https://github.com/golang/go/compare/go1.22.7...go1.22.8 Signed-off-by: Peter Marko Signed-off-by: Richard Purdie (cherry picked from commit 552b9913b25107d7a34611b499b7811896b5f098) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/go/{go-1.22.7.inc => go-1.22.8.inc} | 2 +- ...o-binary-native_1.22.7.bb => go-binary-native_1.22.8.bb} | 6 +++--- ...cross-canadian_1.22.7.bb => go-cross-canadian_1.22.8.bb} | 0 .../go/{go-cross_1.22.7.bb => go-cross_1.22.8.bb} | 0 .../go/{go-crosssdk_1.22.7.bb => go-crosssdk_1.22.8.bb} | 0 .../go/{go-runtime_1.22.7.bb => go-runtime_1.22.8.bb} | 0 meta/recipes-devtools/go/{go_1.22.7.bb => go_1.22.8.bb} | 0 7 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-devtools/go/{go-1.22.7.inc => go-1.22.8.inc} (89%) rename meta/recipes-devtools/go/{go-binary-native_1.22.7.bb => go-binary-native_1.22.8.bb} (78%) rename meta/recipes-devtools/go/{go-cross-canadian_1.22.7.bb => go-cross-canadian_1.22.8.bb} (100%) rename meta/recipes-devtools/go/{go-cross_1.22.7.bb => go-cross_1.22.8.bb} (100%) rename meta/recipes-devtools/go/{go-crosssdk_1.22.7.bb => go-crosssdk_1.22.8.bb} (100%) rename meta/recipes-devtools/go/{go-runtime_1.22.7.bb => go-runtime_1.22.8.bb} (100%) rename meta/recipes-devtools/go/{go_1.22.7.bb => go_1.22.8.bb} (100%) diff --git a/meta/recipes-devtools/go/go-1.22.7.inc b/meta/recipes-devtools/go/go-1.22.8.inc similarity index 89% rename from meta/recipes-devtools/go/go-1.22.7.inc rename to meta/recipes-devtools/go/go-1.22.8.inc index e54a902741..542519b930 100644 --- a/meta/recipes-devtools/go/go-1.22.7.inc +++ b/meta/recipes-devtools/go/go-1.22.8.inc @@ -15,4 +15,4 @@ SRC_URI += "\ file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ " -SRC_URI[main.sha256sum] = "66432d87d85e0cfac3edffe637d5930fc4ddf5793313fe11e4a0f333023c879f" +SRC_URI[main.sha256sum] = "df12c23ebf19dea0f4bf46a22cbeda4a3eca6f474f318390ce774974278440b8" diff --git a/meta/recipes-devtools/go/go-binary-native_1.22.7.bb b/meta/recipes-devtools/go/go-binary-native_1.22.8.bb similarity index 78% rename from meta/recipes-devtools/go/go-binary-native_1.22.7.bb rename to meta/recipes-devtools/go/go-binary-native_1.22.8.bb index aba317fd38..98799eb503 100644 --- a/meta/recipes-devtools/go/go-binary-native_1.22.7.bb +++ b/meta/recipes-devtools/go/go-binary-native_1.22.8.bb @@ -9,9 +9,9 @@ PROVIDES = "go-native" # Checksums available at https://go.dev/dl/ SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "fc5d49b7a5035f1f1b265c17aa86e9819e6dc9af8260ad61430ee7fbe27881bb" -SRC_URI[go_linux_arm64.sha256sum] = "ed695684438facbd7e0f286c30b7bc2411cfc605516d8127dc25c62fe5b03885" -SRC_URI[go_linux_ppc64le.sha256sum] = "a6441d5da40a961039ec22b0aadbc8b513f52b31bb8919c359a7e2c3c5bcf26a" +SRC_URI[go_linux_amd64.sha256sum] = "5f467d29fc67c7ae6468cb6ad5b047a274bae8180cac5e0b7ddbfeba3e47e18f" +SRC_URI[go_linux_arm64.sha256sum] = "5c616b32dab04bb8c4c8700478381daea0174dc70083e4026321163879278a4a" +SRC_URI[go_linux_ppc64le.sha256sum] = "c546f27866510bf8e54e86fe6f58c705af0e894341e5572c91f197a734152c27" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux" diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.22.7.bb b/meta/recipes-devtools/go/go-cross-canadian_1.22.8.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross-canadian_1.22.7.bb rename to meta/recipes-devtools/go/go-cross-canadian_1.22.8.bb diff --git a/meta/recipes-devtools/go/go-cross_1.22.7.bb b/meta/recipes-devtools/go/go-cross_1.22.8.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross_1.22.7.bb rename to meta/recipes-devtools/go/go-cross_1.22.8.bb diff --git a/meta/recipes-devtools/go/go-crosssdk_1.22.7.bb b/meta/recipes-devtools/go/go-crosssdk_1.22.8.bb similarity index 100% rename from meta/recipes-devtools/go/go-crosssdk_1.22.7.bb rename to meta/recipes-devtools/go/go-crosssdk_1.22.8.bb diff --git a/meta/recipes-devtools/go/go-runtime_1.22.7.bb b/meta/recipes-devtools/go/go-runtime_1.22.8.bb similarity index 100% rename from meta/recipes-devtools/go/go-runtime_1.22.7.bb rename to meta/recipes-devtools/go/go-runtime_1.22.8.bb diff --git a/meta/recipes-devtools/go/go_1.22.7.bb b/meta/recipes-devtools/go/go_1.22.8.bb similarity index 100% rename from meta/recipes-devtools/go/go_1.22.7.bb rename to meta/recipes-devtools/go/go_1.22.8.bb From patchwork Wed Nov 20 13:56:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52783 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 496FAD63947 for ; Wed, 20 Nov 2024 13:57:34 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web10.13939.1732111045061008119 for ; Wed, 20 Nov 2024 05:57:25 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=I3Dq9xul; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2ea4d429e43so2939979a91.3 for ; Wed, 20 Nov 2024 05:57:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111044; x=1732715844; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=VXh+h3OyLQu4fx0ilO3JHaDp+fVL507LNfR2n+7r2KI=; b=I3Dq9xulxYzbWsXyZBSdD+tOKjt/FgLMvBUD6MHHvoih+vpNxuoDHzrzGGFqwA6uGg Cv/22KrnG14HXW7J3lR+HW1f16y1wEzFF2jZYTqme6jUsMIWOe+9L/h2E9MyTZ6D99/3 p9R1MqRa9qRdDUPgqOOzWe8yQL4ZRxQClqBo992qIbPOglS/RHgNXwzCoJa3I2Ha8XoA 0gVVkK8IeYsWclM+uubkUDmWL0WcW0E2DtjFi3V/V7X5fE/9fIIg2VzHUUbF/FJKfrCw Q5x62YdIOX2z6w2dfuYbtEroNiZu1jJ0zaYIf2F8vt/mD8qJLrjGlhkZAJYR6WQXC1yl MLfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111044; x=1732715844; 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=VXh+h3OyLQu4fx0ilO3JHaDp+fVL507LNfR2n+7r2KI=; b=DzagfLhrfQN9GVbWdS43Yax6H7175R7QdIa85t8sXC+KGxgukEcZ1egLYM2lv2Cphb Rs9tG7nOaWNpZY+xylMC8mavwRwuMFFQ4QTI6BaVs0GfSZi8KnGbl6fsIzkMA49JJ2Gm g8bKsbLJiH0sVCPJO6Hc+F/4fBOk7d68PGqGS1x8A0f0exoABFQG4HUXm+9C35ScG0qW 7jAmSa+rOtu+ztEhQ0Rt1uYlwu5HE2OdCmLRAmIt99lkFOhl2CjVaGnO2aBHhunSb3EW ds2/jVcIxKzFK411kQZDvTd7yPLjzOkTHyLXTcsq+0oyvh9AQwxHWty9yba1TUBiDB9e CA3Q== X-Gm-Message-State: AOJu0Yy9wzQ+z/5xdyJutqYJRDXcPlqXzrSWqF87z8Cnxlqur4bXirna jQiHE8+EUsO6O7jehoqjeOornr1cfO8l73qwQgDcuPv3UkeEWzGMgcNIf8GRjJ9Otgyq4HihEmO L X-Google-Smtp-Source: AGHT+IGc4NjcM3oGNxMkDrlztFFg5axflssefqehFDL8Uqz1POLyRMCPmgx589OQpA6rnub5LPyvyQ== X-Received: by 2002:a17:90b:1dc9:b0:2ea:7179:5c2b with SMTP id 98e67ed59e1d1-2eaca7de4a2mr3412501a91.35.1732111044268; Wed, 20 Nov 2024 05:57:24 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:23 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 08/31] weston: backport patch to allow neatvnc < v0.9.0 Date: Wed, 20 Nov 2024 05:56:40 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207432 From: Hiago De Franco Currently weston 13.0.3 with neatvnc 0.8.1 does not compile when using VNC: | Dependency neatvnc found: NO found 0.8.1 but need: '< 0.8.0' ; matched: '>= 0.7.0' However weston upstream already increased the allowed version to 0.9.0, since neatvnc 0.8.0 does not introduce any changes that breaks API used by the VNC backend. Therefore, backport this patch. Signed-off-by: Hiago De Franco Signed-off-by: Richard Purdie (cherry picked from commit 8516496018a3ee9e81a67d4682bf9784d0eab2bd) Signed-off-by: Steve Sakoman --- ...1-vnc-Allow-neatvnc-in-version-0.8.0.patch | 27 +++++++++++++++++++ .../recipes-graphics/wayland/weston_13.0.3.bb | 1 + 2 files changed, 28 insertions(+) create mode 100644 meta/recipes-graphics/wayland/weston/0001-vnc-Allow-neatvnc-in-version-0.8.0.patch diff --git a/meta/recipes-graphics/wayland/weston/0001-vnc-Allow-neatvnc-in-version-0.8.0.patch b/meta/recipes-graphics/wayland/weston/0001-vnc-Allow-neatvnc-in-version-0.8.0.patch new file mode 100644 index 0000000000..4ac1c075fd --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/0001-vnc-Allow-neatvnc-in-version-0.8.0.patch @@ -0,0 +1,27 @@ +From 534cfa08ea0a0c2646b4aec20b16bf95f6d0aae6 Mon Sep 17 00:00:00 2001 +From: Lukasz Czechowski +Date: Mon, 3 Jun 2024 13:39:27 +0200 +Subject: [PATCH] vnc: Allow neatvnc in version 0.8.0 + +Neat VNC 0.8.0 does not introduce any changes that breaks API used +by VNC backend, so it is safe to extend compatibility. + +Upstream-Status: Backport [05e5405651054c580b248c4ab2791ed8d66369e3] +Signed-off-by: Lukasz Czechowski +--- + libweston/backend-vnc/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libweston/backend-vnc/meson.build b/libweston/backend-vnc/meson.build +index b7b6916..39b15cf 100644 +--- a/libweston/backend-vnc/meson.build ++++ b/libweston/backend-vnc/meson.build +@@ -3,7 +3,7 @@ if not get_option('backend-vnc') + endif + + config_h.set('BUILD_VNC_COMPOSITOR', '1') +-dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.8.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep']) ++dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.9.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep']) + if not dep_neatvnc.found() + error('VNC backend requires neatvnc which was not found. Or, you can use \'-Dbackend-vnc=false\'.') + endif diff --git a/meta/recipes-graphics/wayland/weston_13.0.3.bb b/meta/recipes-graphics/wayland/weston_13.0.3.bb index e4843d38f7..19b242d01b 100644 --- a/meta/recipes-graphics/wayland/weston_13.0.3.bb +++ b/meta/recipes-graphics/wayland/weston_13.0.3.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ file://0001-libweston-tools-Include-libgen.h-for-basename-signat.patch \ + file://0001-vnc-Allow-neatvnc-in-version-0.8.0.patch \ file://weston.png \ file://weston.desktop \ file://xwayland.weston-start \ From patchwork Wed Nov 20 13:56:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52785 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58C11D6394C for ; Wed, 20 Nov 2024 13:57:34 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web11.13834.1732111046650453725 for ; Wed, 20 Nov 2024 05:57:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=BnkJXZAu; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-21260209c68so6512965ad.0 for ; Wed, 20 Nov 2024 05:57:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111046; x=1732715846; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=UD0tpMjzR08rsMBW3pSKtcrG+3qA2maxKenzc5aKv5s=; b=BnkJXZAuyGtbBEQYWzOEFsqb3z4pMdpJGJllf0E7OOdom73NOeZO+YOXAAOSuRPSIu w3sgBjfXsMqwCJXSFQPEplg30e8CVZTG09gIZCOgBr3b5afiMgRn/tYRLxyRZ21lc7iT GoDehRHPiT+ZRHzMnvUP5q5u+fvTbZpQ9B/r7nvO+9bCsGiZMqEF8n3z+ATPHgaCi9Ov Sye/NvQqE15bq/Obil48RuZxrEniCLXqy3betdYin3aE45JeEVqp9O/GrUJP9u3LmBj3 wPH7LGWJ6DwwRm5J5YYTVSvBiohuX1VIQsb4iLA9grI/hm3jE5EHjz5HvhTAKk0oYcZv FOsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111046; x=1732715846; 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=UD0tpMjzR08rsMBW3pSKtcrG+3qA2maxKenzc5aKv5s=; b=fYnQUDdtSIl9GA8jp8SoR1ilfmv30k5WVUQnCCStqp+HoZHk2ODhBau9O9OJYrJVNh kM200gAaQ/VQ+rF2Zj3rONv/iCCLGDU9ZqxQIZ4ZJCESqQciUeRkU9ILHRflYXzVu/GR y5WdGDNZ+Gkk3TYWm7N7tKjEsEIW+5q6y6ZjDHjlT7GRiPtUtP463bKu8vaMzoXpRREI DuFoK4lK7owIkMj2N3XuxDLLuSfcbfBE4dcf4uNE1XZRwvq6GpANpmFZRY6pDdwm2rqy kEqTQobQ7LqDuhyyhTky1CV68pES+qEhBhCYzCPne0E1/vwEuYJ6LH4gz5gombpTRBE6 p64w== X-Gm-Message-State: AOJu0Yxv6BwGaL3/yiAJUggOchSca08529Wkw0FRYtUnDqBlm0Mh2zOI nZ7zlYG7wFSc9kMq3tOqO0OBYdX787SJG62E88i4Zp8uGhEJ/JH4ZEL/nOLgLhVwjKfFKlHI9KT J X-Google-Smtp-Source: AGHT+IEbx/Nob8ty1rhpGoHawez6Pw+jlj2uzLqXBEAdLdR+2OTW3S001yLWtiE1UOHmJUrql1VaXA== X-Received: by 2002:a17:903:32cf:b0:212:3f36:d983 with SMTP id d9443c01a7336-21269e95910mr39493045ad.27.1732111045889; Wed, 20 Nov 2024 05:57:25 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:25 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 09/31] pseudo: Fix envp bug and add posix_spawn wrapper Date: Wed, 20 Nov 2024 05:56:41 -0800 Message-Id: <1f7c468758bf2a47f606cbdbf1e3c2f21a3f890e.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207433 From: Richard Purdie Fix pseudo with python 3.13 by adding a wrapper for posix_spawn and fixing a NULL pointer dereference in envp handling it uncovered. This fixes issues on Fedora 41. Signed-off-by: Richard Purdie (cherry picked from commit d80e20d70d170397f9827c5a5fc75ad1f2e8cd94) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/pseudo/pseudo_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index 7d8f71f65d..87c62e0678 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -14,7 +14,7 @@ SRC_URI:append:class-nativesdk = " \ file://older-glibc-symbols.patch" SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa" -SRCREV = "374089f2ed83da4d0d4e58df067142ff99c7eb12" +SRCREV = "28dcefb809ce95db997811b5662f0b893b9923e0" S = "${WORKDIR}/git" PV = "1.9.0+git" From patchwork Wed Nov 20 13:56:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52789 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71EA8D63951 for ; Wed, 20 Nov 2024 13:57:34 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web11.13835.1732111047960091781 for ; Wed, 20 Nov 2024 05:57:28 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=li4owxFp; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-21271dc4084so5202925ad.2 for ; Wed, 20 Nov 2024 05:57:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111047; x=1732715847; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=AmTbQUgFd1YxfIFgU+MPCIeyjMubcm3aDZstOocEug8=; b=li4owxFpYEg6V/jw0ZOYS9Ud/2F+fSOJZMDhNcbAM5GA0V+GnhArWM7IAJAg1z6FRg A+AMGEVPXENrlKdSRbMkY51Thi02oPaGNfRpP96GLVKXBlCv16Ggc8sb0JVr88llaIfF 1VTLJn9Cq3+6TDB8Gl9WmfXR4sr5MlpAwgn1tMtLQBZUjaW4M21cmaM5fvuKGH/vK62T Y/zu2Kv8X3aYj2mzVi58Pk1NX8eXbk4HiYxuZ7Z2sZrNdPCvg+A+j1tesK03gE3viXpo XOVvbUlVhoayFiJqzgkSfT1P2xN5FkabGtPGcjnzdBc5r0/RHgBEy72GgwcKBmMDt5RU uUMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111047; x=1732715847; 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=AmTbQUgFd1YxfIFgU+MPCIeyjMubcm3aDZstOocEug8=; b=Qzi9E2Bt71Mqn+rMIOVfjX1BFyOmeYZylUpTMFdXZh0/0/2QX8NVrY+MV3Z7+OgA7z EDljVrkmqryq8u5/qt6qOBZTFseMzc6xABJUdv+F+6WFyw0PZXfPfY6BIZFczCEdLCrt WejoW8o4rzFPXmhZ0C4C57AhlHmgEn7FA07mtWb5/wcyJLtT3AOFOX6/y99Akx+JJmjo IFMu4LEjb1+Juc4HlM0BEr7ONx8Tvk5MBQ5lrI8v0+2RwlJz0T+HkK4OIpOFJdh1FOnw OBJOqae+bD4puQFZ/nWsWgk5InejT7wi+Xhy5FMkb4npH4RQFuD/Tbg0QUlCvGdVsgig MXpw== X-Gm-Message-State: AOJu0YzEbrVkIqImn/eNwQSIZ6eqPyTMr02KTCmYatZXsdc0RTZMB0LA iOLfFGy4ftMuuoCblgMkG68fAZjkUi6MnhwmOQsF2cgo6pP7Onv/8Bc6vAqk3iFb8y4Orc5fA18 J X-Google-Smtp-Source: AGHT+IE+p2o97plWrjxw7q9GaI49by3ixctckn/UDQSjIzAroQxj/E4b7+1wxRSysiUkLNq91Zn6ow== X-Received: by 2002:a17:903:2312:b0:20c:ee32:7597 with SMTP id d9443c01a7336-2126ca4ea95mr30289225ad.8.1732111047308; Wed, 20 Nov 2024 05:57:27 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:26 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 10/31] uboot-sign: fix concat_dtb arguments Date: Wed, 20 Nov 2024 05:56:42 -0800 Message-Id: <5b837f65a41fff75517e9e9c241eaaf8e79afc5d.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207434 From: Clayton Casciato Fixes [YOCTO #15642] Ensure empty argument passed from do_uboot_assemble_fitimage is passed to concat_dtb Signed-off-by: Clayton Casciato Signed-off-by: Richard Purdie (cherry picked from commit b3c473785e5ceef677ff2b77c5fc17f5704c622f) Signed-off-by: Steve Sakoman --- meta/classes-recipe/uboot-sign.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/uboot-sign.bbclass b/meta/classes-recipe/uboot-sign.bbclass index 3e5f5dcf66..a17be745ce 100644 --- a/meta/classes-recipe/uboot-sign.bbclass +++ b/meta/classes-recipe/uboot-sign.bbclass @@ -338,7 +338,7 @@ uboot_assemble_fitimage_helper() { binary="$2" if [ "${UBOOT_SIGN_ENABLE}" = "1" -a -n "${UBOOT_DTB_BINARY}" ] ; then - concat_dtb $type $binary + concat_dtb "$type" "$binary" fi if [ "${UBOOT_FITIMAGE_ENABLE}" = "1" -a -n "${SPL_DTB_BINARY}" ]; then From patchwork Wed Nov 20 13:56:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52786 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67F73D6394E for ; Wed, 20 Nov 2024 13:57:34 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web11.13836.1732111049290905570 for ; Wed, 20 Nov 2024 05:57:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=OeTyFLVf; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-21271dc4084so5203355ad.2 for ; Wed, 20 Nov 2024 05:57:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111048; x=1732715848; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LgJHb//3tSoZO8DpVaI5uCt9BA8heULtS+p+U/dSdmw=; b=OeTyFLVfXFavHH9WdU8XeHt6S+fkhKNJglGzunXR+FEsh4WnTGQkOhflv2AZB5YSu+ OO3/ICHn3/NNrvWz7tusSPa6ELML2c1Ssoq0IEFrzOqsii92rQ4BI1Zn3fLu3jZbKwbZ dTn+GXvCEWeuc29G7Dbg3NLXa4wKaR3Nm5ZtEPH4BR7qoadkx9HXy1FQplMRLnAjK8JJ 1bygkTTzOH/10Ue2mKbJtSwZBNiTln3fyJXRIcICdLsQGslpD0pBDNYOkFztO3HCW6fP sodK2XC0Xz8dH4nvfrIEhhjxv2rJ8mufrvfVwiFwUfgC8wmjnBpKvrri/VfewbSzYAVQ ImPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111048; x=1732715848; 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=LgJHb//3tSoZO8DpVaI5uCt9BA8heULtS+p+U/dSdmw=; b=wGmQqH2TQk6oQRwMMC8CnIFa2LHGTFneSysXrQKd3jiDBKfa77Go1itPGX0b0be2GA nHGgqZMiPgzktMWsH99nnHhtdXPdnYhR/O6mGEiD97Ofix595afX2VJxiGMbjbyp9pmj 76uAUUVBUTnIazsPW/wTNmNWui/6s70L2E8BNGh7tIF/TEjgoclkukhfKObCiPnYmyAv Q7EnhtdPDR1V78uKmBw+aj9h9xhkf61bTpyOvHBs9YSZOS92laIU+nSZEaypkTurEHKy htwzDoNSBEPAjKg42q14VOmGBnjLN8uP7LDDDXwwoeChuwMbVZ8xGLcL03XMZ9ZmQXyI KO5A== X-Gm-Message-State: AOJu0YzfwhCGgk1kxPEMgO+X4KYfHpFFF2WQ4VkcSgGe17YtabtADR+U 18loyGBP0yORvJMO8pqzvRP9WBf17MYNLca43s2vF+iwaQ6JjVFP/YD5HnHo0DZAVWcqukvU6aP 9 X-Google-Smtp-Source: AGHT+IGZ2yjPhTj0l2wrIgegE3y7l7ROkIO7Izj9obWx3qTE7LNyWNqZYDTO27goqX/Ok4bixZDezQ== X-Received: by 2002:a17:903:2282:b0:211:f674:9d60 with SMTP id d9443c01a7336-2126cb3ac18mr28401865ad.50.1732111048577; Wed, 20 Nov 2024 05:57:28 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:28 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 11/31] strace: download release tarballs from GitHub Date: Wed, 20 Nov 2024 05:56:43 -0800 Message-Id: <6e5456a6e953ae388612f60f87b8ff0c61e9376c.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207435 From: Ross Burton Switch to downloading the release tarballs from GitHub. Their CDN is rock solid, and strace.io is hosted inside Russia which some networks are blocking. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit bbdbd6d943a64e5b0dae4c2ee705d017fb7ef80e) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/strace/strace_6.10.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/strace/strace_6.10.bb b/meta/recipes-devtools/strace/strace_6.10.bb index a534fccd4f..d9f34c2f81 100644 --- a/meta/recipes-devtools/strace/strace_6.10.bb +++ b/meta/recipes-devtools/strace/strace_6.10.bb @@ -5,7 +5,7 @@ SECTION = "console/utils" LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=2433d82e1432a76dc3eadd9002bfe304" -SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/strace-${PV}.tar.xz \ file://update-gawk-paths.patch \ file://Makefile-ptest.patch \ file://run-ptest \ @@ -17,7 +17,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ " SRC_URI[sha256sum] = "765ec71aa1de2fe37363c1e40c7b7669fc1d40c44bb5d38ba8e8cd82c4edcf07" -inherit autotools ptest +inherit autotools github-releases ptest # Not yet ported to rv32 COMPATIBLE_HOST:riscv32 = "null" From patchwork Wed Nov 20 13:56:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52784 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58D2ED6394D for ; Wed, 20 Nov 2024 13:57:34 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web10.13942.1732111050700465501 for ; Wed, 20 Nov 2024 05:57:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=FU7StrlA; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-21269c8df64so10615845ad.2 for ; Wed, 20 Nov 2024 05:57:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111050; x=1732715850; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xikLmiroHNHs9rHyNY1Pd2Lk1hzLmdNLLVa4lx2knPA=; b=FU7StrlAOD3U9q8I9p5+l118KQc2DW24Dikeja0GzeETUfcAmuHq7vlr3gBRM9pjG+ 9DyNFdq+TYKjnTgpIlmtVhoSNVXZvsmgBwbZd71lwIk7r6UcJ5sgHaI1cBUhpDsfVuMh T3rTbmHhEvos9GyzRhUpmgK5BYSd5QsAVrsKTVlyA0cl28uWCw519TqoeNT2+fxYDP/r 2BVvEt4UDdCWiDfICcD5fr9m0ss4tXFBDtj3giThZHiH6nuNRJgL/cUOIrvAZrMrJP6L X28P2qkk2bxCEIc8+YEfosd/388l8FI0Se0iZumf2iFjsZc2fqinvlMNmrJvHXHSt02C QjPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111050; x=1732715850; 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=xikLmiroHNHs9rHyNY1Pd2Lk1hzLmdNLLVa4lx2knPA=; b=Lcw380/cEY4x6xATK9a/E/tXdYFdsMovF8C1LzFxK8dySKStMLAmUB1pa3uW0UYIXG TuC1F84OYs0YGS5RE/xPeAlcVn4h+vKGgrGoHqs50EDv+L2aV7Tm2+RnrCu+m5JjOYw6 x3Y3PyhdXH/XdzPDaTQcO1iogHboa7s3Aa0Ij2OKFva111uPtaau4eD518SegIt9V+pv dQuZs2YPxaHiTFRO7/k8ZEHMlveLyhWpFbq0IXW8yEblQt2kceoqQ9lZHGImMVM2nxj3 /qNJXK+N5wC6dSocPzNDnE+aZHExiPypwLumaf7PXA1j1lsGYL9B7jE0OV45S9fsC2yV Ua3w== X-Gm-Message-State: AOJu0YzxPWou/x0LyZ7KYngLAxV1u2ji01x4n3CJsISUNCLskXoqnjIc lT+larlEZjZ0fjCnZWi22E6cRQbZl5LME79oVWN7aA4GZpxyAUhDEXO5/FIjiLh4b8wW+Je6wyI I X-Google-Smtp-Source: AGHT+IGx0rpHEa2YpBZlEnhlKE0+dQRy6veyyKywyNqQJYhG7AmAHMzqdHsTQJxrqpTUBBnvbjCSrw== X-Received: by 2002:a17:902:e888:b0:20c:bda8:3a10 with SMTP id d9443c01a7336-2126a4356cfmr29865775ad.37.1732111049900; Wed, 20 Nov 2024 05:57:29 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:29 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 12/31] toolchain-shar-extract.sh: exit when post-relocate-setup.sh fails Date: Wed, 20 Nov 2024 05:56:44 -0800 Message-Id: <6744c0c96a3d1137f84898c5083e1f974b2cc46a.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207436 From: Chen Qi When LD_LIBRARY_PATH is set, post-relocate-setup.sh will fail and exit properly. But such failure is ignored and the SDK installation will continue and tell user that things succeed. This is misleading. So exit immediately if post-relocate-setup.sh fails. Fixes [Yocto #15586] Signed-off-by: Chen Qi Signed-off-by: Richard Purdie (cherry picked from commit c8e2dcc1f71aa33cc6e56dfdebebbe7ef010c944) Signed-off-by: Steve Sakoman --- meta/files/toolchain-shar-extract.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 89d30005fd..3b4647fca7 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -286,6 +286,10 @@ post_relocate="$target_sdk_dir/post-relocate-setup.sh" if [ -e "$post_relocate" ]; then $SUDO_EXEC sed -e "s:@SDKPATH@:$target_sdk_dir:g" -i $post_relocate $SUDO_EXEC /bin/sh $post_relocate "$target_sdk_dir" "@SDKPATH@" + if [ $? -ne 0 ]; then + echo "Executing $post_relocate failed" + exit 1 + fi $SUDO_EXEC rm -f $post_relocate fi From patchwork Wed Nov 20 13:56:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52787 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50E04D63949 for ; Wed, 20 Nov 2024 13:57:34 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web10.13943.1732111052005064704 for ; Wed, 20 Nov 2024 05:57:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=hm6BdZOd; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-212776d6449so3495945ad.1 for ; Wed, 20 Nov 2024 05:57:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111051; x=1732715851; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=dnfdE7P0Mlsfs95T7zSskqSvvgl2vq64BMlf/DvAdXw=; b=hm6BdZOdaX+Rqbu8wkv8T99rrZybN52ag5j9a/q8/IPDWimmuCUBKVYri8PISs/Rqh PraiEdR12tlyLtrc0/iEh34HAux0eWO0AjhyjXgohQad7EQKGqcBZDzeC1WOXaYP+nLd HC5Ou5GWY6fRzy1R5Kd1N4Kk64gExwg2Vv0YxS8i1ZaprkfwZLyrcwJZobsFi7J24QPi LC3GPLMx6lslVPW5c4QXUQIoVqvrxuMgfvPoVQFTTSBZcUGj3ytH6WmH+ijYXsfYb29i FRL+OVbyous1R3k7EMo53uysyuWQjIWvbdWS4YVuoyih63ZtX12b+MGbpHNewqUt3FnY jDZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111051; x=1732715851; 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=dnfdE7P0Mlsfs95T7zSskqSvvgl2vq64BMlf/DvAdXw=; b=UzoCVDr1/WQ5qr6AQUoCEMk3k4RvZc1iRi7ykE4LnTnSl1PX63AwJ8Wbqu3ojKTwPr +wUNLFYtIEnVFXp4L9zXWWYXs4yi6UTycgS8OT58RXeiBf+C5/rHtMzITjOS0k8UwSyH MzQ7vUmW8HUMixcbFwn9wOr0ObEO/35ukBOrgfd+yQZ9J+f2aXFpYNwoEJN1eFIv/xKV wu2bsH/Ix5RaYGnC8/UAQn3M8y2Sj9sGd9qEwbd5E2ia/lQ7YJop5C64vJDSBJdjbztD oxmyhB8WLO4exo42gsABwUxnpF3s5Zw2sbki98bFPHwTSudKCcWR4txHtT7o6qWO/er3 RRjg== X-Gm-Message-State: AOJu0YxIfMUUTIxP42/RkSj65zMj7PaDnK6bfn+oo1Ww7wELwKbaV3BS OJYbe/TVRAEuyP9yMz8t8hWmY2HKG9cxukT+MbIvkYIriCyOXbnrmDbUMRoHh7iaVDbWuVwAUsD U X-Google-Smtp-Source: AGHT+IHOF77iF7EaylrXIngvOX9RR49S5wfq8GyAXuPo1u4OBEfHeS9NVG5zfXOzCO+I7oNRI+xagg== X-Received: by 2002:a17:902:ccc9:b0:20c:8dff:b4ed with SMTP id d9443c01a7336-2126fb34cabmr23346395ad.16.1732111051283; Wed, 20 Nov 2024 05:57:31 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:30 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 13/31] virglrenderer: Add patch to fix -int-conversion build issue Date: Wed, 20 Nov 2024 05:56:45 -0800 Message-Id: <37b9b21db6aae90ff16a808a20eed52f82575e0e.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207437 From: Purushottam Choudhary Fix int conversion related error during compilation as some of the platforms where EGLNativeDisplayType is an int instead of a pointer with GCC-14. Signed-off-by: Purushottam Choudhary Signed-off-by: Richard Purdie (cherry picked from commit f71f4936a273262343e34f278e6cfcc1e419aea3) Signed-off-by: Steve Sakoman --- ...nversion-fatal-build-error-with-GCC-.patch | 41 +++++++++++++++++++ .../virglrenderer/virglrenderer_1.0.1.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch new file mode 100644 index 0000000000..9c49ee512a --- /dev/null +++ b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch @@ -0,0 +1,41 @@ +From 464deabe4d1bfce6b8f414ab0945d9a62b66ddd4 Mon Sep 17 00:00:00 2001 +From: Purushottam Choudhary +Date: Tue, 8 Oct 2024 11:47:21 +0530 +Subject: [PATCH] vrend: Fix int-conversion fatal build error with GCC-14 + +Getting below error int conversion during compilation as one the +platforms where EGLNativeDisplayType is an int instead of a pointer. + +| ../git/src/vrend_winsys_egl.c: In function 'virgl_egl_init': +| ../git/src/vrend_winsys_egl.c:364:62: error: passing argument 2 of 'egl->funcs.epoxy_eglGetPlatformDisplay' makes pointer from +| 364 | (EGLNativeDisplayType)egl->gbm->device, NULL); +| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +| | | +| | int +| ../git/src/vrend_winsys_egl.c:364:62: note: expected 'void *' but argument is of type 'int' + +Upstream-Status: Backport [https://gitlab.freedesktop.org/virgl/virglrenderer/-/commit/464deabe4d1bfce6b8f414ab0945d9a62b66ddd4] + +Signed-off-by: Purushottam Choudhary +Part-of: +--- + + src/vrend_winsys_egl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/vrend_winsys_egl.c b/src/vrend_winsys_egl.c +index 9d9f410c..8750f6b2 100644 +--- a/src/vrend_winsys_egl.c ++++ b/src/vrend_winsys_egl.c +@@ -361,7 +361,7 @@ struct virgl_egl *virgl_egl_init(EGLNativeDisplayType display_id, bool surfacele + #ifdef ENABLE_GBM + else + egl->egl_display = egl->funcs.eglGetPlatformDisplay(EGL_PLATFORM_GBM_KHR, +- (EGLNativeDisplayType)egl->gbm->device, NULL); ++ (EGLNativeDisplayType*)egl->gbm->device, NULL); + #endif + } else { + #ifdef ENABLE_GBM +-- +2.34.1 + diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.1.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.1.bb index 0501b0c59c..87f25a3461 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.1.bb +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.1.bb @@ -12,6 +12,7 @@ DEPENDS = "libdrm libepoxy virtual/egl virtual/libgbm" SRCREV = "690680e5f0f952e22424fca1538c1b24457a0868" SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=main;protocol=https \ file://0001-meson.build-use-python3-directly-for-python.patch \ + file://0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch \ " S = "${WORKDIR}/git" From patchwork Wed Nov 20 13:56:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52788 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4963AD63940 for ; Wed, 20 Nov 2024 13:57:34 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.web11.13840.1732111053577507930 for ; Wed, 20 Nov 2024 05:57:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=jBndPQNb; spf=softfail (domain: sakoman.com, ip: 209.85.216.43, mailfrom: steve@sakoman.com) Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-2eade1cad26so214928a91.2 for ; Wed, 20 Nov 2024 05:57:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111053; x=1732715853; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cC56nw6kMVWH56xnm79/HVpJuEyzniQEHrzwswpKdUo=; b=jBndPQNb3uHcbwMYDF0p6DYkbMiGVUuaMOPx58CEr7YPZyo5lo7KtJ7kXih7GS6/Bb Xj2sZnl3Fr0WgkQeyjPC3URluFAVHFd/mz6fwHwKuFkZTOQhHF5FiUkAjeVESf1n079/ 3ES4QXCz8fGSevqmPcNLvJ9BWX8Vitn0CKj3UzZ5jIrUyvj9OwaRe88bV2yB6iEgKWWM bFY6Pwt4sU+OVd/9Y/a+Wbwbn2pBEENU4xe3f8b6bHSMKnTLY9bVqlqiWaGrb9a27I1M FHVAMK8M3PBCgCRJvPmRlL96p/s+ZoyGZFBtfxlP0zBxnD1gQ3kxmokCmjGbiaBLsWTj nJFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111053; x=1732715853; 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=cC56nw6kMVWH56xnm79/HVpJuEyzniQEHrzwswpKdUo=; b=SohQWV9K4YD3PsHUj2HPF9FTshInPdf/3spcngs19mXdulYV+Um0ZGgO+kE9mp4W+s smBedGHtdtCcvaf9oj8JmxNS+gcT3Tg/CIRnRhFm+lnmw7uZ5w8rVRVQTlhZdRsZjKN1 BCopgcrQCTBqofeT6k4xc4kADM/9i1wk1SbNeiJbxOOIwPICdrTxI8iZtdO2GRIs0YCy loSgKMxSvT/WpOicPKqs+WsIfO0eNh1439oQiPR8TK6yQjs4BHMCNL11tWXAWHb/cVma 1UNBOcvI9nfY+tsD5F5exN/8k/tu6PZiO5Iz16HYtgmdOht5/D+AnT3hAS0OdsU+H9MN j5mA== X-Gm-Message-State: AOJu0Yx4KDB7hJzNghG7eNWuGgxPPHfaVswvgJg2TRQGDq0ORagd9IiR uZ8EvQ08Lo4kZdknHMk5KXLNuE4LzATur0G3uZC7SVE+MKa8bmbakgh8tq6raJG/F9vWNrRaU4d W X-Google-Smtp-Source: AGHT+IFSPhX9ntmvRqxAf1UYBXKB4ukWpxp0OcnuWvlpDMjXywdI68VVB5MR+ZHTdzCZRWUqMTE00Q== X-Received: by 2002:a17:90b:2d0b:b0:2ea:8c5c:ff63 with SMTP id 98e67ed59e1d1-2eaca7cecc2mr3304907a91.29.1732111052792; Wed, 20 Nov 2024 05:57:32 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:32 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 14/31] oeqa/runtime/ssh: Rework ssh timeout Date: Wed, 20 Nov 2024 05:56:46 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207438 From: Richard Purdie After the changes to improve this test, we keep seeing image testing ssh failures, particularly on mips. It looks like part of the problem is that on a loaded system, 5s is too short for mips to reliably establish an ssh connection. I've seen logs where it keeps timing out and fails to work, then the debug code successfully uses ssh later after everything else fails. Change the timings/retries to give slow platforms enough time to respond. Signed-off-by: Richard Purdie (cherry picked from commit ba64ccf3ad6e40461219b72d60eb0fe5cb38fddd) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/runtime/cases/ssh.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/ssh.py b/meta/lib/oeqa/runtime/cases/ssh.py index b86428002f..f5b76edff4 100644 --- a/meta/lib/oeqa/runtime/cases/ssh.py +++ b/meta/lib/oeqa/runtime/cases/ssh.py @@ -16,7 +16,7 @@ class SSHTest(OERuntimeTestCase): @OETestDepends(['ping.PingTest.test_ping']) @OEHasPackage(['dropbear', 'openssh-sshd']) def test_ssh(self): - for i in range(20): + for i in range(5): status, output = self.target.run("uname -a", timeout=5) if status == 0: break @@ -29,7 +29,7 @@ class SSHTest(OERuntimeTestCase): # give it time for the port to open. # We sometimes see -15 (SIGTERM) on slow emulation machines too, likely # from boot/init not being 100% complete, retry for these too. - time.sleep(5) + time.sleep(30) continue else: self.fail("uname failed with \"%s\" (exit code %s)" % (output, status)) From patchwork Wed Nov 20 13:56:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52790 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70F45D6394F for ; Wed, 20 Nov 2024 13:57:44 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web10.13944.1732111054942894369 for ; Wed, 20 Nov 2024 05:57:35 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=qtBR3AV0; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-21116b187c4so32910015ad.3 for ; Wed, 20 Nov 2024 05:57:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111054; x=1732715854; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=NC6ZejAYjq4zzs89Ie3/1zeIkqzDxLx+DF3EOIoe5U8=; b=qtBR3AV0XbO2g0uPGEu2s3bnJlRYjsfmT71+GIm/+kWSFHurAZJx5lPgsGWSCr5+yM jpydXSXrk93/qDNSbP8O6cRaszSb/n47ssOV3JxgiDHqrgrNDvNl9oBp9cemvbr/NzGs fkfzpydl4g8es4M16b9xJ1YHliuSbXce9dVC7tV0dE2FuZV4ETi82hDY9Ka1m5gTCZWq kR2pbZ9T3tfkYoA22eTX62WBGKOwmSgpkckjhH9rmiAtVkxxXDtz8eimVUX87be2DFoF Bl3Xp6FxItx6iaLBsaP2H1FrjYIcNSD3nkIXSvXE4xu1zH6SykbLs42a3HB2iKGY5mqD JHww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111054; x=1732715854; 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=NC6ZejAYjq4zzs89Ie3/1zeIkqzDxLx+DF3EOIoe5U8=; b=uC0BpvFAli8ZMnIpEnGYPgFt5VZayMvNe1W74k2vvnYdNMmthkBpJ5hsD2/tD1VpCn i2AyW27nK88J9JN509U38hrJLegyq2AJQoewDzGzLZCNImD8S2Wa59ZXswMYuPP6iU27 swZvA8pkkpijhpmUflqti+czMI+FxNcYLoOvmYXyOQ2g45VqMi5JUqx3cyAD5tW9DTcd IdfoyM/RW1ZLgkGBBlTgOJxp4QST+9F2Zyla4hczSfnZ5rmq/PuRmsORuxGx79aOLMsT 4kZfxt8uymFI6ogY84xaBZNtdpZGn0Et8+Hbyxsb+w9irdWjzbYNaQ5kexbtimBqoozN 81rg== X-Gm-Message-State: AOJu0YzXl55j1nc05ekayKmU27sLONRA/5QeUElfyEN+4eDEfGtcSbVa ywWVc7Nbps+QleQ/4fM2TtTvsdGL1Xkh9+w06dPMZwHOK+qEr8E4phslTnG4i8kL5ueszUVQwK5 d X-Google-Smtp-Source: AGHT+IHmn73358fXgP7phdR+tuMFVKeq0N7z/L7HM+Osa7z8U5CONNkgcb+WCyQQvbJzH94xmEylow== X-Received: by 2002:a17:902:e550:b0:20c:9ec9:9a77 with SMTP id d9443c01a7336-2126a4750abmr29300735ad.37.1732111054060; Wed, 20 Nov 2024 05:57:34 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:33 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 15/31] oeqa/runtime/ssh: Fix incorrect timeout fix Date: Wed, 20 Nov 2024 05:56:47 -0800 Message-Id: <29fa3c132c5c1fdb2352a175b3c882472fea11a8.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207439 From: Richard Purdie I'd meant to change the command timeout in the previous change, fix the correct one. Signed-off-by: Richard Purdie (cherry picked from commit bb991988cb23be2c8947171726ada321f27e6eed) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/runtime/cases/ssh.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/ssh.py b/meta/lib/oeqa/runtime/cases/ssh.py index f5b76edff4..89d64430e5 100644 --- a/meta/lib/oeqa/runtime/cases/ssh.py +++ b/meta/lib/oeqa/runtime/cases/ssh.py @@ -17,7 +17,7 @@ class SSHTest(OERuntimeTestCase): @OEHasPackage(['dropbear', 'openssh-sshd']) def test_ssh(self): for i in range(5): - status, output = self.target.run("uname -a", timeout=5) + status, output = self.target.run("uname -a", timeout=30) if status == 0: break elif status == 255 or status == -signal.SIGTERM: @@ -29,7 +29,7 @@ class SSHTest(OERuntimeTestCase): # give it time for the port to open. # We sometimes see -15 (SIGTERM) on slow emulation machines too, likely # from boot/init not being 100% complete, retry for these too. - time.sleep(30) + time.sleep(5) continue else: self.fail("uname failed with \"%s\" (exit code %s)" % (output, status)) From patchwork Wed Nov 20 13:56:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52792 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 808DBD63954 for ; Wed, 20 Nov 2024 13:57:44 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web11.13845.1732111056983256422 for ; Wed, 20 Nov 2024 05:57:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=htAmb7wE; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-20c803787abso7434835ad.0 for ; Wed, 20 Nov 2024 05:57:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111056; x=1732715856; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=C/9ISed6Dq7PhB8BCgyZJZMIPGaOQcl7C3628B3wTcg=; b=htAmb7wESQptlbjlZloyc/keAMoC5WIZNvMPTKAdCcGOMpl4x9z6N3025zV1ww5BVM 4w9EpWCxZzH19Bn0CJRPlBp0gOmLyjK7uis6vQrIAETXK5ieXUDfhmceM4V0IuX+wzzq HjSNL02m5ASVNRTPmD0RF1dNiXI2j1cNvkoIrdA7Vrtm9ov4bkSI71ZxGDSoKLBMS/j0 j9lXXE/lgTMOuWQtl0EwPh09qIIwA2s9/RoUaarxVFdawuMGEkx6NUPIFfEd3dhF9tTA HWtpzGs9LOc607e41TJARc/k412NEbEMIupcPLrGNxT5XLw3F6I8rT6LRHZSoP8bbtmA fUwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111056; x=1732715856; 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=C/9ISed6Dq7PhB8BCgyZJZMIPGaOQcl7C3628B3wTcg=; b=Gdeh6JghAT+UCaDhSWLIWKSSlZv/k/J8Ebk4DcAW/KwuXfcKc7eale/Gdwh4/db9ts 1VVstIwnGbGONZHYTw/tHucwrlJ5J1Ti8LPSDYmg4RT7RvK6u7Wrg78J0BbzwmGW+pc8 quNsXEivT89nZEZT4wQh6l+3I+7at+5C/2OvrBsjLBo0sitKxIB0IJ7189pgt0AmlFu4 9/A8liQOrQ7uGwKcZjdW8ejWbzqhIvXxaKpA9YldMh2e3/OzBxdFkJyEdKD1arpiABk8 2T4kiQpHnHWDhkE569xV4dgRtixQQOZbvuBP3CY6h1tokAsK85c06c8j9i0yF7vJ7AKl EEOw== X-Gm-Message-State: AOJu0YxwsoDQmqVKiFlGpeTjI3WIAcDn6zW/IO4lhiBzvFDhseuMMJ98 zuoXE5Uzy+KRZJA9vruqxLApo8AHlo0dgT6NIkT8omR3sz6jbrwK8AHMTh+CLLbAg0FpHa9Ms6b I X-Google-Smtp-Source: AGHT+IEZkVTZ8QHJYgbZhD2Zv4rBxTVhpm0b3SpjRjtOYlf4ikSxNar3SexsdPKx7/twvjYNcFotwg== X-Received: by 2002:a17:903:188:b0:205:5d71:561e with SMTP id d9443c01a7336-21269e8379amr49695225ad.26.1732111056279; Wed, 20 Nov 2024 05:57:36 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:35 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 16/31] cml1.bbclass: do_diffconfig: Don't override .config with .config.orig Date: Wed, 20 Nov 2024 05:56:48 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207440 From: Robert Yang Fixed: 1) $ bitbake virtual/kernel -cmenuconfig Do some changes and save the new config to default .config. 2) $ bitbake virtual/kernel -cdiffconfig The config fragment is dumped into ${WORKDIR}/fragment.cfg. But the .config which was saved by step #1 is overridden by .config.orig, so the changes will be lost if run 'bitbake virtual/kernel' And the following comment is for subprocess.call(), not for shutil.copy(), so move subprocess.call() to the correct location. # No need to check the exit code as we know it's going to be # non-zero, but that's what we expect. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie (cherry picked from commit 6cccf6b02f92dad514e65fd779ff659b19eb6be7) Signed-off-by: Steve Sakoman --- meta/classes-recipe/cml1.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/classes-recipe/cml1.bbclass b/meta/classes-recipe/cml1.bbclass index 8c207daec4..0bf171a668 100644 --- a/meta/classes-recipe/cml1.bbclass +++ b/meta/classes-recipe/cml1.bbclass @@ -93,10 +93,9 @@ python do_diffconfig() { if isdiff: statement = 'diff --unchanged-line-format= --old-line-format= --new-line-format="%L" ' + configorig + ' ' + config + '>' + fragment - subprocess.call(statement, shell=True) # No need to check the exit code as we know it's going to be # non-zero, but that's what we expect. - shutil.copy(configorig, config) + subprocess.call(statement, shell=True) bb.plain("Config fragment has been dumped into:\n %s" % fragment) else: From patchwork Wed Nov 20 13:56:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52795 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BD8DD63956 for ; Wed, 20 Nov 2024 13:57:44 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web11.13847.1732111058450311864 for ; Wed, 20 Nov 2024 05:57:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=mh1NrFrd; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2124a86f4cbso20468225ad.3 for ; Wed, 20 Nov 2024 05:57:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111058; x=1732715858; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=D4p8N/hsiYwHmbx8TgiAizmOPZSrkOuSl5pPkRX8juw=; b=mh1NrFrdK+WnTRV0Grf7sd+yVTO2nUcwtkercvEdHqRnPD24fZ4aBO/lvQsNQJAvVP s4ake5jlyz6KXilAWl5Ix7yBMf6jxc1sWZW+3q24lVWC6CiLmjeA6/xXP0PhuDIgQKvm /tWDU82B9pP2rqM3mJQRpBrkYe/k6/oTs0aBG44QYh+/KB9waGbeo9cX9yot9XF29wf+ qnkxJiLiZILD3DkHBnoLBDPOdk+x8me562UgtM60+FspbwQ/ZxiD0Cu62Ntpvefk6a5c a6EcHGoDYDiMAzOSyzVppr/kwA3cj6FgKsTafYg8MS7J/uoOWomBR7A4FZqG6U4oazi5 7YKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111058; x=1732715858; 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=D4p8N/hsiYwHmbx8TgiAizmOPZSrkOuSl5pPkRX8juw=; b=gkpOOuQmppzi9jOD1pKjZcV5fh4bl5SDs7pZhqv85WZ09QKwvOJiK3y3slVaGfvh3Y GNZ94POw7nVAEYWH0Awekt8PPAxQeeSvV2SpvqgWm+704+t1h7RHq/anVbOQNPXEIUUp SgCBVyKOO2q0dKVnADVuXEmAu8mfaBB0yFkSJ4PpVQ9Atex9cI6hwo3Xt81YdPnIoKuI kYsqJ0/sX3L88RCwgZ92l2hxn9p3vimq8ZMTlpoAg5cIymQHB6+3233ejF7ukO1vqONf eHo0A7Ra58YGrELNy3I7mjcn45ZvfRp4ZnFosDCC0DgdJ36s+2PED8Bnv2wBbNPhd8Bw iVnw== X-Gm-Message-State: AOJu0Ywi3PnNyKR7XqR6IZL9Js0fGfKoAUxGAPFo3rrceKR5KYjJ8mn8 /HxQAcOSP+eGjscvhS9dxXHxTjysk7wAwTOcsKcEMbUBZAHQFQzEDAwbhBY0kXxUF3/2ZqG+0mT Y X-Google-Smtp-Source: AGHT+IFxCzxVSOOWoodH/owbQF7zOYCjzx7doNJK+TwkbbvOCL7gL/0ZfQgpoXdgUgsg9NUQbDqRBw== X-Received: by 2002:a17:902:fc85:b0:212:46c2:632e with SMTP id d9443c01a7336-2126a35328fmr40284045ad.15.1732111057737; Wed, 20 Nov 2024 05:57:37 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:37 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 17/31] package_rpm: Check if file exists before open() Date: Wed, 20 Nov 2024 05:56:49 -0800 Message-Id: <71512c028ac7b214c5dd6932aee9c5c6a9381e4f.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207441 From: Pavel Zhukov Exception handler tries to read() /etc/passwd file in sysroot and if file doesn't exist for any reason then it raises FileNotFoundError exception which mask the original source of the problem and makes debugging of the issue more difficult. Fixes: Exception: FileNotFoundError: [Errno 2] No such file or directory: '/codebuild/output/src1899304708/src/build/tmp-container/work/core2-64-oe-linux/emqx-bin/4.3.12/recipe-sysroot/etc/passwd' Signed-off-by: Pavel Zhukov Signed-off-by: Richard Purdie (cherry picked from commit 4ad9a0e0b11eb7bc5a3dd45fc8945e094ea949e9) Signed-off-by: Steve Sakoman --- meta/classes-global/package_rpm.bbclass | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 474d2491eb..ddc4bf3a6a 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -201,14 +201,22 @@ python write_specfile () { try: owner = pwd.getpwuid(stat_f.st_uid).pw_name except Exception as e: - bb.error("Content of /etc/passwd in sysroot:\n{}".format( - open(d.getVar("RECIPE_SYSROOT") +"/etc/passwd").read())) + filename = d.getVar('RECIPE_SYSROOT') + '/etc/passwd' + if os.path.exists(filename): + bb.error("Content of /etc/passwd in sysroot:\n{}".format( + open(filename).read())) + else: + bb.error("File {} doesn't exist in sysroot!".format(filename)) raise e try: group = grp.getgrgid(stat_f.st_gid).gr_name except Exception as e: - bb.error("Content of /etc/group in sysroot:\n{}".format( - open(d.getVar("RECIPE_SYSROOT") +"/etc/group").read())) + filename = d.getVar("RECIPE_SYSROOT") +"/etc/group" + if os.path.exists(filename): + bb.error("Content of /etc/group in sysroot:\n{}".format( + open(filename).read())) + else: + bb.error("File {} doesn't exists in sysroot!".format(filename)) raise e return "%attr({:o},{},{}) ".format(mode, owner, group) From patchwork Wed Nov 20 13:56:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52794 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D1BBD63953 for ; Wed, 20 Nov 2024 13:57:44 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web10.13947.1732111059956686276 for ; Wed, 20 Nov 2024 05:57:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=N2cJcT6e; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-21269c8df64so10618595ad.2 for ; Wed, 20 Nov 2024 05:57:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111059; x=1732715859; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ZR9szJTYHAA+5hHVaAaYJBZWXd/eZxs14F4rhxsofXQ=; b=N2cJcT6eTwbEX4+tVv46pj40osu2ENxyjT9mXwufzZ+nwFzWKDg3/my397YN3/ue8L sVqAcWx7FlBIUjbnNVs1++kI8rw1Q0lREdf85buw14/nOwMVuS0ZCzu/AkCG+3iF9JZF Ix5S4JeXcUFkN/6CMwI/8MeUooSMBOrNDp+nOePHtasgc/J5DoKhSbmx3HIk3yKH3gQV 9rS5KyPdI2AFfAF3Z9OpK6K6DlAOOU5SKUzWZiSCouXW/Zs82CZPLHQMI6Jg5srPPyhC R30WV4kFYel6PgsMKuuDuwfPymZ1065BuFKpTC88/8pUHs0cidCAK9A80SQV4QPVjxYK +H9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111059; x=1732715859; 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=ZR9szJTYHAA+5hHVaAaYJBZWXd/eZxs14F4rhxsofXQ=; b=JAY1KMhPk3dKMR0i6WXm0+7XCjDnUMXM/nugzh95FMfOSk8wE1wcOVEuPYuGum4ojJ mUJ4fGqikxwF0jo1dixlEn7Ivg9+WiVWtPG8xMs3o2Y0seSwDaaAaTH9Hx2SE8/Upafp m3ivHnEtdHCOIDicjYaJQVoqJ5/6F5uUSgFRrv9fl38qrztPyuGiH0Isg9zIsABtAYSy GoLbqrsf4p/WPWEszcgLUoe0DTKcGPTEg+ERKNQkibhg8qWMe+P0X918hlqkOeI6HFGW adTkZr5sG5UvX81tuIWqvWiVZfjtIZmW0kvIh0o1mjQKlPc0FKwwUU8yRqcOSdXqlKcr PUqQ== X-Gm-Message-State: AOJu0Yw+4gQMsVFyx5CkIXzsvgKLhd75iRNXQOoWintnryUDR0JP5h4n PWKaDrflaAIgrGT1Z4Cf6ZDmNKs0KAj8Ao/isQU49EQbKmzIiqNN/q/h0Q8NAFcU6xKyv/VjlOB Y X-Google-Smtp-Source: AGHT+IFbvDM9ZUcMFGzkduUZ7Y96uCylISxYxq3F16H/r4NYP6yqo6nNB42McDf+WVgW+36QfcQd0w== X-Received: by 2002:a17:903:230d:b0:211:ee35:830c with SMTP id d9443c01a7336-2126a34d311mr37551685ad.15.1732111059192; Wed, 20 Nov 2024 05:57:39 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:38 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 18/31] lib/oe/package-manager: skip processing installed-pkgs with empty globs Date: Wed, 20 Nov 2024 05:56:50 -0800 Message-Id: <0f4100e40b97d2b349bcf261f6a0ee489d916629.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207442 From: Claus Stovgaard We can skip processing the installed-pkgs file if globs is empty. This is the case if self.d.getVar for IMAGE_INSTALL_COMPLEMENTARY returns an empty string. If globs is an empty string the result from processing with empty glob in oe-pkgdata-util will always be 0 packages to install. Instead of return early on this we just skip and still generate the locale archive if needed. Signed-off-by: Claus Stovgaard Signed-off-by: Richard Purdie (cherry picked from commit 160c45c83d5addf01e4834cf896af871bd6fca7f) Signed-off-by: Steve Sakoman --- meta/lib/oe/package_manager/__init__.py | 76 ++++++++++++------------- 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/meta/lib/oe/package_manager/__init__.py b/meta/lib/oe/package_manager/__init__.py index d3b2317894..2100a97c12 100644 --- a/meta/lib/oe/package_manager/__init__.py +++ b/meta/lib/oe/package_manager/__init__.py @@ -365,45 +365,43 @@ class PackageManager(object, metaclass=ABCMeta): for complementary_linguas in (self.d.getVar('IMAGE_LINGUAS_COMPLEMENTARY') or "").split(): globs += (" " + complementary_linguas) % lang - if globs is None: - return - - # we need to write the list of installed packages to a file because the - # oe-pkgdata-util reads it from a file - with tempfile.NamedTemporaryFile(mode="w+", prefix="installed-pkgs") as installed_pkgs: - pkgs = self.list_installed() - - provided_pkgs = set() - for pkg in pkgs.values(): - provided_pkgs |= set(pkg.get('provs', [])) - - output = oe.utils.format_pkg_list(pkgs, "arch") - installed_pkgs.write(output) - installed_pkgs.flush() - - cmd = ["oe-pkgdata-util", - "-p", self.d.getVar('PKGDATA_DIR'), "glob", installed_pkgs.name, - globs] - exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY') - if exclude: - cmd.extend(['--exclude=' + '|'.join(exclude.split())]) - try: - bb.note('Running %s' % cmd) - proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = proc.communicate() - if stderr: bb.note(stderr.decode("utf-8")) - complementary_pkgs = stdout.decode("utf-8") - complementary_pkgs = set(complementary_pkgs.split()) - skip_pkgs = sorted(complementary_pkgs & provided_pkgs) - install_pkgs = sorted(complementary_pkgs - provided_pkgs) - bb.note("Installing complementary packages ... %s (skipped already provided packages %s)" % ( - ' '.join(install_pkgs), - ' '.join(skip_pkgs))) - self.install(install_pkgs, hard_depends_only=True) - except subprocess.CalledProcessError as e: - bb.fatal("Could not compute complementary packages list. Command " - "'%s' returned %d:\n%s" % - (' '.join(cmd), e.returncode, e.output.decode("utf-8"))) + if globs: + # we need to write the list of installed packages to a file because the + # oe-pkgdata-util reads it from a file + with tempfile.NamedTemporaryFile(mode="w+", prefix="installed-pkgs") as installed_pkgs: + pkgs = self.list_installed() + + provided_pkgs = set() + for pkg in pkgs.values(): + provided_pkgs |= set(pkg.get('provs', [])) + + output = oe.utils.format_pkg_list(pkgs, "arch") + installed_pkgs.write(output) + installed_pkgs.flush() + + cmd = ["oe-pkgdata-util", + "-p", self.d.getVar('PKGDATA_DIR'), "glob", installed_pkgs.name, + globs] + exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY') + if exclude: + cmd.extend(['--exclude=' + '|'.join(exclude.split())]) + try: + bb.note('Running %s' % cmd) + proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = proc.communicate() + if stderr: bb.note(stderr.decode("utf-8")) + complementary_pkgs = stdout.decode("utf-8") + complementary_pkgs = set(complementary_pkgs.split()) + skip_pkgs = sorted(complementary_pkgs & provided_pkgs) + install_pkgs = sorted(complementary_pkgs - provided_pkgs) + bb.note("Installing complementary packages ... %s (skipped already provided packages %s)" % ( + ' '.join(install_pkgs), + ' '.join(skip_pkgs))) + self.install(install_pkgs, hard_depends_only=True) + except subprocess.CalledProcessError as e: + bb.fatal("Could not compute complementary packages list. Command " + "'%s' returned %d:\n%s" % + (' '.join(cmd), e.returncode, e.output.decode("utf-8"))) if self.d.getVar('IMAGE_LOCALES_ARCHIVE') == '1': target_arch = self.d.getVar('TARGET_ARCH') From patchwork Wed Nov 20 13:56:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52791 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70D13D6394E for ; Wed, 20 Nov 2024 13:57:44 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web11.13848.1732111062172289161 for ; Wed, 20 Nov 2024 05:57:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=dAv8HkY5; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-21210eaa803so37124855ad.2 for ; Wed, 20 Nov 2024 05:57:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111061; x=1732715861; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=2frCu3S0iPIxXvlmiloiv1PEdz3W+5T/tBYyTavbGb8=; b=dAv8HkY5JEnQ1vdF+EbdlDJBVhKM3K5r2cWcYxkxUyZIyfRd3YuxmZHM6mjmkX0PRL NsUGpBKwB/naPuvPgjKr22Pug+nBOCJYtjPkVwaejfTlhaIJhYMdSBRBXlXRj4HYeIAA 3/q5279Nxpc6r+f4V41FDDLEYsCUIx1HLs/AUTDkuH0j0UIYLnHQfYm8fNJIA/CT6WeZ UHbTiE5wgmlyxARtfDReNa8Os3eQHxCdEJOO13UaoQBgY/CvPdfLmIYLtGqVyd+E4mmv dhxRh9HQlsipX8rEYkhK/bo9idYHx9mPOgveUtDdHcvC6w+sNgN6DhmPBAD92ybDfGkB M1Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111061; x=1732715861; 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=2frCu3S0iPIxXvlmiloiv1PEdz3W+5T/tBYyTavbGb8=; b=axFJcyIsFVl0G9xVTMhuYxC0KEZ39yeOaf/U1ymFAj3TnrxDyl70rNI9Qgm5RBV6Ah 0igq8RlJxvexWMrG4njLmn75RLnNCjcYPWxO1N98I5/PeAK6qqjxljJ0/JdSJGUvjw5N XhrVjRevxfQan+77dLngvyg0+46Pvi7kPJhFq2AMBhtmjaytumjVtbhY5C50vuOq/g7r yk+APNW3jyheG1KdwcqujziG7Vlzdfc54hYLSCqdOO/qv1spb4kNnvEgXH5dgpLZHhG5 7qNGL0Bh129T1hK9p7CwWdD5mSngmV6fh4YlwOQS5cDiSzJL0aiKYbHWPuXty31XK/d6 8Yjg== X-Gm-Message-State: AOJu0YyFF9cgQZEgTstisnRFIEQM7KtBM0yKvX0jpcOHr7kdH4iFCrgf Tnih/nqBzor2IEYUIPMuKHGcXGa0AVPn6utuObd/Zdy6Hh3VoaN4Xyqp1YvCMusDiFhjn3WsCOw I X-Google-Smtp-Source: AGHT+IGmRlQEwZ0alwBarxyMpU8Lry7gSHLDZe30X7FsL0vKKiAAoBJKxE0ozZuI4TUbBE/k7y0yiA== X-Received: by 2002:a17:903:41c6:b0:20b:ce88:1b9d with SMTP id d9443c01a7336-2126a486965mr28983215ad.45.1732111061435; Wed, 20 Nov 2024 05:57:41 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:41 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 19/31] qemurunner: Clean up serial_lock handling Date: Wed, 20 Nov 2024 05:56:51 -0800 Message-Id: <72b930a2482d35a533755de35983d933db97b1a8.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207443 From: Richard Purdie Avoid "RuntimeError: release unlocked lock" since the lock shouldn't be locked even in the error path. Add a try/finally path to ensure this. Signed-off-by: Richard Purdie (cherry picked from commit b0732ee009ca47580d1d2ad75334f4aa50e6efd5) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/utils/qemurunner.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index cda43aad8c..f1c2d2b5c9 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -519,7 +519,6 @@ class QemuRunner: except Exception as e: self.logger.warning('Extra log data exception %s' % repr(e)) data = None - self.thread.serial_lock.release() return False with self.thread.serial_lock: @@ -822,10 +821,12 @@ class LoggingThread(threading.Thread): self.logfunc(data, ".stdout") elif self.serialsock and self.serialsock.fileno() == fd: if self.serial_lock.acquire(blocking=False): - data = self.recv(1024, self.serialsock) - self.logger.debug("Data received serial thread %s" % data.decode('utf-8', 'replace')) - self.logfunc(data, ".2") - self.serial_lock.release() + try: + data = self.recv(1024, self.serialsock) + self.logger.debug("Data received serial thread %s" % data.decode('utf-8', 'replace')) + self.logfunc(data, ".2") + finally: + self.serial_lock.release() else: serial_registered = False poll.unregister(self.serialsock.fileno()) From patchwork Wed Nov 20 13:56:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52793 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70705D6394D for ; Wed, 20 Nov 2024 13:57:44 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web10.13948.1732111064143486113 for ; Wed, 20 Nov 2024 05:57:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=w/AX2JSH; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-21207f0d949so41548525ad.2 for ; Wed, 20 Nov 2024 05:57:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111063; x=1732715863; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=pLmVny/5IVPMXeFYM2mKqbvCDgKKZ8u5FlWGG2z2VKQ=; b=w/AX2JSHLdY7nNS9u7IaiYKxnoi+hf81Lo0n/H3lfkij2kF+3RQnDmoI5ytiShE3lN 95cbXXwrTYr9kV4KGWAOBpWoBX40R5oHAbEXoHlP8JhrFfIs5y28zm1Gv93/nyvicCPk 9AwnYYC3ZFBEpA1zBUSKSN7bqdnkfPrmed33MC/KfTgRhYatvxd2xudf6bPWRdVHPXDe yOW2TOgXz4rRdVEVIas5boMS7Jc6YE+tVwYF1z9xR6VQQNFWFD0r+wdRn6DFMLyEpmR1 FS0vlOah8gX/IdJ19cSkvmu0K048BgQtJoK0CpjIEyLMG/nBQaKPm9O2m+sCDwlrHzRT nOBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111063; x=1732715863; 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=pLmVny/5IVPMXeFYM2mKqbvCDgKKZ8u5FlWGG2z2VKQ=; b=J+EefwocqFPSdgkMLWXdIiXtUkgiSnxawlO7FuBza9vCvhTuXAxMN8wXF6Pj+xHo5h FhKUvEf2dwg5nL56i4KCo7W5z3uUiG56MITu2mvBODtmCUgNN/N0VN1/0uOfxBChbpb0 5vG1V/zD24tCYBlSBUkHO1aavL4fuk46tggpOtM0Y0j0eLbx0PdQpFhEcOqzez+d2T9p EqiIDoGA4PF/FJ7lwcrfh5Fsk7PhprH8qKJOXPqxmL73Rg8uSIEQvNfvZ+XhVScAHv4G +fGEVlMdSVz60sQgw/ts7rqI0s87OlutunTJD127inyBmIujQKNPvHCl+0yphGIIaWuX mHMQ== X-Gm-Message-State: AOJu0YzA79UybGENX+vebVbmnz2g69yDutfoEmfSV9kDfu+Epsv8RvJJ m5bX3LKwZspV0Gf8uYx4/gxOS/+WSUt2Yya4/BU2H2rdviz4eMW3ixSLGcCuDcv8bO37KbNXp2K F X-Google-Smtp-Source: AGHT+IHn3bqf7wg6JTb1dzkksd2THEtvNOONBLYTQXbm9fvGm890+gsCsHIGAXuL3CyGM/Rblt74AQ== X-Received: by 2002:a17:902:e951:b0:20e:5777:1b81 with SMTP id d9443c01a7336-2127045e494mr21414215ad.50.1732111063424; Wed, 20 Nov 2024 05:57:43 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:43 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 20/31] ovmf-native: remove .pyc files from install Date: Wed, 20 Nov 2024 05:56:52 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207444 From: Mikko Rapeli They break builds which share sstate files on different machines and paths: ERROR: ovmf-edk2-stable202408-r0 do_prepare_recipe_sysroot: 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:extend_recipe_sysroot(d) 0003: File: '/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/meta/classes-global/staging.bbclass', lineno: 624, function: extend_recipe_sysroot 0620: 0621: # Handle deferred binfiles 0622: for l in binfiles: 0623: (targetdir, dest) = binfiles[l] *** 0624: staging_copyfile(l, targetdir, dest, postinsts, seendirs) 0625: 0626: bb.note("Installed into sysroot: %s" % str(msg_adding)) 0627: bb.note("Skipping as already exists in sysroot: %s" % str(msg_exists)) 0628: File: '/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/meta/classes-global/staging.bbclass', lineno: 165, function: staging_copyfile 0161: os.symlink(linkto, dest) 0162: #bb.warn(c) 0163: else: 0164: try: *** 0165: os.link(c, dest) 0166: except OSError as err: 0167: if err.errno == errno.EXDEV: 0168: bb.utils.copyfile(c, dest) 0169: else: Exception: FileExistsError: [Errno 17] File exists: '/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-667282/tmp/sysroots-components/x86_64/ovmf-native/usr/bin/edk2_basetools/BaseTools/Source/Python/AutoGen/__pycache__/WorkspaceAutoGen.cpython-312.pyc' -> '/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-667282/tmp/work/core2-64-poky-linux/ovmf/edk2-stable202408/recipe-sysroot-native/usr/bin/edk2_basetools/BaseTools/Source/Python/AutoGen/__pycache__/WorkspaceAutoGen.cpython-312.pyc' Signed-off-by: Mikko Rapeli Signed-off-by: Richard Purdie (cherry picked from commit facd9e17fa53e2fb3a828b3f179cfb659be75d37) Signed-off-by: Steve Sakoman --- meta/recipes-core/ovmf/ovmf_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index 085574c0cb..c86fc72d3e 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb @@ -223,6 +223,7 @@ do_compile:class-target() { do_install:class-native() { install -d ${D}/${bindir}/edk2_basetools + find ${S}/BaseTools -name \*.pyc -exec rm -rf \{\} \; cp -r ${S}/BaseTools ${D}/${bindir}/${EDK_TOOLS_DIR} } From patchwork Wed Nov 20 13:56:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52800 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 865BDD63955 for ; Wed, 20 Nov 2024 13:57:54 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web10.13950.1732111067120654190 for ; Wed, 20 Nov 2024 05:57:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=luTnuzRo; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-21145812538so15681325ad.0 for ; Wed, 20 Nov 2024 05:57:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111066; x=1732715866; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=f3Gq1LhsgUhKgwT1rSMVnKgKhlzopqeC9HWNPnfFjEs=; b=luTnuzRoac9Z0OqrKn5bEmTQGb8ldJNqM3IvvAb5j9B/mZXd8ediJdQ3k3V4qbDuX8 2bPkLmQKF2TM2t3dEiAjB7WMhPJ0aZ3AFcsQ5EB/ltOAvjrEflc0LzXLD+AuS3R4MBeT vdqdIIJdqhI8oEw7o8RIq1eNadxS3xX1ZQHfg6cmKEnQtwXlTJLHS00RDsY1nE7NzEs4 QYaIZ6ZRBIE0EhPguBvKMis4dzuj3zdEY0r3GUTWvJ3c8wHo1mtLyE43fDHUvJiniERg LQUcfMyPsvsIce7y8NFWkiHIsUuXgPPmNSnkP8Z4eRKqilyrlD4+iC9JJvnhZRYBu1lb bCcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111066; x=1732715866; 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=f3Gq1LhsgUhKgwT1rSMVnKgKhlzopqeC9HWNPnfFjEs=; b=WfMEitS1ruZu7q6kJJtinGdOvJA5bZ/AJjqwjaWa9JKAA0uixJsBG/Mu8lESBuuEbS WIex9ADVmmpv2wtyBrgCI0uE59Sj36mF4TO6fxcFTIk5l5yO3fYkTWzRwmyq7KIAmXPK 2prhOl6EmntcCkAiiEX07Rp3EF+Yo2y8+lWyd8wKA/ALkP2bcyu7RUcx8uT1kxDbEHJG r3Or4QZCCuu8omSfm3D0JFPaORDD+ITfy/Fhmb+hV7t1PjT/fkM0fcyOc+aqPeOpVTdT Xh1U8dNMZYNsGdP6GMVoLFiPONtq58OE26XJ1tHjWmcNJFMv7q0JuFOGXHPRCjdgShX/ oCSQ== X-Gm-Message-State: AOJu0YyIC9wK1Zj4Brn4voYEkxcPF2uoCl69BHbEEXdu7q6c52BD57To NOfRCxecPjVNlyNV1Yqde7mYsBpC9K7a7oHoqR0LbD/7nXDTawS4zdDLlI7mp3R/Cv9nb+CgkkJ I X-Google-Smtp-Source: AGHT+IFYZnti5YXN72BA2f6L5JE1F78z3AKFPH9UYfObLxwUBjrc7EFamd7jAWY9TqAT+4Ix7s+u6Q== X-Received: by 2002:a17:902:e5c6:b0:20c:9936:f0ab with SMTP id d9443c01a7336-2126c37bf16mr30152455ad.47.1732111066401; Wed, 20 Nov 2024 05:57:46 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:46 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 21/31] gcc-source: Fix racing on building gcc-source-14.2.0 and lib32-gcc-source-14.2.0 Date: Wed, 20 Nov 2024 05:56:53 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207445 From: Hongxu Jia While enabling multilib, build gcc-source-14.2.0 and lib32-gcc-source-14.2.0 at the same time: $ MACHINE = "qemux86-64" $ require conf/multilib.conf $ MULTILIBS = "multilib:lib32" $ DEFAULTTUNE:virtclass-multilib-lib32 = "x86" $ bitbake gcc-source-14.2.0 lib32-gcc-source-14.2.0 ... $ cat tmp-glibc/work-shared/gcc-14.2.0-r0.vr2401/temp/log.task_order 20241012-064533.415426 do_recipe_qa (2688052): log.do_recipe_qa.2688052 20241012-064533.463783 do_recipe_qa (2688051): log.do_recipe_qa.2688051 20241012-064533.805164 do_fetch (2688257): log.do_fetch.2688257 20241012-064533.852955 do_fetch (2688256): log.do_fetch.2688256 20241012-064617.823714 do_unpack (2698542): log.do_unpack.2698542 20241012-064617.871730 do_unpack (2698541): log.do_unpack.2698541 ... There are two tasks for do_fetch, do_unpack and others, so there are race issues. Both of them have the same hardcode 'gcc' prefix in ${WORKDIR} and ${S}, explicitly disable lib32-gcc-source-14.2.0 for multilib Set gcc-source as BPN of gcc-source-14.2.0 Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie (cherry picked from commit 901c47877e0710af50639f688e0bfdb851b762b5) Signed-off-by: Steve Sakoman --- meta/conf/multilib.conf | 2 +- meta/recipes-devtools/gcc/gcc-source_14.2.bb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index 09546315b8..7bdfcd56aa 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf @@ -24,4 +24,4 @@ OPKG_ARGS:append = " --force-maintainer --force-overwrite" # These recipes don't need multilib variants, the ${BPN} PROVDES/RPROVDES # ${MLPREFIX}${BPN} -NON_MULTILIB_RECIPES = "grub grub-efi make-mod-scripts ovmf u-boot" +NON_MULTILIB_RECIPES = "grub grub-efi make-mod-scripts ovmf u-boot gcc-source" diff --git a/meta/recipes-devtools/gcc/gcc-source_14.2.bb b/meta/recipes-devtools/gcc/gcc-source_14.2.bb index b890fa33ea..be11fa2fcc 100644 --- a/meta/recipes-devtools/gcc/gcc-source_14.2.bb +++ b/meta/recipes-devtools/gcc/gcc-source_14.2.bb @@ -1,4 +1,5 @@ require recipes-devtools/gcc/gcc-${PV}.inc require recipes-devtools/gcc/gcc-source.inc +BPN = "gcc-source" EXCLUDE_FROM_WORLD = "1" From patchwork Wed Nov 20 13:56:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52798 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98BADD63958 for ; Wed, 20 Nov 2024 13:57:54 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web11.13856.1732111068644853460 for ; Wed, 20 Nov 2024 05:57:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=dJ9uRVtK; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-212583bd467so16345355ad.3 for ; Wed, 20 Nov 2024 05:57:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111068; x=1732715868; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=SLmXigqoI58DgK7XiIz0/VNXT9LZFROAqvxI19JHSb8=; b=dJ9uRVtKLucv+5qd1xTOFkh6CFvdZ7601uO08HcqCVJuAcrZZPCAeye1mFqebZmM7F v6S12EcbF1N+uWnXsbFxSvu6Iw4SU2S6JIkl0v7uODphzT8Gt6xWl36mLxocxS0wx885 MQWs5UDpIHmv2DFD5mz4NECy8cxL+bxyLkGtzLJA57M3gCkAuUxcYmWIAVMzMvZXOKZC Qhb55Mq1tQtkty6F70AJViQMjX4WAMIhZ1V6KoxdyL94IrccDfCR++Wwgu7KchaZbj83 pPpDoBrmkfBGxJZDKhAfVCMgEdRMYPSniLWZ11Gmnl4DoziUoUoh4R06pXoQ1Z583kix wtVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111068; x=1732715868; 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=SLmXigqoI58DgK7XiIz0/VNXT9LZFROAqvxI19JHSb8=; b=sd7/em//Njj9g/4Vvw8t9hRbPsG5nKCITlj/W6xvsLaA6EJgsilEFfNGwhbHtOxMXP E98gft59HxOcRBprKAimvCZsSfmv4EDaS9WK12sMD/Y1Xw3YKPQAERSkDkVwQLu6Vnp0 K6KgXbCZTVe1cojmDcyBcdIdX0/61TIcZ5swDQRn3LKFyuBh9JaYVHTC36VoJ5P91Dhi yizvubfg6/tFlLnooot86KfHemxmJ/9MyVJ1S3e08JnuhhS/JZGcXo0uH0wwwR1LwF+c YPpPGqR+SvHNgMNYaX8OZwPEXkq4LD+ttQW3cXrJxgig9Vw8rRwBjn75fXrwRjmCyXeT t79g== X-Gm-Message-State: AOJu0YyChnnCWnTIklR5Iy9Nf/2jEkhemtUF3I5wYjNqt2eT2oxNDh/e JeFH8CW82Nk8L9gcJRJj/x/DWmT/7ygpjjDKpUVwgOot30vSf8xloySTaA7twyVNKpKVGSpjY2b U X-Google-Smtp-Source: AGHT+IFwyOdQwh27lAZ9i8DZAW713+T069M/n6YyKC7vX4NxRlXceEzb5/inIjCOOGNOcW2gF1yW9w== X-Received: by 2002:a17:903:40ca:b0:212:349f:8413 with SMTP id d9443c01a7336-2126c0e412fmr28048215ad.21.1732111067973; Wed, 20 Nov 2024 05:57:47 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:47 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 22/31] tcl: skip io-13.6 test case Date: Wed, 20 Nov 2024 05:56:54 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207446 From: Ross Burton ---- Result was: {abcdefghj 01234} 0 ---- Result should have been (exact matching): {abcdefghj } 1 01234 0 ==== io-13.6 FAILED This test is documented as failing on slow machines, so just skip it. [ YOCTO #15407 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit f69183586655294c9aed6687cebe57767c2f3eb8) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/tcltk/tcl/run-ptest | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/tcltk/tcl/run-ptest b/meta/recipes-devtools/tcltk/tcl/run-ptest index a403a74bb6..c485e535c7 100644 --- a/meta/recipes-devtools/tcltk/tcl/run-ptest +++ b/meta/recipes-devtools/tcltk/tcl/run-ptest @@ -15,6 +15,8 @@ SKIP="$SKIP cmdMZ-6.6" SKIP="$SKIP exit-1.\*" # 15407 15421 SKIP="$SKIP \*io-46.1" +# io-13.6 explicitly says it can fail on slow/loaded machines +SKIP="$SKIP io-13.6" # 14825 SKIP="$SKIP socket-\* socket_inet-\*" From patchwork Wed Nov 20 13:56:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52799 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4F4DD6395A for ; Wed, 20 Nov 2024 13:57:54 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web10.13953.1732111070970606497 for ; Wed, 20 Nov 2024 05:57:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=B2Qr04Rn; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-21260209c68so6517055ad.0 for ; Wed, 20 Nov 2024 05:57:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111070; x=1732715870; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xR3XzQwId3B78T0KDvXSYIVDvrN6ffT3J6X+udF+pTA=; b=B2Qr04RnKu240ivlDCUkvZ0CsW/UTB59t2jM31noMYVk1EKTuSsOt4a0/SxnRZvPFD Q8PC/CIy/sZMhqmTN1tp/LE2+W5KU9UM2kgrhH4OUHzlqvxdOjR8PcpJWALFVs1le5KV qT6jFEPmNs9bZUeT78NmefcmMZhR4Wme0kzVqVlRNT3xqfFTxkwy44F4cVuTan0nBNtl G1ADiMS8IBLBjmvKRLHBFNctfx1G7z3U3Ejb1y/Q1uhPwXI1TLvb13B9fKJpfrwzkbdY 2NUZoRiQQJJ8iSJ7KZq7q1d9IehPHo/1tMx7nsEbVb6TiPlCZV2igfWGRI04cV86yBz+ v4BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111070; x=1732715870; 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=xR3XzQwId3B78T0KDvXSYIVDvrN6ffT3J6X+udF+pTA=; b=Fzob+J0kZP0E+FrFKzHDOvw5ybcKbr3hItzuwyRKQDB1QQcJrW/RSEW365Vw+ylsuz Fk4IDFGgWH1d+3mgpRvI5CrpltD3BlJEUfhgYcHR7OpaGf+BTckPvNznEvfEqrgknuSw YLlzDZ2TdwaBDR+TU+I6Z+x19i1gma5o+k7BVKk8Sk3BkOedo/DI1OMMi76P/M0AtYRF PSaJ6YzpgDlwDkj6BaamAGu1AL3y1CYxArpHFtlAE8dd+aSpTTADvAy8l74JSRoqyNpn P5zp9m9L6meWDfhqqRL5V+Wr/LsTsQKO59COh4gGdCzejVJY7NfHhYDTHqqtmO3ZaEAd zBVQ== X-Gm-Message-State: AOJu0Yxx1H0Q0jT5Gzwvg1Qs73OpNI+yucmCL9RtVSKdtIHiZKIswcx9 hR2CCQRaeE7LN/NpThwRNzvb8X4hnWC4DTHqRWmKQq/qYH3a34QSkPyo2XhP+zgPLj70yZJXjS0 K X-Google-Smtp-Source: AGHT+IHMOjjWrGXR9JNFQZuCLe2X/N0VeKAyHipi2QpWuE+BEpvt/hi3DhjdS2yqhE8OxI5Yk2/VCg== X-Received: by 2002:a17:902:db0b:b0:20c:7e99:3df2 with SMTP id d9443c01a7336-21269e68f3cmr46654645ad.23.1732111070250; Wed, 20 Nov 2024 05:57:50 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:49 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 23/31] groff: fix rare build race in hdtbl Date: Wed, 20 Nov 2024 05:56:55 -0800 Message-Id: <3dcc6fbc5fca38b14e61967bfdf92f8c29d95be1.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207447 From: Ross Burton It's possible to build the hdtbl examples before grn has been build: groff: error: couldn't exec grn: No such file or directory Backport a dependency fix from upstream. [ YOCTO #15610 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit d590a32423d05cefc4e7282f971f633b3fa0b941) Signed-off-by: Steve Sakoman --- ...l-Fix-Savannah-66316-missing-grn-dep.patch | 38 +++++++++++++++++++ meta/recipes-extended/groff/groff_1.23.0.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta/recipes-extended/groff/files/0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch diff --git a/meta/recipes-extended/groff/files/0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch b/meta/recipes-extended/groff/files/0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch new file mode 100644 index 0000000000..d9455af2ac --- /dev/null +++ b/meta/recipes-extended/groff/files/0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch @@ -0,0 +1,38 @@ +From 12169aa269341753d491a69e9adb86c58dca039a Mon Sep 17 00:00:00 2001 +From: "G. Branden Robinson" +Date: Thu, 10 Oct 2024 18:17:08 -0500 +Subject: [PATCH] [hdtbl]: Fix Savannah #66316 (missing `grn` dep). + +* hdtbl.am (HDTBLPROCESSEDEXAMPLEFILES): Declare dependency on `grn`; + because `-I` flags are used, it is dragged in even though not + explicitly needed. Resolves race against `grn`'s availability in the + build tree. + +Fixes . Thanks to Ross Burton for +the report. + +Upstream-Status: Backport +Signed-off-by: Ross Burton +--- + contrib/hdtbl/ChangeLog | 10 ++++++++++ + contrib/hdtbl/hdtbl.am | 3 +-- + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am +index b6c334c18..3c37174f2 100644 +--- a/contrib/hdtbl/hdtbl.am ++++ b/contrib/hdtbl/hdtbl.am +@@ -119,9 +119,8 @@ SUFFIXES += .roff .in .ps + && sed -e "s|[@]fontdir[@]|$(fontdir)|" \ + -e "s|[@]EGREP[@]|$(EGREP)|" $< >$@ + +- + $(HDTBLPROCESSEDEXAMPLEFILES): $(DOC_GNU_EPS) groff troff eqn pic tbl \ +- grops font/devps/stamp contrib/hdtbl/examples/common.roff ++ grops grn font/devps/stamp contrib/hdtbl/examples/common.roff + + uninstall_groffdirs: uninstall-hdtbl-hook + uninstall-hdtbl-hook: +-- +2.34.1 + diff --git a/meta/recipes-extended/groff/groff_1.23.0.bb b/meta/recipes-extended/groff/groff_1.23.0.bb index 0fc4f831d8..8a16321479 100644 --- a/meta/recipes-extended/groff/groff_1.23.0.bb +++ b/meta/recipes-extended/groff/groff_1.23.0.bb @@ -12,6 +12,7 @@ SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ file://0001-Make-manpages-mulitlib-identical.patch \ file://0001-build-Fix-Savannah-64681-webpage.ps-deps.patch \ file://0001-build-meintro_fr.ps-depends-on-tbl.patch \ + file://0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch \ " SRC_URI[sha256sum] = "6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13" From patchwork Wed Nov 20 13:56:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52797 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86596D63954 for ; Wed, 20 Nov 2024 13:57:54 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web10.13955.1732111072371727952 for ; Wed, 20 Nov 2024 05:57:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=yLD/q5cC; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-212008b0d6eso35993685ad.3 for ; Wed, 20 Nov 2024 05:57:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111072; x=1732715872; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9u0ic8R5f6HSwhRqqN77srjQ3/yUU5qavWcvx/VLnVE=; b=yLD/q5cCaO/qVpnhHK0780Faz4kQACbVwlN5ZrKV2fL1meKSlbwfYorBz3UbOJk1Fm RvmP87mneMthfA/iV3Z7rn0SrZEHTzy5QuF59RBqFEgwrvIKJffvkhxAceJjr9w2636p XXatYbhr9U4WGKLRpWNAgqClR+8GFj5n9UTDCjtP5mSm+c5lvFvpM30Y4LWHiGyS5Sbx DCgBQCzATsWtrSDYuodne+n5KdbF2GyKsCG27PkQyNajLB33xM5r2uZvp/4MWD5kWql0 D3gRv/YzvBJ3gfP0k92Dl7+fXRWhNoE3xv1ZnWiVsgdKZuDf480KbAx/naEiVOSr+bm4 fH3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111072; x=1732715872; 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=9u0ic8R5f6HSwhRqqN77srjQ3/yUU5qavWcvx/VLnVE=; b=TPrf+zMfKb7cSXLgQBVnhfYNEUX4DuJUwhEmxCo1qcWtcaMNpwW2ouLucHWWpa5/gI 0MYt9b1u+zWRl3YkKzg0kgYOR+y3AdMv1yhQlE5n5U+xo7QWWaaU8dMi5TZuux1MZkdN D9kn18Nx2jMMKjazy4XH2HMMxXPb1fKFooRFHbPoLoKt9sz3/wqz5fmiKzN2OxKSPGWc J8a6YYAGW2m1FigGQj0osUCt2dQyUFlAlsYApWrlCI3mvpyt8MGuK8V0MPVNaJ5/CvKp EVrBIaKaEYgicc22e63mZ3VHJXx+redueyYMmN/ZJpnSAP1KCvx6NhrPZ56hFtZmF3Id BqMQ== X-Gm-Message-State: AOJu0YwHEpgyMTGDAaLBU5c8vuT3Xv1/2BEjs1izjmx8FJ0xi+s5TZEZ 7qV7EyYw3O5aD+9wjoie0vEAFNlW8dva2BP35ODSy7k6cIIiBmK22Kn7+sTBaVRnI2T+ZcTkNUg O X-Google-Smtp-Source: AGHT+IE3oJ5OSLOGZkIK7qWoJ0h2JsUtEeKmtplzbLb6uir/ollTGglIvLUoK1TmriE0HzFbal5qVA== X-Received: by 2002:a17:902:f684:b0:212:4b18:4a44 with SMTP id d9443c01a7336-2126c117a87mr28752815ad.10.1732111071647; Wed, 20 Nov 2024 05:57:51 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:51 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 24/31] util-linux: Add `findmnt` to the bash completion RDEPENDS Date: Wed, 20 Nov 2024 05:56:56 -0800 Message-Id: <30c37334aa8c72fdfea51120a655f910d99ad05e.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207448 From: Alban Bedel The bash completion scripts for `umount`, `fstrim` and `fsfreeze` make use of `findmnt` so add it to the bash completion RDEPENDS. Signed-off-by: Alban Bedel Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie (cherry picked from commit f8703b486a6ccf39225815362acadafb890ca56e) Signed-off-by: Steve Sakoman --- meta/recipes-core/util-linux/util-linux_2.40.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/util-linux/util-linux_2.40.2.bb b/meta/recipes-core/util-linux/util-linux_2.40.2.bb index a8e346539a..646bc05564 100644 --- a/meta/recipes-core/util-linux/util-linux_2.40.2.bb +++ b/meta/recipes-core/util-linux/util-linux_2.40.2.bb @@ -148,7 +148,7 @@ RDEPENDS:${PN}-dev += " util-linux-libuuid-dev" RPROVIDES:${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev" -RDEPENDS:${PN}-bash-completion += "${PN}-lsblk" +RDEPENDS:${PN}-bash-completion += "${PN}-lsblk ${PN}-findmnt" RDEPENDS:${PN}-ptest += "bash bc btrfs-tools coreutils e2fsprogs findutils grep iproute2 kmod procps sed socat which xz diffutils" RRECOMMENDS:${PN}-ptest += "kernel-module-scsi-debug kernel-module-sd-mod kernel-module-loop kernel-module-algif-hash" RDEPENDS:${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" From patchwork Wed Nov 20 13:56:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52796 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86606D63956 for ; Wed, 20 Nov 2024 13:57:54 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web11.13864.1732111073865571734 for ; Wed, 20 Nov 2024 05:57:53 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=aBFy87q6; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-20cb7139d9dso21762615ad.1 for ; Wed, 20 Nov 2024 05:57:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111073; x=1732715873; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=m5oOFCFpI6IwA+PzzonMbGpqWHBJ9FCgmFPEOsPEqoM=; b=aBFy87q69gw59oAiFENW/x5fWAPBK5NGrJB0JlF5KYu52Ub9MOiQuuaU2jvRQWhZsB pIJ5olOzGAYREhY2QwRDw8CNIt5aU92GvAzcU1enjizrttSicOa7ZTr1pk0MiFpctJf9 u8tNDdQrzKYLXELZCT0iSfr2sc4mCIE9KTV+qr8Qjha4b5gEx2omjgGup6t46rtAgQtv +zVUOw8aWOOXUK5cLi8SsLlAA9jltYMxNX/iZ1OWqcH6IDaZXG4Oiu0arFp9KYnPfqvy AU7m1jowX3eqGO3wJOtdAI74fAekBNC1bljd8CvYMQVakxV5EOeRxV4JtLo6EGdNqSdV o/GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111073; x=1732715873; 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=m5oOFCFpI6IwA+PzzonMbGpqWHBJ9FCgmFPEOsPEqoM=; b=i8hwwC7Qv1Fms9eHXCnwJ75RFmzCpw1P9ztOTqSDexKdF3R5UBwg2EmZAwOjAXNTvY SpkBe5vMzBtP7kKtJL+67LxJuIZXFF5Ycafw23cTuswxI1EvlxMJYa0jfMmH2Hcfs/r0 BpYNjAYC+0qQU2vqjsBBcm/3mFtFczuLulb4PZnylG56kDG+RqTCucn2OdRXcTxC4mJ5 ITQ9n/HQRCm8d1jeTu9xbV4N/wy+/BaNprTIt9Apmgih5iVsClPaOKx8BH7cRpypsVnY OxQwjGm9vPSOpoUC2mEMI4ktTLfKysZnl2kX51ZfjvHzuoLOocQOZoUGE0X5DKRlG4O4 G8Pg== X-Gm-Message-State: AOJu0Yx6D9Jh3rUEPhFEslK746sI1PMeR9D4IUWF4bxuR6H1O+9zqouq IkLumth4Ylgrt54Ei1nAqL3nKDyyzEhC3/KdUVKG6ZcITC9xLYwLacpaGU2xQof7je69zJW0Z+I 2 X-Gm-Gg: ASbGnctkKsvwbM2XGK78sZ0l+IIlKFBqOfXEhVkK7cMI5JVajZ0j3vpQAm7U/dzqEvZ XtDTht8P/4vBrI5SIwKx4XBB0U28Xjigy4+1OEJqjReVphvgRBoSLiM8J1FLGjUM4DSNOhLLrjs UFa9Xc5U3y0LWxHif1EKZTtqpIcDd/VbhR8qxAIWccpq14w7ZO7RGE9DbvcY1d5gw3uZ9EYcfMS p0ENedQktcpQFpCj76tM83HY93ZGw4zCSpbfZ0= X-Google-Smtp-Source: AGHT+IEcyvBCNYASbBBiTBx0jwkk3UbLG0j9CdXR3lYphm87TTNRfiX/+93bfQ9c7YevyyL2HpdMMA== X-Received: by 2002:a17:902:c94a:b0:211:3275:409 with SMTP id d9443c01a7336-2126a3f418emr30486775ad.33.1732111073107; Wed, 20 Nov 2024 05:57:53 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:52 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 25/31] tune-cortexa32: set tune feature as armv8a Date: Wed, 20 Nov 2024 05:56:57 -0800 Message-Id: <2ff1c65ad0df7ad40939765f5cf0c08afcecd01e.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:57:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207449 From: Jagadeesh Krishnanjanappa Cortexa32 is a 32-bit armv8a architecture processor, so set the tune feature as armv8a instead of aarch64 which is 64-bit armv8a architecture. It solves the following build error while compiling libgcc-initial and libssp-nonshared. -- snip -- aarch64-poky-linux-musl-gcc: error: unrecognized command-line option '-mfpu=neon' aarch64-poky-linux-musl-gcc: error: unrecognized command-line option '-mfloat-abi=hard' -- snip -- Signed-off-by: Jagadeesh Krishnanjanappa Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie (cherry picked from commit 3b898270aca62559dfa42ed71d296fe8a8b46a41) Signed-off-by: Steve Sakoman --- meta/conf/machine/include/arm/armv8a/tune-cortexa32.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/machine/include/arm/armv8a/tune-cortexa32.inc b/meta/conf/machine/include/arm/armv8a/tune-cortexa32.inc index 25bdf12b18..0eb938a240 100644 --- a/meta/conf/machine/include/arm/armv8a/tune-cortexa32.inc +++ b/meta/conf/machine/include/arm/armv8a/tune-cortexa32.inc @@ -10,7 +10,7 @@ AVAILTUNES += "cortexa32 cortexa32-crypto" ARMPKGARCH:tune-cortexa32 = "cortexa32" ARMPKGARCH:tune-cortexa32-crypto = "cortexa32" # We do not want -march since -mcpu is added above to cover for it -TUNE_FEATURES:tune-cortexa32 = "aarch64 cortexa32 crc callconvention-hard neon" +TUNE_FEATURES:tune-cortexa32 = "armv8a cortexa32 crc callconvention-hard neon" TUNE_FEATURES:tune-cortexa32-crypto = "${TUNE_FEATURES:tune-cortexa32} crypto" PACKAGE_EXTRA_ARCHS:tune-cortexa32 = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc} cortexa32 cortexa32hf-neon" PACKAGE_EXTRA_ARCHS:tune-cortexa32-crypto = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc-crypto} cortexa32 cortexa32hf-neon cortexa32hf-neon-crypto" From patchwork Wed Nov 20 13:56:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52801 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C9ACD63958 for ; Wed, 20 Nov 2024 13:58:04 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web11.13865.1732111075647322135 for ; Wed, 20 Nov 2024 05:57:55 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=vMNjMC4H; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-21263dbbbc4so15224075ad.1 for ; Wed, 20 Nov 2024 05:57:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111075; x=1732715875; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=oPCMHF49nDAH5fr5PBi7YAsxuxjLpnf+/f4Vg93hGDM=; b=vMNjMC4HsZnivLnFK9gjH9rVqC4OudTPjbfGnt90Cr/PfZsbca0iuIQgS3Ikxv6jF2 +CTTLG/qBQM3Df1/EK2x67u0QM9q5LPgO26BVcGKJQHJGsy+d4TbomOnWJr8fM3/HMoC 8p+qkE4iROcD5eYx4YaIvwiGFDvbQvzzoP1+ITj0zZLMjV/dX7c5yBckrw2xwuuo0Jw3 eOuiaPT3I3hpfX10AefOWDYTqTEoWMDxaBM7q3ghtnLuy9xApxvqbOKWhBhqUpXDjgp8 6xvRjbj9GiVvq/ZLlb6vbXbR8G6v8aJhxs4AtZQpO1eXySOpx/z7eMPWLtFv3ABs1Ol1 bDMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111075; x=1732715875; 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=oPCMHF49nDAH5fr5PBi7YAsxuxjLpnf+/f4Vg93hGDM=; b=E2Rr1QnGFlF99jaiszWZ1lgieoC/kuQQyoJnDFDx8ybC0vC8pSL2fZMhG/ZE7VF32H 0H1oxb6CbNKkrecD4dmUqdZ2Rvnl7VRolj1DIsvntURwFrPmlb0YpsTbp3ZwoKTd7Mo3 PFP0slnQzzLNhJZv8fWdPOGjrhwSbgp+2o5B/3hyh60fpJ5uiNItqqaKJR0QuJgbNNJj luS/wcJ28nEqSbmvUWeiWpDUf4aW5hIQ8SwZ7MbAVhpfLfK/xSdBnrOahidwjZMGp8fQ 3deWs5mbyOiSxu2Uz1QR83Rn/zcK3dWI09unu8R/W7ZJgJHeyEXlEPM/WRP4JShEDjWi hWbA== X-Gm-Message-State: AOJu0YyjrrNW4m0d7u+naQhbkFHZIqMCUl2vYIvBxJty8e+yPmh3kPMu nhWwhSLcnOc5/PpwooLW5/Hii20ysbBQ2hVBN//qcxK9radCOgAeSiUMkP1NTL1LGZPBF68gjtm / X-Google-Smtp-Source: AGHT+IFccX0LlOFphxQDvBT/DtZlU07DtQdNPWY9dyN5CJMM7++kZsFAfp1Mf5rmOaPaJH3645694w== X-Received: by 2002:a17:902:e842:b0:20c:e6e4:9daf with SMTP id d9443c01a7336-2126c0e07b7mr30163795ad.13.1732111074886; Wed, 20 Nov 2024 05:57:54 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:54 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 26/31] libgfortran: fix buildpath QA issue Date: Wed, 20 Nov 2024 05:56:58 -0800 Message-Id: <821eed0bc6489aed1b9f93d06481a6c3a03a0260.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:58:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207450 From: Chen Qi The '-fdebug-prefix-map' options are used to map source files locations, otherwise, DW_AT_comp_dir will contain buildpath. The '-gno-record-gcc-switches' option is used to fix the buildpath introduced by '-fintrinsic-modules-path' option, which is automatically added by fortran. Here's some output from 'readelf --debug-dump libgfortran.so.5.0.0' when this option is not added: """ <0><1a37d3>: Abbrev Number: 4 (DW_TAG_compile_unit) <1a37d4> DW_AT_producer : (indirect string, offset: 0xd653): GNU Fortran2008 14.2.0 -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -mshstk -g -O2 -O2 -fstack-protector-strong -fimplicit-none -fno-repack-arrays -fno-underscoring -fcf-protection=full -fallow-leading-underscore -fbuilding-libgfortran -fPIC -fintrinsic-modules-path /ala-lpggp72/qichen/Yocto/builds/build-poky/tmp/work/ core2-64-poky-linux/libgfortran/14.2.0/recipe-sysroot-native/usr/bin/x86_64-poky-linux /../../lib/x86_64-poky-linux/gcc/x86_64-poky-linux/14.2.0/finclude -fpre-include=../../../../recipe-sysroot/usr/include/finclude/math-vector-fortran.h """ See https://gcc.gnu.org/pipermail/fortran/2024-October/061204.html for more detailed information. Signed-off-by: Chen Qi Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie (cherry picked from commit 1eb084956bcba83782bc2b24cf8cc89459a57e34) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/gcc/libgfortran.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/gcc/libgfortran.inc b/meta/recipes-devtools/gcc/libgfortran.inc index c68645e392..2a08872c25 100644 --- a/meta/recipes-devtools/gcc/libgfortran.inc +++ b/meta/recipes-devtools/gcc/libgfortran.inc @@ -8,7 +8,7 @@ EXTRA_OECONF_PATHS = "\ # An arm hard float target like raspberrypi4 won't build # as CFLAGS don't make it to the fortran compiler otherwise # (the configure script sets FC to $GFORTRAN unconditionally) -export GFORTRAN = "${FC}" +export GFORTRAN = "${FC} -fcanon-prefix-map -fdebug-prefix-map=${S}=${TARGET_DBGSRC_DIR} -fdebug-prefix-map=${B}=${TARGET_DBGSRC_DIR} -gno-record-gcc-switches" do_configure () { for target in libbacktrace libgfortran From patchwork Wed Nov 20 13:56:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52802 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9CB1D6395B for ; Wed, 20 Nov 2024 13:58:04 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web10.13962.1732111076999856143 for ; Wed, 20 Nov 2024 05:57:57 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=yaPIAwMV; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-7f3e30a43f1so3260410a12.1 for ; Wed, 20 Nov 2024 05:57:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111076; x=1732715876; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=wAqLJ9PPiCl4OjRb0eiyKur4QUBzqMP1Dz6OMIVFeTM=; b=yaPIAwMVZ/dlQXohwGDmhBlJGHGbrt9KYXEuVD8yKSvNBI9KZUbCQVK1CYMqzYyfD0 jMQ+hYEHCraKC/OU6uejuC0C0mCVCpgjOjSJg+XR41GFwSGYJrETkeLYm8sjnlkWr61K Qy/ZxYoTI44Ud2FefetST/gGQoxLjMtq4Klklrub97tZhGml8YnANtiOFCCulSgvMdgE SPQboG4DBDqBQK23B5HV8o6BttCm4nIhaCb1ZNdGB0FLUXRbY9O9+l3kviojEsK/oEor Dr9GfdcsWZbC7lnBq7EFLdaDP39chtQ/XBvz4crlQFK/YIRxMDp8/EeHjtFd9gsFC+8s UgxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111076; x=1732715876; 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=wAqLJ9PPiCl4OjRb0eiyKur4QUBzqMP1Dz6OMIVFeTM=; b=nnqde6lzmsTbUVPOlUCf2ry4gkVIHmyWfFJbM17uAKiWN789oJgdSY4DhMfr6ag6Bs O/RXzwSbInViU/gWK7Poqp47es5ctKkn2fWedoQZG+PNmbS5RjUqLgPcKgCgN0+ApOC+ bi++D92GrmxdHXoEYLn5JQNBa5G7e90wkLBRw855b3hFwjYSgzeCmPXGZakakHzpHgxH HgLnmVgegy0ostq0dPgYplRnI7/HCHChplUgOyDkoBY85OCPNanz8EZOOeTiHubmo+qo 56KoC3tKvfRyFk66iTv0qjhex0pxnNmCJsOw4JqI85gq+eDG7ebWqaUzMECmJFtPPPar v9gw== X-Gm-Message-State: AOJu0YxI6JIKYxRwpB3wrBPz0lBsqyOANPJ1GROiPV7JWxG7OHSibNoM lCDSee1Dh0SUIZdQd6a2zMyVci8gykn/mDVECxhyqLTWtFrDbkDslZzRzVaiDbtm01cpOs3pIMm M X-Google-Smtp-Source: AGHT+IEW4Alh7RxYr6oxHH057sKcq8en03sBF7icENLoY+VUDZlPIeOnJyrUBjJM5LC5jdVBMVSmrg== X-Received: by 2002:a05:6a20:4313:b0:1db:e9fc:a9b8 with SMTP id adf61e73a8af0-1ddafd5931cmr4080306637.33.1732111076210; Wed, 20 Nov 2024 05:57:56 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:56 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 27/31] python3-maturin: sort external libs in wheel files Date: Wed, 20 Nov 2024 05:56:59 -0800 Message-Id: <6309ead6aa94510ca17d4f7716c62d0ed6b9aad9.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:58:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207451 From: Yoann Congal Import a merged patch that sort external libs in the wheel file generated by maturin. That improve reproducibility. Signed-off-by: Yoann Congal CC: Tim Orling Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie (cherry picked from commit 66da28f85727206c0e647efba93c1be028519fe5) Signed-off-by: Steve Sakoman --- ...prove-wheel-reproducibility-by-sorti.patch | 55 +++++++++++++++++++ .../python/python3-maturin_1.7.1.bb | 1 + 2 files changed, 56 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-maturin/0001-build_context-improve-wheel-reproducibility-by-sorti.patch diff --git a/meta/recipes-devtools/python/python3-maturin/0001-build_context-improve-wheel-reproducibility-by-sorti.patch b/meta/recipes-devtools/python/python3-maturin/0001-build_context-improve-wheel-reproducibility-by-sorti.patch new file mode 100644 index 0000000000..83b586ff72 --- /dev/null +++ b/meta/recipes-devtools/python/python3-maturin/0001-build_context-improve-wheel-reproducibility-by-sorti.patch @@ -0,0 +1,55 @@ +From 49b985d7f5a4582bf9e2c58b6220124e2b7aa395 Mon Sep 17 00:00:00 2001 +From: Yoann Congal +Date: Thu, 17 Oct 2024 22:17:20 +0200 +Subject: [PATCH] build_context: improve wheel reproducibility by sorting libs + (#2261) + +OE-core note: Upstream does not have a commit message for this. Bellow +is the message I've sent: +> While tracking a reproducibility issue from maturin's output, we found +> that the .so file in the output .whl were not ordered the same +> every time. +> +> Order of the external libraries in the .whl comes down to the order +> `soname_map` is iterated. But, `std::HashMap` does not provide a stable +> order and that create an unstable order in the wheel. +> +> Switch to `std::BTreeMap` which keeps keys sorted and is iterable +> in a stable order. +> +> This can be tested by building current python3-cryptography : +> SOURCE_DATE_EPOCH=1728915855 maturin build +> +> Before this commit, the above give two possible outputs (~50% each), the +> difference is in the order of libssl and libcrypto. +> +> After this commit, the output is reproducible. + +Signed-off-by: Yoann Congal +Upstream-Status: Backport [https://github.com/PyO3/maturin/commit/61d54809776e1ca79ff8cc92387d70796d50c16e] +--- + src/build_context.rs | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/build_context.rs b/src/build_context.rs +index 2e498537..6fbd25c1 100644 +--- a/src/build_context.rs ++++ b/src/build_context.rs +@@ -24,7 +24,7 @@ use normpath::PathExt; + use pep508_rs::Requirement; + use platform_info::*; + use sha2::{Digest, Sha256}; +-use std::collections::{HashMap, HashSet}; ++use std::collections::{BTreeMap, HashSet}; + use std::env; + use std::fmt::{Display, Formatter}; + use std::io; +@@ -396,7 +396,7 @@ impl BuildContext { + writer.add_directory(&libs_dir)?; + + let temp_dir = tempfile::tempdir()?; +- let mut soname_map = HashMap::new(); ++ let mut soname_map = BTreeMap::new(); + let mut libs_copied = HashSet::new(); + for lib in ext_libs.iter().flatten() { + let lib_path = lib.realpath.clone().with_context(|| { diff --git a/meta/recipes-devtools/python/python3-maturin_1.7.1.bb b/meta/recipes-devtools/python/python3-maturin_1.7.1.bb index b9279f5ab5..8837128896 100644 --- a/meta/recipes-devtools/python/python3-maturin_1.7.1.bb +++ b/meta/recipes-devtools/python/python3-maturin_1.7.1.bb @@ -12,6 +12,7 @@ SRC_URI:append = "\ file://0003-Extract-extension-ABI-name-resolvation-code-as-helpe.patch \ file://0004-Fix-cross-compilation-issue-with-linux-ppc-architect.patch \ file://0005-Fix-cross-compilation-issue-with-linux-mips64-archit.patch \ + file://0001-build_context-improve-wheel-reproducibility-by-sorti.patch \ " S = "${WORKDIR}/maturin-${PV}" From patchwork Wed Nov 20 13:57:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52803 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4019D6395F for ; Wed, 20 Nov 2024 13:58:04 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web11.13871.1732111078994911131 for ; Wed, 20 Nov 2024 05:57:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=ktwFHhnw; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-21269c8df64so10625095ad.2 for ; Wed, 20 Nov 2024 05:57:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111078; x=1732715878; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=r3kBA5DkGas62gUhUUtByt8cuvsHEqu2EMaLijKXcTc=; b=ktwFHhnwhGocSNbEsfRzvzm0RZ2uphCWy43BjYaBKPr+f8PV/z6LJZ9H7b80aAgzTm FGmkH8KuxMiBG/h1LKSo4g0dOfEvfyk1EHEX13dqX6oyoozlatJy9MOaOcz2Ph198eWE Wx21xq4CKuUbxQeHtEW81yYtFx3HiEevxa+7YmdxkP7In3FgkK6z/KR5u8UwV4y3ACp3 qmiDHpvcbJY1zy18C/zCBtSpc1xUu8c20Y9gPai4+m74GakVKkMm3MlCa067lSYJaJUB mtB11wZMBtwIHmanj+sNATlCkPPU3idKaysmD7AFDL4maPp9N5G7KmvHCdemTx+Gj+I5 AdXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111078; x=1732715878; 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=r3kBA5DkGas62gUhUUtByt8cuvsHEqu2EMaLijKXcTc=; b=oGofbuozB283IeD8PE7Wb0AGmgPqzK2UgSay8D9o1Xs4E2Glb6QDIGyk4w2cag2co7 XiGiAKU0ZYj9uWAgw5AMvvo7eNYqfOx9VjdKUrUYnsIUxLl6VetEllJ8Pnj4FLRteNju ttfxmqpCc9ixeAC5+y0jfPL42P/8wkcdcySi6+9hXsObAc2kashbtJMVLFnbtzGkb9Y8 8itUhk9VeWrrizHcCiI2LFGovybJR0+VrhVeR4M2ZTdVZurYfFhwMkm8SEtuBT4mSQ1D SPthMOPHxpBjkquTWFSzFZM6Z7eMgHyRQ+iS57TiYPqT8vzchEJ7oL+AwN9PNhaAUxRR LM5A== X-Gm-Message-State: AOJu0YzR3zMQjxfaCAr5s/xLY1OPNIqES21wj+SofN4cQ3CoGz84Gcj9 ClkFUd1vyHMYeFGQTfr/00A+42xM/x5ujrN/Zi5YjkMXmWJhSKUmVrsw7n8YcMf/k/9fvJeTxVg k X-Google-Smtp-Source: AGHT+IFQNv/m8PsRZyUGA2gho9zLdfz/PExKgkZQYsPQtBFgwxPjBHx7IVZf4taxsgg3xCQ+MErWIQ== X-Received: by 2002:a17:903:298f:b0:20c:872f:6963 with SMTP id d9443c01a7336-2126a3bb2edmr32593835ad.33.1732111078153; Wed, 20 Nov 2024 05:57:58 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.57.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:57:57 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 28/31] udev-extraconf: fix network.sh script did not configure hotplugged interfaces Date: Wed, 20 Nov 2024 05:57:00 -0800 Message-Id: <31d01b27a86f84e62b3cd9698786c894091c352f.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:58:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207452 From: Regis Dargent Udev script network.sh is called when a new ethernet interface is plugged (eg. USB). Due to some (old) missing files, this script does nothing, instead of configuring the interfaces with ifup. I just commented the corresponding lines to allow the script to reach the part where it calls ifup. Signed-off-by: Regis Dargent Fixes [YOCTO 15616] network.sh relies on (long) missing files (eg. /etc/network/options, /etc/init.d/network) to decide if it should configure the new network interface (ifup) or put its name in /etc/udev_network_queue for future initialization by /etc/init.d/network service. The actual result was that the new hotplugged interface was never automatically configured. Removing the obsolete tests allows the script to do its intended job. Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie (cherry picked from commit 160f7139172ffdf510a0d7d4e85f7fbaac7fd000) Signed-off-by: Steve Sakoman --- .../udev/udev-extraconf/network.sh | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/meta/recipes-core/udev/udev-extraconf/network.sh b/meta/recipes-core/udev/udev-extraconf/network.sh index 3ee92714af..ace38808cd 100644 --- a/meta/recipes-core/udev/udev-extraconf/network.sh +++ b/meta/recipes-core/udev/udev-extraconf/network.sh @@ -6,38 +6,6 @@ echo "$INTERFACE" | grep -q wifi && exit 0 # udevd does clearenv(). Export shell PATH to children. export PATH -# Check if /etc/init.d/network has been run yet to see if we are -# called by starting /etc/rcS.d/S03udev and not by hotplugging a device -# -# At this stage, network interfaces should not be brought up -# automatically because: -# a) /etc/init.d/network has not been run yet (security issue) -# b) /var has not been populated yet so /etc/resolv,conf points to -# oblivion, making the network unusable -# - -spoofp="`grep ^spoofprotect /etc/network/options`" -if test -z "$spoofp" -then - # This is the default from /etc/init.d/network - spoofp_val=yes -else - spoofp_val=${spoofp#spoofprotect=} -fi - -test "$spoofp_val" = yes && spoofp_val=1 || spoofp_val=0 - -# I think it is safe to assume that "lo" will always be there ;) -if test "`cat /proc/sys/net/ipv4/conf/lo/rp_filter`" != "$spoofp_val" -a -n "$spoofp_val" -then - echo "$INTERFACE" >> /dev/udev_network_queue - exit 0 -fi - -# -# Code taken from pcmcia-cs:/etc/pcmcia/network -# - # if this interface has an entry in /etc/network/interfaces, let ifupdown # handle it if grep -q "iface \+$INTERFACE" /etc/network/interfaces; then From patchwork Wed Nov 20 13:57:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52804 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3F8CD63954 for ; Wed, 20 Nov 2024 13:58:04 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web11.13874.1732111082076024334 for ; Wed, 20 Nov 2024 05:58:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=G7xk7khP; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-20cdb889222so52940515ad.3 for ; Wed, 20 Nov 2024 05:58:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111081; x=1732715881; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4zaN/Yzylp6P9P7K9tZ0wt8u7JVehowjRpt2dPX8B0o=; b=G7xk7khP6cjErQyFdnuW65PFU7eWv7Gc8VHZ8kE9guadHCWXyGbK4tlaWkdMKDxh3K 5Ckf0dgqy+PjY+X6gbmcgmQtYv7tYmi4RausZW15J7WJrNMGob6Mpg5DYXg9MznKRKYe v216gHzUPvykiLwl7zIjb07J/hTQmP5ny7KLbr0E6qpXxJcsr2Raz5nw3uTjU4ttFz4y 8Rm8PdiVEF6Z11OMeVhbZN6UWpiRV6plvMhv+xJmbE2xKX4ygcUgO4vokI75QbmAzlKU n/T6kYbAl1cwZieoPL3xcWch7JOEj6TnLWfcatBmLzptTdlPfDj/CF0R/AQREVi+ysyY bYWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111081; x=1732715881; 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=4zaN/Yzylp6P9P7K9tZ0wt8u7JVehowjRpt2dPX8B0o=; b=hXzEaCJZ2vrWwXcSgSGFrHF576oHetuXj3nuI1gJl9bc8kCjbVAZPjA2MQLMuLi0X8 ZAVxCP8vgwNTuwbVDGNDg+oSDJ2W3vQ62gObF3eIbCAsRazu7sNTHOWebx5fBbQPKWhg 4nGf9czLp3n8vK6eb1+V1nROnn1xef8yp7+roGP2Ju4rye5FQEKyFQ0obGzHW97rNZ0w tdDi5cU7YSYASWc22NireF1CVUO9YnR5I1150BWb+ptKH/hrWH5DTFa/0wHLCWJCEGMj 2MkBXgTgd5nEBtP0Y+zq4aTpk4IAnOs2sSOC1Z/4+uJZtFQfaXrYuVfW852jmK057XxH fbhg== X-Gm-Message-State: AOJu0YzZZYcQjD7ooYLHNV4Zsds7cVp9CpIZM0z2d+SOPw4nwsB0iycI m2fkHqnpe+s6TnVaM1vGI1NlnnLpQvblvfwsY76iEFP7zUwrNiFA76A8ZPMITrpT2blSKDiyYR6 d X-Google-Smtp-Source: AGHT+IHyvqh+qqglnesDTO0ElVjkaNe6Zf+6yG9kwpHx4WlD0X3mIGvu5FSOTnv1DdXkWymgnZqIeg== X-Received: by 2002:a17:902:f690:b0:212:5132:9699 with SMTP id d9443c01a7336-2126a389a7dmr39769315ad.24.1732111081281; Wed, 20 Nov 2024 05:58:01 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.58.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:58:01 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 29/31] weston: Add missing runtime dependency on freerdp Date: Wed, 20 Nov 2024 05:57:01 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:58:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207453 From: Tom Hochstein With rdp enabled, nothing from freerdp is installed in the rootfs, and rdp is not usable. It seems there is no actual build time dependency other than the meson check itself, so add an explicit runtime dependency. Signed-off-by: Tom Hochstein Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie (cherry picked from commit 23271a1f908a223b4eb56d6034cbb1ac23da14fe) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/wayland/weston_13.0.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/wayland/weston_13.0.3.bb b/meta/recipes-graphics/wayland/weston_13.0.3.bb index 19b242d01b..471dc52bb3 100644 --- a/meta/recipes-graphics/wayland/weston_13.0.3.bb +++ b/meta/recipes-graphics/wayland/weston_13.0.3.bb @@ -62,7 +62,7 @@ PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libx # Headless Weston PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" # Weston on RDP -PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp" +PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp,freerdp" # VA-API desktop recorder PACKAGECONFIG[vaapi] = "-Dbackend-drm-screencast-vaapi=true,-Dbackend-drm-screencast-vaapi=false,libva" # Weston with EGL support From patchwork Wed Nov 20 13:57:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52805 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C9D5D63959 for ; Wed, 20 Nov 2024 13:58:04 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web10.13968.1732111084370182814 for ; Wed, 20 Nov 2024 05:58:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=gMQhSkuv; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-21262a191a5so14429175ad.0 for ; Wed, 20 Nov 2024 05:58:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111084; x=1732715884; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=YstW2t2RO8ENWCgAsHaIQWJCTP/70JiNu+vdqQxFTVI=; b=gMQhSkuvJe5K6i3J4jzAPF6oh0sO3T+SOdMFZrGvOyOvlBijuB51z0DfSumyp35fyC zm1IhaT/l1gGIA6jYlsOVVKE6v6UWeCwAM3UfiXlj1hv2FyvMh03tZiJyP1rbRI6cqPM JmfStdIpKHsQwGqvylcgBGreBVlXlv6eSuQ2WWKv9fULgNNrYpWrrMz5O0wx0oFU0A2o OXBPS5SHCv8BA4v7IZIheGFeIqFpEzhj2U0LHwOcDqrHvIh0bAu3aLGbqV4kBv7lFT3b zUR7o7IgpcOiaU0pz3U0aFodp8xHBu1qSyx288Ai12rBZE+bQxth1i4PUdIzxW1PW7Jq ZxUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111084; x=1732715884; 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=YstW2t2RO8ENWCgAsHaIQWJCTP/70JiNu+vdqQxFTVI=; b=SW2h6wuE/mqRo9rbMYZoZN2BSMuhQGWLregxv24vtRWosXOd6Ms+AWf8Qn2k6QW3Ob c1qFmRfyNCJk+9wgBuNgTFfeCn6h4YJqSyVNwelsXIWXe5e/s8zbm/sH2Elb745NrN+v zgK5zRSM+IF+l4eCHNlMwu99IrxutvnFLo9vm+/k6tTpR4VYGQ3VRCWDJEkyiFczyTfE N6EW3iX9rwM8E739GN10v6554JTUSJp8/jKMVHOtgw/2xV6mQcYxMHFIo2v4MT7ezQKv 0cj7so1cYkquUM+y5xqouTkO4ZREIGv5WGdq0drdAxs+ARZ5LFUnx58zwnERpPeEfgLK D5Kg== X-Gm-Message-State: AOJu0YwCJ1MY08KFBV+z7PqMVIGZH7JWJqyLrh7qkidFLnUfztwSrE0a EjMwu8M2LUzrQGg3LC0XNtQITEHslHBy+aIZzjpCxZConvZzwJGYTp+eq7BGxjf0/wijWvDx+Aw n X-Google-Smtp-Source: AGHT+IEPIGogQJ/tfQ3FQ2PXm86VS7BKdiafww7fA/waZp/DH7bdFzHQobNH2rZ0g1QojrTg34Qifw== X-Received: by 2002:a17:903:22d0:b0:212:6011:594a with SMTP id d9443c01a7336-2126c117c14mr29848745ad.3.1732111083519; Wed, 20 Nov 2024 05:58:03 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.58.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:58:03 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 30/31] glib-2.0: fix glib-2.0 ptest failure when upgrading tzdata2024b Date: Wed, 20 Nov 2024 05:57:02 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:58:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207454 From: Jinfeng Wang Backport 3 patches [1][2][3] for gdatetime test to fix the ptest failure. [1] https://github.com/GNOME/glib/commit/c0619f08e6c608fd6464d2f0c6970ef0bbfb9ecf [2] https://github.com/GNOME/glib/commit/30e9cfa5733003cd1079e0e9e8a4bff1a191171a [3] https://github.com/GNOME/glib/commit/fe2699369f79981dcf913af4cfd98b342b84a9c1 Signed-off-by: Jinfeng Wang Signed-off-by: Richard Purdie (cherry picked from commit 0c8f87d5d4ec9f286b1e85d114cb9a728c1ff64b) Signed-off-by: Steve Sakoman --- .../files/gdatetime-test-fail-0001.patch | 72 +++++++++++++++++++ .../files/gdatetime-test-fail-0002.patch | 65 +++++++++++++++++ .../files/gdatetime-test-fail-0003.patch | 63 ++++++++++++++++ meta/recipes-core/glib-2.0/glib.inc | 3 + 4 files changed, 203 insertions(+) create mode 100644 meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0001.patch create mode 100644 meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0002.patch create mode 100644 meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0003.patch diff --git a/meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0001.patch b/meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0001.patch new file mode 100644 index 0000000000..e78d96c3ce --- /dev/null +++ b/meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0001.patch @@ -0,0 +1,72 @@ +From 729d1cbcd599e848bee07c72a276ccc02a06ddc0 Mon Sep 17 00:00:00 2001 +From: "Rebecca N. Palmer" +Date: Fri, 11 Oct 2024 09:38:52 +0100 +Subject: [PATCH 1/3] gdatetime test: Do not assume PST8PDT was always exactly + -8/-7 + +In newer tzdata, it is an alias for America/Los_Angeles, which has a +slightly different meaning: DST did not exist there before 1883. As a +result, we can no longer hard-code the knowledge that interval 0 is +standard time and interval 1 is summer time, and instead we need to look +up the correct intervals from known timestamps. + +Resolves: https://gitlab.gnome.org/GNOME/glib/-/issues/3502 +Bug-Debian: https://bugs.debian.org/1084190 +[smcv: expand commit message, fix whitespace] +Signed-off-by: Simon McVittie + +Upstream-Status: Backport +[https://github.com/GNOME/glib/commit/c0619f08e6c608fd6464d2f0c6970ef0bbfb9ecf] + +Signed-off-by: Jinfeng Wang +--- + glib/tests/gdatetime.c | 22 ++++++++++++++++------ + 1 file changed, 16 insertions(+), 6 deletions(-) + +diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c +index d46f653ac..2eefc4106 100644 +--- a/glib/tests/gdatetime.c ++++ b/glib/tests/gdatetime.c +@@ -2930,6 +2930,7 @@ test_posix_parse (void) + { + GTimeZone *tz; + GDateTime *gdt1, *gdt2; ++ gint i1, i2; + + /* Check that an unknown zone name falls back to UTC. */ + G_GNUC_BEGIN_IGNORE_DEPRECATIONS +@@ -2953,16 +2954,25 @@ test_posix_parse (void) + + /* This fails rules_from_identifier on Unix (though not on Windows) + * but passes anyway because PST8PDT is a zone name. ++ * ++ * Intervals i1 and i2 (rather than 0 and 1) are needed because in ++ * recent tzdata, PST8PDT may be an alias for America/Los_Angeles, ++ * and hence be aware that DST has not always existed. ++ * https://bugs.debian.org/1084190 + */ + tz = g_time_zone_new_identifier ("PST8PDT"); + g_assert_nonnull (tz); + g_assert_cmpstr (g_time_zone_get_identifier (tz), ==, "PST8PDT"); +- g_assert_cmpstr (g_time_zone_get_abbreviation (tz, 0), ==, "PST"); +- g_assert_cmpint (g_time_zone_get_offset (tz, 0), ==, - 8 * 3600); +- g_assert (!g_time_zone_is_dst (tz, 0)); +- g_assert_cmpstr (g_time_zone_get_abbreviation (tz, 1), ==, "PDT"); +- g_assert_cmpint (g_time_zone_get_offset (tz, 1), ==,- 7 * 3600); +- g_assert (g_time_zone_is_dst (tz, 1)); ++ /* a date in winter = non-DST */ ++ i1 = g_time_zone_find_interval (tz, G_TIME_TYPE_STANDARD, 0); ++ /* approximately 6 months in seconds, i.e. a date in summer = DST */ ++ i2 = g_time_zone_find_interval (tz, G_TIME_TYPE_DAYLIGHT, 15000000); ++ g_assert_cmpstr (g_time_zone_get_abbreviation (tz, i1), ==, "PST"); ++ g_assert_cmpint (g_time_zone_get_offset (tz, i1), ==, - 8 * 3600); ++ g_assert (!g_time_zone_is_dst (tz, i1)); ++ g_assert_cmpstr (g_time_zone_get_abbreviation (tz, i2), ==, "PDT"); ++ g_assert_cmpint (g_time_zone_get_offset (tz, i2), ==,- 7 * 3600); ++ g_assert (g_time_zone_is_dst (tz, i2)); + g_time_zone_unref (tz); + + tz = g_time_zone_new_identifier ("PST8PDT6:32:15"); +-- +2.34.1 + diff --git a/meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0002.patch b/meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0002.patch new file mode 100644 index 0000000000..d97bec12d6 --- /dev/null +++ b/meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0002.patch @@ -0,0 +1,65 @@ +From 2702d7ff73649c05297105bab8977e2a9d28fa0b Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Fri, 18 Oct 2024 11:03:19 +0100 +Subject: [PATCH 2/3] gdatetime test: Try to make PST8PDT test more obviously + correct + +Instead of using timestamp 0 as a magic number (in this case interpreted +as 1970-01-01T00:00:00-08:00), calculate a timestamp from a recent +year/month/day in winter, in this case 2024-01-01T00:00:00-08:00. + +Similarly, instead of using a timestamp 15 million seconds later +(1970-06-23T15:40:00-07:00), calculate a timestamp from a recent +year/month/day in summer, in this case 2024-07-01T00:00:00-07:00. + +Signed-off-by: Simon McVittie + +Upstream-Status: Backport +[https://github.com/GNOME/glib/commit/30e9cfa5733003cd1079e0e9e8a4bff1a191171a] + +Signed-off-by: Jinfeng Wang +--- + glib/tests/gdatetime.c | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c +index 2eefc4106..728b87343 100644 +--- a/glib/tests/gdatetime.c ++++ b/glib/tests/gdatetime.c +@@ -2954,19 +2954,16 @@ test_posix_parse (void) + + /* This fails rules_from_identifier on Unix (though not on Windows) + * but passes anyway because PST8PDT is a zone name. +- * +- * Intervals i1 and i2 (rather than 0 and 1) are needed because in +- * recent tzdata, PST8PDT may be an alias for America/Los_Angeles, +- * and hence be aware that DST has not always existed. +- * https://bugs.debian.org/1084190 + */ + tz = g_time_zone_new_identifier ("PST8PDT"); + g_assert_nonnull (tz); + g_assert_cmpstr (g_time_zone_get_identifier (tz), ==, "PST8PDT"); + /* a date in winter = non-DST */ +- i1 = g_time_zone_find_interval (tz, G_TIME_TYPE_STANDARD, 0); +- /* approximately 6 months in seconds, i.e. a date in summer = DST */ +- i2 = g_time_zone_find_interval (tz, G_TIME_TYPE_DAYLIGHT, 15000000); ++ gdt1 = g_date_time_new (tz, 2024, 1, 1, 0, 0, 0); ++ i1 = g_time_zone_find_interval (tz, G_TIME_TYPE_STANDARD, g_date_time_to_unix (gdt1)); ++ /* a date in summer = DST */ ++ gdt2 = g_date_time_new (tz, 2024, 7, 1, 0, 0, 0); ++ i2 = g_time_zone_find_interval (tz, G_TIME_TYPE_DAYLIGHT, g_date_time_to_unix (gdt2)); + g_assert_cmpstr (g_time_zone_get_abbreviation (tz, i1), ==, "PST"); + g_assert_cmpint (g_time_zone_get_offset (tz, i1), ==, - 8 * 3600); + g_assert (!g_time_zone_is_dst (tz, i1)); +@@ -2974,6 +2971,8 @@ test_posix_parse (void) + g_assert_cmpint (g_time_zone_get_offset (tz, i2), ==,- 7 * 3600); + g_assert (g_time_zone_is_dst (tz, i2)); + g_time_zone_unref (tz); ++ g_date_time_unref (gdt1); ++ g_date_time_unref (gdt2); + + tz = g_time_zone_new_identifier ("PST8PDT6:32:15"); + #ifdef G_OS_WIN32 +-- +2.34.1 + diff --git a/meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0003.patch b/meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0003.patch new file mode 100644 index 0000000000..dfeec97810 --- /dev/null +++ b/meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0003.patch @@ -0,0 +1,63 @@ +From df251923fb2c80cc7acfe99aaf8c98d7d7cbd29f Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Fri, 18 Oct 2024 11:23:42 +0100 +Subject: [PATCH 3/3] gdatetime test: Fall back if legacy System V PST8PDT is + not available + +On recent versions of Debian, PST8PDT is part of the tzdata-legacy +package, which is not always installed and might disappear in future. +Successfully tested with and without tzdata-legacy on Debian unstable. + +Signed-off-by: Simon McVittie + +Upstream-Status: Backport +[https://github.com/GNOME/glib/commit/fe2699369f79981dcf913af4cfd98b342b84a9c1] + +Signed-off-by: Jinfeng Wang +--- + glib/tests/gdatetime.c | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) + +diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c +index 728b87343..9e1acd097 100644 +--- a/glib/tests/gdatetime.c ++++ b/glib/tests/gdatetime.c +@@ -2931,6 +2931,7 @@ test_posix_parse (void) + GTimeZone *tz; + GDateTime *gdt1, *gdt2; + gint i1, i2; ++ const char *expect_id; + + /* Check that an unknown zone name falls back to UTC. */ + G_GNUC_BEGIN_IGNORE_DEPRECATIONS +@@ -2953,11 +2954,25 @@ test_posix_parse (void) + g_time_zone_unref (tz); + + /* This fails rules_from_identifier on Unix (though not on Windows) +- * but passes anyway because PST8PDT is a zone name. ++ * but can pass anyway because PST8PDT is a legacy System V zone name. + */ + tz = g_time_zone_new_identifier ("PST8PDT"); ++ expect_id = "PST8PDT"; ++ ++#ifndef G_OS_WIN32 ++ /* PST8PDT is in tzdata's "backward" set, packaged as tzdata-legacy and ++ * not always present in some OSs; fall back to the equivalent geographical ++ * name if the "backward" time zones are absent. */ ++ if (tz == NULL) ++ { ++ g_test_message ("Legacy PST8PDT time zone not available, falling back"); ++ tz = g_time_zone_new_identifier ("America/Los_Angeles"); ++ expect_id = "America/Los_Angeles"; ++ } ++#endif ++ + g_assert_nonnull (tz); +- g_assert_cmpstr (g_time_zone_get_identifier (tz), ==, "PST8PDT"); ++ g_assert_cmpstr (g_time_zone_get_identifier (tz), ==, expect_id); + /* a date in winter = non-DST */ + gdt1 = g_date_time_new (tz, 2024, 1, 1, 0, 0, 0); + i1 = g_time_zone_find_interval (tz, G_TIME_TYPE_STANDARD, g_date_time_to_unix (gdt1)); +-- +2.34.1 + diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 9e742c4d3b..6ab52481b1 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -226,6 +226,9 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ file://skip-timeout.patch \ + file://gdatetime-test-fail-0001.patch \ + file://gdatetime-test-fail-0002.patch \ + file://gdatetime-test-fail-0003.patch \ " SRC_URI:append:class-native = " file://relocate-modules.patch \ file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ From patchwork Wed Nov 20 13:57:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52806 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B240AD63959 for ; Wed, 20 Nov 2024 13:58:14 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web11.13880.1732111087109612876 for ; Wed, 20 Nov 2024 05:58:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Qm0YkVuP; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-20e576dbc42so58932925ad.0 for ; Wed, 20 Nov 2024 05:58:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732111086; x=1732715886; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=bpnrF7DbjPXCVwT9oERqCmWHPHl9zb5oOn80hkJTT2E=; b=Qm0YkVuPX4krkdNy59lBfVBWE98VqWx2TFrm688fitYkC82amE2N0kM0S9nomNMHep d7lGBVZKLrpWoVAu/BbeNV/MP5ZJ4HOJEHgU+Mq3HVwfvfN8hlCcsDlZGWyU3RWH6q4I iodd3PIx6Ux6BearzK148tK1l+5RFfuoemGfVkjUJEDQoFvUdrmFvTXb4zTSdGon6LZD fcFn1EYqGAMACeQkFZezyZZOrGKytGnEoyYwoLtJ0KQlFlKf3bEkPedkhNLI4vz/hzfi KxeAz7KhIwMCDvUjB0vYcnWKwoMjZJIYJyXMrSdYM/x9oJTBSWqCfhAA2fwppIzeTIdC 3L7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732111086; x=1732715886; 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=bpnrF7DbjPXCVwT9oERqCmWHPHl9zb5oOn80hkJTT2E=; b=VxXeesqtGoeLbdX4V6U2zWwJQnwa0xRiZo4qVxhPVUW2xkoh3bPJCBTZyevwRnJjZt gtdKsHUWoO84l5w/9O+G/UUo5TQ//yIh7s1zwIuTBmuAffPUri4LYW99EXpRnuFoVTpJ FWFvdDQV4s/WUIdlp8z9NHBC97LOe9D3BnNsvMYKYK1ItbiN9QjgzSrpCVNYdW+ywnfh P05jBbGGNPf+7gGAaXCrWy9cVbsgI9zIHrJ6qdmt+k6MHjBZ9GkoDi19NtIGFSJql3wI hBscGXNW5j1nZ7Rd3xtQEYKy2Cmi+nayOxJWf6NXOGaL0wYmJGLTmuxYaNctJ7ZWzGBj DsBw== X-Gm-Message-State: AOJu0Yx8Cj4cmHPytSNnIumZ7ffPi6vj+itRfEToSFRzB0AG0GpUa9NJ tU98Yl/NHkf9oNP4Zor4AqaSTXwdHcjtTKw78PLa0268+ZuTlhYVqMdJi5uRUfAfYieP72qq6JO I X-Google-Smtp-Source: AGHT+IGCBh9kTITfrSe8H9YQP94EUb4HRMirUc5M6snSKncWaG8ogWjoHHcMvM+157FsdTbLbYdudA== X-Received: by 2002:a17:902:da8d:b0:212:b2b:6f10 with SMTP id d9443c01a7336-2126ae5b86bmr37876495ad.8.1732111086363; Wed, 20 Nov 2024 05:58:06 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2127a4db5b3sm4658175ad.233.2024.11.20.05.58.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 05:58:06 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][styhead 31/31] e2fsprogs: removed 'sed -u' option Date: Wed, 20 Nov 2024 05:57:03 -0800 Message-Id: <7f1b390aa83b6c22f5996cf2c952cbf9a460399e.1732110892.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 13:58:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207455 From: Aditya Tayade In embedded box, sed might be provided another providers like Busybox, hence use generic options whenever possible. /bin/sed -> /etc/alternatives/sed /etc/alternatives/sed -> /bin/busybox.nosuid Here used 'sed -u' option is not necessary, hence removed it. Fixes below error: sed: invalid option -- 'u' Also added 'set -eux' option which halts execution of the script on any failures. Signed-off-by: Aditya Tayade Signed-off-by: Pawan Badganchi Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie (cherry picked from commit 07caee1829d2a61bc018fe0e37ecd482922179ee) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest b/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest index 279923db8e..1857a17189 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest @@ -1,7 +1,8 @@ #!/bin/sh +set -eux cd ./test -SKIP_SLOW_TESTS=yes ./test_script | sed -u -e '/:[[:space:]]ok/s/^/PASS: /' -e '/:[[:space:]]failed/s/^/FAIL: /' -e '/:[[:space:]]skipped/s/^/SKIP: /' +SKIP_SLOW_TESTS=yes ./test_script | sed -e '/:[[:space:]]ok/s/^/PASS: /' -e '/:[[:space:]]failed/s/^/FAIL: /' -e '/:[[:space:]]skipped/s/^/SKIP: /' rm -rf /var/volatile/tmp/*e2fsprogs* rm -f tmp-* rm -f *.tmp