From patchwork Mon Nov 27 10:17:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35213 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 4CE23C46CA3 for ; Mon, 27 Nov 2023 10:18:07 +0000 (UTC) Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by mx.groups.io with SMTP id smtpd.web10.91941.1701080281948514879 for ; Mon, 27 Nov 2023 02:18:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=SEFu5qXb; spf=pass (domain: gmail.com, ip: 209.85.208.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-5482df11e73so5335213a12.0 for ; Mon, 27 Nov 2023 02:18:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701080280; x=1701685080; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xlDfQbiq4+FgLzsxvLlZ6IiT7sBqSGXHvk6gVCJG6GU=; b=SEFu5qXbamGkLJYmfxCh3jWyaqNRRGKcunEIvOtmYAytrZBSh2/Z+JhoV38gRKN4at L0Jf9P/Np7yAEpsOw0/IwPMk8mRvftutTCWj1WcLXW0u5JQMBK3e2Zo3wM2aOk/Pol8p v+Gla1rFoCNAym5EOSHe+7M7AZI1C1BOvWOdlO2MT2I0JQZ7a/wP3KGo+IxS0j3jVy54 W88uR3txyT7TpjjbwdjHaNxWiy70RuGaOw7Ukdbqs1/Pw0FPFjIbSva3kSQPcX2DAh7D KoUy/Je3hpQoG5X6iW1P8SzB34pjPpTJ8w6mtRzbGXbKIilfGYPfEyblYOF+IiQdRcwe PU4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701080280; x=1701685080; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xlDfQbiq4+FgLzsxvLlZ6IiT7sBqSGXHvk6gVCJG6GU=; b=slKfsiMY021q2rUAtQd8JCyuQpokvhK/t5qFu3HGQE6WsDBnjbzeGFPy5vHofrCCR+ tuPqfyfR0LTQys6wwc7wVUVa1vSgw/IbsBxgDWsScpsB7Ixqalm3obvSrC4w32awdWUQ TP5TuYoh5iJRlG5KAU86aYzTLSE15J18V5fgIBId8l/McmhEOx+AjyQTHzZF/l7La1D5 88KN5Ql51Q13p9MZhtHfFrF4iOh9KmNd4uGjzcj25LuzHnRtotiBkdB90tSJ0eYKPELq +sX2Uh7XLHjm4w4h3VSFqGbp7ZRWfTQ4DIQ88oI7tVektx2/pwAPjWCVZAoB7BHg+FVU DNEQ== X-Gm-Message-State: AOJu0YzNkWxPSrryDybVM4V8gn2L3WuQBrdifF5KQNKpg2O1aNKVIdm9 q0GCHGflE/zMaG7PEBuei4+vB2vmGfQ= X-Google-Smtp-Source: AGHT+IE2VUOizSYnzd2XKAySjqqhWwhVaSPE0UgPmFnmny8UU/vOnIdPRHxsPa6Jd5jBrc7ChbP2cQ== X-Received: by 2002:a17:906:2b42:b0:9dd:7ccf:77f8 with SMTP id b2-20020a1709062b4200b009dd7ccf77f8mr6744150ejg.20.1701080280102; Mon, 27 Nov 2023 02:18:00 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id h26-20020a170906585a00b00a0bf09c9483sm2757203ejs.35.2023.11.27.02.17.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 02:17:59 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 01/19] sstate.bbclass: setscene_depvalid(): do not exclude shadow-native from task dependency resolution Date: Mon, 27 Nov 2023 11:17:33 +0100 Message-Id: <20231127101751.3187950-1-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 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 ; Mon, 27 Nov 2023 10:18:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191268 This results in executables from shadow-native, such as useradd, falling through to host libraries instead of using native ones that they were linked with, because the native libraries would not be installed because of this dependency exclusion. Until now that could be coincidentally fulfilled with host libattr (which is present on all hosts), but latest useradd also wants libbsd and libmd, and those are not typically installed. The original reason to add this exclusion was: https://git.yoctoproject.org/poky/commit/?id=0d2a301bca4eb9d43243f1a03c1cd1ab3f27f30a While I can't be sure the reason no longer applies, sstate and sysroot handling has changed massively since early 2013, testing on a-full revealed no issues, and avoiding incorrect fall-through to host libraries is better than pulling unneeded dependencies. Signed-off-by: Alexander Kanavin --- meta/classes-global/sstate.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-global/sstate.bbclass b/meta/classes-global/sstate.bbclass index 5b27a1f0f98..4f49d8f9f8c 100644 --- a/meta/classes-global/sstate.bbclass +++ b/meta/classes-global/sstate.bbclass @@ -1119,7 +1119,7 @@ def setscene_depvalid(task, taskdependees, notneeded, d, log=None): # This is due to the [depends] in useradd.bbclass complicating matters # The logic *is* reversed here due to the way hard setscene dependencies are injected - if (taskdependees[task][1] == 'do_package' or taskdependees[task][1] == 'do_populate_sysroot') and taskdependees[dep][0].endswith(('shadow-native', 'shadow-sysroot', 'base-passwd', 'pseudo-native')) and taskdependees[dep][1] == 'do_populate_sysroot': + if (taskdependees[task][1] == 'do_package' or taskdependees[task][1] == 'do_populate_sysroot') and taskdependees[dep][0].endswith(('shadow-sysroot', 'base-passwd', 'pseudo-native')) and taskdependees[dep][1] == 'do_populate_sysroot': continue # Consider sysroot depending on sysroot tasks From patchwork Mon Nov 27 10:17:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35220 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 C0855C10DC2 for ; Mon, 27 Nov 2023 10:18:07 +0000 (UTC) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by mx.groups.io with SMTP id smtpd.web10.91942.1701080282224336175 for ; Mon, 27 Nov 2023 02:18:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=fW2EUya8; spf=pass (domain: gmail.com, ip: 209.85.208.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-54b7ef7f4d5so552692a12.1 for ; Mon, 27 Nov 2023 02:18:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701080281; x=1701685081; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eKRV2p7W9Qsk1nn/93RpoBWcvMT8PsnUv62ShOAnmc4=; b=fW2EUya8gCByf+WEjn5Zrz8N30AtRsqohSU1UGXxo26kltcS3OEJK/M4rDSi4qIVKG noJC38DcO54wZRSj1NtfrQMYMs2332bdi+G/dYxGy4qbxbnz0dar7de5E4gj5C6EdppD qM+D1PGIdSua81etme+TyyLkukiCpk9ReBSXBSJ3Q3Yi4AVXageor8jZBeFLRCPjp9yl FGSLioZLxK7uBQDC1Lm4e7Jfwtv1llHqBtUtdZuKnOSqhzUUF4OTI8r0FDVVT/uMMppy 636oSqxVyDQ3UfmXkK7VNgvcdE0SNuqiOmgEJs3M39pGYDJjG6OL5xOdeG8wa7o26BmM 7qFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701080281; x=1701685081; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eKRV2p7W9Qsk1nn/93RpoBWcvMT8PsnUv62ShOAnmc4=; b=M43IDmzuUcixHAAQbaWIBTYQjgzJuyKA/SPgxHFbdnn1QWEuO6yQmGf8Jt2kCJ5olu 6PHbvClGQh/J96R8JaNfhJakgC9Y/0F0tybksWu5f0FJRbWERGVBkA7KVNp4TDC9RZj7 KAvUqdv1suBHioValgWelHQLqQIPTv0B5uVbHP39CNmrWvY9ri/N6hcevtrHWt7+Dgbo Hay2L8Z7kbD6XRo+V1DYXs6F3TPhj+GJB3kXfMM37Bz6qkrsH2Mu+IJUD+teHGniDUd/ b73+QZYqk2lYvH7nrj6OKeSRreLx6pjQ1NsDoXQfpGiZ9hqjuZtyQ3rkCOklfuWXfJwf 9Khg== X-Gm-Message-State: AOJu0Ywzj2eLKkgaaBI81nsiZ8ULNjLzB0jF1vQWDVeNNEHRDzUzKSym ARXc64bJ+HWLlvQK7mM21l9WfWBKOwg= X-Google-Smtp-Source: AGHT+IHnX0CLLBvKeiBEPmDeREvQI31qd6FxcGn+/ASvqTtUlMe7c+riD/0A+oL52njn7CwU4w7yeA== X-Received: by 2002:a17:906:738e:b0:9ff:cdf3:553 with SMTP id f14-20020a170906738e00b009ffcdf30553mr8541997ejl.61.1701080280614; Mon, 27 Nov 2023 02:18:00 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id h26-20020a170906585a00b00a0bf09c9483sm2757203ejs.35.2023.11.27.02.18.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 02:18:00 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 02/19] useradd.bbclass: list all needed items for package_setscene task Date: Mon, 27 Nov 2023 11:17:34 +0100 Message-Id: <20231127101751.3187950-2-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127101751.3187950-1-alex@linutronix.de> References: <20231127101751.3187950-1-alex@linutronix.de> 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 ; Mon, 27 Nov 2023 10:18:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191269 Latest shadow-native links with additional libraries; I was unable to find a way to resolve those in setscene context where tasks do not contain such dependencies. Signed-off-by: Alexander Kanavin --- meta/classes/useradd.bbclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 4d3bd9a5f56..a35785c9c23 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass @@ -179,7 +179,13 @@ SSTATEPREINSTFUNCS:append:class-target = " useradd_sysroot_sstate" do_package_setscene[depends] += "${USERADDSETSCENEDEPS}" do_populate_sysroot_setscene[depends] += "${USERADDSETSCENEDEPS}" -USERADDSETSCENEDEPS:class-target = "${MLPREFIX}base-passwd:do_populate_sysroot_setscene pseudo-native:do_populate_sysroot_setscene shadow-native:do_populate_sysroot_setscene ${MLPREFIX}shadow-sysroot:do_populate_sysroot_setscene" +USERADDSETSCENEDEPS:class-target = "${MLPREFIX}base-passwd:do_populate_sysroot_setscene \ + pseudo-native:do_populate_sysroot_setscene \ + shadow-native:do_populate_sysroot_setscene \ + attr-native:do_populate_sysroot_setscene \ + libbsd-native:do_populate_sysroot_setscene \ + libmd-native:do_populate_sysroot_setscene \ + ${MLPREFIX}shadow-sysroot:do_populate_sysroot_setscene" USERADDSETSCENEDEPS = "" # Recipe parse-time sanity checks From patchwork Mon Nov 27 10:17:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35216 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 69815C07D5B for ; Mon, 27 Nov 2023 10:18:07 +0000 (UTC) Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by mx.groups.io with SMTP id smtpd.web11.91590.1701080283052440936 for ; Mon, 27 Nov 2023 02:18:03 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=N70Rz1jQ; spf=pass (domain: gmail.com, ip: 209.85.218.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-a02cc476581so533312066b.2 for ; Mon, 27 Nov 2023 02:18:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701080281; x=1701685081; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BneVUPYP2EGt8QfnmZpcFFlCTmrwjpZ2AFGqU/EkK+s=; b=N70Rz1jQYV845enAEszcjv/pENJOjgtFZcsYl+QruNpdPbLeW/fif/tCMLiST9KEKV qF1cJUOom80VPGhedrdMheRHUppHcc+QILLB6iF7VqU+Ead6DGoUzPBpeARBDt0sg/79 ey8dhktKSemge1yr6m413/Cwo6fkgQxjaqwls+VeAiER9AaCZNc4p+nssg5ShYvlMg8R dUsO2Vh3jcFZa0Va5LWt6nmjwPGVxJ1zWvAfB0yk4Wr47WuOcMjX265En7ihFaACu2JC Wors1IaneMXcbHKHrzZKasexetAIUUJgI9jgkMxWxzndUdAiWV4ad7oMsDHlQA3H+rNP OQdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701080281; x=1701685081; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BneVUPYP2EGt8QfnmZpcFFlCTmrwjpZ2AFGqU/EkK+s=; b=m1VstiFLiNjLsC2cZTCy5VDhuoLg1LmDExGmrYOfrsUT77sLw09vLth5gDAjOqgQ4+ VDIe1zpPvmsXpbhLOAwELiZpy0lchfrHw69tm4ta+RdiKaLdhCAvG7ZiFsTM+9qYQGG7 HAyMOaS3NG6cBKI2DKv5sdxK7b0xE57ZsogmPWXG0yPDGnEW2WwpNz9QMLeW2ssS3GYM tgD81QYgRqBmBwcfMGicfEwKfUJXvYe8XE1A8r623giGNqd+m8/QzLD6qE5kKXMs4MzV CZkSv4qglmcHkMRhx3S9RVrt+o4XhaFRcxdP6Yf+PDLHcSwbh+iuC+NG1z3VdWqx7FB4 lSvA== X-Gm-Message-State: AOJu0Yw5lXyXt3FAc0PXvd4D73rp7iYc64+sNiYqtZzsmxSyLGK3HcdU pmgiDL1IJMhlckxfAT6YD2NwKQuUj7w= X-Google-Smtp-Source: AGHT+IFW6k5ErGTH3A/ww8dm/pe2vGm5i8nUIv4G9zLUL52zj7f0lqTdagvNvyHw7sclgjt3p8ry8g== X-Received: by 2002:a17:906:c0a:b0:a04:45c6:c261 with SMTP id s10-20020a1709060c0a00b00a0445c6c261mr7955637ejf.66.1701080281140; Mon, 27 Nov 2023 02:18:01 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id h26-20020a170906585a00b00a0bf09c9483sm2757203ejs.35.2023.11.27.02.18.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 02:18:00 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 03/19] shadow: update 4.13 -> 4.14.2 Date: Mon, 27 Nov 2023 11:17:35 +0100 Message-Id: <20231127101751.3187950-3-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127101751.3187950-1-alex@linutronix.de> References: <20231127101751.3187950-1-alex@linutronix.de> 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 ; Mon, 27 Nov 2023 10:18:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191270 License-Update: formatting, spdx conversion Drop: 0001-Disable-use-of-syslog-for-sysroot.patch (issue fixed upstream) 0001-Fix-can-not-print-full-login.patch 0001-Overhaul-valid_field.patch CVE-2023-29383.patch (backports) libbsd is a new native dependency, as otherwise glibc >= 2.38 is needed. A similar fix is added to musl in order to define non-standard __BEGIN_DECLS/__END_DECLS. Signed-off-by: Alexander Kanavin --- ...01-Disable-use-of-syslog-for-sysroot.patch | 52 --------------- .../0001-Fix-can-not-print-full-login.patch | 41 ------------ .../files/0001-Overhaul-valid_field.patch | 65 ------------------- .../shadow/files/CVE-2023-29383.patch | 53 --------------- ...nexpected-open-failure-in-chroot-env.patch | 16 +++-- meta/recipes-extended/shadow/shadow.inc | 19 ++---- .../{shadow_4.13.bb => shadow_4.14.2.bb} | 0 7 files changed, 16 insertions(+), 230 deletions(-) delete mode 100644 meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch delete mode 100644 meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch delete mode 100644 meta/recipes-extended/shadow/files/0001-Overhaul-valid_field.patch delete mode 100644 meta/recipes-extended/shadow/files/CVE-2023-29383.patch rename meta/recipes-extended/shadow/{shadow_4.13.bb => shadow_4.14.2.bb} (100%) diff --git a/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch b/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch deleted file mode 100644 index fa1532c8317..00000000000 --- a/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 85d0444229ee3d14fefcf10d093f49c862826f82 Mon Sep 17 00:00:00 2001 -From: Richard Purdie -Date: Thu, 14 Apr 2022 23:11:53 +0000 -Subject: [PATCH] Disable use of syslog for shadow-native tools - -Disable use of syslog to prevent sysroot user and group additions from -writing entries to the host's syslog. This patch should only be used -with the shadow-native recipe. - -Upstream-Status: Inappropriate [OE specific configuration] -Signed-off-by: Richard Purdie -Signed-off-by: Peter Kjellerstedt - ---- - configure.ac | 2 +- - src/login_nopam.c | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 924254a..603af81 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -191,7 +191,7 @@ AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$shadow_cv_passwd_dir/passwd", - [Path to passwd program.]) - - dnl XXX - quick hack, should disappear before anyone notices :). --AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().]) -+#AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().]) - if test "$ac_cv_func_ruserok" = "yes"; then - AC_DEFINE(RLOGIN, 1, [Define if login should support the -r flag for rlogind.]) - AC_DEFINE(RUSEROK, 0, [Define to the ruserok() "success" return value (0 or 1).]) -diff --git a/src/login_nopam.c b/src/login_nopam.c -index df6ba88..fc24e13 100644 ---- a/src/login_nopam.c -+++ b/src/login_nopam.c -@@ -29,7 +29,6 @@ - #ifndef USE_PAM - #ident "$Id$" - --#include "prototypes.h" - /* - * This module implements a simple but effective form of login access - * control based on login names and on host (or domain) names, internet -@@ -57,6 +56,8 @@ - #include - #include /* for inet_ntoa() */ - -+#include "prototypes.h" -+ - #if !defined(MAXHOSTNAMELEN) || (MAXHOSTNAMELEN < 64) - #undef MAXHOSTNAMELEN - #define MAXHOSTNAMELEN 256 diff --git a/meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch b/meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch deleted file mode 100644 index 89f9c05c8d3..00000000000 --- a/meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch +++ /dev/null @@ -1,41 +0,0 @@ -commit 670cae834827a8f794e6f7464fa57790d911b63c -Author: SoumyaWind <121475834+SoumyaWind@users.noreply.github.com> -Date: Tue Dec 27 17:40:17 2022 +0530 - - shadow: Fix can not print full login timeout message - - Login timed out message prints only first few bytes when write is immediately followed by exit. - Calling exit from new handler provides enough time to display full message. - -Upstream-Status: Backport [https://github.com/shadow-maint/shadow/commit/670cae834827a8f794e6f7464fa57790d911b63c] - -diff --git a/src/login.c b/src/login.c -index 116e2cb3..c55f4de0 100644 ---- a/src/login.c -+++ b/src/login.c -@@ -120,6 +120,7 @@ static void get_pam_user (char **ptr_pam_user); - - static void init_env (void); - static void alarm_handler (int); -+static void exit_handler (int); - - /* - * usage - print login command usage and exit -@@ -391,11 +392,16 @@ static void init_env (void) - #endif /* !USE_PAM */ - } - -+static void exit_handler (unused int sig) -+{ -+ _exit (0); -+} - - static void alarm_handler (unused int sig) - { - write (STDERR_FILENO, tmsg, strlen (tmsg)); -- _exit (0); -+ signal(SIGALRM, exit_handler); -+ alarm(2); - } - - #ifdef USE_PAM diff --git a/meta/recipes-extended/shadow/files/0001-Overhaul-valid_field.patch b/meta/recipes-extended/shadow/files/0001-Overhaul-valid_field.patch deleted file mode 100644 index ac08be515bf..00000000000 --- a/meta/recipes-extended/shadow/files/0001-Overhaul-valid_field.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 2eaea70111f65b16d55998386e4ceb4273c19eb4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= -Date: Fri, 31 Mar 2023 14:46:50 +0200 -Subject: [PATCH] Overhaul valid_field() - -e5905c4b ("Added control character check") introduced checking for -control characters but had the logic inverted, so it rejects all -characters that are not control ones. - -Cast the character to `unsigned char` before passing to the character -checking functions to avoid UB. - -Use strpbrk(3) for the illegal character test and return early. - -Upstream-Status: Backport [https://github.com/shadow-maint/shadow/commit/2eaea70111f65b16d55998386e4ceb4273c19eb4] - -Signed-off-by: Xiangyu Chen ---- - lib/fields.c | 24 ++++++++++-------------- - 1 file changed, 10 insertions(+), 14 deletions(-) - -diff --git a/lib/fields.c b/lib/fields.c -index fb51b582..53929248 100644 ---- a/lib/fields.c -+++ b/lib/fields.c -@@ -37,26 +37,22 @@ int valid_field (const char *field, const char *illegal) - - /* For each character of field, search if it appears in the list - * of illegal characters. */ -+ if (illegal && NULL != strpbrk (field, illegal)) { -+ return -1; -+ } -+ -+ /* Search if there are non-printable or control characters */ - for (cp = field; '\0' != *cp; cp++) { -- if (strchr (illegal, *cp) != NULL) { -+ unsigned char c = *cp; -+ if (!isprint (c)) { -+ err = 1; -+ } -+ if (iscntrl (c)) { - err = -1; - break; - } - } - -- if (0 == err) { -- /* Search if there are non-printable or control characters */ -- for (cp = field; '\0' != *cp; cp++) { -- if (!isprint (*cp)) { -- err = 1; -- } -- if (!iscntrl (*cp)) { -- err = -1; -- break; -- } -- } -- } -- - return err; - } - --- -2.34.1 - diff --git a/meta/recipes-extended/shadow/files/CVE-2023-29383.patch b/meta/recipes-extended/shadow/files/CVE-2023-29383.patch deleted file mode 100644 index f53341d3fc2..00000000000 --- a/meta/recipes-extended/shadow/files/CVE-2023-29383.patch +++ /dev/null @@ -1,53 +0,0 @@ -From e5905c4b84d4fb90aefcd96ee618411ebfac663d Mon Sep 17 00:00:00 2001 -From: tomspiderlabs <128755403+tomspiderlabs@users.noreply.github.com> -Date: Thu, 23 Mar 2023 23:39:38 +0000 -Subject: [PATCH] Added control character check - -Added control character check, returning -1 (to "err") if control characters are present. - -CVE: CVE-2023-29383 -Upstream-Status: Backport - -Reference to upstream: -https://github.com/shadow-maint/shadow/commit/e5905c4b84d4fb90aefcd96ee618411ebfac663d - -Signed-off-by: Xiangyu Chen ---- - lib/fields.c | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/lib/fields.c b/lib/fields.c -index 640be931..fb51b582 100644 ---- a/lib/fields.c -+++ b/lib/fields.c -@@ -21,9 +21,9 @@ - * - * The supplied field is scanned for non-printable and other illegal - * characters. -- * + -1 is returned if an illegal character is present. -- * + 1 is returned if no illegal characters are present, but the field -- * contains a non-printable character. -+ * + -1 is returned if an illegal or control character is present. -+ * + 1 is returned if no illegal or control characters are present, -+ * but the field contains a non-printable character. - * + 0 is returned otherwise. - */ - int valid_field (const char *field, const char *illegal) -@@ -45,10 +45,13 @@ int valid_field (const char *field, const char *illegal) - } - - if (0 == err) { -- /* Search if there are some non-printable characters */ -+ /* Search if there are non-printable or control characters */ - for (cp = field; '\0' != *cp; cp++) { - if (!isprint (*cp)) { - err = 1; -+ } -+ if (!iscntrl (*cp)) { -+ err = -1; - break; - } - } --- -2.34.1 - diff --git a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch b/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch index 85d91751056..4a932d2dbb1 100644 --- a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch +++ b/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch @@ -1,4 +1,4 @@ -From 21583da072aa66901d859ac00ce209bac87ddecc Mon Sep 17 00:00:00 2001 +From a773c6b240d27e23d6be41decef0edf24fcee523 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 17 Jul 2014 15:53:34 +0800 Subject: [PATCH] commonio.c-fix-unexpected-open-failure-in-chroot-env @@ -15,35 +15,37 @@ Note that this patch doesn't change the logic in the code, it just expands the codes. Signed-off-by: Chen Qi - --- lib/commonio.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/commonio.c b/lib/commonio.c -index 9a02ce1..61384ec 100644 +index 73fdb3a..d1231e9 100644 --- a/lib/commonio.c +++ b/lib/commonio.c -@@ -616,10 +616,18 @@ int commonio_open (struct commonio_db *db, int mode) +@@ -606,10 +606,18 @@ int commonio_open (struct commonio_db *db, int mode) db->cursor = NULL; db->changed = false; - fd = open (db->filename, - (db->readonly ? O_RDONLY : O_RDWR) -- | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW); +- | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW | O_CLOEXEC); - saved_errno = errno; + if (db->readonly) { + fd = open (db->filename, + (true ? O_RDONLY : O_RDWR) -+ | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW); ++ | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW | O_CLOEXEC); + saved_errno = errno; + } else { + fd = open (db->filename, + (false ? O_RDONLY : O_RDWR) -+ | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW); ++ | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW| O_CLOEXEC); + saved_errno = errno; + } + db->fp = NULL; if (fd >= 0) { #ifdef WITH_TCB +-- +2.30.2 + diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 83e1a847693..c024746d4ff 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -5,7 +5,7 @@ BUGTRACKER = "http://github.com/shadow-maint/shadow/issues" SECTION = "base/utils" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=c9a450b7be84eac23e6353efecb60b5b \ - file://src/passwd.c;beginline=2;endline=30;md5=758c26751513b6795395275969dd3be1 \ + file://src/passwd.c;beginline=2;endline=7;md5=67bcf314687820b2f010d4863fce3fc5 \ " DEPENDS = "virtual/crypt" @@ -14,9 +14,6 @@ GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases" SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ file://useradd \ - file://0001-Fix-can-not-print-full-login.patch \ - file://CVE-2023-29383.patch \ - file://0001-Overhaul-valid_field.patch \ " SRC_URI:append:class-target = " \ @@ -25,14 +22,9 @@ SRC_URI:append:class-target = " \ " SRC_URI:append:class-native = " \ - file://0001-Disable-use-of-syslog-for-sysroot.patch \ file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ " -SRC_URI:append:class-nativesdk = " \ - file://0001-Disable-use-of-syslog-for-sysroot.patch \ - " -SRC_URI[sha256sum] = "813057047499c7fe81108adcf0cffa3ad4ec75e19a80151f9cbaa458ff2e86cd" - +SRC_URI[sha256sum] = "a305edf5d19bddbdf5e836d2d609fa8bff2d35458819de4d9f06306a1cf24342" # Additional Policy files for PAM PAM_SRC_URI = "file://pam.d/chfn \ @@ -43,7 +35,7 @@ PAM_SRC_URI = "file://pam.d/chfn \ file://pam.d/passwd \ file://pam.d/su" -inherit autotools gettext github-releases +inherit autotools gettext github-releases pkgconfig export CONFIG_SHELL="/bin/sh" @@ -53,6 +45,8 @@ EXTRA_OECONF += "--without-libcrack \ --without-sssd \ ${NSCDOPT}" +CFLAGS:append:libc-musl = " -DLIBBSD_OVERLAY" + NSCDOPT = "" NSCDOPT:class-native = "--without-nscd" NSCDOPT:class-nativesdk = "--without-nscd" @@ -72,13 +66,14 @@ PAM_PLUGINS = "libpam-runtime \ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" -PACKAGECONFIG:class-native ??= "${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" +PACKAGECONFIG:class-native ??= "${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} libbsd" PACKAGECONFIG:class-nativesdk = "" PACKAGECONFIG[pam] = "--with-libpam,--without-libpam,libpam,${PAM_PLUGINS}" PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit" PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux libsemanage" +PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" RDEPENDS:${PN} = "shadow-securetty \ base-passwd \ diff --git a/meta/recipes-extended/shadow/shadow_4.13.bb b/meta/recipes-extended/shadow/shadow_4.14.2.bb similarity index 100% rename from meta/recipes-extended/shadow/shadow_4.13.bb rename to meta/recipes-extended/shadow/shadow_4.14.2.bb From patchwork Mon Nov 27 10:17:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35223 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 B3E1DC10DC1 for ; Mon, 27 Nov 2023 10:18:07 +0000 (UTC) Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by mx.groups.io with SMTP id smtpd.web10.91944.1701080283361148485 for ; Mon, 27 Nov 2023 02:18:03 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=H81U7t74; spf=pass (domain: gmail.com, ip: 209.85.208.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-54b18dbf148so2446590a12.1 for ; Mon, 27 Nov 2023 02:18:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701080282; x=1701685082; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Wy1nrkaDFKWgTAi3/37lmNjaN0oAMdUN1H+X/tCpjww=; b=H81U7t74QPfGwM5QZCf3nOiYaj07mc+fH8GKOZqER7m9PkVDxcf4coxYqWX4V5gCgr Rm+YPFh/bfbbwbtSrAeH8zX2dEao6ESigGuVPxoKfYnxWxjpjfgB07TorXnarZC5S85z 8YPwNiaEW5PzDldSwNVs46rLog5HI7M443h0oQYoXLzWZ7Of+aLJAQeW1J+NViapuApE f23hgqUBzwkPY6Yrwz6R0xmd4W/cSFc1KucDWbXKfioEuGpWZBBRPnc9mHPlPWPiVJ7i n3Zz4FK/6+Tgkh3gWyMXXdeIuCaotrFMoPDsIqhzKpudWr+fgPGvnKpne/gGn3nJXAvP GPkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701080282; x=1701685082; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Wy1nrkaDFKWgTAi3/37lmNjaN0oAMdUN1H+X/tCpjww=; b=d6Wmtki1ylP/aQrNUY3J+eMP/ZZcmmIazuxncwimk73M4Z5KuzwBxJhsXIygBwPOZg wgE+BHak0XBzwi7ZSaKfvRayYfhrWerz90VgjRiX/eW+3dfdlR+xBqs/osKijeAt27ks BzDH3LExeaj4xYZxfxB9KbfAjJLDt7Nsmbi7/6xn4kgkk64md5HbDTH8476ZRSWVDBPw eoNRCczocXkM+dBThQFeG31EmTxJq2+c4ZWFycDXwZw79FLAGiQ8lrhX5gFdAQOdax+o wjMPyjfnQUbCMVaABCT2gEaAB0uea1HorUIgiV1L8iZf59Wn3VymQfCJS96cH2Wg4kOy 6Apg== X-Gm-Message-State: AOJu0YzzyDwOVL/dhngZz/9N5S0FFH3ULm7CE6g5Sx/4lS8PFuY/qpFR 5T903KHoHvhtq/NeigcdyBIaLxQ11As= X-Google-Smtp-Source: AGHT+IGgr8ScU9T9SgxR2cBeLnTfo7bLsz9hTJ59rEaeB/1QSRSPv4RfTaYoXyurteKqnkic/7Dpfg== X-Received: by 2002:a17:907:c8f:b0:9c6:8190:359f with SMTP id gi15-20020a1709070c8f00b009c68190359fmr6643500ejc.33.1701080281670; Mon, 27 Nov 2023 02:18:01 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id h26-20020a170906585a00b00a0bf09c9483sm2757203ejs.35.2023.11.27.02.18.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 02:18:01 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 04/19] python3-pyproject-hooks: fix upstream version check Date: Mon, 27 Nov 2023 11:17:36 +0100 Message-Id: <20231127101751.3187950-4-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127101751.3187950-1-alex@linutronix.de> References: <20231127101751.3187950-1-alex@linutronix.de> 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 ; Mon, 27 Nov 2023 10:18:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191271 Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/python/python3-pyproject-hooks_1.0.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/python/python3-pyproject-hooks_1.0.0.bb b/meta/recipes-devtools/python/python3-pyproject-hooks_1.0.0.bb index c3f1fb75ed1..9d08e7acc41 100644 --- a/meta/recipes-devtools/python/python3-pyproject-hooks_1.0.0.bb +++ b/meta/recipes-devtools/python/python3-pyproject-hooks_1.0.0.bb @@ -22,3 +22,5 @@ RDEPENDS:${PN} += " \ do_compile:class-native () { python_flit_core_do_manual_build } + +UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" From patchwork Mon Nov 27 10:17:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35222 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 A718CC46CA7 for ; Mon, 27 Nov 2023 10:18:07 +0000 (UTC) Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by mx.groups.io with SMTP id smtpd.web10.91945.1701080284224075065 for ; Mon, 27 Nov 2023 02:18:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=llkx8o9J; spf=pass (domain: gmail.com, ip: 209.85.218.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-a049d19b63bso551027766b.2 for ; Mon, 27 Nov 2023 02:18:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701080282; x=1701685082; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=v9r94YKit91u/adUpCKYE6i5DphpwKkrFZrlQFJcr28=; b=llkx8o9JTevFU7MV8VQeSWg02jNErWYJW6qmo9yATJYSb5/xizkiwL1pxZ2WDIFM8+ RstSAggxXNs6Kk/GfBSZ0WDkZQIlqL0U0qJBCj3gf7iTBUStsVfmGAsQ4t6R60IosRGH fObV+PHCIh1v3VrUozy+X/chASL0HWkQxRCoUQXSWPtzMCb/3bT5bQ9gKJso6APhexrx QhpMzdsuDSELK482fLcORaWv34CvHubdVfeUDUh1Lxy40Lf2AZquSilVLsR5VbEgzA53 E1DymJyp+YpvQFToRB92pv/eaDDDhghF4QO+Z4YpDyIfSHb7cAFL5PakAC45I0IHc14q nVcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701080282; x=1701685082; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v9r94YKit91u/adUpCKYE6i5DphpwKkrFZrlQFJcr28=; b=HNvpnr1bX23cqRnEKfYlr9epTn3N73cwEbcUospoLF2rY9/LbA/gRJ9Jr5bk6ig21T qGW63KjVBxIkWntZIUD0urKCHBxawxx23ugkMLXgc+tpbvuGYstDM+E8E3v01As2zjUS s+jjERt4A0OMfhfHQNymYIOlbEsytDcDbd3RBN60hA/0qJbWDLNzVlFzGVwl6d/3+srT kjnCH6RLId02aJKdoGtj6i1+2a2M6p73HSJoq06jgwkyfJTuj76xePKvX+z+kBoP8bOq D+AInpUvXoDBDQJ9DIqV+2bDKq2lOLndSHyOvvYqXlPk02qJ0NSFeSEOs2SaOb0gLbW4 ia5A== X-Gm-Message-State: AOJu0Yw8zDAbiZlMObp3p3dp4j1S68Qlco9NiV2MXdN5wvLehDx+6hNJ dKWnV4bQM/qvnJa+oyPEZ6KEjim/cvc= X-Google-Smtp-Source: AGHT+IF8fLnh1Tgwp+n1fup8YZjqdZ46ekgUFntDuPe2hmYLFZy8ljBeBf74auqN9SDkebnHYvi4Pw== X-Received: by 2002:a17:906:6c88:b0:9c3:1d7e:f5b5 with SMTP id s8-20020a1709066c8800b009c31d7ef5b5mr8128770ejr.20.1701080282412; Mon, 27 Nov 2023 02:18:02 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id h26-20020a170906585a00b00a0bf09c9483sm2757203ejs.35.2023.11.27.02.18.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 02:18:02 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 05/19] usbutils: upgrade 015 -> 017 Date: Mon, 27 Nov 2023 11:17:37 +0100 Message-Id: <20231127101751.3187950-5-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127101751.3187950-1-alex@linutronix.de> References: <20231127101751.3187950-1-alex@linutronix.de> 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 ; Mon, 27 Nov 2023 10:18:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191272 Drop CFLAGS (containing host paths) from installed pkg-config file. Signed-off-by: Alexander Kanavin --- .../usbutils/{usbutils_015.bb => usbutils_017.bb} | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) rename meta/recipes-bsp/usbutils/{usbutils_015.bb => usbutils_017.bb} (86%) diff --git a/meta/recipes-bsp/usbutils/usbutils_015.bb b/meta/recipes-bsp/usbutils/usbutils_017.bb similarity index 86% rename from meta/recipes-bsp/usbutils/usbutils_015.bb rename to meta/recipes-bsp/usbutils/usbutils_017.bb index a30037b6938..c62c6256fc8 100644 --- a/meta/recipes-bsp/usbutils/usbutils_015.bb +++ b/meta/recipes-bsp/usbutils/usbutils_017.bb @@ -13,7 +13,7 @@ DEPENDS = "libusb1 virtual/libiconv udev" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "2b8140664578f39c3f6f0166a1b950f8655304e63e3d7f89899acb99bc5cb8e7" +SRC_URI[sha256sum] = "f704c4cb78a060db88b43aac6ebfd3d93c2c5cf1d6dd0e42936faaf00814ab00" inherit autotools pkgconfig update-alternatives @@ -30,3 +30,7 @@ RRECOMMENDS:${PN} = "udev-hwdb" PACKAGE_BEFORE_PN =+ "${PN}-python" FILES:${PN}-python += "${bindir}/lsusb.py" RDEPENDS:${PN}-python = "python3-core" + +do_install:append() { + sed -i -e "s,${WORKDIR},,g" ${D}/${libdir}/pkgconfig/*.pc +} From patchwork Mon Nov 27 10:17:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35219 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 9F695C10DAA for ; Mon, 27 Nov 2023 10:18:07 +0000 (UTC) Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by mx.groups.io with SMTP id smtpd.web10.91946.1701080284433288510 for ; Mon, 27 Nov 2023 02:18:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=WiR16gNr; spf=pass (domain: gmail.com, ip: 209.85.208.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-548d60a4d60so5364954a12.2 for ; Mon, 27 Nov 2023 02:18:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701080283; x=1701685083; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hqpsgy3ONaslkRCh5SCKL4UrcVlW4KbVc2Mjo73D30k=; b=WiR16gNrJutKChQz3YadOZfyvN+S6X/qIXqYr7U4L9L/1abbBxOPiszEB5wt1Y2MjL TQs+Ht4E/CJ15BVT04AaKaGMhLaI9lj06kfMBcp8bc8OzK0+E/Y1AePPVMeDjVzjFOqy dQHe2REwHw4Urfx1271zjsmJdRrFmGvSQXzrYRv0S2cF/C3M3yyMUbBWHAVPLgDaCOow 6EeOVIZt4fn6YH7LqiM3W3waw3yhSpW+j7dfJNYNI8D+YvlxOjFoA82QVKvhT50PXLvX MLNXunixyEqqMb3u9S8vuAvQhoMnMaOaMFmzqwJlg1Bf4vZSVdf0t6ELUBMXUIc+WCTd BMVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701080283; x=1701685083; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hqpsgy3ONaslkRCh5SCKL4UrcVlW4KbVc2Mjo73D30k=; b=NvXopX4UmEjdYecq6rXXRsVe+tZk7JNO0kjMTIYH9oXXffizRnSM01YSyVFwSf+93u DKufZ8rR7A7dxYt/180DwwMrQqXsPQQBcFNxG5iKhpKB4mk1IUrdamHmt22p+U8xesEP nG4RB5a1oo61yV8KJX3AOWwX6QlXkvH+TvsL3iuryHLHDMHHECf/GMw3LZyK9aZhOSL6 RPnIaMAq3zraS/4Cx9gYbYU+e9h95W7WSWk26YwbN0e5RaStkLPLdFSkkKnSdFbgii+p F0bp6LuGyL64LXBaIZ4Hnh1/41UAHuyf6K39TWgSdmbo6fYDpI8qek8JTk5CPbOhHzE0 leXA== X-Gm-Message-State: AOJu0Yy+XyJDn07b6iuqD2flf2p9M5ZDSJXftp1oHYfIo9VjdoJOPwRf rMFlHG1WiOWI8PJbvizAF5gYdzJr0gc= X-Google-Smtp-Source: AGHT+IF2oAHSsum4Z1qihNhK9Z3e2PT9lKfymPdDMg6lCySOKz0CKbwAwnWwMhhFSnXXDvEuuOQCVA== X-Received: by 2002:a17:906:b299:b0:a03:ad29:a00b with SMTP id q25-20020a170906b29900b00a03ad29a00bmr9114747ejz.36.1701080282925; Mon, 27 Nov 2023 02:18:02 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id h26-20020a170906585a00b00a0bf09c9483sm2757203ejs.35.2023.11.27.02.18.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 02:18:02 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 06/19] cmake: upgrade 3.27.5 -> 3.27.7 Date: Mon, 27 Nov 2023 11:17:38 +0100 Message-Id: <20231127101751.3187950-6-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127101751.3187950-1-alex@linutronix.de> References: <20231127101751.3187950-1-alex@linutronix.de> 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 ; Mon, 27 Nov 2023 10:18:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191273 Signed-off-by: Alexander Kanavin --- .../cmake/{cmake-native_3.27.5.bb => cmake-native_3.27.7.bb} | 0 meta/recipes-devtools/cmake/cmake.inc | 2 +- .../recipes-devtools/cmake/{cmake_3.27.5.bb => cmake_3.27.7.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/cmake/{cmake-native_3.27.5.bb => cmake-native_3.27.7.bb} (100%) rename meta/recipes-devtools/cmake/{cmake_3.27.5.bb => cmake_3.27.7.bb} (100%) diff --git a/meta/recipes-devtools/cmake/cmake-native_3.27.5.bb b/meta/recipes-devtools/cmake/cmake-native_3.27.7.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake-native_3.27.5.bb rename to meta/recipes-devtools/cmake/cmake-native_3.27.7.bb diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index ef4eec5ab1b..ecb0e487df2 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "5175e8fe1ca9b1dd09090130db7201968bcce1595971ff9e9998c2f0765004c9" +SRC_URI[sha256sum] = "08f71a106036bf051f692760ef9558c0577c42ac39e96ba097e7662bd4158d8e" UPSTREAM_CHECK_REGEX = "cmake-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/cmake/cmake_3.27.5.bb b/meta/recipes-devtools/cmake/cmake_3.27.7.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake_3.27.5.bb rename to meta/recipes-devtools/cmake/cmake_3.27.7.bb From patchwork Mon Nov 27 10:17:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35217 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 955E0C07E98 for ; Mon, 27 Nov 2023 10:18:07 +0000 (UTC) Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by mx.groups.io with SMTP id smtpd.web10.91947.1701080285198674559 for ; Mon, 27 Nov 2023 02:18:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=JKS5wOw7; spf=pass (domain: gmail.com, ip: 209.85.218.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-a00cbb83c80so555000166b.0 for ; Mon, 27 Nov 2023 02:18:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701080283; x=1701685083; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hKOEzLJoLtD573/RUjwMirBKxFVj9HGHTzNrBSduCqk=; b=JKS5wOw775YZuj1eWlU/xhNcdK3UutGN3+AV5WKPKpeC2i5DlbEZC89vwrrP33C8D9 WCTlcdcW2LOukc5zogvo2bDk0u76xu/ySzGGwxmOk2s0R5Bx/kCiXjW7bJZu00J5uYIw AldFnj9WVKa/ndOs3RIVyu1XfBIZZq5IlPwOPlTSIZe86baVwxhMygwhqAdVde/9klyk AYlDWMdCyTEjWR6ZHxhHAzAu7kFV5qrudjcX9ioP5KMIfAFhwSHjhPzsW8JM8GpLWewP zzkzedh/ZeFduzTZlinKUcciaBC8cLPCdrp4Wlr2jaTnUDn7j5fT1QpcBDDdWm5NLYwM ekNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701080283; x=1701685083; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hKOEzLJoLtD573/RUjwMirBKxFVj9HGHTzNrBSduCqk=; b=F+CUISSM7CYAchgHLrhtOR4RpR5gnIgPbrxUGN6G4eHl3iAMMWeUptB3jj9yd1wr1s hZf344F854+2WakrhYdWlhIOxQ4mA/sjlJF2QX68whTbgogRTiKeqYgLRfXOdaJ931VG X3NW4+lUvQ38Gj0GHvCvDwEyeGPKxrCXpmr67iIVOaz/YTphDsJdXWBArdixbAIgXoHg qapgzwUxUE69AaNeidC1V0YR7Fyad9kfyW86SDG5zBaq8FBClcfONKMqnK5UKDHuanSt R7xjvCikpGS+rK5yWt6a9C4L9/yUaAQd1rciHbbyOa3zbb8cbKzt3YkGeP94+2j0SYs8 LV2Q== X-Gm-Message-State: AOJu0YzewDR6j3UUR3FxH3o919q/mj3q9mnQq/ArhmSfF8UWuw/LFQcL fW3njV+vkmuf5wU4XC/kbfgYqQfzolc= X-Google-Smtp-Source: AGHT+IFRXwaM/crBRSbHTs3Y5V74YXUvvOoljqliPTFJyW4jj3WNolpunpekG04ouhsGvujYmX78+w== X-Received: by 2002:a17:906:51d2:b0:a0e:313a:ebf9 with SMTP id v18-20020a17090651d200b00a0e313aebf9mr2694116ejk.66.1701080283404; Mon, 27 Nov 2023 02:18:03 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id h26-20020a170906585a00b00a0bf09c9483sm2757203ejs.35.2023.11.27.02.18.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 02:18:03 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 07/19] desktop-file-utils: upgrade 0.26 -> 0.27 Date: Mon, 27 Nov 2023 11:17:39 +0100 Message-Id: <20231127101751.3187950-7-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127101751.3187950-1-alex@linutronix.de> References: <20231127101751.3187950-1-alex@linutronix.de> 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 ; Mon, 27 Nov 2023 10:18:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191274 Convert to meson. Signed-off-by: Alexander Kanavin --- ...ktop-file-utils_0.26.bb => desktop-file-utils_0.27.bb} | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) rename meta/recipes-devtools/desktop-file-utils/{desktop-file-utils_0.26.bb => desktop-file-utils_0.27.bb} (76%) diff --git a/meta/recipes-devtools/desktop-file-utils/desktop-file-utils_0.26.bb b/meta/recipes-devtools/desktop-file-utils/desktop-file-utils_0.27.bb similarity index 76% rename from meta/recipes-devtools/desktop-file-utils/desktop-file-utils_0.26.bb rename to meta/recipes-devtools/desktop-file-utils/desktop-file-utils_0.27.bb index f6d1146e892..55c88afcc9c 100644 --- a/meta/recipes-devtools/desktop-file-utils/desktop-file-utils_0.26.bb +++ b/meta/recipes-devtools/desktop-file-utils/desktop-file-utils_0.27.bb @@ -8,18 +8,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://src/validator.c;beginline=4;endline=27;md5=281e1114ee6c486a1a0a4295986b9416" SRC_URI = "http://freedesktop.org/software/${BPN}/releases/${BP}.tar.xz" -SRC_URI[md5sum] = "29739e005f5887cf41639b8450f3c23f" -SRC_URI[sha256sum] = "b26dbde79ea72c8c84fb7f9d870ffd857381d049a86d25e0038c4cef4c747309" +SRC_URI[sha256sum] = "a0817df39ce385b6621880407c56f1f298168c040c2032cedf88d5b76affe836" DEPENDS = "glib-2.0" -inherit autotools pkgconfig - -EXTRA_OECONF += "ac_cv_prog_EMACS=no" +inherit meson pkgconfig BBCLASSEXTEND = "native nativesdk" do_install:append() { rm -rf ${D}${datadir}/emacs } - From patchwork Mon Nov 27 10:17:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35218 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 76C16C46CA0 for ; Mon, 27 Nov 2023 10:18:07 +0000 (UTC) Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by mx.groups.io with SMTP id smtpd.web11.91591.1701080285687841192 for ; Mon, 27 Nov 2023 02:18:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=KJi+F5uo; spf=pass (domain: gmail.com, ip: 209.85.208.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-543456dbd7bso9582210a12.1 for ; Mon, 27 Nov 2023 02:18:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701080284; x=1701685084; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gJlueXq5VqrFZhFt9sgwzU71HBPte7xqwH7fi/AkBDM=; b=KJi+F5uo114UogkbNnJD72hz7i82jVfAQPHboWnuZNVjBWgALHM4p6yv0pWAx7AEsY 9pSo6ZYhvC55U1dZsbWmDs+JaTI2DyK1P1R8lzNO7xxwt0y+2b+XOto+h8LrDIfCL1Pq ctrR192WI1KssIxXy0ibHTrz7DKDxsRDTg8YyljlxBJUJlN011G1561Ke7sk0KnxGPzt 7sC/Lkg/yN11Ly0gn/gxc6Kyr2fGNPACfEGioK1tHKZ+y4R6b1Nc5bl5a74X1BFwv6yC mWGkLizDC2WwV2S9YourYXkbB2fxAWWPAEpZhRc0aJqddtjw5G1m1ZrUACn3pIu/2R9/ Eg3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701080284; x=1701685084; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gJlueXq5VqrFZhFt9sgwzU71HBPte7xqwH7fi/AkBDM=; b=A7yCfzgSNKjFKo5LfqKK1lucnIvApNp9k8OOK8TocEGgczfrIO/d+YqsWief0+HtKQ OCtUntWNDa4cwVDA6aPPb085zNQlmT+OB6Nj9+stb8seqJzmo/aZygiKBCNEYHcO/G2Z OZpm/0eBNdPd0Kmvj/8bH1DvK7qwJklkOFikKhuSBmg60ivHboHBvmyaPIqJbC6LCGT2 L+SNflgJ6BZH2fKslyYUP8wKabqOeST+035SYdLYijdBPt2z0SON/v+QEstf8fN8VSwY 8ZNeDBoZs+DVdqN7CKApsJ/LtKzQ9t1PCmA7Q+3YX2TmUvQAlwsXGb1MYzxEeW/wf+Pe ZeKQ== X-Gm-Message-State: AOJu0YzWoKHq7KxSELwMUlKFHqVu4jGfKW0Y5t3k9I9cj2xj6wT0+vB0 M3PsAD4msgG/jMCtemnqZQs3WPuWvLw= X-Google-Smtp-Source: AGHT+IGTDw5vZ7OmE2mi1e6Wm0BGLesnF4K3s1sL+4LomTAQK+FOsZMRuaa3iXXoblCoeqOWkNT7dA== X-Received: by 2002:a17:906:5308:b0:a01:bd67:d2fb with SMTP id h8-20020a170906530800b00a01bd67d2fbmr12697220ejo.0.1701080283887; Mon, 27 Nov 2023 02:18:03 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id h26-20020a170906585a00b00a0bf09c9483sm2757203ejs.35.2023.11.27.02.18.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 02:18:03 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 08/19] erofs-utils: upgrade 1.6 -> 1.7.1 Date: Mon, 27 Nov 2023 11:17:40 +0100 Message-Id: <20231127101751.3187950-8-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127101751.3187950-1-alex@linutronix.de> References: <20231127101751.3187950-1-alex@linutronix.de> 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 ; Mon, 27 Nov 2023 10:18:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191275 Signed-off-by: Alexander Kanavin --- ...rofs-utils_1.6.bb => erofs-utils_1.7.1.bb} | 10 +- ...-don-t-allocate-read-too-large-exten.patch | 126 ------------------ ...-block-insane-long-paths-when-extrac.patch | 80 ----------- 3 files changed, 4 insertions(+), 212 deletions(-) rename meta/recipes-devtools/erofs-utils/{erofs-utils_1.6.bb => erofs-utils_1.7.1.bb} (70%) delete mode 100644 meta/recipes-devtools/erofs-utils/files/0001-erofs-utils-fsck-don-t-allocate-read-too-large-exten.patch delete mode 100644 meta/recipes-devtools/erofs-utils/files/0002-erofs-utils-fsck-block-insane-long-paths-when-extrac.patch diff --git a/meta/recipes-devtools/erofs-utils/erofs-utils_1.6.bb b/meta/recipes-devtools/erofs-utils/erofs-utils_1.7.1.bb similarity index 70% rename from meta/recipes-devtools/erofs-utils/erofs-utils_1.6.bb rename to meta/recipes-devtools/erofs-utils/erofs-utils_1.7.1.bb index 5a89e4b8ee6..a23cb330ea2 100644 --- a/meta/recipes-devtools/erofs-utils/erofs-utils_1.6.bb +++ b/meta/recipes-devtools/erofs-utils/erofs-utils_1.7.1.bb @@ -5,11 +5,8 @@ SECTION = "base" LIC_FILES_CHKSUM = "file://COPYING;md5=73001d804ea1e3d84365f652242cca20" HOMEPAGE = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/README" -SRCREV = "21710612d35cd952490959bfa6ea9fe87aaa52dd" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git;branch=master;protocol=https \ - file://0001-erofs-utils-fsck-don-t-allocate-read-too-large-exten.patch \ - file://0002-erofs-utils-fsck-block-insane-long-paths-when-extrac.patch \ -" +SRCREV = "83d94dc619075e71ca4d0f42941cfc18d269a2af" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git;branch=master;protocol=https" UPSTREAM_CHECK_GITTAGREGEX = "v(?P(\d+(\.\d+)+))" @@ -19,8 +16,9 @@ DEPENDS = "util-linux-libuuid" inherit pkgconfig autotools -PACKAGECONFIG ??= "lz4" +PACKAGECONFIG ??= "lz4 zlib" PACKAGECONFIG[lz4] = "--enable-lz4,--disable-lz4,lz4" +PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" EXTRA_OECONF = "${PACKAGECONFIG_CONFARGS} --disable-fuse" diff --git a/meta/recipes-devtools/erofs-utils/files/0001-erofs-utils-fsck-don-t-allocate-read-too-large-exten.patch b/meta/recipes-devtools/erofs-utils/files/0001-erofs-utils-fsck-don-t-allocate-read-too-large-exten.patch deleted file mode 100644 index 52f475dc424..00000000000 --- a/meta/recipes-devtools/erofs-utils/files/0001-erofs-utils-fsck-don-t-allocate-read-too-large-exten.patch +++ /dev/null @@ -1,126 +0,0 @@ -From c769805c79d5acede65d96e5786aa5ebb46c01e0 Mon Sep 17 00:00:00 2001 -From: Gao Xiang -Date: Fri, 2 Jun 2023 11:05:19 +0800 -Subject: [PATCH 1/2] erofs-utils: fsck: don't allocate/read too large extents - -Since some crafted EROFS filesystem images could have insane large -extents, which causes unexpected bahaviors when extracting data. - -Fix it by extracting large extents with a buffer of a reasonable -maximum size limit and reading multiple times instead. - -Note that only `--extract` option is impacted. - -CVE: CVE-2023-33552 -Closes: https://nvd.nist.gov/vuln/detail/CVE-2023-33552 -Reported-by: Chaoming Yang -Fixes: 412c8f908132 ("erofs-utils: fsck: add --extract=X support to extract to path X") -Signed-off-by: Gao Xiang -Link: https://lore.kernel.org/r/20230602030519.117071-1-hsiangkao@linux.alibaba.com - -Upstream-Status: Backport -Signed-off-by: Ross Burton ---- - fsck/main.c | 63 +++++++++++++++++++++++++++++++++++++++++------------ - 1 file changed, 49 insertions(+), 14 deletions(-) - -diff --git a/fsck/main.c b/fsck/main.c -index 6b42252..6689ad8 100644 ---- a/fsck/main.c -+++ b/fsck/main.c -@@ -392,6 +392,8 @@ static int erofs_verify_inode_data(struct erofs_inode *inode, int outfd) - } - - while (pos < inode->i_size) { -+ unsigned int alloc_rawsize; -+ - map.m_la = pos; - if (compressed) - ret = z_erofs_map_blocks_iter(inode, &map, -@@ -420,10 +422,28 @@ static int erofs_verify_inode_data(struct erofs_inode *inode, int outfd) - if (!(map.m_flags & EROFS_MAP_MAPPED) || !fsckcfg.check_decomp) - continue; - -- if (map.m_plen > raw_size) { -- raw_size = map.m_plen; -- raw = realloc(raw, raw_size); -- BUG_ON(!raw); -+ if (map.m_plen > Z_EROFS_PCLUSTER_MAX_SIZE) { -+ if (compressed) { -+ erofs_err("invalid pcluster size %" PRIu64 " @ offset %" PRIu64 " of nid %" PRIu64, -+ map.m_plen, map.m_la, -+ inode->nid | 0ULL); -+ ret = -EFSCORRUPTED; -+ goto out; -+ } -+ alloc_rawsize = Z_EROFS_PCLUSTER_MAX_SIZE; -+ } else { -+ alloc_rawsize = map.m_plen; -+ } -+ -+ if (alloc_rawsize > raw_size) { -+ char *newraw = realloc(raw, alloc_rawsize); -+ -+ if (!newraw) { -+ ret = -ENOMEM; -+ goto out; -+ } -+ raw = newraw; -+ raw_size = alloc_rawsize; - } - - if (compressed) { -@@ -434,18 +454,27 @@ static int erofs_verify_inode_data(struct erofs_inode *inode, int outfd) - } - ret = z_erofs_read_one_data(inode, &map, raw, buffer, - 0, map.m_llen, false); -+ if (ret) -+ goto out; -+ -+ if (outfd >= 0 && write(outfd, buffer, map.m_llen) < 0) -+ goto fail_eio; - } else { -- ret = erofs_read_one_data(&map, raw, 0, map.m_plen); -- } -- if (ret) -- goto out; -+ u64 p = 0; - -- if (outfd >= 0 && write(outfd, compressed ? buffer : raw, -- map.m_llen) < 0) { -- erofs_err("I/O error occurred when verifying data chunk @ nid %llu", -- inode->nid | 0ULL); -- ret = -EIO; -- goto out; -+ do { -+ u64 count = min_t(u64, alloc_rawsize, -+ map.m_llen); -+ -+ ret = erofs_read_one_data(&map, raw, p, count); -+ if (ret) -+ goto out; -+ -+ if (outfd >= 0 && write(outfd, raw, count) < 0) -+ goto fail_eio; -+ map.m_llen -= count; -+ p += count; -+ } while (map.m_llen); - } - } - -@@ -460,6 +489,12 @@ out: - if (buffer) - free(buffer); - return ret < 0 ? ret : 0; -+ -+fail_eio: -+ erofs_err("I/O error occurred when verifying data chunk @ nid %llu", -+ inode->nid | 0ULL); -+ ret = -EIO; -+ goto out; - } - - static inline int erofs_extract_dir(struct erofs_inode *inode) --- -2.34.1 - diff --git a/meta/recipes-devtools/erofs-utils/files/0002-erofs-utils-fsck-block-insane-long-paths-when-extrac.patch b/meta/recipes-devtools/erofs-utils/files/0002-erofs-utils-fsck-block-insane-long-paths-when-extrac.patch deleted file mode 100644 index f2f1e343686..00000000000 --- a/meta/recipes-devtools/erofs-utils/files/0002-erofs-utils-fsck-block-insane-long-paths-when-extrac.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 6cebfbb79b1d5d8feb48801e1008eea5bfa8b599 Mon Sep 17 00:00:00 2001 -From: Gao Xiang -Date: Fri, 2 Jun 2023 13:52:56 +0800 -Subject: [PATCH 2/2] erofs-utils: fsck: block insane long paths when - extracting images - -Since some crafted EROFS filesystem images could have insane deep -hierarchy (or may form directory loops) which triggers the -PATH_MAX-sized path buffer OR stack overflow. - -Actually some crafted images cannot be deemed as real corrupted -images but over-PATH_MAX paths are not something that we'd like to -support for now. - -CVE: CVE-2023-33551 -Closes: https://nvd.nist.gov/vuln/detail/CVE-2023-33551 -Reported-by: Chaoming Yang -Fixes: f44043561491 ("erofs-utils: introduce fsck.erofs") -Fixes: b11f84f593f9 ("erofs-utils: fsck: convert to use erofs_iterate_dir()") -Fixes: 412c8f908132 ("erofs-utils: fsck: add --extract=X support to extract to path X") -Signeo-off-by: Gao Xiang -Link: https://lore.kernel.org/r/20230602055256.18061-1-hsiangkao@linux.alibaba.com - -Upstream-Status: Backport -Signed-off-by: Ross Burton ---- - fsck/main.c | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) - -diff --git a/fsck/main.c b/fsck/main.c -index 6689ad8..28d95ec 100644 ---- a/fsck/main.c -+++ b/fsck/main.c -@@ -680,28 +680,35 @@ again: - static int erofsfsck_dirent_iter(struct erofs_dir_context *ctx) - { - int ret; -- size_t prev_pos = fsckcfg.extract_pos; -+ size_t prev_pos, curr_pos; - - if (ctx->dot_dotdot) - return 0; - -- if (fsckcfg.extract_path) { -- size_t curr_pos = prev_pos; -+ prev_pos = fsckcfg.extract_pos; -+ curr_pos = prev_pos; -+ -+ if (prev_pos + ctx->de_namelen >= PATH_MAX) { -+ erofs_err("unable to fsck since the path is too long (%u)", -+ curr_pos + ctx->de_namelen); -+ return -EOPNOTSUPP; -+ } - -+ if (fsckcfg.extract_path) { - fsckcfg.extract_path[curr_pos++] = '/'; - strncpy(fsckcfg.extract_path + curr_pos, ctx->dname, - ctx->de_namelen); - curr_pos += ctx->de_namelen; - fsckcfg.extract_path[curr_pos] = '\0'; -- fsckcfg.extract_pos = curr_pos; -+ } else { -+ curr_pos += ctx->de_namelen; - } -- -+ fsckcfg.extract_pos = curr_pos; - ret = erofsfsck_check_inode(ctx->dir->nid, ctx->de_nid); - -- if (fsckcfg.extract_path) { -+ if (fsckcfg.extract_path) - fsckcfg.extract_path[prev_pos] = '\0'; -- fsckcfg.extract_pos = prev_pos; -- } -+ fsckcfg.extract_pos = prev_pos; - return ret; - } - --- -2.34.1 - From patchwork Mon Nov 27 10:17:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35215 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 5B6FCC07E97 for ; Mon, 27 Nov 2023 10:18:07 +0000 (UTC) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by mx.groups.io with SMTP id smtpd.web10.91948.1701080286084166235 for ; Mon, 27 Nov 2023 02:18:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Va1sfiZt; spf=pass (domain: gmail.com, ip: 209.85.208.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-54af4f2838dso3700752a12.2 for ; Mon, 27 Nov 2023 02:18:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701080284; x=1701685084; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TNCNIBsF39wFTF2a++aDgLD2kjNpILGa2j3C9HGTbYw=; b=Va1sfiZtzqYTUVKE9UKxlC+/4Q0hgBRBYwAsWzjK2GY32/sFkZlWkdM1SoIWFHpC8j D3txKyDTLbffkojnbOg0ngcS6JhVoxIiyL0Fa1x3pl7rNQB/KVGaRwu3G5sBn4PxjSTz aHLFh+XgeKYAEke9V9imL/PuYNXgrQzO8cYHc+OPVZNG08JYTrkhDaqUigfv63hnG7y9 y0OMQBkYDQp/+M/5kGxCXsxyOiLGiE3RJOp6A+6+hgelBhvluk6S6gpg2LXhix8BOihT a85Jw3vSpKayLtEY/ngFSfkFS9k2GgONQD4ZhzwcYNUTJhUo4J3DdSN7r/LYEFpRKnxq CIiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701080284; x=1701685084; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TNCNIBsF39wFTF2a++aDgLD2kjNpILGa2j3C9HGTbYw=; b=CEj15AHW68hu59AvkZmKuZskU3J2okM45jonnlHzx1envW/IGw4eT8mPjpOWFWYCQQ 8j+DpjVULMSiqKEjDLWLFdYHZFduu2/2J9eVdpfb2UTQ5AYlvktymFXqq8nlmsLWEYeR 0HcH8nYgXOEoYy+Fel6+/CiF8i76QyIfdbuOk6brsU6RlMCY6SlQPxNOQTlIivvJH6sk PxoQ74GT4Fo+0VUf8pcrMGWf+LL+e5bIzk27KlzvzUY59zchGgX2rbPwoF9nIhJrebay lcYAeuaMVr/bodr4BGlT0GfT5a8cMTaT9Lk4NoXsF8zTXk8+DnvLXSe8NVI03jwnoJ0M sbKg== X-Gm-Message-State: AOJu0Yy3RReO/uu+daWy911LGKnnFIQnBaZQqs9cO/CGLX3wUeWVzDVo 5FPyRdWzbQ4PKUg/VYk/rw7OzW4FEPg= X-Google-Smtp-Source: AGHT+IERSo+znFz51FPE/eQhDIws0F1PGdlQWWiOwwrOVq3BdxbuLoSOkLo2vX59LcGzVErwOrTP/w== X-Received: by 2002:a17:906:76d1:b0:a02:b4da:dc64 with SMTP id q17-20020a17090676d100b00a02b4dadc64mr8692216ejn.70.1701080284431; Mon, 27 Nov 2023 02:18:04 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id h26-20020a170906585a00b00a0bf09c9483sm2757203ejs.35.2023.11.27.02.18.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 02:18:04 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 09/19] webkitgtk: update 2.40.5 -> 2.42.2 Date: Mon, 27 Nov 2023 11:17:41 +0100 Message-Id: <20231127101751.3187950-9-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127101751.3187950-1-alex@linutronix.de> References: <20231127101751.3187950-1-alex@linutronix.de> 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 ; Mon, 27 Nov 2023 10:18:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191276 Drop check-GST_GL_HAVE_PLATFORM_GLX.patch as upstream removed the code. Signed-off-by: Alexander Kanavin --- ...44e17d258106617b0e6d783d073b188a2548.patch | 15 +++++---- .../check-GST_GL_HAVE_PLATFORM_GLX.patch | 33 ------------------- ...ebkitgtk_2.40.5.bb => webkitgtk_2.42.2.bb} | 4 +-- 3 files changed, 10 insertions(+), 42 deletions(-) delete mode 100644 meta/recipes-sato/webkit/webkitgtk/check-GST_GL_HAVE_PLATFORM_GLX.patch rename meta/recipes-sato/webkit/{webkitgtk_2.40.5.bb => webkitgtk_2.42.2.bb} (98%) diff --git a/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch b/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch index 34e0ff9af38..e5ece82ed31 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch @@ -1,4 +1,4 @@ -From 647c93de99a0f71f478d76a4cc7714eba7ba1447 Mon Sep 17 00:00:00 2001 +From 95398982f4a120147a98a27e176facf6d95b2bf7 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 2 Jun 2022 11:19:06 +0300 Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems @@ -33,6 +33,7 @@ left for a follow-up fix. Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/1233] Signed-off-by: Khem Raj + --- .../cpu/arm/filters/FELightingNEON.cpp | 4 +- .../graphics/cpu/arm/filters/FELightingNEON.h | 52 +++++++++---------- @@ -203,7 +204,7 @@ index b17c603d..e4629cda 100644 - -#endif // FELightingNEON_h diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h -index 70c6512f..b032c82e 100644 +index 70f583b3..7d5d27e5 100644 --- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h +++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h @@ -26,6 +26,10 @@ @@ -218,7 +219,7 @@ index 70c6512f..b032c82e 100644 class DistantLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h -index 53beb596..e78a9354 100644 +index 179edf6d..694d712d 100644 --- a/Source/WebCore/platform/graphics/filters/FELighting.h +++ b/Source/WebCore/platform/graphics/filters/FELighting.h @@ -35,8 +35,6 @@ @@ -229,8 +230,8 @@ index 53beb596..e78a9354 100644 - class FELighting : public FilterEffect { public: - const Color& lightingColor() const { return m_lightingColor; } -@@ -64,11 +62,6 @@ protected: + bool operator==(const FELighting&) const; +@@ -68,11 +66,6 @@ protected: std::unique_ptr createSoftwareApplier() const override; @@ -243,7 +244,7 @@ index 53beb596..e78a9354 100644 float m_surfaceScale; float m_diffuseConstant; diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h -index 3a5723f0..675d63f5 100644 +index a8cfdab8..34f867bb 100644 --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h @@ -26,6 +26,10 @@ @@ -258,7 +259,7 @@ index 3a5723f0..675d63f5 100644 class PointLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h -index 684626f7..dea58389 100644 +index 6404467a..5cac38f2 100644 --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h @@ -26,6 +26,10 @@ diff --git a/meta/recipes-sato/webkit/webkitgtk/check-GST_GL_HAVE_PLATFORM_GLX.patch b/meta/recipes-sato/webkit/webkitgtk/check-GST_GL_HAVE_PLATFORM_GLX.patch deleted file mode 100644 index ae99810cedb..00000000000 --- a/meta/recipes-sato/webkit/webkitgtk/check-GST_GL_HAVE_PLATFORM_GLX.patch +++ /dev/null @@ -1,33 +0,0 @@ -Add additional check on GST_GL_HAVE_PLATFORM_GLX before using gst_gl_display_x11_new_with_display - -This ensures that there is a compile time check for glx support in gstreamer as -runtime check is not enough because gst_gl_display_x11_new_with_display() API comes from -gst/gl/x11/gstgldisplay_x11.h which is only included when GST_GL_HAVE_PLATFORM_GLX is defined -therefore make this check consistent to fix build with some platforms which use pvr gl drivers -where this problem appear at compile time. - - -/mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/webkitgtk/2.40.2-r0/webkitgtk-2.40.2/Source/WebCore/platform/graphics/gstreamer/PlatformDisplayGStreamer.cpp:68:31: error: use of undeclared identifier 'gst_gl_display_x11_new_with_display'; did you mean 'gst_gl_display_egl_new_with_egl_display'? - 68 | return GST_GL_DISPLAY(gst_gl_display_x11_new_with_display(downcast(sharedDisplay).native())); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - | gst_gl_display_egl_new_with_egl_display - -This issue is 2.40 specific since GLX support is removed [1] from trunk upstream, therefore -this patch wont be needed when upgrading to 2.42+ - -[1] https://github.com/WebKit/WebKit/commit/320560f9e53ddcd53954059bd005e0c75eb91abf - -Upstream-Status: Inappropriate [GLX support is gone in 2.41+] -Signed-off-by: Khem Raj - ---- a/Source/WebCore/platform/graphics/gstreamer/PlatformDisplayGStreamer.cpp 2023-02-20 01:22:18.917743700 -0800 -+++ b/Source/WebCore/platform/graphics/gstreamer/PlatformDisplayGStreamer.cpp 2023-07-08 08:45:09.739177065 -0700 -@@ -63,7 +63,7 @@ - if (glPlatform == GST_GL_PLATFORM_EGL) - return GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(sharedDisplay.eglDisplay())); - #endif --#if USE(GLX) -+#if USE(GLX) && GST_GL_HAVE_PLATFORM_GLX - if (is(sharedDisplay) && glPlatform == GST_GL_PLATFORM_GLX) - return GST_GL_DISPLAY(gst_gl_display_x11_new_with_display(downcast(sharedDisplay).native())); - #endif diff --git a/meta/recipes-sato/webkit/webkitgtk_2.40.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.42.2.bb similarity index 98% rename from meta/recipes-sato/webkit/webkitgtk_2.40.5.bb rename to meta/recipes-sato/webkit/webkitgtk_2.42.2.bb index 0c54f202ca5..2ba60eb65ba 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.40.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.42.2.bb @@ -13,10 +13,9 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ file://reproducibility.patch \ file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ - file://check-GST_GL_HAVE_PLATFORM_GLX.patch \ file://0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch \ " -SRC_URI[sha256sum] = "7de051a263668621d91a61a5eb1c3771d1a7cec900043d4afef06c326c16037f" +SRC_URI[sha256sum] = "5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen @@ -75,6 +74,7 @@ PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" PACKAGECONFIG[journald] = "-DENABLE_JOURNALD_LOG=ON,-DENABLE_JOURNALD_LOG=OFF,systemd" PACKAGECONFIG[avif] = "-DUSE_AVIF_LOG=ON,-DUSE_AVIF=OFF,libavif" PACKAGECONFIG[media-recorder] = "-DENABLE_MEDIA_RECORDER=ON,-DENABLE_MEDIA_RECORDER=OFF,gstreamer1.0-plugins-bad" +PACKAGECONFIG[jpegxl] = "-DUSE_JPEGXL=ON,-DUSE_JPEGXL=OFF,libjxl" EXTRA_OECMAKE = " \ -DPORT=GTK \ From patchwork Mon Nov 27 10:17:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35214 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 4C0CEC0755A for ; Mon, 27 Nov 2023 10:18:07 +0000 (UTC) Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by mx.groups.io with SMTP id smtpd.web10.91949.1701080286644417208 for ; Mon, 27 Nov 2023 02:18:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=gSqOkuz3; spf=pass (domain: gmail.com, ip: 209.85.218.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-9ffef4b2741so534351766b.3 for ; Mon, 27 Nov 2023 02:18:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701080285; x=1701685085; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sVloT+FJDywhqZ54jO8yRKRqUKecxdKioEHjFt0GhfY=; b=gSqOkuz3yayrE+RrDIJvICcxflcq63l8Fxe+KV08R7uulyhge2DIEMC/0Rajd7WyCt FcCEiQMxAR1Ry7OAg+tUoDX06k08bfSXQzZq4950pKsY2jJr8I1exGtqIYbrissZQIlS pSCXhpQfgBScxroFQCqM484y1lj1K61/EcKyoxvJkcdgSN+SP9N3Q1g3mCq+lcax43H0 ev0BFL7yEdKLVMXo43vHp966b2DPgESFqNpRd1kciclpZ9pKyEPLUsqyQXP9qLCtJIlE ff28kOO9oWhQPaIR3Ds3xjGxwoT9om98cFPC7LnV2edn3Db4zNNlgVk4gVCNdZhl8Qnf Ii5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701080285; x=1701685085; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sVloT+FJDywhqZ54jO8yRKRqUKecxdKioEHjFt0GhfY=; b=qTErBc0ymOMI1ki2basbnASHiiTri777tB9tOn/s4SSgDD+VcBtNCIJeXs+2UATC1R BJvl4X9Iee0DRhmfbQodaJnXHc78+1R9ARZoa9gpzXUzFAmavJnN9YKp4Aa6rILDJsRD GKzpA0sp/mxMnaqq/vdhm7wem0UvdF/+D21Wh2bdOjIeRpt6Sq3CtxzDDfYKdBHSRlxJ fmerEwae6X4QBCXE7UMaW0gUcSPcYVWtMageXF1vlx4yuACKdaBQiOL3sGz3tnDGMamw 8vjrFbkYseMSsuSOPrDT0W28+0SuwY3TAeils0ZYLSJ+gjwuuY5PmbiE7WN8nTfNS9i/ u27Q== X-Gm-Message-State: AOJu0YyFOMHzozI1EVlK6O5Am+xzHP1uPj9VxkxJd7r3obSsn5TUwFP0 HPF7b5Cor081lqUpseshYrq9B1BAEyE= X-Google-Smtp-Source: AGHT+IGuH9S4H8uJmOwCV5D2Xs2ussJyQU6L+BsP44R9fGShcRM5SORxIzpsYC45NUDUfoGf3Vplgw== X-Received: by 2002:a17:907:6023:b0:a01:b8c6:7724 with SMTP id fs35-20020a170907602300b00a01b8c67724mr7620174ejc.73.1701080285095; Mon, 27 Nov 2023 02:18:05 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id h26-20020a170906585a00b00a0bf09c9483sm2757203ejs.35.2023.11.27.02.18.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 02:18:04 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 10/19] epiphany: upgrade 44.6 -> 45.1 Date: Mon, 27 Nov 2023 11:17:42 +0100 Message-Id: <20231127101751.3187950-10-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127101751.3187950-1-alex@linutronix.de> References: <20231127101751.3187950-1-alex@linutronix.de> 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 ; Mon, 27 Nov 2023 10:18:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191277 Signed-off-by: Alexander Kanavin --- .../epiphany/{epiphany_44.6.bb => epiphany_45.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-gnome/epiphany/{epiphany_44.6.bb => epiphany_45.1.bb} (94%) diff --git a/meta/recipes-gnome/epiphany/epiphany_44.6.bb b/meta/recipes-gnome/epiphany/epiphany_45.1.bb similarity index 94% rename from meta/recipes-gnome/epiphany/epiphany_44.6.bb rename to meta/recipes-gnome/epiphany/epiphany_45.1.bb index 577eb43a80e..c8631e05e97 100644 --- a/meta/recipes-gnome/epiphany/epiphany_44.6.bb +++ b/meta/recipes-gnome/epiphany/epiphany_45.1.bb @@ -31,7 +31,7 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GN file://migrator.patch \ file://distributor.patch \ " -SRC_URI[archive.sha256sum] = "5335dd573581db61e126d854dc16ae519657a5b8790789a47d25e43e17cd3a43" +SRC_URI[archive.sha256sum] = "7c994ef34ecd60e915de331ee123c08938f9623cefada6d50b99e3c9c5ad8135" # Developer mode enables debugging PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false" From patchwork Mon Nov 27 10:17:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35221 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 CC78CC10DC3 for ; Mon, 27 Nov 2023 10:18:07 +0000 (UTC) Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by mx.groups.io with SMTP id smtpd.web10.91950.1701080287148459679 for ; Mon, 27 Nov 2023 02:18:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=lX3Na9Xt; spf=pass (domain: gmail.com, ip: 209.85.218.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-9fa2714e828so546072766b.1 for ; Mon, 27 Nov 2023 02:18:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701080285; x=1701685085; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=R+d7O1NLGH6kxN3U5W/ZwIh11QTnmoJybOK02e2woqI=; b=lX3Na9XtvVUU1GKL+rqVqLek1HKEt3PXbGyWpRlAsBmvxprRa9PCm8GrbqNEZmZOvv uY7NzbWRXApRaLOzXon76ayx0wGzEEQJW4TUdF57Dm8lQRZQFKER341OS86mUYOhmdEy ia7eKZs2CRtIem97fvlIUdvkLsE2zivNUyosOR6PJes/6ThyKfbDKh9+FgYlDx3u6yI9 6XoNUjggLAgm6TBj+D6p0ZSvjaYlt2yULrhV1tlc2TXZQDy5HpSQruw3sp0H2e7Paa7K mbmXzJZFnr/qA/SvPmmpEFBnnjQirnc4hvMtZiz0+Wn/LhdyytUmtXpoPqEUFrJsQw7h +xRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701080285; x=1701685085; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R+d7O1NLGH6kxN3U5W/ZwIh11QTnmoJybOK02e2woqI=; b=Cvrqh/ZKJRGw0xd+guf6RXICTv1KEH/pDbVvpfcAECQIBR2idaxV1ggCGOc7Kswr8S u30fLybcr5DnzB8JHSwHejexhUXQAIqVAppA3STOuLI4yW7cMuwyI2XvYtBo00xDZFX1 ioRC5zRS9k5aoPRvp2bRAdrQGahiz1jpYQ3nfWLvzz1mKSZ3CKkGjNfb1SHephZPd3+z lKy2icVdBntrMoz3qtXywGbj2zBo0zxv4GHFUKCeoH6Vk496LxN9W9ZVHbvjQMvSMFjc cfXE2PO1lMoFjrz9v2/hkuQduvoCw9dDQitqjGXkYJml/tzwwbXzTvlwRMb6DeYzLVYV stDA== X-Gm-Message-State: AOJu0YxIBAjMLfy1Oi7ggPtbh4lEJRLfC4VR6K8vJCI0Hk/BxM2ZAcux ibywdVjsSAp9ZMhWQOFjRR2GSIDdowg= X-Google-Smtp-Source: AGHT+IHi9KH5iKNg8iZJ85fi/VFSXkWHauH+YMXz/+8bAebeQ3/PBUdn4x/+5iu6RshOqpOsfpUezg== X-Received: by 2002:a17:906:1019:b0:a10:eda7:7976 with SMTP id 25-20020a170906101900b00a10eda77976mr802803ejm.56.1701080285616; Mon, 27 Nov 2023 02:18:05 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id h26-20020a170906585a00b00a0bf09c9483sm2757203ejs.35.2023.11.27.02.18.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 02:18:05 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 11/19] virglrenderer: upgrade 0.10.4 -> 1.0.0 Date: Mon, 27 Nov 2023 11:17:43 +0100 Message-Id: <20231127101751.3187950-11-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127101751.3187950-1-alex@linutronix.de> References: <20231127101751.3187950-1-alex@linutronix.de> 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 ; Mon, 27 Nov 2023 10:18:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191278 venus (virtual vulkan support) is no longer experimental. Signed-off-by: Alexander Kanavin --- ...1-meson.build-use-python3-directly-for-python.patch | 10 +++++----- ...{virglrenderer_0.10.4.bb => virglrenderer_1.0.0.bb} | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) rename meta/recipes-graphics/virglrenderer/{virglrenderer_0.10.4.bb => virglrenderer_1.0.0.bb} (84%) diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch index 8230ba588b5..06379ee7166 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch +++ b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch @@ -1,4 +1,4 @@ -From c853c9e5c44f1b23a15a7ba629ee02f7d8ec23a0 Mon Sep 17 00:00:00 2001 +From 2afe24fc95dbb89e99df29ccbe73afa835f58202 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 6 Jan 2020 12:44:42 +0100 Subject: [PATCH] meson.build: use 'python3' directly for python @@ -14,15 +14,15 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 13d95bb..b241eb2 100644 +index de6d16b5..79cedbf6 100644 --- a/meson.build +++ b/meson.build -@@ -64,7 +64,7 @@ flags = [ +@@ -68,7 +68,7 @@ flags = [ add_project_arguments(cc.get_supported_arguments(flags), language : 'c') -prog_python = import('python').find_installation('python3') +prog_python = 'python3' - libdrm_dep = dependency('libdrm', version : '>=2.4.50') - thread_dep = dependency('threads') + not_found = dependency('', required: false) + libdrm_dep = dependency('libdrm', version : '>=2.4.50', required: get_option('drm').enabled() or get_option('venus')) diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.10.4.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.0.bb similarity index 84% rename from meta/recipes-graphics/virglrenderer/virglrenderer_0.10.4.bb rename to meta/recipes-graphics/virglrenderer/virglrenderer_1.0.0.bb index f76e7cb1b94..ffe30a9c525 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.10.4.bb +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.0.bb @@ -9,8 +9,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" DEPENDS = "libdrm libepoxy virtual/egl virtual/libgbm" -SRCREV = "88b9fe3bfc64b23a701e4875006dbc0e769f14f6" -SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=master;protocol=https \ +SRCREV = "9c9d55ecbe502e0d71ee99529709efcca69aac42" +SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=main;protocol=https \ file://0001-meson.build-use-python3-directly-for-python.patch \ " @@ -18,9 +18,9 @@ S = "${WORKDIR}/git" inherit meson pkgconfig features_check -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'venus-experimental', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'venus', '', d)}" -PACKAGECONFIG[venus-experimental] = "-Dvenus-experimental=true,-Dvenus-experimental=false,vulkan-loader vulkan-headers" +PACKAGECONFIG[venus] = "-Dvenus=true,-Dvenus=false,vulkan-loader vulkan-headers" PACKAGECONFIG[va] = "-Dvideo=true,-Dvideo=false,libva" PACKAGECONFIG[render-server] = "-Drender-server=true,-Drender-server=false" PACKAGECONFIG[drm-msm-experimental] = "-Ddrm-msm-experimental=true,-Ddrm-msm-experimental=false" From patchwork Mon Nov 27 10:17:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35224 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 C19AFC0755A for ; Mon, 27 Nov 2023 10:18:17 +0000 (UTC) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by mx.groups.io with SMTP id smtpd.web10.91952.1701080287661721404 for ; Mon, 27 Nov 2023 02:18:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=b6644rxh; spf=pass (domain: gmail.com, ip: 209.85.218.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-a00b01955acso575220366b.1 for ; Mon, 27 Nov 2023 02:18:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701080286; x=1701685086; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wbL735aln9CB9UQe46nDeOtD2f0IHeniFx1wjQVuMhQ=; b=b6644rxhfrpH897OBYnI0QeiM8epPPxECx/mojdj13mG84CyaCFiLr0kIXn1m4+kiO AsZ9ZbVkDqrUzYJbt5/A36lWXwVyMPw8XuREAVHmvQL7P6dAbVs693rGQws4UPTS06ir BPczC8gpgkIWsYcqUDcnnsUth4JmFIyI07saiM0x4ag28qXplGP+jS0RjnOuIWkzW47a dVwFrjLmDk9XSzzydilS3Ls/kmTQAm06FWWvuOrhve/5Mwz8vXQRZG40d5aMWWB2P52g Nr6CmOo3pMpmQb0cfCErHgbCTI3ua6WEe+KtXVyWtI5xb+LK8Db2ZZfM3QD1nX31Duak JmsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701080286; x=1701685086; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wbL735aln9CB9UQe46nDeOtD2f0IHeniFx1wjQVuMhQ=; b=mfDsyTkN7N+DCHISlkiGPO1cddTJ+ntrnGGINdnBVpzyJ2z9pliCjoBhrxVXpCwhk0 HIZbfnlYIToUDSUnt7Bxs2eme57lE1DnAloRi9Ks6i6WFHUOfRoACBtW3ALM3Eitcc8h E9Ch3V7KENken3KpbFyj8ODVS6hegSmaPGJWjpNbAEVsCiqmkQItjhQ3encSz+U9jBDq wF/H+zna/MkS5EtjPP3bSDwFLJfFcTful5jNomV/qiPImDhz43lwx0oP/cYmb4MVcE1E t+KuUWYEhwvFQ5YwfpQt8Rdj8E5k62FWL8uY+8ywp1BwvCXQxBXblwcwcwJ/LtzVSBuA csGA== X-Gm-Message-State: AOJu0YzwD81Aj8O950+P8XZFiulPlHqgcBAGg82tmZtZaorL6tOXqaiq OliaTOj465OpM7mif/1YXyJQVX8r5R4= X-Google-Smtp-Source: AGHT+IG1wuRnqFtvLmLc22uyp+gAGq2lJczkLAWjq1wIh6EhYr3t9A5VfFqYimQra+iZGqnc0jKLIg== X-Received: by 2002:a17:906:2cb:b0:a0c:d99b:7ad with SMTP id 11-20020a17090602cb00b00a0cd99b07admr4066593ejk.23.1701080286109; Mon, 27 Nov 2023 02:18:06 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id h26-20020a170906585a00b00a0bf09c9483sm2757203ejs.35.2023.11.27.02.18.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 02:18:05 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 12/19] libxkbcommon: upgrade 1.5.0 -> 1.6.0 Date: Mon, 27 Nov 2023 11:17:44 +0100 Message-Id: <20231127101751.3187950-12-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127101751.3187950-1-alex@linutronix.de> References: <20231127101751.3187950-1-alex@linutronix.de> 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 ; Mon, 27 Nov 2023 10:18:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191279 Add bash-completion support for xkbcli. Signed-off-by: Alexander Kanavin --- .../xorg-lib/{libxkbcommon_1.5.0.bb => libxkbcommon_1.6.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-lib/{libxkbcommon_1.5.0.bb => libxkbcommon_1.6.0.bb} (92%) diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.6.0.bb similarity index 92% rename from meta/recipes-graphics/xorg-lib/libxkbcommon_1.5.0.bb rename to meta/recipes-graphics/xorg-lib/libxkbcommon_1.6.0.bb index 62e9b158e43..02045cc2122 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.6.0.bb @@ -9,11 +9,11 @@ DEPENDS = "flex-native bison-native" SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "560f11c4bbbca10f495f3ef7d3a6aa4ca62b4f8fb0b52e7d459d18a26e46e017" +SRC_URI[sha256sum] = "0edc14eccdd391514458bc5f5a4b99863ed2d651e4dd761a90abf4f46ef99c2b" UPSTREAM_CHECK_URI = "http://xkbcommon.org/" -inherit meson pkgconfig +inherit meson pkgconfig bash-completion PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)} xkbregistry" From patchwork Mon Nov 27 10:17:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35229 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 0CDD5C07E97 for ; Mon, 27 Nov 2023 10:18:18 +0000 (UTC) Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by mx.groups.io with SMTP id smtpd.web11.91592.1701080288171254633 for ; Mon, 27 Nov 2023 02:18:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=PpkVv6a7; spf=pass (domain: gmail.com, ip: 209.85.208.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-5488bf9e193so5529781a12.2 for ; Mon, 27 Nov 2023 02:18:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701080286; x=1701685086; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bslA+CXrK7064boo5AbekifOd/qWeSEFX7mJOUC6b5U=; b=PpkVv6a7caYmtliwecvtPdxDOkQRM3hT5i4U3X9X8E+RtDvjWjIYFTuhSWGPUI4HXL HtMLYAxZllIkjXvphb1cEu5pcyECCgj1bGEcn+Z3ucEtxFjvhXkGdewHHb/IfFLvzRh+ fDl6zbGufhphHKg8eTBe4ne0M8o1QFXOtzR0ufoVHEcN0xfy0gp0b+tuNXkBsUlc9a9u oMeoWo2xOS+mzqtrrrjwdBDoES76am3lyhdXaLXrA/+lKfAXlzPD2gKeBhPIuc5Zsb0g vEADwd/86rdNnlJ5f85YfyGYFWwDGXP1JsaXFSj678ztgrm5gjI3op8MFeMWZ/M8OUh8 ntXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701080286; x=1701685086; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bslA+CXrK7064boo5AbekifOd/qWeSEFX7mJOUC6b5U=; b=pZcIeqfCmfsXcwrRqA3ik+xKgp73t/SbSHNiYeBQORB25Ns9grn/QhshS0dKwD0t3F XkwXDCBgMkVJBUDblBBXtdhJSXFPXoeR+L5EzmbiISy6W4PSN5fGYo0ChXaKYNJq8f62 gLq+It79eL4WfWsn8oQS08luwUZlevYaN7VbincTKH5umDkNCI3E5NiCV6/lWPisGNpW O/5MQAtWe7GLh3Y92V6kJ27gKp7lyBGGUyVvietzWNSYX+ETtUW4eEYCoBYrQSKrCHJ+ JvXZpT5yg+bEgnTfUYzWjdV+KjZh0BquhFZ/nSRq4o+T0jHAcbs61XggVUU4A9e8+IDz NHig== X-Gm-Message-State: AOJu0Yxep8j7cfIeVeEossyg9g5gy2tAS4ShaAkRIhELMkOHpZeT/Z3v 2R8Mi6u/SMWz7205nE+IBIagEc3DWJM= X-Google-Smtp-Source: AGHT+IEObBAQMj2T+rD/hEePIzn2QLhc/hLHrAPda/fMHfgoGmMnLt/1ynkm5uy69gXE3ds1L+iwRA== X-Received: by 2002:a17:906:b248:b0:a04:cc0e:ff3b with SMTP id ce8-20020a170906b24800b00a04cc0eff3bmr8302867ejb.27.1701080286617; Mon, 27 Nov 2023 02:18:06 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id h26-20020a170906585a00b00a0bf09c9483sm2757203ejs.35.2023.11.27.02.18.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 02:18:06 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 13/19] mpg123: upgrade 1.31.3 -> 1.32.3 Date: Mon, 27 Nov 2023 11:17:45 +0100 Message-Id: <20231127101751.3187950-13-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127101751.3187950-1-alex@linutronix.de> References: <20231127101751.3187950-1-alex@linutronix.de> 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 ; Mon, 27 Nov 2023 10:18:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191280 --disable-lfs-alias removed upstream. Signed-off-by: Alexander Kanavin --- .../mpg123/{mpg123_1.31.3.bb => mpg123_1.32.3.bb} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename meta/recipes-multimedia/mpg123/{mpg123_1.31.3.bb => mpg123_1.32.3.bb} (95%) diff --git a/meta/recipes-multimedia/mpg123/mpg123_1.31.3.bb b/meta/recipes-multimedia/mpg123/mpg123_1.32.3.bb similarity index 95% rename from meta/recipes-multimedia/mpg123/mpg123_1.31.3.bb rename to meta/recipes-multimedia/mpg123/mpg123_1.32.3.bb index b03ee9f71a9..3ea68b12a8c 100644 --- a/meta/recipes-multimedia/mpg123/mpg123_1.31.3.bb +++ b/meta/recipes-multimedia/mpg123/mpg123_1.32.3.bb @@ -10,7 +10,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=e7b9c15fcfb986abb4cc5e8400a24169" SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2" -SRC_URI[sha256sum] = "1ca77d3a69a5ff845b7a0536f783fee554e1041139a6b978f6afe14f5814ad1a" +SRC_URI[sha256sum] = "2d9913a57d4ee8f497a182c6e82582602409782a4fb481e989feebf4435867b4" UPSTREAM_CHECK_REGEX = "mpg123-(?P\d+(\.\d+)+)\.tar" @@ -40,7 +40,6 @@ CACHED_CONFIGUREVARS:libc-musl = "ac_cv_sys_file_offset_bits=no" EXTRA_OECONF = " \ --enable-shared \ --enable-largefile \ - --disable-lfs-alias \ --with-audio='${AUDIOMODS}' \ ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-cpu=neon', '', d)} \ ${@bb.utils.contains('TUNE_FEATURES', 'altivec', '--with-cpu=altivec', '', d)} \ From patchwork Mon Nov 27 10:17:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35225 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 CED3AC46CA0 for ; Mon, 27 Nov 2023 10:18:17 +0000 (UTC) Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by mx.groups.io with SMTP id smtpd.web11.91594.1701080288992459267 for ; Mon, 27 Nov 2023 02:18:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=E2xoqMSS; spf=pass (domain: gmail.com, ip: 209.85.218.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-a03a9009572so545034966b.3 for ; Mon, 27 Nov 2023 02:18:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701080287; x=1701685087; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rmhoLzKYHM6KC3A9qiRZECcNFDdS8OD9uG4EnDskow4=; b=E2xoqMSSondXNxYpXlmE+wCmZdqFnfg/4282v6chpr57/Cz3jBk3eUD4kFQq0Y5kH0 G9L7BgyCogiXcDLIEkoXbIrzxNsUXRMrzguBqeD0HImQZfSGQWED2483jxrdXL+yo1Ux 179xXrQOI0wA8uogWDtcdG5mnUI52aNespBNimxLuW3+2e0+BL1XxlQfMvo1hfkDzcse viCHazjpYDphG0tQ6N+KN3E717p/btGqcp/Q6mPFlVIh/Wrl9RIMMKh/WH0fx41wAtak lUVo6htnhFY3BrsfdvEpOyWkx7HdkHYtBGVFh2tVJ49c2RKomV1DSKAcU4XmJGKyNOkb EjAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701080287; x=1701685087; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rmhoLzKYHM6KC3A9qiRZECcNFDdS8OD9uG4EnDskow4=; b=nlViYgc0jnIz0qJSYK0vLhmhkiyDRUTg8eCue+dNIJNWglymHtxl/sQRVvt9lOcvPt TX0F0twoj+YBI7kZt8+WJKULs2B6ZGXms8BXwGd7eklpdm420U+tYVoXxPtSgW0qvKrg d1sXhrLl92Ara6E1/svtnK5vSCAbD9d4K/lQg5O40ptdmFiqQ6ZaRYzYbFPuK1pAZNPi BtYFCxpTpPyT0eEc2jBIqgKFRK/++8Jh56CZD5IqEzVBvLCsFNvUG+NJZ1H3PXu8uiQW ax3MxIDgb0zhTourYWWwKgmelwHn7EozeDbK6CTTw+KBNGzuiIO9QSz1A3CNhOdYbvrO V1Sw== X-Gm-Message-State: AOJu0Yz6H1XR1FAyjNfbnpTleWtLgZXOgGbvvZtKAuf+0yDO6Qe+/YNC nRigproUprKDAgf42L+U6shi4vWAAs4= X-Google-Smtp-Source: AGHT+IHOheVZ2XqC9sitDvEO28TIWTmwejvfas9HvbQ0uAQTshfOUisdNnThnvedwu+HLy8C9NqKVw== X-Received: by 2002:a17:906:3290:b0:9e0:5dab:a0f1 with SMTP id 16-20020a170906329000b009e05daba0f1mr7503540ejw.36.1701080287091; Mon, 27 Nov 2023 02:18:07 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id h26-20020a170906585a00b00a0bf09c9483sm2757203ejs.35.2023.11.27.02.18.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 02:18:06 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 14/19] icu: upgrade 73-2 -> 74-1 Date: Mon, 27 Nov 2023 11:17:46 +0100 Message-Id: <20231127101751.3187950-14-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127101751.3187950-1-alex@linutronix.de> References: <20231127101751.3187950-1-alex@linutronix.de> 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 ; Mon, 27 Nov 2023 10:18:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191281 License-Update: formatting https://github.com/unicode-org/icu/commit/248b1c2a13fc7fc346e9e9419c4794df8a590ad9 Signed-off-by: Alexander Kanavin --- meta/recipes-support/icu/{icu_73-2.bb => icu_74-1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-support/icu/{icu_73-2.bb => icu_74-1.bb} (95%) diff --git a/meta/recipes-support/icu/icu_73-2.bb b/meta/recipes-support/icu/icu_74-1.bb similarity index 95% rename from meta/recipes-support/icu/icu_73-2.bb rename to meta/recipes-support/icu/icu_74-1.bb index 7c59f8bb896..88ded166b52 100644 --- a/meta/recipes-support/icu/icu_73-2.bb +++ b/meta/recipes-support/icu/icu_74-1.bb @@ -78,7 +78,7 @@ FILES:libicuio = "${libdir}/libicuio.so.*" BBCLASSEXTEND = "native nativesdk" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=80c2cf39ad8ae12b9b9482a1737c6650" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=08dc3852df8fffa807301902ad899ff8" def icu_download_version(d): pvsplit = d.getVar('PV').split('-') @@ -111,8 +111,8 @@ SRC_URI = "${BASE_SRC_URI};name=code \ SRC_URI:append:class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[code.sha256sum] = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1" -SRC_URI[data.sha256sum] = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701" +SRC_URI[code.sha256sum] = "86ce8e60681972e60e4dcb2490c697463fcec60dd400a5f9bffba26d0b52b8d0" +SRC_URI[data.sha256sum] = "67d5ab39c5187e1dd0fed60a3fe52794dce9784b4c045cb85e19f5d317fd783f" UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P(?!.+rc).+)" GITHUB_BASE_URI = "https://github.com/unicode-org/icu/releases" From patchwork Mon Nov 27 10:17:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35231 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 E461DC46CA9 for ; Mon, 27 Nov 2023 10:18:17 +0000 (UTC) Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by mx.groups.io with SMTP id smtpd.web11.91596.1701080289154553606 for ; Mon, 27 Nov 2023 02:18:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ljj1folt; spf=pass (domain: gmail.com, ip: 209.85.218.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-a00a9c6f1e9so574393366b.3 for ; Mon, 27 Nov 2023 02:18:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701080287; x=1701685087; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2BmTYZegMcUsaHpjdP/G5E/ZFwlOwU7XUSksiWTnmQc=; b=ljj1foltd7TFazJROxM4P1rBeSTaGUldzj7wKuxhNy5aCKh/VFc86QLeedzNMn9OuR /GfBDXko+ANCC7zRa0ciy7kk3PnmvJtaH4E3bcPVWSl+gCuguA7WlsMwsAY4A/GACH63 8zUyw/L7rjp3/0fzCpdloe9A/VgrfqLmeX0DTIUA92SfSk+kH8uhrgXlDzFpwQhImeBL ATdrKLZsRxrclabvKWd0gjb4ZQQcVmhbhxPjmRjAGcb5yvc02qsXXUn+Wj4ais7Ef7QH p7zFRbO0SP3kfJem+lkCNFK/rB8VUbauYEKspBvAb1VVXiP8X5pu6tMgyYbsIJ4PXS++ hD6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701080287; x=1701685087; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2BmTYZegMcUsaHpjdP/G5E/ZFwlOwU7XUSksiWTnmQc=; b=lLNM5CsSnu6PKdimhGmZB1YJsm7CfIH0+afW51iT+CgloKECf+SgCkGB1pfz3wiwwC lkdT8ZkXu6RlwuZEJRJoKD8JzMjtYYGiq7WjIFo8OJ7FKzIZisa6zlB1FKNzAyQU9TD+ 68WlIu5vHGVk2iZrnEbNj72i2AQNVVnoqwkERab5Bz8gAK17ZrXGa7sbKOVEch8r7W/6 jO4htds8VbDI14JzCpf2zfqJGdW3hkA6pZpL/SniLyJoC8AqZpU8kA7pP5Sme3vunu9B +mvpQOoT93Ugcepw91xhFwqkdKGVKjQB4Pk1zfYmCafMCqwsvPN7+8avQ6hs09sppJkB ch4A== X-Gm-Message-State: AOJu0Yy4z9G8qPsHb50BzwvMp2V6RcShb5ND0c6rn1MCKDxZxSzkFmiz qJJZMtPsHj4hSBqDdEwdUq2AQSZ2iYk= X-Google-Smtp-Source: AGHT+IHVZyie/jgziFAFgFQIRFfNfWYkzF0I++qJhA9lnQjGd82VxhxfANhyDUR5Nu0hTpMsG7im+w== X-Received: by 2002:a17:906:d28e:b0:9e5:cef:6ff with SMTP id ay14-20020a170906d28e00b009e50cef06ffmr9039465ejb.33.1701080287569; Mon, 27 Nov 2023 02:18:07 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id h26-20020a170906585a00b00a0bf09c9483sm2757203ejs.35.2023.11.27.02.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 02:18:07 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 15/19] p11-kit: upgrade 0.25.0 -> 0.25.2 Date: Mon, 27 Nov 2023 11:17:47 +0100 Message-Id: <20231127101751.3187950-15-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127101751.3187950-1-alex@linutronix.de> References: <20231127101751.3187950-1-alex@linutronix.de> 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 ; Mon, 27 Nov 2023 10:18:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191282 Switch to gitsm:// to fetch https://github.com/p11-glue/pkcs11-json.git as a submodule (otherwise meson will try to do that in do_configure). Signed-off-by: Alexander Kanavin --- .../p11-kit/files/strerror-1.patch | 76 ------------------- .../p11-kit/files/strerror-2.patch | 30 -------- .../{p11-kit_0.25.0.bb => p11-kit_0.25.2.bb} | 6 +- 3 files changed, 2 insertions(+), 110 deletions(-) delete mode 100644 meta/recipes-support/p11-kit/files/strerror-1.patch delete mode 100644 meta/recipes-support/p11-kit/files/strerror-2.patch rename meta/recipes-support/p11-kit/{p11-kit_0.25.0.bb => p11-kit_0.25.2.bb} (85%) diff --git a/meta/recipes-support/p11-kit/files/strerror-1.patch b/meta/recipes-support/p11-kit/files/strerror-1.patch deleted file mode 100644 index 6af4fee7249..00000000000 --- a/meta/recipes-support/p11-kit/files/strerror-1.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 3ba2c55dfdc8ff20de369f07f6c57d08718d3add Mon Sep 17 00:00:00 2001 -From: Adam Sampson -Date: Sun, 2 Jul 2023 15:22:49 +0100 -Subject: [PATCH] Check for GNU strerror_r using the compiler only - -The new test that was added to distinguish GNU/XSI strerror_r ran a -compiled program, which doesn't work when cross-compiling. The only -difference at compile time is that the GNU version returns char * and -the XSI version returns int, so detect it by compiling a program that -dereferences the return value. - -Signed-off-by: Adam Sampson - -Upstream-Status: Backport -Signed-off-by: Ross Burton ---- - configure.ac | 19 +++++++------------ - meson.build | 10 +++++----- - 2 files changed, 12 insertions(+), 17 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 40f5a583..29890622 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -146,19 +146,14 @@ if test "$os_unix" = "yes"; then - - AC_CHECK_FUNC( - [strerror_r], -- [AC_RUN_IFELSE( -- [AC_LANG_SOURCE([[ -- #include -- #include -- -- int main (void) -- { -- char buf[32]; -- return strerror_r (EINVAL, buf, 32); -- } -- ]])], -- [AC_DEFINE([HAVE_XSI_STRERROR_R], 1, [Whether XSI-compliant strerror_r() is available])], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM([[#include -+ #include ]], -+ [[/* GNU strerror_r returns char *, XSI returns int */ -+ char buf[32]; -+ return *strerror_r (EINVAL, buf, 32);]])], - [AC_DEFINE([HAVE_GNU_STRERROR_R], 1, [Whether GNU-specific strerror_r() is available])], -+ [AC_DEFINE([HAVE_XSI_STRERROR_R], 1, [Whether XSI-compliant strerror_r() is available])], - [])], - []) - -diff --git a/meson.build b/meson.build -index 0f8c8da0..4cc3f89a 100644 ---- a/meson.build -+++ b/meson.build -@@ -306,15 +306,15 @@ if cc.has_function('strerror_r', prefix: '#include ') - - int main (void) - { -+ /* GNU strerror_r returns char *, XSI returns int */ - char buf[32]; -- return strerror_r (EINVAL, buf, 32); -+ return *strerror_r (EINVAL, buf, 32); - } - ''' -- strerror_r_check = cc.run(strerror_r_code, name : 'strerror_r check') -- if strerror_r_check.returncode() == 0 -- conf.set('HAVE_XSI_STRERROR_R', 1) -- else -+ if cc.compiles(strerror_r_code, name : 'GNU strerror_r check') - conf.set('HAVE_GNU_STRERROR_R', 1) -+ else -+ conf.set('HAVE_XSI_STRERROR_R', 1) - endif - endif - diff --git a/meta/recipes-support/p11-kit/files/strerror-2.patch b/meta/recipes-support/p11-kit/files/strerror-2.patch deleted file mode 100644 index 1a9180b508c..00000000000 --- a/meta/recipes-support/p11-kit/files/strerror-2.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7aa6251bf4ce36d027d53c9c96bb05f90ef7eb5b Mon Sep 17 00:00:00 2001 -From: Adam Sampson -Date: Sun, 2 Jul 2023 15:44:06 +0100 -Subject: [PATCH] Define _GNU_SOURCE when testing for strerror_r - -The Meson check for GNU/XSI strerror_r didn't inherit the project -options that include _GNU_SOURCE (unlike the autoconf version), so the -result didn't match how the code that uses it will be compiled. Add -_GNU_SOURCE explicitly as with the following checks. - -Signed-off-by: Adam Sampson - -Upstream-Status: Backport -Signed-off-by: Ross Burton ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index 4cc3f89a..9a72e148 100644 ---- a/meson.build -+++ b/meson.build -@@ -301,6 +301,7 @@ endforeach - - if cc.has_function('strerror_r', prefix: '#include ') - strerror_r_code = ''' -+#define _GNU_SOURCE - #include - #include - diff --git a/meta/recipes-support/p11-kit/p11-kit_0.25.0.bb b/meta/recipes-support/p11-kit/p11-kit_0.25.2.bb similarity index 85% rename from meta/recipes-support/p11-kit/p11-kit_0.25.0.bb rename to meta/recipes-support/p11-kit/p11-kit_0.25.2.bb index ad1fda3f3b7..d00ef2daf55 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.25.0.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.25.2.bb @@ -10,10 +10,8 @@ DEPENDS = "libtasn1 libtasn1-native libffi" DEPENDS:append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" -SRC_URI = "git://github.com/p11-glue/p11-kit;branch=master;protocol=https \ - file://strerror-1.patch \ - file://strerror-2.patch" -SRCREV = "a8cce8bd8065bbf80bd47219f85f0cd9cf27dd0c" +SRC_URI = "gitsm://github.com/p11-glue/p11-kit;branch=master;protocol=https" +SRCREV = "66d6b42ef8dd84fcd8e199ac9f23f822f1a058c9" S = "${WORKDIR}/git" PACKAGECONFIG ??= "" From patchwork Mon Nov 27 10:17:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35227 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 E3CE0C4167B for ; Mon, 27 Nov 2023 10:18:17 +0000 (UTC) Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by mx.groups.io with SMTP id smtpd.web11.91597.1701080289847488069 for ; Mon, 27 Nov 2023 02:18:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ZsYI0Zqm; spf=pass (domain: gmail.com, ip: 209.85.218.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-a00cbb83c82so574548966b.2 for ; Mon, 27 Nov 2023 02:18:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701080288; x=1701685088; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pG1nHG6pdORPEJ4yq+LuZ7VZ1pErwS4R8FnMvfUzCkw=; b=ZsYI0ZqmuXxDLUAYuhXkJ3SgVzzvh6t479LgNOdVQA5wuYQK7bzYDxYirtqtqd1lhj 8DHMqlRnYD/RNASiP8PgMeqqv1gNgCHy936aF62AjiLSx53dDzTKaODeGX4dxmx8/Jlb BYvBKlPhEFj8WXWTKcYC5KqOpGWgfqVTAR0fmmAQgFOcI8fKE8ov9kDIwPjm0gXtwlDZ 1qX5SugiykoGpnWYPIJhVkzf+YQU4bZamUU89K6zszGXFnEBKFoTbJUd3yDQIi95aObW eDm4VJ3ax04MViy8KIsmz5ZmPtYGmhNuFzFeB7BXFKKRbEMZTXGj7GR9+2RWCHbmUhX/ jD0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701080288; x=1701685088; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pG1nHG6pdORPEJ4yq+LuZ7VZ1pErwS4R8FnMvfUzCkw=; b=DTGoGOJccpQCTIJJ09tvQoT6VIlSFNZIu08q+VlvCLMVWH36L4HwXvsq3lrEGHkny8 xO3vJiWHZH3GBdRcKgi7ld1/crvxN3FdjSSw9UbDMjCjC+ODrF/m0KUzjah8lr0U3uDe sxtFb1haZltTp4/n85vonllEo4sPOWJKt4exu0SqK0MdvE6z7EIOPkZk14vzvKxRTv4X wZngmn1tU4WUF967cYPWUO3tbrbAr+0Kyo6g8lcFhrzgxobtTjYs7ik27+YgVoR7gu2c 0i3cClbGOr5ZesdBBNVuejQvZMpatBrZrUp/xtiuanAzarL1aF9Vdk/I+QjMUUmlwfnU foJQ== X-Gm-Message-State: AOJu0YzVDSGfOI3pZQCt661CYNHvykiHpS2aWneSowiWs9DAlScYiOHN kHMdJjim/cXc3tYRuKuhlYcT06IoVhI= X-Google-Smtp-Source: AGHT+IF+Cs59WKVlo73XJiWn5mwkCJO1eVuPD4lFFMf2EyGex6/P56L38DchJO35wdcVqlBmy+ZnBA== X-Received: by 2002:a17:906:856:b0:a00:2de3:73cc with SMTP id f22-20020a170906085600b00a002de373ccmr6557353ejd.69.1701080288230; Mon, 27 Nov 2023 02:18:08 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id h26-20020a170906585a00b00a0bf09c9483sm2757203ejs.35.2023.11.27.02.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 02:18:07 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 16/19] glib-2.0: install gio-querymodules into bindir as well as libexecdir for native Date: Mon, 27 Nov 2023 11:17:48 +0100 Message-Id: <20231127101751.3187950-16-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127101751.3187950-1-alex@linutronix.de> References: <20231127101751.3187950-1-alex@linutronix.de> 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 ; Mon, 27 Nov 2023 10:18:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191283 Latest meson expects it there and fails if it can't find it; meanwhile we patch glib to put it into libexecdir for reasons of avoiding incorrect debian package renaming in multilib scenarios. Signed-off-by: Alexander Kanavin --- meta/recipes-core/glib-2.0/glib.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index cec06b2f88e..fbf3a39b15f 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -113,6 +113,11 @@ do_install:append () { mkdir -p ${D}${libdir}/gio/modules } +do_install:append:class-native () { + # Link gio-querymodules into ${bindir} as otherwise tools like meson won't find it + ln -rs ${D}${libexecdir}/gio-querymodules ${D}${bindir} +} + do_install:append:class-target () { # Tests are only installed on targets, not native builds. Separating this out # keeps glib-2.0-native from depending on DISTRO_FEATURES From patchwork Mon Nov 27 10:17:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35230 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 D68E8C46CA3 for ; Mon, 27 Nov 2023 10:18:17 +0000 (UTC) Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by mx.groups.io with SMTP id smtpd.web10.91954.1701080290359636435 for ; Mon, 27 Nov 2023 02:18:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Rv1XzYXr; spf=pass (domain: gmail.com, ip: 209.85.218.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-a03a9009572so545038166b.3 for ; Mon, 27 Nov 2023 02:18:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701080289; x=1701685089; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QdeIVsqls22jpPteDcz1zC8rhg3/M+O85ZuGsGJaGgQ=; b=Rv1XzYXrdc0uX78KbDbCSJVJ90PzwrmIAHL5G7X8J2KMpNZXGBWpRxKYE9MfXbXI2y vBGSco0DRQ9QYfrzA2HnC5Elbv9EYFR2+Or2nmTJlzc84cyg2MVFr9M9JrME9SgBNSRR VYzWoroLocAGLaMm5jqNw1WUFSZ0jVgnNxha7AzWfIATeHg4Z9Nb/89y7LU7eBpi+SAF YARw1ISKXgZvHOW3yCB90lLUHGibHgIUgDt2ISSGugqHxWBaLlc7W9ivQqM1xTlKGhj7 AZ/cPjCkOn3Y7DVxiGn2o3vOW+gviRK2YHA3XvhNV6Yaqj/I/U6nTLv5oIAxT03aKMmT RT/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701080289; x=1701685089; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QdeIVsqls22jpPteDcz1zC8rhg3/M+O85ZuGsGJaGgQ=; b=cHla35SyZD4+joskM78wyUW73Q6NNuucSo/3+l0X+FPf2z+qDluoSd5Mm6WEWMkpAz 8nuaGutfeKNiobTQu0Mz+1WP8sEBrlPQOQl8UZVyOFlLDQN1ZG20gggpM4ZwfgQqvEuN D/VRwegkKbwVPs5yLfStnFgfMpsxCV+tQ7QUsNOFWnRy6zy6iVHmcAQvm3P0IU9md7Nz JSVP8yHbdyAxVMac2FOQ7jxga9+vFjKguTY/8HGd+mnkemMrYswWaAj4MVwTqdNVm5X3 50Civc2wRTbWV8iBKoW33+Q8MZqN0/c/777V6qac3MOCe9K4o/cXs35g01fe/vB1wxTS l11w== X-Gm-Message-State: AOJu0YwRiQ3NddZI7APYzR4KFKieo7FLBMJY4uMTqLczYPcYuOIaR7nk 6+h1zp1NjdNIfwuThi5a5851FMlopmg= X-Google-Smtp-Source: AGHT+IFqVnEyAvnCREPsFUJJz6ipm7/9aD1oN7jYtHZ32jSknKKPpc+TR2XjDcQU9uwTADm/dl6l+g== X-Received: by 2002:a17:906:9e04:b0:9cf:797b:6adc with SMTP id fp4-20020a1709069e0400b009cf797b6adcmr6690794ejc.33.1701080288751; Mon, 27 Nov 2023 02:18:08 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id h26-20020a170906585a00b00a0bf09c9483sm2757203ejs.35.2023.11.27.02.18.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 02:18:08 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 17/19] meson: update 1.2.2 -> 1.3.0 Date: Mon, 27 Nov 2023 11:17:49 +0100 Message-Id: <20231127101751.3187950-17-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127101751.3187950-1-alex@linutronix.de> References: <20231127101751.3187950-1-alex@linutronix.de> 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 ; Mon, 27 Nov 2023 10:18:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191284 Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/meson/{meson_1.2.2.bb => meson_1.3.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/meson/{meson_1.2.2.bb => meson_1.3.0.bb} (98%) diff --git a/meta/recipes-devtools/meson/meson_1.2.2.bb b/meta/recipes-devtools/meson/meson_1.3.0.bb similarity index 98% rename from meta/recipes-devtools/meson/meson_1.2.2.bb rename to meta/recipes-devtools/meson/meson_1.3.0.bb index c38d88fe61f..e794bb28a52 100644 --- a/meta/recipes-devtools/meson/meson_1.2.2.bb +++ b/meta/recipes-devtools/meson/meson_1.3.0.bb @@ -15,7 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ file://0001-Make-CPU-family-warnings-fatal.patch \ file://0002-Support-building-allarch-recipes-again.patch \ " -SRC_URI[sha256sum] = "4a0f04de331fbc7af3b802a844fc8838f4ccd1ded1e792ba4f8f2faf8c5fe4d6" +SRC_URI[sha256sum] = "4ba253ef60e454e23234696119cbafa082a0aead0bd3bbf6991295054795f5dc" inherit python_setuptools_build_meta github-releases From patchwork Mon Nov 27 10:17:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35226 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 D6809C07D5B for ; Mon, 27 Nov 2023 10:18:17 +0000 (UTC) Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by mx.groups.io with SMTP id smtpd.web10.91955.1701080290773491984 for ; Mon, 27 Nov 2023 02:18:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=LvKozGBb; spf=pass (domain: gmail.com, ip: 209.85.218.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-a049d19b63bso551044966b.2 for ; Mon, 27 Nov 2023 02:18:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701080289; x=1701685089; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=F/jaHwXAkT9261tMGlpvO4uBG0O6r/FhCog8Iyf0hyc=; b=LvKozGBb4T2qG7WG51wAzhFipj7qnLUVljp+4pXNQIEWq3wy7mPi71F94NQl51KoWN QlvSWi9tAT4Mi8X3Sf4fzRi952WqKeCZqkuV8rBFHQ3tmdxQE5UPbAS5O+J49pWYYIfC nqXzEB9G2YlsTSW0/RSyMDQevQIMBiJdi49ooH4FvAX3LwuX3goKFns5WH8GMAZU4WoY dC1sAAz7Vl9chRXWJAmIMRBU6BKFpB/Zb17T8q2usLTn09tO8v1anV6QwAGxTpvnj+CO tjpw98ULj8F6t9jpJ/0J1yjhDEiRz18VS4t/QjuQWYnTyCa546mXtTBQnGbWSqNshE76 7tFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701080289; x=1701685089; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F/jaHwXAkT9261tMGlpvO4uBG0O6r/FhCog8Iyf0hyc=; b=FBRy5w0OY/ldi7n0YZwhLTrja4utRQ3DOrYXXJfl4Z/Yj6UvHm38ge8h8iAt7d/yP3 q8KXArckQEcMsFUJDMuPqkCJJdmvzb+sA/K1t0fAZ6a84ApA83XR+qIfflnsH1/L/nuX isT3xVuhShjZBC+gKrFv+8tg6Bww7WeLo60sQa2ArXJvpdSO6aeXpo0ZaVF2nrqMujCJ l93TR0G1rTWFTk3tLuQUTC5c7ZYddRZwKa1xWhKKLygJTenkMw6X4TLOeSpG3Rk0NosQ DZpPd8ynoURutTLmNGLGLfjFq2ibhZJDHmuhg6eUpuFcHXDO4HS3iSWK8bg/TcPzjfs2 Yg/A== X-Gm-Message-State: AOJu0YxfXlcM9t8CmKE6xO0Ot55IhYZZFHq1rmFeHRFr5t7uqBamCZnS Lo6wG6oAZX7ySFyNK8vRxeBQdnrq0uA= X-Google-Smtp-Source: AGHT+IGhaua8s4zCsdEMtJSZLQ2030ZiAwqrwfbKBzHUfgv7uS3oYw07U2+usPLqQ7MShoa9kSUAfA== X-Received: by 2002:a17:906:41b:b0:9b2:982e:339a with SMTP id d27-20020a170906041b00b009b2982e339amr8288904eja.22.1701080289268; Mon, 27 Nov 2023 02:18:09 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id h26-20020a170906585a00b00a0bf09c9483sm2757203ejs.35.2023.11.27.02.18.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 02:18:09 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 18/19] repo: update 2.37 -> 2.39 Date: Mon, 27 Nov 2023 11:17:50 +0100 Message-Id: <20231127101751.3187950-18-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127101751.3187950-1-alex@linutronix.de> References: <20231127101751.3187950-1-alex@linutronix.de> 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 ; Mon, 27 Nov 2023 10:18:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191285 Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/repo/repo/0001-python3-shebang.patch | 2 +- meta/recipes-devtools/repo/{repo_2.37.bb => repo_2.39.bb} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/repo/{repo_2.37.bb => repo_2.39.bb} (95%) diff --git a/meta/recipes-devtools/repo/repo/0001-python3-shebang.patch b/meta/recipes-devtools/repo/repo/0001-python3-shebang.patch index d3888c8bb2a..fba89a32d82 100644 --- a/meta/recipes-devtools/repo/repo/0001-python3-shebang.patch +++ b/meta/recipes-devtools/repo/repo/0001-python3-shebang.patch @@ -19,8 +19,8 @@ index b13e34c..205e0e5 100755 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # -*- coding:utf-8 -*- # # Copyright (C) 2008 The Android Open Source Project + # -- 2.33.0 diff --git a/meta/recipes-devtools/repo/repo_2.37.bb b/meta/recipes-devtools/repo/repo_2.39.bb similarity index 95% rename from meta/recipes-devtools/repo/repo_2.37.bb rename to meta/recipes-devtools/repo/repo_2.39.bb index d6d3d03a623..a0633a5cbbc 100644 --- a/meta/recipes-devtools/repo/repo_2.37.bb +++ b/meta/recipes-devtools/repo/repo_2.39.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main \ file://0001-python3-shebang.patch \ " -SRCREV = "83c66ec661e39e47795086a5d26d0f3782ac1d49" +SRCREV = "b99272c601bc5f466c3cfc782bb852c2c967ad27" MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git" From patchwork Mon Nov 27 10:17:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35228 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 C6E8CC07D5A for ; Mon, 27 Nov 2023 10:18:17 +0000 (UTC) Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by mx.groups.io with SMTP id smtpd.web11.91600.1701080291531739930 for ; Mon, 27 Nov 2023 02:18:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=R9GGerce; spf=pass (domain: gmail.com, ip: 209.85.218.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-a011e9bf336so550777266b.3 for ; Mon, 27 Nov 2023 02:18:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701080290; x=1701685090; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CaJiiVjcni57c3zek6VKdf4USKXatzmMCjFjglOT6Og=; b=R9GGerceAo9QaRV+MtbfXBCtCFka+eiMYbS9+0kNO/ky8xvLjDgwuAdhTznVfJCc5f OfhG+huTSTdAe8IDqgN6FXiRyp+4X2MY5ckTXkyAK+2h4di1SJQbktqPpiTnjbp09Unt 7LDoPurMHaeLzoo8l8+xfmDg98UxNf4YKSXdM38zLF/zDniFBVfla7HNJcGL77mVDT8w nsj7iQ+0oJFcTJkmrTb1JA0yOLeMw9jd4pWduDHUub8/UAKm3sq/zM5Bir/qGuwF4zya mqsKxLK6Ap99/czq4tXvcLZ3hF8Dkzh77e3qHTtGH39DtEmNG1o4VJ8obtCfDcCUsksn XhiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701080290; x=1701685090; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CaJiiVjcni57c3zek6VKdf4USKXatzmMCjFjglOT6Og=; b=V8g6Ne5VavleKiZhcftrICufeIzjZEV6DErEGhx35b6jHf4VeVulsHa2efpUTlPSD3 1s8MaCFFpz6bLgAeKC4xpSI4Gwstydul1YeA9Qx9zr0yog/2ClDrZw1jcDQIr4icqg6M ABstfmX4WdIZ2AyOuDWuTS9n9J8SanNAFTtneiv45+qdP0I1hx2kVfZww1Pq03C097R3 ztDoEKKdM9xJA4+B9XIGAjtg2XXMXLoJwANxE6/thjBfPqz+QTlLbqqlZFzejWOPHz1o 3Sh4LNzeYGqcluq2PuZQGJHAXw2XHQyWsgj4fjla5x4pZgCA93ELjB+ICULu8fvgayMz 1DbA== X-Gm-Message-State: AOJu0YxCSRzbomZpIeg9UluXKTvrqvzIKfrNQ29MPs7b7PpXIVSsamQK wwoRTHZlPhZ8cyL11WsVmwuoL5BX80g= X-Google-Smtp-Source: AGHT+IGmLr5xWdiNmEBpZx4EuWhjN/PKJP1LkLyFQcsfULSwXOJgbAJF/LNILJs95p5uM1/bj46KlQ== X-Received: by 2002:a17:906:71cd:b0:a01:c7de:9704 with SMTP id i13-20020a17090671cd00b00a01c7de9704mr8122502ejk.68.1701080289726; Mon, 27 Nov 2023 02:18:09 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id h26-20020a170906585a00b00a0bf09c9483sm2757203ejs.35.2023.11.27.02.18.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 02:18:09 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 19/19] rt-tests: update 2.5 -> 2.6 Date: Mon, 27 Nov 2023 11:17:51 +0100 Message-Id: <20231127101751.3187950-19-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127101751.3187950-1-alex@linutronix.de> References: <20231127101751.3187950-1-alex@linutronix.de> 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 ; Mon, 27 Nov 2023 10:18:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191286 Signed-off-by: Alexander Kanavin --- ...0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch | 6 +++--- meta/recipes-rt/rt-tests/rt-tests.inc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch index e9967767a0f..a1fc9e26a03 100644 --- a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch +++ b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch @@ -1,4 +1,4 @@ -From 174fd202f2c85e43261139d71ad18908cc29b586 Mon Sep 17 00:00:00 2001 +From 7cf4cf097895bd4c3f3d3a6f783c766b3173cf1a Mon Sep 17 00:00:00 2001 From: Randy Witt Date: Fri, 16 Oct 2020 16:54:30 -0700 Subject: [PATCH] Makefile: Allow for CC and AR to be overridden @@ -15,11 +15,11 @@ Upstream-Status: Inappropriate [other] 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 4df61ec..a229986 100644 +index 223a839..a735584 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ - VERSION = 2.5 + VERSION = 2.6 -CC = $(CROSS_COMPILE)gcc -AR = $(CROSS_COMPILE)ar +CC ?= $(CROSS_COMPILE)gcc diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc index 527e14ad546..70315c46941 100644 --- a/meta/recipes-rt/rt-tests/rt-tests.inc +++ b/meta/recipes-rt/rt-tests/rt-tests.inc @@ -1,5 +1,5 @@ -SRCREV = "4579b9a6d85ae528f76e92421eb5e7b33cd26b17" -PV = "2.5" +SRCREV = "217cd8518c5f7777d490892aa9c765a6b2782cb5" +PV = "2.6" PE = "1" SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=main;protocol=https"