From patchwork Thu Mar 9 15:19: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: 20649 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 E1548C64EC4 for ; Thu, 9 Mar 2023 15:20:11 +0000 (UTC) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.groups.io with SMTP id smtpd.web11.16012.1678375206331469382 for ; Thu, 09 Mar 2023 07:20:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=U3yzEZh8; spf=pass (domain: gmail.com, ip: 209.85.221.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f42.google.com with SMTP id j2so2224792wrh.9 for ; Thu, 09 Mar 2023 07:20:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375205; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2PunAzaCufJCJQi9WZNoCgJwGhqV7JsAMOHEc3pVHTA=; b=U3yzEZh840R8LKbCZWhAuvVZkNfF14fqdCm8J4+yIUTSkLADvraDeDlMZiZBXdD6od Tv3F5dJLr47GIhgSzeEmyCIm3ypjV3w39IS/xeVFsi2Hytz8ztCObUzbYWBvmV1f9N8L TNud33hhF1l1Dy860w+CvUCb2rU05z4rq47S3pGG9CjSp8vyJ/5A7d4tZ9k8pXigzUjB 53ah+sOBO/ZolXtsw19wJg0cVLwcuCNl79qF9bobcoAsiJ0C5bG78CX4hYx9qdocaykF NsxcAdY7xD2tt8aNOARXfII2ZJct5/WF7aYqgEvSFo7LhLdklw3aXrSGq1nWlAmZ4gwv prWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375205; 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=2PunAzaCufJCJQi9WZNoCgJwGhqV7JsAMOHEc3pVHTA=; b=sY77Ld7NAUvwyDcYLDlUHbduGbj/eW110Qv3yXoXteFsRsXQjnA/FjPFKKqHXRjN70 3HOmzIUXm9xcEoVil7uOYkWiq4ZzaB0jwrqu+ElxZQApM9bZ7RciQ0aHe6xqLMG/SuPY 2OWeJ63WwhoCWNS82993DRAjXGv6TONkc2Va+nYWhUX2e0QCZ4YENS+n2PEzL+DTthTi OJuX5phr5i25LMf/Aeb8f0GRCDm5ndgDdgFeK3Wwm/8suY+sL0eBDKdqSyK84rx98kE2 UQCFiP9uaAePTZkeDj04lH7Pg9k5oCeI+pSOI2p70XeUy7fZpXY1IUdIbCOBBXXX+EOk 9SUQ== X-Gm-Message-State: AO0yUKXDJmmA4Q80Xfutx8Dw01ASPjwnotJY+W56Tq0MGW5UO7fPZE2Q Ru4RC0ywwHtB2VbH9R3bftIE8sZs6t4= X-Google-Smtp-Source: AK7set8VLSAxcQp6qyyHcd9qKS26mgzD/XuG4N0Q7J9mcqVGmVCtSJddr5CR6U8TLokUOGGMlk8DnA== X-Received: by 2002:a5d:6543:0:b0:2ce:46b5:8c42 with SMTP id z3-20020a5d6543000000b002ce46b58c42mr13560532wrv.29.1678375204670; Thu, 09 Mar 2023 07:20:04 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:04 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 01/26] devtool/upgrade: do not delete the workspace/recipes directory Date: Thu, 9 Mar 2023 16:19:33 +0100 Message-Id: <20230309151958.3619193-1-alex@linutronix.de> X-Mailer: git-send-email 2.30.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 ; Thu, 09 Mar 2023 15:20:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178226 If it exists, there is no need to delete it, and if it does not, devtool prints an ugly traceback. Signed-off-by: Alexander Kanavin --- scripts/lib/devtool/upgrade.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index 967d157077..6c4a62b558 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py @@ -125,11 +125,8 @@ def _write_append(rc, srctreebase, srctree, same_dir, no_same_dir, rev, copied, return af def _cleanup_on_error(rd, srctree): - rdp = os.path.split(rd)[0] # recipes folder if os.path.exists(rd): shutil.rmtree(rd) - if not len(os.listdir(rdp)): - os.rmdir(rdp) srctree = os.path.abspath(srctree) if os.path.exists(srctree): shutil.rmtree(srctree) From patchwork Thu Mar 9 15:19: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: 20647 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 E4FC0C742A7 for ; Thu, 9 Mar 2023 15:20:11 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.web11.16013.1678375206818307064 for ; Thu, 09 Mar 2023 07:20:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=MIoq4ph+; spf=pass (domain: gmail.com, ip: 209.85.221.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f49.google.com with SMTP id h11so2241863wrm.5 for ; Thu, 09 Mar 2023 07:20:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375205; 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=dbiQp8DADaujDCUZ+uyuK0iGL5MIgzZIIlK+HokPlKY=; b=MIoq4ph+f3IeJl6fTZmzbjbPzKP9E9k16p/VONk30Inijt1+71qHMghpMI2R2q7gyg oFnGR08yJkdslk3BiU7odliV0nk2RZUIniRcNhRY7Bn9EPrN7ARXYkj6rT67wEVZPpJC 7N79Di0FENBzSGtH0i6hW1tUp9CIZOiB0x5hiaeAO0I0Lhq7dp2AfEoGpDIW9eR7fdcy b/YJZyvNkbVMNkIdS8IeRymSwclJB3D1fJozDqBK1vd9TOdVkAdL85BbAVtRLGzEdp0y 0GFBl9ZOcqsurGyK47QcQu4rN5hu8pbE0B0hlTM+iOhBoD9B5YhRmf+M8ree/NOa7yUg aXJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375205; 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=dbiQp8DADaujDCUZ+uyuK0iGL5MIgzZIIlK+HokPlKY=; b=U1hX6vI9HdsCAHlDr8g3UL/5u3qJcvw0yQ/UOzPX5bPhzrbkvQ6ycskIRtLc4lUQH5 Yf3bEV7uVzZkLq6nhzD8qmFM2sVsqeWgs24c+w1dMqhgODAXRE+FBA9I7DweCa17+2Hs L3r2+sxez+yGmRZJBI4+OXqUtJUnwaEEIJLNtv+DL6VB2Rary9z/JKTF09gMJKNUAiNv vMbIuNFESZmImKx71xstE3raUA9UfxnCNTcy6myCnDnasXxB7WveL6JAzG2u8Y3KHOvp TXwUx0E4+Im980/DNnDcREOgF2hVeCxDc3tXYaXW8Tx7TJEvyzj92i/BYATHPolawi82 h1hQ== X-Gm-Message-State: AO0yUKXKs2A4MMqSoFP9siExgcKvqj3uD79VnU4S9CmTz/I8X1MYgviY ZJKrQmywuWsT7D+HL1fuSiB65urQrwM= X-Google-Smtp-Source: AK7set8NvpTGr1Ss3nRl4jTFL1AuUcKyzm4kA3LpKjjK4oDyjj6MYHRy5SWOP07XzSugsKGtH+4hlw== X-Received: by 2002:adf:ec47:0:b0:2c7:e48:8ca3 with SMTP id w7-20020adfec47000000b002c70e488ca3mr14925271wrn.0.1678375205154; Thu, 09 Mar 2023 07:20:05 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:04 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 02/26] sudo: update 1.9.12p2 -> 1.9.13p2 Date: Thu, 9 Mar 2023 16:19:34 +0100 Message-Id: <20230309151958.3619193-2-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178227 License-update: copyright years, formatting. Signed-off-by: Alexander Kanavin --- ...o.conf.in-fix-conflict-with-multilib.patch | 21 ++++++++++--------- meta/recipes-extended/sudo/sudo.inc | 2 +- .../{sudo_1.9.12p2.bb => sudo_1.9.13p2.bb} | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) rename meta/recipes-extended/sudo/{sudo_1.9.12p2.bb => sudo_1.9.13p2.bb} (96%) diff --git a/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch b/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch index f4fc376bb8..041c717e00 100644 --- a/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch +++ b/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch @@ -1,4 +1,7 @@ -sudo.conf.in: fix conflict with multilib +From 6e835350b7413210c410d3578cfab804186b7a4f Mon Sep 17 00:00:00 2001 +From: Kai Kang +Date: Tue, 17 Nov 2020 11:13:40 +0800 +Subject: [PATCH] sudo.conf.in: fix conflict with multilib When pass ${libdir} to --libexecdir of sudo, it fails to install sudo and lib32-sudo at same time: @@ -12,12 +15,13 @@ Update the comments in sudo.conf.in to avoid the conflict. Signed-off-by: Kai Kang Upstream-Status: Inappropriate [OE configuration specific] + --- examples/sudo.conf.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in -index 6535d3a..50afc8f 100644 +index 2187457..0908d24 100644 --- a/examples/sudo.conf.in +++ b/examples/sudo.conf.in @@ -4,7 +4,7 @@ @@ -33,8 +37,8 @@ index 6535d3a..50afc8f 100644 # The compiled-in value is usually sufficient and should only be changed # if you rename or move the sudo_intercept.so file. # --#Path intercept @plugindir@/sudo_intercept.so -+#Path intercept $plugindir/sudo_intercept.so +-#Path intercept @intercept_file@ ++#Path intercept $intercept_file # # Sudo noexec: @@ -42,8 +46,8 @@ index 6535d3a..50afc8f 100644 # The compiled-in value is usually sufficient and should only be changed # if you rename or move the sudo_noexec.so file. # --#Path noexec @plugindir@/sudo_noexec.so -+#Path noexec $plugindir/sudo_noexec.so +-#Path noexec @noexec_file@ ++#Path noexec $noexec_file # # Sudo plugin directory: @@ -55,7 +59,4 @@ index 6535d3a..50afc8f 100644 +#Path plugin_dir $plugindir # - # Sudo developer mode: --- -2.17.1 - + # Core dumps: diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 498d60d534..bedf713d2c 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws" BUGTRACKER = "http://www.sudo.ws/bugs/" SECTION = "admin" LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7aacba499777b719416b293d16f29c8c \ +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5100e20d35f9015f9eef6bdb27ba194f \ file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \ file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \ file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \ diff --git a/meta/recipes-extended/sudo/sudo_1.9.12p2.bb b/meta/recipes-extended/sudo/sudo_1.9.13p2.bb similarity index 96% rename from meta/recipes-extended/sudo/sudo_1.9.12p2.bb rename to meta/recipes-extended/sudo/sudo_1.9.13p2.bb index ae7207c081..a028bcc216 100644 --- a/meta/recipes-extended/sudo/sudo_1.9.12p2.bb +++ b/meta/recipes-extended/sudo/sudo_1.9.13p2.bb @@ -8,7 +8,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[sha256sum] = "b9a0b1ae0f1ddd9be7f3eafe70be05ee81f572f6f536632c44cd4101bb2a8539" +SRC_URI[sha256sum] = "df2004fde4c1033b1fdca339958e0ec633d393d604fcff9d1513abef1f94574d" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" From patchwork Thu Mar 9 15:19: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: 20652 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 0FFA3C74A4B for ; Thu, 9 Mar 2023 15:20:12 +0000 (UTC) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.groups.io with SMTP id smtpd.web10.16121.1678375207572494913 for ; Thu, 09 Mar 2023 07:20:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=nfTGfPLT; spf=pass (domain: gmail.com, ip: 209.85.128.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f53.google.com with SMTP id p23-20020a05600c1d9700b003ead4835046so3698970wms.0 for ; Thu, 09 Mar 2023 07:20:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375206; 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=PbIJboBoexUI2aLca4uHCfMAztqctQQmqDeU/bH4vl4=; b=nfTGfPLTdQC34/6YQf0+B3MUq/rL28XkxRIwV7GfTfUR12xsijX0KrEX9CRS//1NKI jqtMjh4tHJ1gHriBbU9XteFzszTcOL/oRrt1vDGg4j9UfU7UOGcJj24lPgxONnXkaGV9 sS25IK+lmHCZvNnTXI5vweaRJ0smzg6L9WQL+PV9nzfsBoQxqOffemHEkHE0JgF4zmeP B+fMC5eTpy+n9JIsFpJCdXynX0LRm/f9iOJ/PR2dcogqdHQpeuDe38PvBRO6vd/HadWL a8RnO2NUFjcFsCDBP34j897yeTNvb9B1ogOMcn3wtLXWwnMY0Q+JT+zwD1ulzANRgy02 Xf+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375206; 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=PbIJboBoexUI2aLca4uHCfMAztqctQQmqDeU/bH4vl4=; b=f4Zp6qUt56zM/PWiJbUzprMGzr8C2tJNS6YLJg7x30y8GbI4htRLJ7TjZfqbG8UDO0 g6qmbppHVgdDXL9Uzz6RprVyXpJhRozGJ+ryqlttTpvhLSZCtIJz6WIUMTppSpSUaH0V yzitAmEireDsPfqqdKMVLDneDDaKxWNHYEjbWAoxH3a/ZDucYtmy8F/iXH2zSaGW+B+V QP4MFLHMrchv6h377oUmgTceDxUIdTISOSA2ZqOezJ8QnNFsVC1tEXr5qQMBcyFzeZuy uUkDGx1R1Qp6zscRw//1Nmu7Xi9YiWRayZgesNVE9TxpkbYVCNcKSma0bpvwOWNKGy9F 2DMw== X-Gm-Message-State: AO0yUKX4Tre4xfJBJMsZMGYHy3xEIIlv+fiCIwKfX2sVF4N2R93kAaDl 6hBkL7yEhsjuRYTXBf33NhsXZVqHg98= X-Google-Smtp-Source: AK7set8+FkhNRyGD1EdgSVsfxsgi+sLl7RWPLcGE+GSUYj4oQFwW4AIvB0Pht26RPglxMwgxQkPpXw== X-Received: by 2002:a05:600c:548c:b0:3ea:bc08:b55e with SMTP id iv12-20020a05600c548c00b003eabc08b55emr18402629wmb.25.1678375205785; Thu, 09 Mar 2023 07:20:05 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:05 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 03/26] procps: update 3.3.17 -> 4.0.3 Date: Thu, 9 Mar 2023 16:19:35 +0100 Message-Id: <20230309151958.3619193-3-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178228 Drop patches as upstream refactored the code. Add a compatibility patch to igt-gpu-tools. Add a musl compatibility patch. Signed-off-by: Alexander Kanavin --- .../procps/0001-src-w.c-use-utmp.h-only.patch | 65 +++ .../procps/0001-w.c-correct-musl-builds.patch | 44 -- ...02-proc-escape.c-add-missing-include.patch | 23 - .../{procps_3.3.17.bb => procps_4.0.3.bb} | 9 +- .../0001-Support-procps-4.x.patch | 502 ++++++++++++++++++ .../igt-gpu-tools/igt-gpu-tools_git.bb | 4 +- 6 files changed, 572 insertions(+), 75 deletions(-) create mode 100644 meta/recipes-extended/procps/procps/0001-src-w.c-use-utmp.h-only.patch delete mode 100644 meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch delete mode 100644 meta/recipes-extended/procps/procps/0002-proc-escape.c-add-missing-include.patch rename meta/recipes-extended/procps/{procps_3.3.17.bb => procps_4.0.3.bb} (90%) create mode 100644 meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-Support-procps-4.x.patch diff --git a/meta/recipes-extended/procps/procps/0001-src-w.c-use-utmp.h-only.patch b/meta/recipes-extended/procps/procps/0001-src-w.c-use-utmp.h-only.patch new file mode 100644 index 0000000000..23c91ec775 --- /dev/null +++ b/meta/recipes-extended/procps/procps/0001-src-w.c-use-utmp.h-only.patch @@ -0,0 +1,65 @@ +From c41b3be62fbb78e0939fddaebad519360cbd8702 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 6 Mar 2023 09:27:57 +0100 +Subject: [PATCH] src/w.c: use only utmpx + +Nowadays this works both on musl and glibc systems, however on musl +utmp.h is also needed to avoid the following failure: + +| ../git/src/w.c: In function 'print_from': +| ../git/src/w.c:73:28: error: '__UT_HOSTSIZE' undeclared (first use in this function); did you mean 'UT_HOSTSIZE'? +| 73 | # define UT_HOSTSIZE __UT_HOSTSIZE +| | ^~~~~~~~~~~~~ +| ../git/src/w.c:233:64: note: in expansion of macro 'UT_HOSTSIZE' +| 233 | print_display_or_interface(u->ut_host, UT_HOSTSIZE, fromlen - len); +| | ^~~~~~~~~~~ +| + +It is caused by including utmpx.h, but not utmp.h, which (on musl) +lacks the needed definitions. + +I have verified that both musl and glibc based builds continue to work. + +Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/171] +Signed-off-by: Alexander Kanavin + +--- + src/w.c | 17 ++--------------- + 1 file changed, 2 insertions(+), 15 deletions(-) + +diff --git a/src/w.c b/src/w.c +index 5e878f04..912c5df3 100644 +--- a/src/w.c ++++ b/src/w.c +@@ -46,11 +46,8 @@ + #include + #include + #include +-#ifdef HAVE_UTMPX_H +-# include +-#else +-# include +-#endif ++#include ++#include + #include + + #include "c.h" +@@ -63,17 +60,7 @@ + static int ignoreuser = 0; /* for '-u' */ + static int oldstyle = 0; /* for '-o' */ + +-#ifdef HAVE_UTMPX_H + typedef struct utmpx utmp_t; +-#else +-typedef struct utmp utmp_t; +-#endif +- +-#if !defined(UT_HOSTSIZE) || defined(__UT_HOSTSIZE) +-# define UT_HOSTSIZE __UT_HOSTSIZE +-# define UT_LINESIZE __UT_LINESIZE +-# define UT_NAMESIZE __UT_NAMESIZE +-#endif + + #ifdef W_SHOWFROM + # define FROM_STRING "on" diff --git a/meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch b/meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch deleted file mode 100644 index c92ad28e4f..0000000000 --- a/meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 22f8d25567b8d64bdbab0fb0b4915b4362561d9b Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 24 Feb 2021 21:14:31 +0000 -Subject: [PATCH] w.c: correct musl builds - -No need to redefine UT_ stuff to something that does not exist. - -UT_ is already provided in musl but via utmp.h header, so include -it always. - -Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/126] -Signed-off-by: Alexander Kanavin ---- - w.c | 9 +-------- - 1 file changed, 1 insertion(+), 8 deletions(-) - -diff --git a/w.c b/w.c -index 9d07ac9..d10639b 100644 ---- a/w.c -+++ b/w.c -@@ -57,9 +57,8 @@ - #include - #ifdef HAVE_UTMPX_H - # include --#else --# include - #endif -+#include - #include - - static int ignoreuser = 0; /* for '-u' */ -@@ -72,12 +71,6 @@ typedef struct utmpx utmp_t; - typedef struct utmp utmp_t; - #endif - --#if !defined(UT_HOSTSIZE) || defined(__UT_HOSTSIZE) --# define UT_HOSTSIZE __UT_HOSTSIZE --# define UT_LINESIZE __UT_LINESIZE --# define UT_NAMESIZE __UT_NAMESIZE --#endif -- - #ifdef W_SHOWFROM - # define FROM_STRING "on" - #else diff --git a/meta/recipes-extended/procps/procps/0002-proc-escape.c-add-missing-include.patch b/meta/recipes-extended/procps/procps/0002-proc-escape.c-add-missing-include.patch deleted file mode 100644 index 5fa1ac9d78..0000000000 --- a/meta/recipes-extended/procps/procps/0002-proc-escape.c-add-missing-include.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 4f964821398dff7ab21fec63da15e1e00b2e9277 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 24 Feb 2021 21:16:14 +0000 -Subject: [PATCH] proc/escape.c: add missing include - -Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/126] -Signed-off-by: Alexander Kanavin ---- - proc/escape.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/proc/escape.c b/proc/escape.c -index 2e8fb7d..e1f4612 100644 ---- a/proc/escape.c -+++ b/proc/escape.c -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include "procps.h" - #include "escape.h" - #include "readproc.h" diff --git a/meta/recipes-extended/procps/procps_3.3.17.bb b/meta/recipes-extended/procps/procps_4.0.3.bb similarity index 90% rename from meta/recipes-extended/procps/procps_3.3.17.bb rename to meta/recipes-extended/procps/procps_4.0.3.bb index 59ad89d326..cc3420df4e 100644 --- a/meta/recipes-extended/procps/procps_3.3.17.bb +++ b/meta/recipes-extended/procps/procps_4.0.3.bb @@ -14,14 +14,9 @@ inherit autotools gettext pkgconfig update-alternatives SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \ file://sysctl.conf \ - file://0001-w.c-correct-musl-builds.patch \ - file://0002-proc-escape.c-add-missing-include.patch \ + file://0001-src-w.c-use-utmp.h-only.patch \ " -SRCREV = "19a508ea121c0c4ac6d0224575a036de745eaaf8" -# 4.x version is an API incompatible rewrite -# until procps consumers are transitioned to it we need to stick with 3.x -# https://gitlab.com/procps-ng/procps/-/issues/239 -UPSTREAM_CHECK_GITTAGREGEX = "(?P3(\.\d+)+)" +SRCREV = "806eb270f217ff7e1e745c7bda2b002b5be74be4" S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-Support-procps-4.x.patch b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-Support-procps-4.x.patch new file mode 100644 index 0000000000..fe9663b6eb --- /dev/null +++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-Support-procps-4.x.patch @@ -0,0 +1,502 @@ +From 524e58f3b2f9e4702293af66f6768755b300e8d3 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Thu, 2 Mar 2023 13:59:13 +0100 +Subject: [PATCH] Support procps 4.x + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/116#note_1785522] +Signed-off-by: Alexander Kanavin +--- + lib/igt_aux.c | 238 ++++++++++++++++++++++++++++++++++++++++-------- + lib/meson.build | 7 +- + meson.build | 10 +- + 3 files changed, 215 insertions(+), 40 deletions(-) + +diff --git a/lib/igt_aux.c b/lib/igt_aux.c +index 15e30440..d23c9a40 100644 +--- a/lib/igt_aux.c ++++ b/lib/igt_aux.c +@@ -52,8 +52,16 @@ + #include + #include + ++#ifdef HAVE_LIBPROCPS + #include ++#endif ++#ifdef HAVE_LIBPROC2 ++#include ++#endif ++ + #include ++#include ++#include + + #include "drmtest.h" + #include "i915_drm.h" +@@ -1217,6 +1225,7 @@ void igt_unlock_mem(void) + */ + int igt_is_process_running(const char *comm) + { ++#if HAVE_LIBPROCPS + PROCTAB *proc; + proc_t *proc_info; + bool found = false; +@@ -1235,6 +1244,26 @@ int igt_is_process_running(const char *comm) + + closeproc(proc); + return found; ++#endif ++#ifdef HAVE_LIBPROC2 ++ enum pids_item Item[] = { PIDS_CMD }; ++ struct pids_info *info = NULL; ++ struct pids_stack *stack; ++ char *pid_comm; ++ bool found = false; ++ ++ if (procps_pids_new(&info, Item, 1) < 0) ++ return false; ++ while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) { ++ pid_comm = PIDS_VAL(0, str, stack, info); ++ if (!strncasecmp(pid_comm, comm, strlen(pid_comm))) { ++ found = true; ++ break; ++ } ++ } ++ procps_pids_unref(&info); ++ return found; ++#endif + } + + /** +@@ -1251,6 +1280,7 @@ int igt_is_process_running(const char *comm) + */ + int igt_terminate_process(int sig, const char *comm) + { ++#ifdef HAVE_LIBPROCPS + PROCTAB *proc; + proc_t *proc_info; + int err = 0; +@@ -1272,6 +1302,29 @@ int igt_terminate_process(int sig, const char *comm) + + closeproc(proc); + return err; ++#endif ++#ifdef HAVE_LIBPROC2 ++ enum pids_item Items[] = { PIDS_ID_PID, PIDS_CMD }; ++ struct pids_info *info = NULL; ++ struct pids_stack *stack; ++ char *pid_comm; ++ int pid; ++ int err = 0; ++ ++ if (procps_pids_new(&info, Items, 2) < 0) ++ return -errno; ++ while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) { ++ pid = PIDS_VAL(0, s_int, stack, info); ++ pid_comm = PIDS_VAL(1, str, stack, info); ++ if (!strncasecmp(pid_comm, comm, strlen(pid_comm))) { ++ if (kill(pid, sig) < 0) ++ err = -errno; ++ break; ++ } ++ } ++ procps_pids_unref(&info); ++ return err; ++#endif + } + + struct pinfo { +@@ -1341,9 +1394,9 @@ igt_show_stat_header(void) + } + + static void +-igt_show_stat(proc_t *info, int *state, const char *fn) ++igt_show_stat(const pid_t tid, const char *cmd, int *state, const char *fn) + { +- struct pinfo p = { .pid = info->tid, .comm = info->cmd, .fn = fn }; ++ struct pinfo p = { .pid = tid, .comm = cmd, .fn = fn }; + + if (!*state) + igt_show_stat_header(); +@@ -1353,7 +1406,7 @@ igt_show_stat(proc_t *info, int *state, const char *fn) + } + + static void +-__igt_lsof_fds(proc_t *proc_info, int *state, char *proc_path, const char *dir) ++__igt_lsof_fds(const pid_t tid, const char *cmd, int *state, char *proc_path, const char *dir) + { + struct dirent *d; + struct stat st; +@@ -1400,7 +1453,7 @@ again: + dirn = dirname(copy_fd_lnk); + + if (!strncmp(dir, dirn, strlen(dir))) +- igt_show_stat(proc_info, state, fd_lnk); ++ igt_show_stat(tid, cmd, state, fd_lnk); + + free(copy_fd_lnk); + free(fd_lnk); +@@ -1416,13 +1469,14 @@ again: + static void + __igt_lsof(const char *dir) + { +- PROCTAB *proc; +- proc_t *proc_info; +- + char path[30]; + char *name_lnk; + struct stat st; + int state = 0; ++#ifdef HAVE_LIBPROCPS ++ PROCTAB *proc; ++ proc_t *proc_info; ++ + + proc = openproc(PROC_FILLCOM | PROC_FILLSTAT | PROC_FILLARG); + igt_assert(proc != NULL); +@@ -1456,6 +1510,44 @@ __igt_lsof(const char *dir) + } + + closeproc(proc); ++#endif ++#ifdef HAVE_LIBPROC2 ++ enum pids_item Items[] = { PIDS_ID_PID, PIDS_CMD }; ++ struct pids_info *info = NULL; ++ struct pids_stack *stack; ++ ++ if (procps_pids_new(&info, Items, 2) < 0) ++ return; ++ while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) { ++ ssize_t read; ++ int tid = PIDS_VAL(0, s_int, stack, info); ++ char *pid_comm = PIDS_VAL(1, str, stack, info); ++ ++ /* check current working directory */ ++ memset(path, 0, sizeof(path)); ++ snprintf(path, sizeof(path), "/proc/%d/cwd", tid); ++ ++ if (stat(path, &st) == -1) ++ continue; ++ ++ name_lnk = malloc(st.st_size + 1); ++ ++ igt_assert((read = readlink(path, name_lnk, st.st_size + 1))); ++ name_lnk[read] = '\0'; ++ ++ if (!strncmp(dir, name_lnk, strlen(dir))) ++ igt_show_stat(tid, pid_comm, &state, name_lnk); ++ ++ /* check also fd, seems that lsof(8) doesn't look here */ ++ memset(path, 0, sizeof(path)); ++ snprintf(path, sizeof(path), "/proc/%d/fd", tid); ++ ++ __igt_lsof_fds(tid, pid_comm, &state, path, dir); ++ ++ free(name_lnk); ++ } ++ procps_pids_unref(&info); ++#endif + } + + /** +@@ -1490,7 +1582,7 @@ igt_lsof(const char *dpath) + free(sanitized); + } + +-static void pulseaudio_unload_module(proc_t *proc_info) ++static void pulseaudio_unload_module(const uid_t euid, const gid_t egid) + { + struct igt_helper_process pa_proc = {}; + char xdg_dir[PATH_MAX]; +@@ -1498,14 +1590,14 @@ static void pulseaudio_unload_module(proc_t *proc_info) + struct passwd *pw; + + igt_fork_helper(&pa_proc) { +- pw = getpwuid(proc_info->euid); ++ pw = getpwuid(euid); + homedir = pw->pw_dir; +- snprintf(xdg_dir, sizeof(xdg_dir), "/run/user/%d", proc_info->euid); ++ snprintf(xdg_dir, sizeof(xdg_dir), "/run/user/%d", euid); + + igt_info("Request pulseaudio to stop using audio device\n"); + +- setgid(proc_info->egid); +- setuid(proc_info->euid); ++ setgid(egid); ++ setuid(euid); + clearenv(); + setenv("HOME", homedir, 1); + setenv("XDG_RUNTIME_DIR",xdg_dir, 1); +@@ -1524,10 +1616,12 @@ static void pipewire_reserve_wait(void) + char xdg_dir[PATH_MAX]; + const char *homedir; + struct passwd *pw; +- proc_t *proc_info; +- PROCTAB *proc; ++ int tid=0, euid, egid; + ++#ifdef HAVE_LIBPROCPS + igt_fork_helper(&pw_reserve_proc) { ++ proc_t *proc_info; ++ PROCTAB *proc; + igt_info("Preventing pipewire-pulse to use the audio drivers\n"); + + proc = openproc(PROC_FILLCOM | PROC_FILLSTAT | PROC_FILLARG); +@@ -1539,21 +1633,44 @@ static void pipewire_reserve_wait(void) + freeproc(proc_info); + } + closeproc(proc); ++ tid = proc_info->tid; ++ euid = proc_info->euid; ++ egid = proc_info->egid; ++ freeproc(proc_info); ++#endif ++#ifdef HAVE_LIBPROC2 ++ igt_fork(child, 1) { ++ enum pids_item Items[] = { PIDS_ID_PID, PIDS_ID_EUID, PIDS_ID_EGID }; ++ enum rel_items { EU_PID, EU_EUID, EU_EGID }; ++ struct pids_info *info = NULL; ++ struct pids_stack *stack; ++ ++ igt_info("Preventing pipewire-pulse to use the audio drivers\n"); ++ ++ if (procps_pids_new(&info, Items, 3) < 0) ++ return; ++ while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) { ++ tid = PIDS_VAL(EU_PID, s_int, stack, info); ++ if (pipewire_pulse_pid == tid) ++ break; ++ } ++ euid = PIDS_VAL(EU_EUID, s_int, stack, info); ++ egid = PIDS_VAL(EU_EGID, s_int, stack, info); ++ procps_pids_unref(&info); ++#endif + + /* Sanity check: if it can't find the process, it means it has gone */ +- if (pipewire_pulse_pid != proc_info->tid) ++ if (pipewire_pulse_pid != tid) + exit(0); + +- pw = getpwuid(proc_info->euid); ++ pw = getpwuid(euid); + homedir = pw->pw_dir; +- snprintf(xdg_dir, sizeof(xdg_dir), "/run/user/%d", proc_info->euid); +- setgid(proc_info->egid); +- setuid(proc_info->euid); ++ snprintf(xdg_dir, sizeof(xdg_dir), "/run/user/%d", euid); ++ setgid(egid); ++ setuid(euid); + clearenv(); + setenv("HOME", homedir, 1); + setenv("XDG_RUNTIME_DIR",xdg_dir, 1); +- freeproc(proc_info); +- + /* + * pw-reserve will run in background. It will only exit when + * igt_kill_children() is called later on. So, it shouldn't +@@ -1570,9 +1687,7 @@ static void pipewire_reserve_wait(void) + int pipewire_pulse_start_reserve(void) + { + bool is_pw_reserve_running = false; +- proc_t *proc_info; + int attempts = 0; +- PROCTAB *proc; + + if (!pipewire_pulse_pid) + return 0; +@@ -1584,6 +1699,10 @@ int pipewire_pulse_start_reserve(void) + * pipewire version 0.3.50 or upper. + */ + for (attempts = 0; attempts < PIPEWIRE_RESERVE_MAX_TIME; attempts++) { ++#ifdef HAVE_LIBPROCPS ++ proc_t *proc_info; ++ PROCTAB *proc; ++ + usleep(1000); + proc = openproc(PROC_FILLCOM | PROC_FILLSTAT | PROC_FILLARG); + igt_assert(proc != NULL); +@@ -1598,6 +1717,25 @@ int pipewire_pulse_start_reserve(void) + freeproc(proc_info); + } + closeproc(proc); ++#endif ++#ifdef HAVE_LIBPROC2 ++ enum pids_item Items[] = { PIDS_ID_PID, PIDS_CMD }; ++ struct pids_info *info = NULL; ++ struct pids_stack *stack; ++ ++ usleep(1000); ++ ++ if (procps_pids_new(&info, Items, 2) < 0) ++ return 1; ++ while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) { ++ if (!strcmp(PIDS_VAL(1, str, stack, info), "pw-reserve")) { ++ is_pw_reserve_running = true; ++ pipewire_pw_reserve_pid = PIDS_VAL(0, s_int, stack, info); ++ break; ++ } ++ } ++ procps_pids_unref(&info); ++#endif + if (is_pw_reserve_running) + break; + } +@@ -1645,7 +1783,7 @@ void pipewire_pulse_stop_reserve(void) + * If the check fails, it means that the process can simply be killed. + */ + static int +-__igt_lsof_audio_and_kill_proc(proc_t *proc_info, char *proc_path) ++__igt_lsof_audio_and_kill_proc(const pid_t tid, const char *cmd, const uid_t euid, const gid_t egid, char *proc_path) + { + const char *audio_dev = "/dev/snd/"; + char path[PATH_MAX * 2]; +@@ -1670,10 +1808,10 @@ __igt_lsof_audio_and_kill_proc(proc_t *proc_info, char *proc_path) + * 2) unload/unbind the the audio driver(s); + * 3) stop the pw-reserve thread. + */ +- if (!strcmp(proc_info->cmd, "pipewire-pulse")) { ++ if (!strcmp(cmd, "pipewire-pulse")) { + igt_info("process %d (%s) is using audio device. Should be requested to stop using them.\n", +- proc_info->tid, proc_info->cmd); +- pipewire_pulse_pid = proc_info->tid; ++ tid, cmd); ++ pipewire_pulse_pid = tid; + return 0; + } + /* +@@ -1685,9 +1823,9 @@ __igt_lsof_audio_and_kill_proc(proc_t *proc_info, char *proc_path) + * will respawn them. So, just ignore here, they'll honor pw-reserve, + * when the time comes. + */ +- if (!strcmp(proc_info->cmd, "pipewire-media-session")) ++ if (!strcmp(cmd, "pipewire-media-session")) + return 0; +- if (!strcmp(proc_info->cmd, "wireplumber")) ++ if (!strcmp(cmd, "wireplumber")) + return 0; + + dp = opendir(proc_path); +@@ -1723,22 +1861,22 @@ __igt_lsof_audio_and_kill_proc(proc_t *proc_info, char *proc_path) + * enough to unbind audio modules and won't cause race issues + * with systemd trying to reload it. + */ +- if (!strcmp(proc_info->cmd, "pulseaudio")) { +- pulseaudio_unload_module(proc_info); ++ if (!strcmp(cmd, "pulseaudio")) { ++ pulseaudio_unload_module(euid, egid); + break; + } + + /* For all other processes, just kill them */ + igt_info("process %d (%s) is using audio device. Should be terminated.\n", +- proc_info->tid, proc_info->cmd); ++ tid, cmd); + +- if (kill(proc_info->tid, SIGTERM) < 0) { ++ if (kill(tid, SIGTERM) < 0) { + igt_info("Fail to terminate %s (pid: %d) with SIGTERM\n", +- proc_info->cmd, proc_info->tid); +- if (kill(proc_info->tid, SIGABRT) < 0) { ++ cmd, tid); ++ if (kill(tid, SIGABRT) < 0) { + fail++; + igt_info("Fail to terminate %s (pid: %d) with SIGABRT\n", +- proc_info->cmd, proc_info->tid); ++ cmd, tid); + } + } + +@@ -1760,9 +1898,10 @@ int + igt_lsof_kill_audio_processes(void) + { + char path[PATH_MAX]; ++ int fail = 0; ++#ifdef HAVE_LIBPROCPS + proc_t *proc_info; + PROCTAB *proc; +- int fail = 0; + + proc = openproc(PROC_FILLCOM | PROC_FILLSTAT | PROC_FILLARG); + igt_assert(proc != NULL); +@@ -1772,12 +1911,35 @@ igt_lsof_kill_audio_processes(void) + if (snprintf(path, sizeof(path), "/proc/%d/fd", proc_info->tid) < 1) + fail++; + else +- fail += __igt_lsof_audio_and_kill_proc(proc_info, path); ++ fail += __igt_lsof_audio_and_kill_proc(proc_info->pid, proc_info->cmd, proc_info->euid, proc_info->egid, path); + + freeproc(proc_info); + } + closeproc(proc); ++#endif ++#ifdef HAVE_LIBPROC2 ++ enum pids_item Items[] = { PIDS_ID_PID, PIDS_CMD, PIDS_ID_EUID, PIDS_ID_EGID }; ++ enum rel_items { EU_PID, EU_CMD, EU_EUID, EU_EGID }; ++ struct pids_info *info = NULL; ++ struct pids_stack *stack; ++ pid_t tid; ++ ++ if (procps_pids_new(&info, Items, 4) < 0) ++ return 1; ++ while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) { ++ tid = PIDS_VAL(EU_PID, s_int, stack, info); + ++ if (snprintf(path, sizeof(path), "/proc/%d/fd", tid) < 1) ++ fail++; ++ else ++ fail += __igt_lsof_audio_and_kill_proc(tid, ++ PIDS_VAL(EU_CMD, str, stack, info), ++ PIDS_VAL(EU_EUID, s_int, stack, info), ++ PIDS_VAL(EU_EGID, s_int, stack, info), ++ path); ++ } ++ procps_pids_unref(&info); ++#endif + return fail; + } + +diff --git a/lib/meson.build b/lib/meson.build +index cc784686..90591e0e 100644 +--- a/lib/meson.build ++++ b/lib/meson.build +@@ -105,7 +105,6 @@ lib_deps = [ + libdrm, + libdw, + libkmod, +- libprocps, + libudev, + math, + pciaccess, +@@ -169,6 +168,12 @@ if chamelium.found() + lib_sources += 'monitor_edids/monitor_edids_helper.c' + endif + ++if libprocps.found() ++ lib_deps += libprocps ++else ++ lib_deps += libproc2 ++endif ++ + if get_option('srcdir') != '' + srcdir = join_paths(get_option('srcdir'), 'tests') + else +diff --git a/meson.build b/meson.build +index e7a68503..309b0af3 100644 +--- a/meson.build ++++ b/meson.build +@@ -120,7 +120,15 @@ build_info += 'With libdrm: ' + ','.join(libdrm_info) + + pciaccess = dependency('pciaccess', version : '>=0.10') + libkmod = dependency('libkmod') +-libprocps = dependency('libprocps', required : true) ++libprocps = dependency('libprocps', required : false) ++libproc2 = dependency('libproc2', required : false) ++if libprocps.found() ++ config.set('HAVE_LIBPROCPS', 1) ++elif libproc2.found() ++ config.set('HAVE_LIBPROC2', 1) ++else ++ error('Either libprocps or libproc2 is required') ++endif + + libunwind = dependency('libunwind', required : get_option('libunwind')) + build_info += 'With libunwind: @0@'.format(libunwind.found()) diff --git a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb index fbe5e1a4e7..f4799fbc77 100644 --- a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb +++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb @@ -12,7 +12,9 @@ inherit meson pkgconfig SRCREV = "2b29e8ac07fbcfadc48b9d60e4d736a6e3b289ab" PV = "1.27.1" -SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https;branch=master" +SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https;branch=master \ + file://0001-Support-procps-4.x.patch \ + " S = "${WORKDIR}/git" From patchwork Thu Mar 9 15:19: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: 20656 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 23125C7618B for ; Thu, 9 Mar 2023 15:20:12 +0000 (UTC) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.web11.16014.1678375207798734971 for ; Thu, 09 Mar 2023 07:20:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=cZ4p5ULt; spf=pass (domain: gmail.com, ip: 209.85.128.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f51.google.com with SMTP id ay29-20020a05600c1e1d00b003e9f4c2b623so3854779wmb.3 for ; Thu, 09 Mar 2023 07:20:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375206; 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=k2Y6jtEtgpdqpQX6cO4ZtlSA0PUn5GZqI7f7almwtso=; b=cZ4p5ULtqWza//vPaNtUBFDwwdkF/aKij2ijSglw1ObuXNy6/izm+qtHYX2hc05ITN lhLoc+V+yFNrSYv73RCv4+VBQoQADZD4HTH5U83pqSKKrOwOac7PHvb2DeS9RBqohORS MgkVWawpiAW7udoV2FmpqoJi6Cz1J47QLMpb4SDdtEu9HxZjlC10YOgw091HnGmX+tU3 AoCxsob/hyGaxFWKT673BFuvAJTBgs/ao73g30R+IDQmaRjP5K5ox1KUyGcU14/iKfoO 9bkU8uGJXOGMjQc8jTpk2e1ZLPEiFoEbHWF9gBgExxUxKw4aP+nkVU9KBHIh1z2DdRSp eMMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375206; 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=k2Y6jtEtgpdqpQX6cO4ZtlSA0PUn5GZqI7f7almwtso=; b=oIwPq3XDccLDz/e0JAXcLvPxGZSJwoP5xRAd74ArwC963OoY22X3I8gxeORoVhX1N/ HKyU8OgLhc2wxUYKOYSGoTaD2W1sF3CaCb4KMWt0zKp3Hp5/4WZCEz13HwWQBE77Tudb mW95jLHD2fpYmFhuGkI3dtNOzkmUIjjlD2TRKKgrDfDHiOaRmNla/Y/OpwTcqzng2qW7 qn4a9FLmZuoIs5lE/dOq+B1bLJ6uvfPl/Q4xohOl+I5HFFlfAX+j4uqeYlcLKvUTpWzv Ar6dZA8aoVGguMBUb99h1VqyT375BphIzBmMDHCHNxOsm1N6HOKD5AOTpt5L7EtcAlXa yE+w== X-Gm-Message-State: AO0yUKXVFDPB8POaezMyj+0IdeLd47SAWIAqkr7EF/lekLBwD8UMEb4H Ofqx8DAVZbWJuDx7GYCAnC8w819eVi8= X-Google-Smtp-Source: AK7set/29vT3LZn6D7sX9IZaC/rgoqb2jpSXopiOqx9CHVCG48VGImqXZoaCrR9o+9kcMeQAItlqDA== X-Received: by 2002:a1c:7417:0:b0:3eb:2b69:c3c4 with SMTP id p23-20020a1c7417000000b003eb2b69c3c4mr20956305wmc.36.1678375206286; Thu, 09 Mar 2023 07:20:06 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:06 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 04/26] selftest/overlayfs: enable systemd via INIT_MANAGER Date: Thu, 9 Mar 2023 16:19:36 +0100 Message-Id: <20230309151958.3619193-4-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178229 Latest systemd version needs the full set of settings enabled by that (if also r/o rootfs is enabled), and refuses to boot otherwise. Signed-off-by: Alexander Kanavin --- meta/lib/oeqa/selftest/cases/overlayfs.py | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/overlayfs.py b/meta/lib/oeqa/selftest/cases/overlayfs.py index dfd9f1486d..b4f0663828 100644 --- a/meta/lib/oeqa/selftest/cases/overlayfs.py +++ b/meta/lib/oeqa/selftest/cases/overlayfs.py @@ -139,10 +139,10 @@ OVERLAYFS_MOUNT_POINT[usr-share-overlay] = "/usr/share/overlay" config = """ IMAGE_INSTALL:append = " overlayfs-user systemd-machine-units" -DISTRO_FEATURES:append = " systemd overlayfs" +DISTRO_FEATURES:append = " overlayfs" # Use systemd as init manager -VIRTUAL-RUNTIME_init_manager = "systemd" +INIT_MANAGER = "systemd" # enable overlayfs in the kernel KERNEL_EXTRA_FEATURES:append = " features/overlayfs/overlayfs.scc" @@ -274,10 +274,8 @@ class OverlayFSEtcRunTimeTests(OESelftestTestCase): """ configBase = """ -DISTRO_FEATURES:append = " systemd" - # Use systemd as init manager -VIRTUAL-RUNTIME_init_manager = "systemd" +INIT_MANAGER = "systemd" # enable overlayfs in the kernel KERNEL_EXTRA_FEATURES:append = " features/overlayfs/overlayfs.scc" @@ -316,10 +314,8 @@ OVERLAYFS_ETC_DEVICE = "/dev/mmcblk0p1" """ config = """ -DISTRO_FEATURES:append = " systemd" - # Use systemd as init manager -VIRTUAL-RUNTIME_init_manager = "systemd" +INIT_MANAGER = "systemd" # enable overlayfs in the kernel KERNEL_EXTRA_FEATURES:append = " features/overlayfs/overlayfs.scc" @@ -344,10 +340,8 @@ EXTRA_IMAGE_FEATURES += "package-management" """ config = """ -DISTRO_FEATURES:append = " systemd" - # Use systemd as init manager -VIRTUAL-RUNTIME_init_manager = "systemd" +INIT_MANAGER = "systemd" # enable overlayfs in the kernel KERNEL_EXTRA_FEATURES:append = " features/overlayfs/overlayfs.scc" @@ -465,10 +459,8 @@ IMAGE_INSTALL:append = " overlayfs-user" def get_working_config(self): return """ -DISTRO_FEATURES:append = " systemd" - # Use systemd as init manager -VIRTUAL-RUNTIME_init_manager = "systemd" +INIT_MANAGER = "systemd" # enable overlayfs in the kernel KERNEL_EXTRA_FEATURES:append = " features/overlayfs/overlayfs.scc" From patchwork Thu Mar 9 15:19: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: 20655 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 11484C7618A for ; Thu, 9 Mar 2023 15:20:12 +0000 (UTC) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.groups.io with SMTP id smtpd.web11.16015.1678375208292380096 for ; Thu, 09 Mar 2023 07:20:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=hZo6x4L5; spf=pass (domain: gmail.com, ip: 209.85.128.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f49.google.com with SMTP id j19-20020a05600c1c1300b003e9b564fae9so3860470wms.2 for ; Thu, 09 Mar 2023 07:20:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375207; 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=zaWxNHVXGdFYYFF46f95Y2c7gJJJR/36bWcTGU26rag=; b=hZo6x4L5Ztv3mRn9hV8/NVuOAtK9Sq6GQ2JPxmqEvGqxfiwGCfmM+vbwzuxcLzhkgu oJzJmifbW9pD2XYF32UM5+BjGKgLBEgYzLT5C4Kax6r2zED3ODDkv3RQszC5JZpr9SfA 1V+r0tGj7gB/lMbYA4OgC1fD2xbTa7Swep4Pvgpbb7JgsrIrE+rtwufyXBGHs3OJV75b ADAk8U6xjLKV6Zhoy2+oah+eu/VYAphaHbFJ4Mb/QGyXie6o61uPAkgTpQAh+rYjwn1r +T12+ZAMYOF1WnLfm29l8PBnP56/mSdeq8Sz82sAWCvlPO0kxJW0Oj/c7U64Psuy9LQt Suaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375207; 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=zaWxNHVXGdFYYFF46f95Y2c7gJJJR/36bWcTGU26rag=; b=NdgafAbmEkBvE1w3YEfeU4fslCCDCeIPglBFICgvtTHLS39xti5qeXeyph5TaI5yDC 4hWzJhuPBpWqMN7+OEH1hGAZbC1aYOtONdwpc5M2926H7o40T80Y0mPo6ueAgRDSMz28 PjiTlrjlyEm/YxJOtC6XUXtXxqPFegvfigTegNl/v9Cm+RRr8B/JzJY4560KTf1cUGD6 Him6E9A/U7GFNcQmjTZHnBQ7voKAgRM6/G5II/9NGhhUwAuft0G4SEDHNuBG8SFonIi8 IbuCwt/R7AmIzR3Rm76kWKsDMYqKmNOpYU2UEtbFMTPUJKbteikivQk46VEUH1OdWzFS NJlQ== X-Gm-Message-State: AO0yUKW0v8VzYPqXoFloUmNcaCUEu6xOfK7OJUonBX+gHsH5t7jq63+V jtW5cxtBbUson81HcwjJu7a2+o6ZiKc= X-Google-Smtp-Source: AK7set+nbFl4HNgSj8+csSG/lO5/0bOk2mGEVYhaLZyQ/JVEIk84zJk+QmCr8mYvoXo2A37pdza0ug== X-Received: by 2002:a05:600c:350f:b0:3ea:d620:57a7 with SMTP id h15-20020a05600c350f00b003ead62057a7mr19373682wmq.8.1678375206767; Thu, 09 Mar 2023 07:20:06 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:06 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 05/26] systemd: update 252.5 -> 253.1 Date: Thu, 9 Mar 2023 16:19:37 +0100 Message-Id: <20230309151958.3619193-5-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178230 Add a musl compatibility patch to systemd-boot. Backport a patch to address systemctl fails on 32 bit targets. Signed-off-by: Alexander Kanavin --- ...md-boot_252.5.bb => systemd-boot_253.1.bb} | 0 meta/recipes-core/systemd/systemd.inc | 8 ++-- ...-string.c-define-wchar_t-from-__WCHA.patch | 40 ++++++++++++++++++ .../systemd/systemd/fix-32bit.patch | 41 +++++++++++++++++++ .../{systemd_252.5.bb => systemd_253.1.bb} | 2 + 5 files changed, 88 insertions(+), 3 deletions(-) rename meta/recipes-core/systemd/{systemd-boot_252.5.bb => systemd-boot_253.1.bb} (100%) create mode 100644 meta/recipes-core/systemd/systemd/0004-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch create mode 100644 meta/recipes-core/systemd/systemd/fix-32bit.patch rename meta/recipes-core/systemd/{systemd_252.5.bb => systemd_253.1.bb} (99%) diff --git a/meta/recipes-core/systemd/systemd-boot_252.5.bb b/meta/recipes-core/systemd/systemd-boot_253.1.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_252.5.bb rename to meta/recipes-core/systemd/systemd-boot_253.1.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index df27e01b1c..354cc46e90 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,9 +14,11 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "61f5710d0bfd8f522af6f8eef399a851509946e2" -SRCBRANCH = "v252-stable" +SRCREV = "6c327d74aa0d350482e82a247d7018559699798d" +SRCBRANCH = "v253-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ -" + file://0004-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch \ + file://fix-32bit.patch \ + " S = "${WORKDIR}/git" diff --git a/meta/recipes-core/systemd/systemd/0004-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch b/meta/recipes-core/systemd/systemd/0004-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch new file mode 100644 index 0000000000..927f914848 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0004-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch @@ -0,0 +1,40 @@ +From a4ff7772acf1d983921833aa20ccd7c4d5e59a1c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 6 Mar 2023 15:24:49 +0100 +Subject: [PATCH] src/boot/efi/efi-string.c: define wchar_t from __WCHAR_TYPE__ + +systemd-boot relies on wchar_t being 16 bit, and breaks at build time otherwise. + +To set wchar_t to 16 bit it is passing -fshort-wchar to gcc; this has the +desired effect on glibc (which sets wchar_t from __WCHAR_TYPE__) but not on +musl (which hardcodes it to 32 bit). + +This patch ensures wchar_t is set from the compiler flags on all systems; note +that systemd-boot is not actually using functions from musl or other libc, just their headers. + +Meanwhile upstream has refactored the code to not rely on libc headers at all; +however this will not be backported to v253 and we need a different fix. + +Upstream-Status: Inappropriate [fixed differently in trunk according to https://github.com/systemd/systemd/pull/26689] +Signed-off-by: Alexander Kanavin +--- + src/boot/efi/efi-string.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/boot/efi/efi-string.c b/src/boot/efi/efi-string.c +index 22923d60f6..22a8d1ef71 100644 +--- a/src/boot/efi/efi-string.c ++++ b/src/boot/efi/efi-string.c +@@ -2,7 +2,12 @@ + + #include + #include ++ ++#if SD_BOOT ++typedef __WCHAR_TYPE__ wchar_t; ++#else + #include ++#endif + + #include "efi-string.h" + diff --git a/meta/recipes-core/systemd/systemd/fix-32bit.patch b/meta/recipes-core/systemd/systemd/fix-32bit.patch new file mode 100644 index 0000000000..6b614625c8 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/fix-32bit.patch @@ -0,0 +1,41 @@ +From c63bfd0884cf20e48befbee49d41f667660a8802 Mon Sep 17 00:00:00 2001 +From: Frantisek Sumsal +Date: Fri, 3 Mar 2023 12:17:27 +0100 +Subject: [PATCH] systemctl: explicitly cast the constants to uint64_t + +Otherwise under certain conditions `va_arg()` might get garbage instead +of the expected value, i.e.: + +$ sudo build-o0/systemctl disable asdfasfaf +sd_bus_message_appendv: Got uint64_t: 0 +Failed to disable unit: Unit file asdfasfaf.service does not exist. + +$ sudo build-o1/systemctl disable asdfasfaf +sd_bus_message_appendv: Got uint64_t: 7954875719681572864 +Failed to disable unit: Invalid argument + +(reproduced on an armv7hl machine) + +Resolves: #26568 +Follow-up to: bf1bea43f15 +Related issue: https://github.com/systemd/systemd/pull/14470#discussion_r362893735 + +Upstream-Status: Backport [https://github.com/systemd/systemd/commit/c63bfd0884cf20e48befbee49d41f667660a8802] +Signed-off-by: Alexander Kanavin +--- + src/systemctl/systemctl-enable.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/systemctl/systemctl-enable.c b/src/systemctl/systemctl-enable.c +index 4ebe5888ac69..a9c6f3a742c9 100644 +--- a/src/systemctl/systemctl-enable.c ++++ b/src/systemctl/systemctl-enable.c +@@ -211,7 +211,7 @@ int verb_enable(int argc, char *argv[], void *userdata) { + + if (send_runtime) { + if (streq(method, "DisableUnitFilesWithFlagsAndInstallInfo")) +- r = sd_bus_message_append(m, "t", arg_runtime ? UNIT_FILE_RUNTIME : 0); ++ r = sd_bus_message_append(m, "t", arg_runtime ? (uint64_t) UNIT_FILE_RUNTIME : UINT64_C(0)); + else + r = sd_bus_message_append(m, "b", arg_runtime); + if (r < 0) diff --git a/meta/recipes-core/systemd/systemd_252.5.bb b/meta/recipes-core/systemd/systemd_253.1.bb similarity index 99% rename from meta/recipes-core/systemd/systemd_252.5.bb rename to meta/recipes-core/systemd/systemd_253.1.bb index 8b92b2cf42..40a8226b2b 100644 --- a/meta/recipes-core/systemd/systemd_252.5.bb +++ b/meta/recipes-core/systemd/systemd_253.1.bb @@ -57,6 +57,7 @@ PAM_PLUGINS = " \ pam-plugin-unix \ pam-plugin-loginuid \ pam-plugin-keyinit \ + pam-plugin-namespace \ " PACKAGECONFIG ??= " \ @@ -715,6 +716,7 @@ FILES:udev += "${base_sbindir}/udevd \ ${rootlibexecdir}/udev/rules.d/60-drm.rules \ ${rootlibexecdir}/udev/rules.d/60-evdev.rules \ ${rootlibexecdir}/udev/rules.d/60-fido-id.rules \ + ${rootlibexecdir}/udev/rules.d/60-infiniband.rules \ ${rootlibexecdir}/udev/rules.d/60-input-id.rules \ ${rootlibexecdir}/udev/rules.d/60-persistent-alsa.rules \ ${rootlibexecdir}/udev/rules.d/60-persistent-input.rules \ From patchwork Thu Mar 9 15:19: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: 20653 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 027F3C74A5B for ; Thu, 9 Mar 2023 15:20:12 +0000 (UTC) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.groups.io with SMTP id smtpd.web11.16016.1678375209133202861 for ; Thu, 09 Mar 2023 07:20:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=BaKixGm5; spf=pass (domain: gmail.com, ip: 209.85.128.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f53.google.com with SMTP id d41-20020a05600c4c2900b003e9e066550fso1458318wmp.4 for ; Thu, 09 Mar 2023 07:20:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375207; 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=Ri0FjTyR3BjGdPHmS4T1IkjM5cf2TL3MxjdVBu3uslc=; b=BaKixGm5joqxOXT2swPndzvhi05VxNGAd1rT4GYW8G+R7OR4WYN1JSUnxkETOGRsN1 30mWwuDCvflpNA2Kq6FjMZS7BVe65DPH3t98sH8kgIlvgUdGowzgveJ3iVpFi3GeyE+F sDRUEcgu5Mqvap4oVeTfX9Mb+ErRtTT/G1iqk/Bwbn9Ip01Q+eHCuGok6J4lOQAJGPLk w1XDcjErSGuoZ/eAL9rqVTR5qbe6g3qWrKP3NGvJjC9kCTgP4wE6klJFcbI+lqrD6r5A 66VyJDbhvnBRz9e0ECvpv7ILcQ3s48x/MMoSoPhvIqxmLXMifQ323vwKtW3XXvoCq48n gHLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375207; 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=Ri0FjTyR3BjGdPHmS4T1IkjM5cf2TL3MxjdVBu3uslc=; b=Pl/aJWaDbaHpNE3onBZGOXfBeQXYc7iNELIwuKjY+pt4QSzIyvQvnr39o0gNFJUvf9 W1peAfjkgN/RxWzA/xIfKQ9+Pznv8ztY5MzNRo/lBWFOnZjCbf+FoD0AYCA4Pf471eMe UIsgxsmmq7FrNdrDz2QPjrYHnlUu9g0GphZmlFE9qE7K9sR2SrIOvScK8SpB3NEQC8NA 9q9jeOF/Vhxb5gEciNsdeNEsnqUyb6tsOPzMCj+dsjKSULwBS5y5UbvaGKKmBtmYN20V UOOqcVNtM1UWEb9C58X3XWStvlXjFPU7ndrHyJm/lWRmum3REEUhXxhI4vLzm66HYRsl OfmQ== X-Gm-Message-State: AO0yUKVw/xFspoCi0wrgIQ4Odij1Opjb7mmq25pwisOCqzOXC2gkPGhM GiuycbQE4rGjMuMNvF8rDtT3a2cWhYc= X-Google-Smtp-Source: AK7set/L2JCi0bdR4GzfFg1ajOKpjy+riIACrP9r2A6JMARRcXa+/QU9LEqSj9ek9tOtF2caigt+fg== X-Received: by 2002:a05:600c:4fc8:b0:3eb:cf1:f2b6 with SMTP id o8-20020a05600c4fc800b003eb0cf1f2b6mr20883390wmq.14.1678375207692; Thu, 09 Mar 2023 07:20:07 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:07 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 06/26] dpkg: update 1.21.20 -> 1.21.21 Date: Thu, 9 Mar 2023 16:19:38 +0100 Message-Id: <20230309151958.3619193-6-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178231 Signed-off-by: Alexander Kanavin --- .../dpkg/{dpkg_1.21.20.bb => dpkg_1.21.21.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/dpkg/{dpkg_1.21.20.bb => dpkg_1.21.21.bb} (93%) diff --git a/meta/recipes-devtools/dpkg/dpkg_1.21.20.bb b/meta/recipes-devtools/dpkg/dpkg_1.21.21.bb similarity index 93% rename from meta/recipes-devtools/dpkg/dpkg_1.21.20.bb rename to meta/recipes-devtools/dpkg/dpkg_1.21.21.bb index a6ed4fd429..a19a96ef06 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.21.20.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.21.21.bb @@ -1,7 +1,7 @@ require dpkg.inc LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main \ +SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.21.x \ file://noman.patch \ file://remove-tar-no-timestamp.patch \ file://arch_pm.patch \ @@ -18,6 +18,6 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" -SRCREV = "6c5140f124925ad4eb12fb2c8e83a050028bbc1f" +SRCREV = "9ef736b7b3a5fa0d6e991e8475eb2e3151fec345" S = "${WORKDIR}/git" From patchwork Thu Mar 9 15:19: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: 20650 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 F3FD4C61DA4 for ; Thu, 9 Mar 2023 15:20:11 +0000 (UTC) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.groups.io with SMTP id smtpd.web11.16017.1678375209608285310 for ; Thu, 09 Mar 2023 07:20:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=X1mmITD1; spf=pass (domain: gmail.com, ip: 209.85.128.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f48.google.com with SMTP id l7-20020a05600c4f0700b003e79fa98ce1so1484415wmq.2 for ; Thu, 09 Mar 2023 07:20:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375208; 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=zxmAriV4ECYUIhdOlAC8FFs3D511n6K7rmTE4Y1ZOFU=; b=X1mmITD1VMYPKZlB3GTfQsel9m/KD+f+xA/xbFla8Ln3JWO82h8BmIic9hH7dD1uzR 9V4vi+dUKGd5fI/q9yvYykXeTuiHhcTzgIimahKyGgc5kAB0Ux4qv8obwx/nkUDTge6v CzysoOT7hEESiIoMPMHUGf0/UnVYh4i46PQbJCs1N0nNwpZtZ4Iq7IwNOSt49nMtv8n7 Yk1YFK7oLle+uXReQhrTyVYnEjVzMJd+4nBtnaNC6AJWfcBL5qoszgyYuY4JgMB4QisE z5Ft3K/zd6rL1lfzmPHcB/YJxGIbjYGlfZ/oVryU/ChPUpR7SyPuKamofPZw/lrAl/ow NCLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375208; 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=zxmAriV4ECYUIhdOlAC8FFs3D511n6K7rmTE4Y1ZOFU=; b=WBc0ol3AqZBfnG5tCkY1Gq25/aHxfC50PkdxsvKL33o83idOGWYWL7CHNNAGIqQc6q oIlkVL2CQvIwKX9tIhJmueASVkuKD1CqWQjeccs0DeVQHVNJ43yvx0l9t9FiAxIXpEAy eeCpZDEoOqIcaW+2i+2F7q+jIbJJ+xACFIdFeiWteL5pftGLdDsUiz6yFrpxXfKInQ68 w199R8xEYhXgIdynhvELrcUjuBTPloGvaS1V+GPm3AsLkkwYtb+jv5FuhZlbmrJLEtaK gIxmi3bIoIA5rVsZhtsHKZ048L2bBjq9QJy7/ZOEdb0ytVazxJeNgIQXSrbItN/+6ep7 W4rQ== X-Gm-Message-State: AO0yUKXzWRMFKU9ZdLTVjebqQwGOfhaEnh7fyX6f576b5HizXc683LEg smL1qVnjx26HyENTJymkAA84PG/yL9M= X-Google-Smtp-Source: AK7set84c5GX2nNzu/HGO8UP3p2Nab9nYAU1qAHTgzxntA1aCMGvWLxoDZgjqfoN5tP9YUr+sAnORA== X-Received: by 2002:a05:600c:46c6:b0:3eb:3cc9:9f85 with SMTP id q6-20020a05600c46c600b003eb3cc99f85mr21555035wmo.26.1678375208173; Thu, 09 Mar 2023 07:20:08 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:08 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 07/26] libdnf: update 0.69.0 -> 0.70.0 Date: Thu, 9 Mar 2023 16:19:39 +0100 Message-Id: <20230309151958.3619193-7-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178232 Drop the patch as issue addressed upstream. Signed-off-by: Alexander Kanavin --- ...xt.cpp-do-not-try-to-access-BDB-data.patch | 37 ------------------- .../{libdnf_0.69.0.bb => libdnf_0.70.0.bb} | 3 +- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch rename meta/recipes-devtools/libdnf/{libdnf_0.69.0.bb => libdnf_0.70.0.bb} (93%) diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch b/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch deleted file mode 100644 index 6f8a3dcb50..0000000000 --- a/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2f7382b35d59fe08034603497e82ffb943fedef1 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 30 Jun 2021 15:31:16 +0200 -Subject: [PATCH] libdnf/dnf-context.cpp: do not try to access BDB database - -Upstream-Status: Inappropriate [upstream needs to rework this to support -sqlite] -Signed-off-by: Alexander Kanavin ---- - libdnf/dnf-context.cpp | 14 -------------- - 1 file changed, 14 deletions(-) - -diff --git a/libdnf/dnf-context.cpp b/libdnf/dnf-context.cpp -index 86f71a79..9cdcf769 100644 ---- a/libdnf/dnf-context.cpp -+++ b/libdnf/dnf-context.cpp -@@ -2264,20 +2264,6 @@ dnf_context_setup(DnfContext *context, - !dnf_context_set_os_release(context, error)) - return FALSE; - -- /* setup a file monitor on the rpmdb, if we're operating on the native / */ -- if (g_strcmp0(priv->install_root, "/") == 0) { -- rpmdb_path = g_build_filename(priv->install_root, "var/lib/rpm/Packages", NULL); -- file_rpmdb = g_file_new_for_path(rpmdb_path); -- priv->monitor_rpmdb = g_file_monitor_file(file_rpmdb, -- G_FILE_MONITOR_NONE, -- NULL, -- error); -- if (priv->monitor_rpmdb == NULL) -- return FALSE; -- g_signal_connect(priv->monitor_rpmdb, "changed", -- G_CALLBACK(dnf_context_rpmdb_changed_cb), context); -- } -- - /* copy any vendor distributed cached metadata */ - if (!dnf_context_copy_vendor_cache(context, error)) - return FALSE; diff --git a/meta/recipes-devtools/libdnf/libdnf_0.69.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.70.0.bb similarity index 93% rename from meta/recipes-devtools/libdnf/libdnf_0.69.0.bb rename to meta/recipes-devtools/libdnf/libdnf_0.70.0.bb index da2550d323..14d6a37de1 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.69.0.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.70.0.bb @@ -10,10 +10,9 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ file://enable_test_data_dir_set.patch \ file://0001-drop-FindPythonInstDir.cmake.patch \ - file://0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch \ " -SRCREV = "5c6d9cd6e5955e7038722f091396607c60fcbdd1" +SRCREV = "93759bc5cac262906e52b6a173d7b157914ec29e" UPSTREAM_CHECK_GITTAGREGEX = "(?P(?!4\.90)\d+(\.\d+)+)" S = "${WORKDIR}/git" From patchwork Thu Mar 9 15:19: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: 20651 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 00699C74A44 for ; Thu, 9 Mar 2023 15:20:11 +0000 (UTC) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.groups.io with SMTP id smtpd.web10.16123.1678375210112749934 for ; Thu, 09 Mar 2023 07:20:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ItRe1/td; spf=pass (domain: gmail.com, ip: 209.85.221.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f50.google.com with SMTP id g3so2242366wri.6 for ; Thu, 09 Mar 2023 07:20:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375208; 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=MFaEO5L6BiI0MP2NZfXgYGI0aa3cxfygwv5zFjbd4xE=; b=ItRe1/tdj7YzGaEEqdF3wpVbAs+RW7JDP+BknI8QEQVqKiUPxav0ToBl4SJrjg6ERk YgJLr4uJyqUxgxhSYFSHG2nztP/Rju2LNqXmVt08mlWpMcLfeAinkzM0EOLQp7HP5ah7 wZqtXdvVYee/Io/6kf8INO5YZobSgobLcipIOoKpM3wKMjN6v2T6f96nP7wf9qpsKew7 QNKoA3AGBUCPXRdm6RfmQEGa6Yf5gtq2L+N4Mbdn1zfcGMbnjBrb6SQIxaoB8nvL6CZW dw1K3t0vLlInpzVd4r6hmkPD5BtMKiTMhBJERZE1zawbvSxKhZ+gLvMPqPWvUCzD88gD 4KFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375208; 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=MFaEO5L6BiI0MP2NZfXgYGI0aa3cxfygwv5zFjbd4xE=; b=mNLQkIEymjg5dqK/mKLXaYErLGcA/ZpcH+RJt8WUFLYasULXsdih21nwYXiVKo2Ipr 5Hm1i0CxEIK96mckuq6aDUlwU6yKZ/Lq3/nkxkb9U6pCYK/JRSj0c9ig7mnrX1m3WGur CzjIJp/dxYm8FPsmaRhHcqhMdJzUiaERiZ6vzMlaRJZXtlfGMo1zJE+ykgRIrqXx93+A m6bEt90o5rMzerBkuGYcAb5Kx2IenkttCr0LvCvvKSAUTkUWnr+EKMheZoh4PxR5/xGu APycCXL7n1tQBXsFE7uKxhXXeFqbbWOEmhv7lDSAyDHHe8I1gM5cxwx+RW5iNfVW4ZCo 9tpg== X-Gm-Message-State: AO0yUKVyZ8XcmM8j5wu0AjSsNUmYOVdAjiFAYaa5+GUzNOGfCr6s6TjD nwfZWUB0Up+KXO+UcFw5J/cOhMgLZOs= X-Google-Smtp-Source: AK7set/H4kwGIkJnKoFpxYEm1ksCbo3WYWJCIo7ybXGgXjXKI3xSZa6yGagklD5XlHW6frdun/ruhQ== X-Received: by 2002:a5d:50c7:0:b0:2cb:29eb:a35e with SMTP id f7-20020a5d50c7000000b002cb29eba35emr18957959wrt.11.1678375208632; Thu, 09 Mar 2023 07:20:08 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:08 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 08/26] ethtool: update 6.1 -> 6.2 Date: Thu, 9 Mar 2023 16:19:40 +0100 Message-Id: <20230309151958.3619193-8-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178233 Drop patch merged upstream. Signed-off-by: Alexander Kanavin --- .../0001-marvell.c-define-_GNU_SOURCE.patch | 59 ------------------- .../ethtool/avoid_parallel_tests.patch | 6 +- .../{ethtool_6.1.bb => ethtool_6.2.bb} | 3 +- 3 files changed, 4 insertions(+), 64 deletions(-) delete mode 100644 meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch rename meta/recipes-extended/ethtool/{ethtool_6.1.bb => ethtool_6.2.bb} (90%) diff --git a/meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch b/meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch deleted file mode 100644 index 8a7eeafb9c..0000000000 --- a/meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 5112785191e3279c671a027fe797be77e1071ecd Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 2 Jan 2023 13:45:46 +0100 -Subject: [PATCH] marvell.c: use portable integer types - -u_int32_t is not portable, but uint32_t is. - -Upstream-Status: Submitted [by email to mkubecek@suse.cz] -Signed-off-by: Alexander Kanavin - ---- - marvell.c | 34 +++++++++++++++++----------------- - 1 file changed, 17 insertions(+), 17 deletions(-) - -diff --git a/marvell.c b/marvell.c -index d3d570e..3d42eed 100644 ---- a/marvell.c -+++ b/marvell.c -@@ -31,23 +31,23 @@ static void dump_timer(const char *name, const void *p) - static void dump_queue(const char *name, const void *a, int rx) - { - struct desc { -- u_int32_t ctl; -- u_int32_t next; -- u_int32_t data_lo; -- u_int32_t data_hi; -- u_int32_t status; -- u_int32_t timestamp; -- u_int16_t csum2; -- u_int16_t csum1; -- u_int16_t csum2_start; -- u_int16_t csum1_start; -- u_int32_t addr_lo; -- u_int32_t addr_hi; -- u_int32_t count_lo; -- u_int32_t count_hi; -- u_int32_t byte_count; -- u_int32_t csr; -- u_int32_t flag; -+ uint32_t ctl; -+ uint32_t next; -+ uint32_t data_lo; -+ uint32_t data_hi; -+ uint32_t status; -+ uint32_t timestamp; -+ uint16_t csum2; -+ uint16_t csum1; -+ uint16_t csum2_start; -+ uint16_t csum1_start; -+ uint32_t addr_lo; -+ uint32_t addr_hi; -+ uint32_t count_lo; -+ uint32_t count_hi; -+ uint32_t byte_count; -+ uint32_t csr; -+ uint32_t flag; - }; - const struct desc *d = a; - diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index 4994369682..d5cb8705c2 100644 --- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -1,4 +1,4 @@ -From 0d066a901292e6a44ff7bc7ee16f99dd2ba4ea15 Mon Sep 17 00:00:00 2001 +From b4ec6635af4d4a47e9ab7bbd5347e78710d19362 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Wed, 28 May 2014 18:59:54 +0200 Subject: [PATCH] ethtool: use serial-tests config needed by ptest. @@ -15,11 +15,11 @@ Upstream-Status: Inappropriate 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 3eb4e7b..ee5c72f 100644 +index ebdfd39..c93b79a 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(ethtool, 6.1, netdev@vger.kernel.org) + AC_INIT(ethtool, 6.2, netdev@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu subdir-objects]) diff --git a/meta/recipes-extended/ethtool/ethtool_6.1.bb b/meta/recipes-extended/ethtool/ethtool_6.2.bb similarity index 90% rename from meta/recipes-extended/ethtool/ethtool_6.1.bb rename to meta/recipes-extended/ethtool/ethtool_6.2.bb index 2b9bbe69db..881e638851 100644 --- a/meta/recipes-extended/ethtool/ethtool_6.1.bb +++ b/meta/recipes-extended/ethtool/ethtool_6.2.bb @@ -9,10 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://run-ptest \ file://avoid_parallel_tests.patch \ - file://0001-marvell.c-define-_GNU_SOURCE.patch \ " -SRC_URI[sha256sum] = "1d03f1ce324fbd95591191c42ac0c4c9cc721e067b929083a20a46c4b4731436" +SRC_URI[sha256sum] = "1a9f95c3d8c1795a942220912d72c06a208f1c122a78f7690259402856ff06a0" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" From patchwork Thu Mar 9 15:19: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: 20648 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 E1693C6FD1F for ; Thu, 9 Mar 2023 15:20:11 +0000 (UTC) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.groups.io with SMTP id smtpd.web10.16124.1678375210689528935 for ; Thu, 09 Mar 2023 07:20:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=lRJJoNgH; spf=pass (domain: gmail.com, ip: 209.85.128.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f54.google.com with SMTP id m25-20020a7bcb99000000b003e7842b75f2so1459557wmi.3 for ; Thu, 09 Mar 2023 07:20:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375209; 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=zQlu1jbTyY0Uz5bH/HffKVnluoif8pFSNENmWksU65c=; b=lRJJoNgHAUkzskkK0/w/wgDtVCQWgaXV5Ufi+wIxmSBK4a0v6cDaElrfTBVmeSG7AH dR6ZQtUkz2Sc0xBtA/Um3JqND+steOEOQDKVBXh927k4qhChDAnf1f/CWb1WBC1T3WHD JlYMvBwfmUrgfOtuSeBx7GuFFmkfABi3d6mKWmWKt+ssF3rwUBHAQ67SFBM14KnkrNWk lLxfjEHmfEx/63zOend76eqbHTemhMRqNjsf0cJWCsa4pal4JtW/nX0yf94hrhERTb7D 5YVh/V2hvZGuKPMzH29WeKCQ+RfNdBO5ylIBkHKwUQwwUZd4iSNfqq+3UEWLctax/wrb RvzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375209; 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=zQlu1jbTyY0Uz5bH/HffKVnluoif8pFSNENmWksU65c=; b=c0pyOyl+4TBXEPGtO3nC2W+UMQG4jLKFJ0LHTBtWDcfAwWUhvCcJcv8vtBIbBR6Bo6 geEsKKJzEWHQbbvX9LdknKRp4GZdWsSKy3BWxKM/uUwV/Z/s9VRnJTSaecke87N0BQhF QtMeOwnQJjH81Sqo7hfSp2w10N0wS1sRSd8RCHMHvIAgYsCZZ/gfjTd/qCnAEGPqhag8 tme2eqVtC8Zo/p7cjwzpBfhFayERu7/r0kIII35l0wBRZJuywS/PORTGwAwTVu186iXn 9g9uy2q3uMKz++w3yXse3R2BTVS4a6hdgi7sW98yDuHWI3gRMqwfuIZ/hZ9E1mmmoQJi WX7A== X-Gm-Message-State: AO0yUKWbE81beAI07dnASDdTAC0ius6lcaWFYyF+m76i3jEBGc32iU37 FOK4m2KuBg0sFy0vIW7xCRKiemmuheE= X-Google-Smtp-Source: AK7set+be2K/1Ki0MiDjckQ9/l0nMTxh8ctzLkO0qmWKZ/6htX58qBbvZZ9XVvmlLfi0SKvlIeGeew== X-Received: by 2002:a05:600c:348d:b0:3eb:9822:2907 with SMTP id a13-20020a05600c348d00b003eb98222907mr16651181wmq.4.1678375209154; Thu, 09 Mar 2023 07:20:09 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:08 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 09/26] iptables: update 1.8.8 -> 1.8.9 Date: Thu, 9 Mar 2023 16:19:41 +0100 Message-Id: <20230309151958.3619193-9-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178234 Replace one format string fixing patch with another format string fixing patch. (one problem fixed upstream, another introduced) Signed-off-by: Alexander Kanavin --- ...ption-to-enable-disable-libnfnetlink.patch | 10 ++--- ...d.h-add-missing-sys.types.h-include.patch} | 9 +++-- ...le.am-do-not-install-etc-ethertypes.patch} | 17 +++++---- ...-check-conntrack-when-libnfnetlink-.patch} | 10 ++--- .../iptables/iptables/format-security.patch | 37 ++++++++++--------- .../{iptables_1.8.8.bb => iptables_1.8.9.bb} | 16 ++++---- 6 files changed, 53 insertions(+), 46 deletions(-) rename meta/recipes-extended/iptables/iptables/{0001-iptables-xshared.h-add-missing-sys.types.h-include.patch => 0002-iptables-xshared.h-add-missing-sys.types.h-include.patch} (84%) rename meta/recipes-extended/iptables/iptables/{0001-Makefile.am-do-not-install-etc-ethertypes.patch => 0003-Makefile.am-do-not-install-etc-ethertypes.patch} (71%) rename meta/recipes-extended/iptables/iptables/{0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch => 0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch} (89%) rename meta/recipes-extended/iptables/{iptables_1.8.8.bb => iptables_1.8.9.bb} (90%) diff --git a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch index 03c36ccbc2..0c2c97cdc8 100644 --- a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch +++ b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch @@ -1,7 +1,7 @@ -From c46db7c2e1f63ec525835553587e70c635565310 Mon Sep 17 00:00:00 2001 +From 698ed332e2c592235d2b737c545ac25ad0970e15 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Tue, 21 Feb 2017 11:16:31 +0200 -Subject: [PATCH] configure: Add option to enable/disable libnfnetlink +Subject: [PATCH 1/4] configure: Add option to enable/disable libnfnetlink This changes the configure behaviour from autodetecting for libnfnetlink to having an option to disable it explicitly @@ -15,7 +15,7 @@ Signed-off-by: Maxin B. John 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index eda7871..03ddc50 100644 +index bc2ed47b..e27745e5 100644 --- a/configure.ac +++ b/configure.ac @@ -63,6 +63,9 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH], @@ -28,7 +28,7 @@ index eda7871..03ddc50 100644 AC_ARG_ENABLE([connlabel], AS_HELP_STRING([--disable-connlabel], [Do not build libnetfilter_conntrack]), -@@ -115,9 +118,10 @@ if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then +@@ -117,9 +120,10 @@ if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then AC_CHECK_LIB(pcap, pcap_compile,, AC_MSG_ERROR(missing libpcap library required by bpf compiler or nfsynproxy tool)) fi @@ -43,5 +43,5 @@ index eda7871..03ddc50 100644 if test "x$enable_nftables" = "xyes"; then PKG_CHECK_MODULES([libmnl], [libmnl >= 1.0], [mnl=1], [mnl=0]) -- -2.4.0 +2.30.2 diff --git a/meta/recipes-extended/iptables/iptables/0001-iptables-xshared.h-add-missing-sys.types.h-include.patch b/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch similarity index 84% rename from meta/recipes-extended/iptables/iptables/0001-iptables-xshared.h-add-missing-sys.types.h-include.patch rename to meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch index 17dd032434..9621d46c09 100644 --- a/meta/recipes-extended/iptables/iptables/0001-iptables-xshared.h-add-missing-sys.types.h-include.patch +++ b/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch @@ -1,7 +1,7 @@ -From 796b8f6fc1e584c27c42ba302f623fd1c5aa0667 Mon Sep 17 00:00:00 2001 +From d4699d2169fe2d91d0f1f4369d40d2e5f42b8877 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 17 May 2022 10:56:59 +0200 -Subject: [PATCH] iptables/xshared.h: add missing sys.types.h include +Subject: [PATCH 2/4] iptables/xshared.h: add missing sys.types.h include This resolves the build error under musl: @@ -17,7 +17,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+) diff --git a/iptables/xshared.h b/iptables/xshared.h -index 14568bb..73b1017 100644 +index 0ed9f3c2..b1413834 100644 --- a/iptables/xshared.h +++ b/iptables/xshared.h @@ -6,6 +6,7 @@ @@ -28,3 +28,6 @@ index 14568bb..73b1017 100644 #include #include #include +-- +2.30.2 + diff --git a/meta/recipes-extended/iptables/iptables/0001-Makefile.am-do-not-install-etc-ethertypes.patch b/meta/recipes-extended/iptables/iptables/0003-Makefile.am-do-not-install-etc-ethertypes.patch similarity index 71% rename from meta/recipes-extended/iptables/iptables/0001-Makefile.am-do-not-install-etc-ethertypes.patch rename to meta/recipes-extended/iptables/iptables/0003-Makefile.am-do-not-install-etc-ethertypes.patch index aa51265822..cbc97572ec 100644 --- a/meta/recipes-extended/iptables/iptables/0001-Makefile.am-do-not-install-etc-ethertypes.patch +++ b/meta/recipes-extended/iptables/iptables/0003-Makefile.am-do-not-install-etc-ethertypes.patch @@ -1,7 +1,7 @@ -From a4ed9fc8da720585f853d2ca6ffd30e2fa4d1247 Mon Sep 17 00:00:00 2001 +From 28291b41bc3717f51e8d9d465f0100f1ca99dc26 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Wed, 9 Mar 2022 12:50:39 -0500 -Subject: [PATCH] Makefile.am: do not install /etc/ethertypes +Subject: [PATCH 3/4] Makefile.am: do not install /etc/ethertypes The /etc/ethertypes is provided by netbase since 6.0[1]. Do not instal the file in ebtables, otherwise there would be a conflict: @@ -20,21 +20,22 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Trevor Gamblin --- - Makefile.am | 1 - - 1 file changed, 1 deletion(-) + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index 799bf8b8..2eb1843f 100644 +index 451c3cb2..5125238c 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -18,7 +18,6 @@ SUBDIRS += iptables +@@ -20,7 +20,7 @@ EXTRA_DIST = autogen.sh iptables-test.py xlate-test.py if ENABLE_NFTABLES confdir = $(sysconfdir) --dist_conf_DATA = etc/ethertypes +-dist_conf_DATA = etc/ethertypes etc/xtables.conf ++dist_conf_DATA = etc/xtables.conf endif .PHONY: tarball -- -2.35.1 +2.30.2 diff --git a/meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch b/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch similarity index 89% rename from meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch rename to meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch index 7842c6408a..20c40c4039 100644 --- a/meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch +++ b/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch @@ -1,7 +1,7 @@ -From 26090b3dbcdf6a11e60535da949b726a6e86426d Mon Sep 17 00:00:00 2001 +From e7aa1dd2831f9bb5d0603c5e5027387ad7721b00 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Tue, 21 Feb 2017 11:49:07 +0200 -Subject: [PATCH] configure.ac: +Subject: [PATCH 4/4] configure.ac: only-check-conntrack-when-libnfnetlink-enabled.patch Package libnetfilter-conntrack depends on package libnfnetlink. iptables @@ -28,10 +28,10 @@ Signed-off-by: Maxin B. John 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 03ddc50..523caea 100644 +index e27745e5..528f1bb5 100644 --- a/configure.ac +++ b/configure.ac -@@ -172,10 +172,12 @@ if test "$nftables" != 1; then +@@ -158,10 +158,12 @@ if test "$nftables" != 1; then fi if test "x$enable_connlabel" = "xyes"; then @@ -47,5 +47,5 @@ index 03ddc50..523caea 100644 blacklist_modules="$blacklist_modules connlabel"; echo "WARNING: libnetfilter_conntrack not found, connlabel match will not be built"; -- -2.4.0 +2.30.2 diff --git a/meta/recipes-extended/iptables/iptables/format-security.patch b/meta/recipes-extended/iptables/iptables/format-security.patch index be1e077b49..fae920f0a8 100644 --- a/meta/recipes-extended/iptables/iptables/format-security.patch +++ b/meta/recipes-extended/iptables/iptables/format-security.patch @@ -1,30 +1,31 @@ -From b72eb12ea5a61df0655ad99d5048994e916be83a Mon Sep 17 00:00:00 2001 +From ed4082a7405a5838c205a34c1559e289949200cc Mon Sep 17 00:00:00 2001 From: Phil Sutter -Date: Fri, 13 May 2022 16:51:58 +0200 -Subject: xshared: Fix build for -Werror=format-security +Date: Thu, 12 Jan 2023 14:38:44 +0100 +Subject: extensions: NAT: Fix for -Werror=format-security -Gcc complains about the omitted format string. +Have to pass either a string literal or format string to xt_xlate_add(). +Fixes: f30c5edce0413 ("extensions: Merge SNAT, DNAT, REDIRECT and MASQUERADE") Signed-off-by: Phil Sutter -Upstream-Status: Backport +Upstream-Status: Backport [https://git.netfilter.org/iptables/commit/?id=ed4082a7405a5838c205a34c1559e289949200cc] Signed-off-by: Alexander Kanavin --- - iptables/xshared.c | 2 +- + extensions/libxt_NAT.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/iptables/xshared.c b/iptables/xshared.c -index fae5ddd5..a8512d38 100644 ---- a/iptables/xshared.c -+++ b/iptables/xshared.c -@@ -1307,7 +1307,7 @@ static void check_empty_interface(struct xtables_args *args, const char *arg) - return; +diff --git a/extensions/libxt_NAT.c b/extensions/libxt_NAT.c +index da9f2201..2a634398 100644 +--- a/extensions/libxt_NAT.c ++++ b/extensions/libxt_NAT.c +@@ -424,7 +424,7 @@ __NAT_xlate(struct xt_xlate *xl, const struct nf_nat_range2 *r, + if (r->flags & NF_NAT_RANGE_PROTO_OFFSET) + return 0; - if (args->family != NFPROTO_ARP) -- xtables_error(PARAMETER_PROBLEM, msg); -+ xtables_error(PARAMETER_PROBLEM, "%s", msg); - - fprintf(stderr, "%s", msg); - } +- xt_xlate_add(xl, tgt); ++ xt_xlate_add(xl, "%s", tgt); + if (strlen(range_str)) + xt_xlate_add(xl, " to %s", range_str); + if (r->flags & NF_NAT_RANGE_PROTO_RANDOM) { -- cgit v1.2.3 diff --git a/meta/recipes-extended/iptables/iptables_1.8.8.bb b/meta/recipes-extended/iptables/iptables_1.8.9.bb similarity index 90% rename from meta/recipes-extended/iptables/iptables_1.8.8.bb rename to meta/recipes-extended/iptables/iptables_1.8.9.bb index 54d027220b..dc91973548 100644 --- a/meta/recipes-extended/iptables/iptables_1.8.8.bb +++ b/meta/recipes-extended/iptables/iptables_1.8.9.bb @@ -8,18 +8,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://iptables/iptables.c;beginline=13;endline=25;md5=c5cffd09974558cf27d0f763df2a12dc \ " -SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ - file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ - file://0001-Makefile.am-do-not-install-etc-ethertypes.patch \ - file://0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch \ - file://format-security.patch \ +SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.xz \ file://iptables.service \ file://iptables.rules \ file://ip6tables.service \ file://ip6tables.rules \ - file://0001-iptables-xshared.h-add-missing-sys.types.h-include.patch \ + file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ + file://0002-iptables-xshared.h-add-missing-sys.types.h-include.patch \ + file://0003-Makefile.am-do-not-install-etc-ethertypes.patch \ + file://0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch \ + file://format-security.patch \ " -SRC_URI[sha256sum] = "71c75889dc710676631553eb1511da0177bbaaf1b551265b912d236c3f51859f" +SRC_URI[sha256sum] = "ef6639a43be8325a4f8ea68123ffac236cb696e8c78501b64e8106afb008c87f" SYSTEMD_SERVICE:${PN} = "\ iptables.service \ @@ -116,8 +116,10 @@ RDEPENDS:${PN}-apply = "${PN} bash" # Include the symlinks as well in respective packages FILES:${PN}-module-xt-conntrack += "${libdir}/xtables/libxt_state.so" FILES:${PN}-module-xt-ct += "${libdir}/xtables/libxt_NOTRACK.so ${libdir}/xtables/libxt_REDIRECT.so" +FILES:${PN}-module-xt-nat += "${libdir}/xtables/libxt_SNAT.so ${libdir}/xtables/libxt_DNAT.so ${libdir}/xtables/libxt_MASQUERADE.so" ALLOW_EMPTY:${PN}-modules = "1" INSANE_SKIP:${PN}-module-xt-conntrack = "dev-so" INSANE_SKIP:${PN}-module-xt-ct = "dev-so" +INSANE_SKIP:${PN}-module-xt-nat = "dev-so" From patchwork Thu Mar 9 15:19: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: 20654 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 10553C76186 for ; Thu, 9 Mar 2023 15:20:12 +0000 (UTC) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.groups.io with SMTP id smtpd.web10.16125.1678375211185558952 for ; Thu, 09 Mar 2023 07:20:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=HM6t0w2e; spf=pass (domain: gmail.com, ip: 209.85.221.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f46.google.com with SMTP id e13so2225753wro.10 for ; Thu, 09 Mar 2023 07:20:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375209; 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=Ae9+b77lw4soxnlSrsQ5z/FruT7M4ct4LldTnINKFhA=; b=HM6t0w2eoMwO5bZ//3H4TukGw/zjgtb3gwqmTzzmTvkcACqyiahf+wlMT+M5tiFSlQ pd5qT096RSETQUAj2IrKUa5XF3+95+Eif0Z/vqdWcnShBwjMyfRb1e8qf2cYwrpBP6zE aabaZ97gCVMRPHf4fvzo+cwA14m/uNoaUBpZ08zh6FN4wVARJfWNuhW5aUeZ0AHBzqRI +k8PvZmfVR2rsrxOxo8/fo/40NcG76pYLW2ztn24w02Y3Lr8EfaLJxbg4jlPie1VtLyA JxYp5zi5J2lrVX9l/LoSZy6cVE30OZNsM6lI6mWqq7cmzlZ5X1Fa/zXUyOkf80Apx1/G McNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375209; 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=Ae9+b77lw4soxnlSrsQ5z/FruT7M4ct4LldTnINKFhA=; b=MBRG4gf7UD6iCpyfRSPkoS2k/Ug5lS8vJMByMKOhX6EO+tV0EWFMJPAd0daE7GYG0I sMrTJo2nuk+y2oWsjs9Snp/5KozSPWzUOSH1eHUQozUZ41AAceajTa6AvtvQDg9IAGZU mrkhCzAKpUy2VtD1amaWBkqKVShJ5MVuGDey9gxYDJ7nNk8XeWub9TNOxgi6Q/GqFXrV sxwLjnEJMieKWsRJPg0251LmH12JwVfy7Z4N3VqIi7C8WbEFivgSbRxhpmMWcYIvAasu LFHp+DLVFPos9LgWiNnUgtrLxB3oSGL3EkuuhXIpHKeMtEjCzTzPF2747fZZRAlsKHRU XjSw== X-Gm-Message-State: AO0yUKX4YQH3Rr943JhUv0QF46P7QKJ1Ll24cs2xkSskZ3uA3885OjR/ +0nTZRdxO84a15GWe5KWClq/aMaCLG8= X-Google-Smtp-Source: AK7set8+Q/DT+mVwuUsMF89fk7w6KK8O7LAiQmhzC9Ygve+fVVwvhHz/U/wxIDqYcVmrXdJpueY2+A== X-Received: by 2002:adf:f048:0:b0:2c7:1757:3a8e with SMTP id t8-20020adff048000000b002c717573a8emr15051236wro.34.1678375209688; Thu, 09 Mar 2023 07:20:09 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:09 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 10/26] util-macros: do not probe into host triplet when checking manpage section names Date: Thu, 9 Mar 2023 16:19:42 +0100 Message-Id: <20230309151958.3619193-10-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178235 This does not work for allarch recipes in particular (config.sub rejects allarch-poky-linux). Signed-off-by: Alexander Kanavin --- ...n-do-not-run-AC_CANONICAL_HOST-in-ma.patch | 28 +++++++++++++++++++ .../xorg-util/util-macros_1.20.0.bb | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-graphics/xorg-util/util-macros/0001-xorg-macros.m4.in-do-not-run-AC_CANONICAL_HOST-in-ma.patch diff --git a/meta/recipes-graphics/xorg-util/util-macros/0001-xorg-macros.m4.in-do-not-run-AC_CANONICAL_HOST-in-ma.patch b/meta/recipes-graphics/xorg-util/util-macros/0001-xorg-macros.m4.in-do-not-run-AC_CANONICAL_HOST-in-ma.patch new file mode 100644 index 0000000000..e08b586bf0 --- /dev/null +++ b/meta/recipes-graphics/xorg-util/util-macros/0001-xorg-macros.m4.in-do-not-run-AC_CANONICAL_HOST-in-ma.patch @@ -0,0 +1,28 @@ +From 6afaaf164ab9370204856961a92ad8ee523a8293 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 3 Mar 2023 13:24:58 +0100 +Subject: [PATCH] xorg-macros.m4.in: do not run AC_CANONICAL_HOST in manpage + section macro + +This doesn't work when building allarch items, as it calls into +config.sub with the host triplet, and config.sub can't match +it against any architeture it knows. + +Upstream-Status: Inappropriate [oe specific] +Signed-off-by: Alexander Kanavin +--- + xorg-macros.m4.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in +index 3b8b8e9..6541236 100644 +--- a/xorg-macros.m4.in ++++ b/xorg-macros.m4.in +@@ -111,7 +111,6 @@ AC_SUBST(TRADITIONALCPPFLAGS) + # Added AC_PROG_SED in version 1.8 + + AC_DEFUN([XORG_MANPAGE_SECTIONS],[ +-AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([AC_PROG_SED]) + + case $host_os in diff --git a/meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb b/meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb index 60495ad0c8..cd4bc387a2 100644 --- a/meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb +++ b/meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb @@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=42ba50748cb7ccf8739424e5e2072b02" PE = "1" +SRC_URI += "file://0001-xorg-macros.m4.in-do-not-run-AC_CANONICAL_HOST-in-ma.patch" + SRC_URI[sha256sum] = "8daf36913d551a90fd1013cb078401375dabae021cb4713b9b256a70f00eeb74" # ${PN} is empty so we need to tweak -dev and -dbg package dependencies From patchwork Thu Mar 9 15:19: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: 20658 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 14379C742A7 for ; Thu, 9 Mar 2023 15:20:22 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.web11.16019.1678375211681279958 for ; Thu, 09 Mar 2023 07:20:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=XLddl5sJ; spf=pass (domain: gmail.com, ip: 209.85.221.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f49.google.com with SMTP id e13so2225780wro.10 for ; Thu, 09 Mar 2023 07:20:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375210; 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=KWeU7HB5hEmg90S2eo9/IkI1l8R3CMPySxtfR2lfGVs=; b=XLddl5sJ3zSjVkNCf3siz2mvtBZIoUha0kiQehaxuVslbbRoeVKa64xUAPtK+MdbmF ral0WiZpBqNrnUAuZDycvjxSHQLKXWW+PK97jt1XsUapc6+nzVuHKxS/Eqlmtcc083td d+GPfAb264vNdEuOeyaI2GPE8amWUaRyk/zTV2aJ04hAbsa79KYbTUoCrK67VS02gy9e iLfJSMG8ToS7Umws23CWaLkxMPQTfRL7BVO7Wdsd2tCh65nQHllGvuOJ8jfh8nHkXW2b ZDQY8nffZbi34HcI+4r7R5bF7YTvhPW5hP/m+SyoV+UK5dzxzRtbyEDC9DppF9VbS/US v5Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375210; 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=KWeU7HB5hEmg90S2eo9/IkI1l8R3CMPySxtfR2lfGVs=; b=NUY5jLuR12AuWIGNc8YNKUhmgt7mCZ+mDJTSmzhIt9C6rBklNzN+zFGoT0vyLL4R4p 2BXkTBq5q7TUM9UW+/2KvqnWoZ4U+8OStGRG69DAlbOfd4HlBn/f0nKUImkzpZk6IB5/ ulM5KcYceCpHcraKwzszwkTttCYL7NYcGoYLw4V22wuUwHraWGgmukbVcoz4Cl93i40i 8AyT0ZVmZoFWwSRw5cf/5xvDvmQVapWK41VhYBNdvOaWdJkiBGHVokpP+InH2244UNpD zUZMb+zwhb8BAp197AOgcD5Wdq6cDA05tgwi67apE4tcn9NR0qVumdaUx+FXSZk1pYsD lZlg== X-Gm-Message-State: AO0yUKUs3qXff4V7JJLmFz8jIVnEo3g/5Im4qaZrHCu+GaF461mfyt5g EFQ2ncujcHLZT3B9OBasvgo8BbTlFxo= X-Google-Smtp-Source: AK7set9yXkWrTUq79zNzjEDjyvkxWGPvBDNNDzmRQCzrDP1l4OVpsx1Ytey1pJmZIK2l4/LZHuibng== X-Received: by 2002:a5d:6647:0:b0:2c7:e7e:f2c5 with SMTP id f7-20020a5d6647000000b002c70e7ef2c5mr15352779wrw.8.1678375210210; Thu, 09 Mar 2023 07:20:10 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:10 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 11/26] encodings: update 1.0.6 -> 1.0.7 Date: Thu, 9 Mar 2023 16:19:43 +0100 Message-Id: <20230309151958.3619193-11-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178236 Drop nocompiler.patch as upstream is now using a macro specifically for data-only items: https://www.spinics.net/lists/xorg/msg60817.html Signed-off-by: Alexander Kanavin --- .../xorg-font/encodings/nocompiler.patch | 42 ------------------- ...{encodings_1.0.6.bb => encodings_1.0.7.bb} | 3 +- 2 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-font/encodings/nocompiler.patch rename meta/recipes-graphics/xorg-font/{encodings_1.0.6.bb => encodings_1.0.7.bb} (81%) diff --git a/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch b/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch deleted file mode 100644 index 9ee7abe775..0000000000 --- a/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0c0790e90a68bf8290da5c0e57142bf7c620f039 Mon Sep 17 00:00:00 2001 -From: Richard Purdie -Date: Tue, 17 May 2011 23:03:02 +0000 -Subject: [PATCH] Improve handling of 'all' architecture recipes and their - -Upstream-Status: Inappropriate [configuration] - -XORG_DEFAULT_OPTIONS pulls in the following dependency chains: - -XORG_CWARNFLAGS -> AC_PROG_CC_C99 -XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS -XORG_MANPAGE_SECTIONS -> AC_CANONICAL_HOST -> Checks host - -each of which triggers the use of the host compiler. As an "all" -architecture package, it shouldn't need a compiler (and doesn't). - -RP 17/5/2011 - ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b80e3de..80208bb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3,12 +3,12 @@ AC_INIT([encodings], [1.0.6], - [https://gitlab.freedesktop.org/xorg/font/encodings/issues]) - AM_INIT_AUTOMAKE([foreign dist-xz]) - --# Require xorg-macros: XORG_DEFAULT_OPTIONS - m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) - XORG_MACROS_VERSION(1.3) --XORG_DEFAULT_OPTIONS -- -+XORG_RELEASE_VERSION -+XORG_CHANGELOG -+XORG_INSTALL - AC_PROG_INSTALL - - # Require X.Org's font util macros 1.2 or later diff --git a/meta/recipes-graphics/xorg-font/encodings_1.0.6.bb b/meta/recipes-graphics/xorg-font/encodings_1.0.7.bb similarity index 81% rename from meta/recipes-graphics/xorg-font/encodings_1.0.6.bb rename to meta/recipes-graphics/xorg-font/encodings_1.0.7.bb index be82414eef..5906da416a 100644 --- a/meta/recipes-graphics/xorg-font/encodings_1.0.6.bb +++ b/meta/recipes-graphics/xorg-font/encodings_1.0.7.bb @@ -11,8 +11,7 @@ PE = "1" DEPENDS = "mkfontscale-native mkfontdir-native font-util-native" RDEPENDS:${PN} = "" -SRC_URI += "file://nocompiler.patch" -SRC_URI[sha256sum] = "77e301de661f35a622b18f60b555a7e7d8c4d5f43ed41410e830d5ac9084fc26" +SRC_URI[sha256sum] = "3a39a9f43b16521cdbd9f810090952af4f109b44fa7a865cd555f8febcea70a4" SRC_URI_EXT = "xz" From patchwork Thu Mar 9 15:19: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: 20660 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 2251AC74A44 for ; Thu, 9 Mar 2023 15:20:22 +0000 (UTC) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web10.16127.1678375212343386824 for ; Thu, 09 Mar 2023 07:20:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=GsXo+bNb; spf=pass (domain: gmail.com, ip: 209.85.221.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f45.google.com with SMTP id l25so2247232wrb.3 for ; Thu, 09 Mar 2023 07:20:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375211; 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=eb2YUP90W3da/9BPhTpRboHrh/oevvOA5ZUGGzgn3cI=; b=GsXo+bNbQQ/VWmlHsxXepfPBqDRLqa2ZPHkwx+lVl9dPkRlpim6Ad8yMgpPwFcO1ZC nLvGpRh54EQIXNfv/xq/sqVEn54mql8wk08ne3FLMr3W5ctyq2bTDPlG9WEZ0UZE0VhB OfqWNPAiCO4LQzd9I3k6IYdLL3iElfXgD6H/o1zpuZRxjnAV/DWBdg+PkPxaxszrZ6ek K8uksYIy20/YgUEaPMc8ZriYZIGNAE24PIcqytb5MAVme4DMS+/0xSvYMVOVaUVp6G2L XwaL9rf3Pk+i69RFze7f0He8yu36AKnAkMKoDXvoGr8u2XQX5j6G5PB0H0agNjG6iAPL A0PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375211; 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=eb2YUP90W3da/9BPhTpRboHrh/oevvOA5ZUGGzgn3cI=; b=Ug3uMeMydW/d+7GVye2p/g1UXNczpZAkObP9AV7gQcPC5ROCeW4L5gHUizYDZQ82xV SLuLZEXkD69QX0ekUoE+b2jCVfZkjqqj2eoTc4Y5Q0lvNqiMbrLz/aMpnbqEGwNW64Mh kbkg4xvN7vYowqxiyZnhVlD80AyYx7L4qaf1puss+Cc/x7ZljLPeuboulCenPay9snKs dVXpe8qbOpf2EkZx8c81fz5lMJ0hp5eY5tMnrAcuDAfuRqX741ZDEVAsnC9f74OIHKVD GhainQb7kOqzkpaTCC+Zh7GV/sUX7nP1MOjGyVNz104MZaZdsZ0/+BfVFRtc91phHG4z rx3Q== X-Gm-Message-State: AO0yUKVeSNaeXqOYJtUXGis8cmDK5jxUDcZ9qo/78MTnRhiHLT/TDGef 2mIGCfTztGkzHKMVayn/Rp9mTNJ38jg= X-Google-Smtp-Source: AK7set9jofmUC/ZY57ysuq+a2WiurPHrDJ0FrZiRK5jqb0sfD0SLr5TMm7l4dixxcOXhUbh9Se3qsg== X-Received: by 2002:adf:f44a:0:b0:2c9:ee50:b295 with SMTP id f10-20020adff44a000000b002c9ee50b295mr14898570wrp.28.1678375210753; Thu, 09 Mar 2023 07:20:10 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:10 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 12/26] font-alias: update 1.0.4 -> 1.0.5 Date: Thu, 9 Mar 2023 16:19:44 +0100 Message-Id: <20230309151958.3619193-12-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178237 Drop nocompiler.patch as upstream is now using a macro specifically for data-only items: https://www.spinics.net/lists/xorg/msg60817.html Signed-off-by: Alexander Kanavin --- .../font-alias-1.0.4/nocompiler.patch | 42 ------------------- ...ont-alias_1.0.4.bb => font-alias_1.0.5.bb} | 5 +-- 2 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-font/font-alias-1.0.4/nocompiler.patch rename meta/recipes-graphics/xorg-font/{font-alias_1.0.4.bb => font-alias_1.0.5.bb} (84%) diff --git a/meta/recipes-graphics/xorg-font/font-alias-1.0.4/nocompiler.patch b/meta/recipes-graphics/xorg-font/font-alias-1.0.4/nocompiler.patch deleted file mode 100644 index e54eee4ea9..0000000000 --- a/meta/recipes-graphics/xorg-font/font-alias-1.0.4/nocompiler.patch +++ /dev/null @@ -1,42 +0,0 @@ -From fa2bbd48a55d54bd2dae30edf7936e3ab7587c96 Mon Sep 17 00:00:00 2001 -From: Richard Purdie -Date: Tue, 17 May 2011 23:03:02 +0000 -Subject: [PATCH] Improve handling of 'all' architecture recipes and their - -Upstream-Status: Inappropriate [configuration] - -XORG_DEFAULT_OPTIONS pulls in the following dependency chains: - -XORG_CWARNFLAGS -> AC_PROG_CC_C99 -XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS -XORG_MANPAGE_SECTIONS -> AC_CANONICAL_HOST -> Checks host - -each of which triggers the use of the host compiler. As an "all" -architecture package, it shouldn't need a compiler (and doesn't). - -RP 17/5/2011 - ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3407c69..9fe1f89 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -27,12 +27,12 @@ AC_INIT([font-alias], [1.0.4], - [font-alias]) - AM_INIT_AUTOMAKE([foreign dist-bzip2]) - --# Require xorg-macros: XORG_DEFAULT_OPTIONS - m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) - XORG_MACROS_VERSION(1.3) --XORG_DEFAULT_OPTIONS -- -+XORG_RELEASE_VERSION -+XORG_CHANGELOG -+XORG_INSTALL - AC_PROG_INSTALL - - # Require X.Org's font util macros 1.2 or later diff --git a/meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb b/meta/recipes-graphics/xorg-font/font-alias_1.0.5.bb similarity index 84% rename from meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb rename to meta/recipes-graphics/xorg-font/font-alias_1.0.5.bb index d80ecbeb8f..03c39a4334 100644 --- a/meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb +++ b/meta/recipes-graphics/xorg-font/font-alias_1.0.5.bb @@ -9,8 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \ file://misc/fonts.alias;md5=1bdafa7c31aa54f87f3531f2ef8ed5a6 \ file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb \ " - -SRC_URI += "file://nocompiler.patch" +SRC_URI_EXT = "xz" DEPENDS = "util-macros-native font-util-native" RDEPENDS:${PN} = "encodings font-util" @@ -20,4 +19,4 @@ inherit allarch PE = "1" -SRC_URI[sha256sum] = "f3111ae8bf2e980f5f56af400e8eefe5fc9f4207f4a412ea79637fd66c945276" +SRC_URI[sha256sum] = "9f89e217bb73e0e3636a0a493fbf8b7c995156e0c53d9a0476d201b67c2d6b6e" From patchwork Thu Mar 9 15:19: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: 20672 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 59D2BC76186 for ; Thu, 9 Mar 2023 15:20:22 +0000 (UTC) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.groups.io with SMTP id smtpd.web10.16128.1678375213091885554 for ; Thu, 09 Mar 2023 07:20:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=YNvNJWgY; spf=pass (domain: gmail.com, ip: 209.85.128.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f45.google.com with SMTP id r19-20020a05600c459300b003eb3e2a5e7bso1498845wmo.0 for ; Thu, 09 Mar 2023 07:20:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375211; 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=cUFATPSfNlQTbTlYhFgq0svFnaUajN7uKDakaa0pZ6s=; b=YNvNJWgY1O/hE4I3WzAXhxnEHncZKCZX9FThPA8JlLYbMHsi9C0FueBLD2cWFen/aa 3r7PdyZolbFRXVnZN3raqIhr9AOUzH/DnNEMg9ivOMQe1PDa4LWyDh7X4oFcTfXwdmPa wJQTJbf2XWHC2Qo6QKJw67Y0EU3X1RjFl3s4I1NwF7tPs5ElrwQ1o+opMzyGGNWIgCks iihZDN51VzknzsdByrlMn3jd0hi4hZWoCafQyGIuBm7dNFAeFnQOnYIv1LBdCsE8Alna dIZzBGOzLbNt4wMRLR7cnzzBjz/2WBiqs/zEoS7IvF3M9IaxjXShD2uE1pKvJ/QbsaNK SmVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375211; 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=cUFATPSfNlQTbTlYhFgq0svFnaUajN7uKDakaa0pZ6s=; b=H0JUmFWzvMUgEFy8Sd+QkZgmY0J+qje7Ez48fcMBAg86KkzbXaP5/4hOAHaN/+O+BF IRIPp/KJuquQbWxqbABw5lhEHh0JtGfmomjBtiypR7a8Ib8ouaDbIzByg1GFAg4omFuP 7CDDei52xvBlCe0J8hMiaA48afUM2N2TFv6o9WmEATOZ0EfJvxrGQqfPa3kjpyFnHgED ovKdt31tNiXUclELa5u19IveTahSWS62WKRaYpz/BhyZTp7AHm8UTJQKmjtfCihy7TV1 15PmDaDKD1hlljhR+/xksANPwBvJ2iohsgCJk7KK3GiYTQQ9nUr19F1ywkmMCH2zausB LSsQ== X-Gm-Message-State: AO0yUKWR5x+ZMO3TE+QB7IvnRfriK98cSBbll45n65IURmb8qcNyXe38 seJfX/ViQ6QCUhBlYiJW2kdup5Z025E= X-Google-Smtp-Source: AK7set/HfBzvrTEr0CHStX6b5EwvZBB1MwB4aNElMTfRBeWY9UuPLpsJYKxHqaNtQehdXoYXQ9SXjA== X-Received: by 2002:a05:600c:4e86:b0:3ea:d601:976f with SMTP id f6-20020a05600c4e8600b003ead601976fmr20051780wmq.23.1678375211396; Thu, 09 Mar 2023 07:20:11 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:11 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 13/26] ffmpeg: update 5.1.2 -> 6.0 Date: Thu, 9 Mar 2023 16:19:45 +0100 Message-Id: <20230309151958.3619193-13-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178240 Add a patch to gstreamer1.0-libav to address an API compatibility fail. Signed-off-by: Alexander Kanavin --- ...c-stop-accessing-out-of-bounds-frame.patch | 89 --------------- ...c-stop-accessing-out-of-bounds-frame.patch | 108 ------------------ .../ffmpeg/ffmpeg/ffmpeg-fix-vulkan.patch | 34 ------ .../ffmpeg/{ffmpeg_5.1.2.bb => ffmpeg_6.0.bb} | 8 +- .../gstreamer1.0-libav/ffmpeg-6.0.patch | 49 ++++++++ .../gstreamer/gstreamer1.0-libav_1.22.0.bb | 4 +- 6 files changed, 54 insertions(+), 238 deletions(-) delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/0001-avcodec-rpzaenc-stop-accessing-out-of-bounds-frame.patch delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/0001-avcodec-smcenc-stop-accessing-out-of-bounds-frame.patch delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/ffmpeg-fix-vulkan.patch rename meta/recipes-multimedia/ffmpeg/{ffmpeg_5.1.2.bb => ffmpeg_6.0.bb} (95%) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-avcodec-rpzaenc-stop-accessing-out-of-bounds-frame.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-avcodec-rpzaenc-stop-accessing-out-of-bounds-frame.patch deleted file mode 100644 index 2775a81cc8..0000000000 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-avcodec-rpzaenc-stop-accessing-out-of-bounds-frame.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 92f9b28ed84a77138105475beba16c146bdaf984 Mon Sep 17 00:00:00 2001 -From: Paul B Mahol -Date: Sat, 12 Nov 2022 16:12:00 +0100 -Subject: [PATCH] avcodec/rpzaenc: stop accessing out of bounds frame - -Upstream-Status: Backport [https://github.com/FFmpeg/FFmpeg/commit/92f9b28ed84a77138105475beba16c146bdaf984] - -Signed-off-by: - ---- - libavcodec/rpzaenc.c | 22 +++++++++++++++------- - 1 file changed, 15 insertions(+), 7 deletions(-) - -diff --git a/libavcodec/rpzaenc.c b/libavcodec/rpzaenc.c -index d710eb4f82..4ced9523e2 100644 ---- a/libavcodec/rpzaenc.c -+++ b/libavcodec/rpzaenc.c -@@ -205,7 +205,7 @@ static void get_max_component_diff(const BlockInfo *bi, const uint16_t *block_pt - - // loop thru and compare pixels - for (y = 0; y < bi->block_height; y++) { -- for (x = 0; x < bi->block_width; x++){ -+ for (x = 0; x < bi->block_width; x++) { - // TODO: optimize - min_r = FFMIN(R(block_ptr[x]), min_r); - min_g = FFMIN(G(block_ptr[x]), min_g); -@@ -278,7 +278,7 @@ static int leastsquares(const uint16_t *block_ptr, const BlockInfo *bi, - return -1; - - for (i = 0; i < bi->block_height; i++) { -- for (j = 0; j < bi->block_width; j++){ -+ for (j = 0; j < bi->block_width; j++) { - x = GET_CHAN(block_ptr[j], xchannel); - y = GET_CHAN(block_ptr[j], ychannel); - sumx += x; -@@ -325,7 +325,7 @@ static int calc_lsq_max_fit_error(const uint16_t *block_ptr, const BlockInfo *bi - int max_err = 0; - - for (i = 0; i < bi->block_height; i++) { -- for (j = 0; j < bi->block_width; j++){ -+ for (j = 0; j < bi->block_width; j++) { - int x_inc, lin_y, lin_x; - x = GET_CHAN(block_ptr[j], xchannel); - y = GET_CHAN(block_ptr[j], ychannel); -@@ -420,7 +420,9 @@ static void update_block_in_prev_frame(const uint16_t *src_pixels, - uint16_t *dest_pixels, - const BlockInfo *bi, int block_counter) - { -- for (int y = 0; y < 4; y++) { -+ const int y_size = FFMIN(4, bi->image_height - bi->row * 4); -+ -+ for (int y = 0; y < y_size; y++) { - memcpy(dest_pixels, src_pixels, 8); - dest_pixels += bi->rowstride; - src_pixels += bi->rowstride; -@@ -730,14 +732,15 @@ post_skip : - - if (err > s->sixteen_color_thresh) { // DO SIXTEEN COLOR BLOCK - uint16_t *row_ptr; -- int rgb555; -+ int y_size, rgb555; - - block_offset = get_block_info(&bi, block_counter); - - row_ptr = &src_pixels[block_offset]; -+ y_size = FFMIN(4, bi.image_height - bi.row * 4); - -- for (int y = 0; y < 4; y++) { -- for (int x = 0; x < 4; x++){ -+ for (int y = 0; y < y_size; y++) { -+ for (int x = 0; x < 4; x++) { - rgb555 = row_ptr[x] & ~0x8000; - - put_bits(&s->pb, 16, rgb555); -@@ -745,6 +748,11 @@ post_skip : - row_ptr += bi.rowstride; - } - -+ for (int y = y_size; y < 4; y++) { -+ for (int x = 0; x < 4; x++) -+ put_bits(&s->pb, 16, 0); -+ } -+ - block_counter++; - } else { // FOUR COLOR BLOCK - block_counter += encode_four_color_block(min_color, max_color, --- -2.34.1 - diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-avcodec-smcenc-stop-accessing-out-of-bounds-frame.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-avcodec-smcenc-stop-accessing-out-of-bounds-frame.patch deleted file mode 100644 index 923fc6a9c1..0000000000 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-avcodec-smcenc-stop-accessing-out-of-bounds-frame.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 13c13109759090b7f7182480d075e13b36ed8edd Mon Sep 17 00:00:00 2001 -From: Paul B Mahol -Date: Sat, 12 Nov 2022 15:19:21 +0100 -Subject: [PATCH] avcodec/smcenc: stop accessing out of bounds frame - -Upstream-Status: Backport [https://github.com/FFmpeg/FFmpeg/commit/13c13109759090b7f7182480d075e13b36ed8edd] - -Signed-off-by: - ---- - libavcodec/smcenc.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/libavcodec/smcenc.c b/libavcodec/smcenc.c -index f3d26a4e8d..33549b8ab4 100644 ---- a/libavcodec/smcenc.c -+++ b/libavcodec/smcenc.c -@@ -61,6 +61,7 @@ typedef struct SMCContext { - { \ - row_ptr += stride * 4; \ - pixel_ptr = row_ptr; \ -+ cur_y += 4; \ - } \ - } \ - } -@@ -117,6 +118,7 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, - const uint8_t *prev_pixels = (const uint8_t *)s->prev_frame->data[0]; - uint8_t *distinct_values = s->distinct_values; - const uint8_t *pixel_ptr, *row_ptr; -+ const int height = frame->height; - const int width = frame->width; - uint8_t block_values[16]; - int block_counter = 0; -@@ -125,13 +127,14 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, - int color_octet_index = 0; - int color_table_index; /* indexes to color pair, quad, or octet tables */ - int total_blocks; -+ int cur_y = 0; - - memset(s->color_pairs, 0, sizeof(s->color_pairs)); - memset(s->color_quads, 0, sizeof(s->color_quads)); - memset(s->color_octets, 0, sizeof(s->color_octets)); - - /* Number of 4x4 blocks in frame. */ -- total_blocks = ((frame->width + 3) / 4) * ((frame->height + 3) / 4); -+ total_blocks = ((width + 3) / 4) * ((height + 3) / 4); - - pixel_ptr = row_ptr = src_pixels; - -@@ -145,11 +148,13 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, - int cache_index; - int distinct = 0; - int blocks = 0; -+ int frame_y = cur_y; - - while (prev_pixels && s->key_frame == 0 && block_counter + inter_skip_blocks < total_blocks) { -+ const int y_size = FFMIN(4, height - cur_y); - int compare = 0; - -- for (int y = 0; y < 4; y++) { -+ for (int y = 0; y < y_size; y++) { - const ptrdiff_t offset = pixel_ptr - src_pixels; - const uint8_t *prev_pixel_ptr = prev_pixels + offset; - -@@ -170,8 +175,10 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, - - pixel_ptr = xpixel_ptr; - row_ptr = xrow_ptr; -+ cur_y = frame_y; - - while (block_counter > 0 && block_counter + intra_skip_blocks < total_blocks) { -+ const int y_size = FFMIN(4, height - cur_y); - const ptrdiff_t offset = pixel_ptr - src_pixels; - const int sy = offset / stride; - const int sx = offset % stride; -@@ -180,7 +187,7 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, - const uint8_t *old_pixel_ptr = src_pixels + nx + ny * stride; - int compare = 0; - -- for (int y = 0; y < 4; y++) { -+ for (int y = 0; y < y_size; y++) { - compare |= memcmp(old_pixel_ptr + y * stride, pixel_ptr + y * stride, 4); - if (compare) - break; -@@ -197,9 +204,11 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, - - pixel_ptr = xpixel_ptr; - row_ptr = xrow_ptr; -+ cur_y = frame_y; - - while (block_counter + coded_blocks < total_blocks && coded_blocks < 256) { -- for (int y = 0; y < 4; y++) -+ const int y_size = FFMIN(4, height - cur_y); -+ for (int y = 0; y < y_size; y++) - memcpy(block_values + y * 4, pixel_ptr + y * stride, 4); - - qsort(block_values, 16, sizeof(block_values[0]), smc_cmp_values); -@@ -224,6 +233,7 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, - - pixel_ptr = xpixel_ptr; - row_ptr = xrow_ptr; -+ cur_y = frame_y; - - blocks = coded_blocks; - distinct = coded_distinct; --- -2.34.1 - diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/ffmpeg-fix-vulkan.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/ffmpeg-fix-vulkan.patch deleted file mode 100644 index 95bd608a27..0000000000 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg/ffmpeg-fix-vulkan.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Lynne -Date: Sun, 25 Dec 2022 00:03:30 +0000 (+0100) -Subject: hwcontext_vulkan: remove optional encode/decode extensions from the list -X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/eb0455d64690 - -hwcontext_vulkan: remove optional encode/decode extensions from the list - -They're not currently used, so they don't need to be there. -Vulkan stabilized the decode extensions less than a week ago, and their -name prefixes were changed from EXT to KHR. It's a bit too soon to be -depending on it, so rather than bumping, just remove these for now. - -Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/eb0455d64690] ---- - -diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c -index f1db1c7291..2a9b5f4aac 100644 ---- a/libavutil/hwcontext_vulkan.c -+++ b/libavutil/hwcontext_vulkan.c -@@ -358,14 +358,6 @@ static const VulkanOptExtension optional_device_exts[] = { - { VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_MEMORY }, - { VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_SEM }, - #endif -- -- /* Video encoding/decoding */ -- { VK_KHR_VIDEO_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, -- { VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, -- { VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, -- { VK_EXT_VIDEO_ENCODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, -- { VK_EXT_VIDEO_DECODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, -- { VK_EXT_VIDEO_DECODE_H265_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, - }; - - /* Converts return values to strings */ diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb similarity index 95% rename from meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.2.bb rename to meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb index cccd9f65ab..e4a4a0effa 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb @@ -22,13 +22,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" -SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ - file://0001-avcodec-rpzaenc-stop-accessing-out-of-bounds-frame.patch \ - file://0001-avcodec-smcenc-stop-accessing-out-of-bounds-frame.patch \ - file://ffmpeg-fix-vulkan.patch \ - " +SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz" -SRC_URI[sha256sum] = "619e706d662c8420859832ddc259cd4d4096a48a2ce1eefd052db9e440eef3dc" +SRC_URI[sha256sum] = "57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082" # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717 ARM_INSTRUCTION_SET:armv4 = "arm" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch new file mode 100644 index 0000000000..0a06540fb4 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch @@ -0,0 +1,49 @@ +From cde31d23c071ee93fae96331805f696856084254 Mon Sep 17 00:00:00 2001 +From: "U. Artie Eoff" +Date: Mon, 13 Feb 2023 17:02:01 -0500 +Subject: [PATCH] avviddec: change + AV_CODEC_CAP_AUTO_THREADS->AV_CODEC_CAP_OTHER_THREADS + +This fixes a compile error with recent upstream FFmpeg. + +The AV_CODEC_CAP_AUTO_THREADS was deprecated and renamed to +AV_CODEC_CAP_OTHER_THREADS in FFmpeg upstream commit +7d09579190de (lavc 58.132.100). + +The AV_CODEC_CAP_AUTO_THREADS was finally removed in FFmpeg upstream +commit 10c9a0874cb3 (lavc 59.63.100). + +Part-of: + +Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/cde31d23c071ee93fae96331805f696856084254?merge_request_iid=3964] +Signed-off-by: Alexander Kanavin +--- + ext/libav/gstavviddec.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c +index 43cea456ae8..6d7c4cd0de8 100644 +--- a/ext/libav/gstavviddec.c ++++ b/ext/libav/gstavviddec.c +@@ -35,6 +35,10 @@ + + GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE); + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,132,100) ++#define AV_CODEC_CAP_OTHER_THREADS AV_CODEC_CAP_AUTO_THREADS ++#endif ++ + #define GST_FFMPEG_VIDEO_CODEC_FRAME_FLAG_ALLOCATED (1<<15) + + #define MAX_TS_MASK 0xff +@@ -615,7 +619,7 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder, + if (ffmpegdec->max_threads == 0) { + /* When thread type is FF_THREAD_FRAME, extra latency is introduced equal + * to one frame per thread. We thus need to calculate the thread count ourselves */ +- if ((!(oclass->in_plugin->capabilities & AV_CODEC_CAP_AUTO_THREADS)) || ++ if ((!(oclass->in_plugin->capabilities & AV_CODEC_CAP_OTHER_THREADS)) || + (ffmpegdec->context->thread_type & FF_THREAD_FRAME)) + ffmpegdec->context->thread_count = + MIN (gst_ffmpeg_auto_max_threads (), 16); +-- +GitLab diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.0.bb index 625a52ea55..d1dce6739d 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.0.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.0.bb @@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \ file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \ " -SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz" +SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \ + file://ffmpeg-6.0.patch \ + " SRC_URI[sha256sum] = "0e48407b4905227a260213dbda84cba3812f0530fc7a75b43829102ef82810f1" S = "${WORKDIR}/gst-libav-${PV}" From patchwork Thu Mar 9 15:19: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: 20669 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 60B6EC7619A for ; Thu, 9 Mar 2023 15:20:22 +0000 (UTC) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.groups.io with SMTP id smtpd.web11.16012.1678375206331469382 for ; Thu, 09 Mar 2023 07:20:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=jbkglZNW; spf=pass (domain: gmail.com, ip: 209.85.221.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f42.google.com with SMTP id j2so2225094wrh.9 for ; Thu, 09 Mar 2023 07:20:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375212; 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=t+jeNTTjQOiFloJeBtIXb0IN54IMWRM5+kUC77gkjzU=; b=jbkglZNWSipVe6F423NI4Qateu/VCOxsfLMZ5VxgAYvgbBiW872S1l009KNU9pq4iF nq8zsxF/xWRYXMI1VMwGsZZbO5K5NeHUMAbyGlh8gx664cYCGbLYeOdEJnDNBC+KOmBh iC0cyMhrlcOPXySyQkol8DgRxzcp8RZnZBMx4GkOr5FBnWv/BQRfPJ+fCaY9aamJX+b7 j1bJZRKnlpB/5gz0nlTl0UuGK2jwxCFcdJXCacMpx5XjSwbodunNG8M+6joa9akF4mOt teX/4/2nwXTdq4mCKyXQctC7WhI0GZkg0sGy8WiJixtY1jPYie93FYDbfRa7c6o5wRDU Woqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375212; 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=t+jeNTTjQOiFloJeBtIXb0IN54IMWRM5+kUC77gkjzU=; b=pW/Wn4Qmx/+Z8AO7Ha08Gz/YGkAFDVx9J9J1qiRr95ncs7WghNdkdZIOS6y9XP8jv9 MtMKH5Wewrt5Rq141BYG/Xvg6aG3hMc6inIqav/Snn0duqZh9CpwgPAiG0xMTEjHAglw Dg15q4e9FbWLY0XZX7YYEdMh/4g0hVVXfJZgjG57o53fqrJDU2WFVleHKGWrQ67GZFLH 7xdvDB+cT0+AE8AZzAHSAAqVWXf3UR2uHjCQqeIMPo8XjSd/00KRjcEnvRYePvLffHU2 MSvJPW4yM41TIUiv803xSqi29bhsgQGMeMd8JD1qHfR7sgqT6fDERfWaiEQQodC/tT2X fhGQ== X-Gm-Message-State: AO0yUKUT0hYul+gXv1rsuQiRNp7MFCdBLROHGjFflyQUh/bRso82zOHY BVdAJEAneV1rWa+S1v9Dai6UR86Jz8E= X-Google-Smtp-Source: AK7set/UjvkhQIuyJaxaZzCEIEp7/gz8atQpkWYtonHhmwMsjN35hrbUe7ImzjPm99wKjWdGGtcLYg== X-Received: by 2002:a5d:5253:0:b0:2c5:5d21:7d4c with SMTP id k19-20020a5d5253000000b002c55d217d4cmr14711878wrc.43.1678375211855; Thu, 09 Mar 2023 07:20:11 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:11 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 14/26] libgit2: update 1.5.1 -> 1.6.2 Date: Thu, 9 Mar 2023 16:19:46 +0100 Message-Id: <20230309151958.3619193-14-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178238 License-Update: added bsd-2-clause due to https://github.com/libgit2/libgit2/commit/aa1605dd1484cf7350d736c7677c7a9ee6352316 Signed-off-by: Alexander Kanavin --- .../libgit2/{libgit2_1.5.1.bb => libgit2_1.6.2.bb} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-support/libgit2/{libgit2_1.5.1.bb => libgit2_1.6.2.bb} (64%) diff --git a/meta/recipes-support/libgit2/libgit2_1.5.1.bb b/meta/recipes-support/libgit2/libgit2_1.6.2.bb similarity index 64% rename from meta/recipes-support/libgit2/libgit2_1.5.1.bb rename to meta/recipes-support/libgit2/libgit2_1.6.2.bb index 59866ce385..25108ed56c 100644 --- a/meta/recipes-support/libgit2/libgit2_1.5.1.bb +++ b/meta/recipes-support/libgit2/libgit2_1.6.2.bb @@ -1,12 +1,12 @@ SUMMARY = "the Git linkable library" HOMEPAGE = "http://libgit2.github.com/" -LICENSE = "GPL-2.0-with-GCC-exception & MIT & OpenSSL & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=112e6bb421dea73cd41de09e777f2d2c" +LICENSE = "GPL-2.0-with-GCC-exception & MIT & OpenSSL & BSD-3-Clause & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=5bdf47bbc9a39dc6ce076d59e322dc17" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.5;protocol=https" -SRCREV = "42e5db98b963ae503229c63e44e06e439df50e56" +SRC_URI = "git://github.com/libgit2/libgit2.git;branch=main;protocol=https" +SRCREV = "25ec37379ed07b10c4ecc6143cf6018cabc8f857" S = "${WORKDIR}/git" From patchwork Thu Mar 9 15:19: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: 20670 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 69EDCC761A6 for ; Thu, 9 Mar 2023 15:20:22 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.web11.16013.1678375206818307064 for ; Thu, 09 Mar 2023 07:20:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=gfCBSa3S; spf=pass (domain: gmail.com, ip: 209.85.221.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f49.google.com with SMTP id h11so2242199wrm.5 for ; Thu, 09 Mar 2023 07:20:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375212; 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=8zu+NoqicbxYxJmwqUBYqUenxfk0EaL/JvES7gM6DNo=; b=gfCBSa3SYSM9xO8iTdWM4TV9JstAdrZ9oVnUybksUXPIqaDTQ16OoQ0HgjDF8qkYjf jO6o30j1z8VBe2SffNPfXqurRnnYq4H4FD+v7N/KQuRNRLNHc1k2D+XTvNPPbmnADJH+ I2VvS45duXWX8JfPH/zB+vmCaX25h40kzxlTRgN3l4gecLTO72AGThdrlwQyUnVrXrd8 r55PRiVuaXHzxDobWMx4AaeEHkkEJiANRUUv/eZm8Get7YlrH2wS05H5gLF3XgKFWYDg AqpsrHeKMva1/fF67DIYOj2dIwC4bFyKjkX3Aqa/Hpa1m+WFNNGeE77ntEDdodLSkx+E 2kaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375212; 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=8zu+NoqicbxYxJmwqUBYqUenxfk0EaL/JvES7gM6DNo=; b=c2f8BgESxUGaB2S6TSTk3ZmT3CbHfb1ZbX7fB8+Ml+KQ1D587QUc05h7cseaLfWaDl zwkD8qyBje7c1gnOdq+yzdzSmx32vAHNrutpBmRs1XT4OMI3HQvPj2YyelzgFpYdftco ezQjoGx2PHEYY0GFU5XfCbL56HSlW7CGt491nqVVioBV/78JM+Oiuz5BYFvceAxZOeSe QnEfWPBBj04xYJDdOCYq6pZkU4ee2igquv4mpDa1vMk/g6C1i12FS8v4xN8J/XspiFvq jWHFryECLb2pq6T8FI94VJopB7ajJxCsK17j0UZIaohvfpUxWPhXhKZX/+4MXyZiu20N BvYw== X-Gm-Message-State: AO0yUKWBgogOH0TU65gAseaCZAfubweGlBWhshfoHuThc0isOL9kv6To P7uwguT/5e9somdRBT31YUdPVJjSznw= X-Google-Smtp-Source: AK7set8anX/Cyoj4aOLOwv/JHkOzD8mM4vP8I1ooipIDsUdkZZg4/UwDUu4v5qEZbNDC3RAO1oIfGA== X-Received: by 2002:a5d:5492:0:b0:2c5:96a5:5b83 with SMTP id h18-20020a5d5492000000b002c596a55b83mr14943870wrv.26.1678375212308; Thu, 09 Mar 2023 07:20:12 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:12 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 15/26] sqlite3: update 3.40.1 -> 3.41.0 Date: Thu, 9 Mar 2023 16:19:47 +0100 Message-Id: <20230309151958.3619193-15-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178239 Signed-off-by: Alexander Kanavin --- .../sqlite/{sqlite3_3.40.1.bb => sqlite3_3.41.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/sqlite/{sqlite3_3.40.1.bb => sqlite3_3.41.0.bb} (77%) diff --git a/meta/recipes-support/sqlite/sqlite3_3.40.1.bb b/meta/recipes-support/sqlite/sqlite3_3.41.0.bb similarity index 77% rename from meta/recipes-support/sqlite/sqlite3_3.40.1.bb rename to meta/recipes-support/sqlite/sqlite3_3.41.0.bb index c9b6ca1c5f..f17c15e258 100644 --- a/meta/recipes-support/sqlite/sqlite3_3.40.1.bb +++ b/meta/recipes-support/sqlite/sqlite3_3.41.0.bb @@ -3,8 +3,8 @@ require sqlite3.inc LICENSE = "PD" LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" -SRC_URI = "http://www.sqlite.org/2022/sqlite-autoconf-${SQLITE_PV}.tar.gz" -SRC_URI[sha256sum] = "2c5dea207fa508d765af1ef620b637dcb06572afa6f01f0815bd5bbf864b33d9" +SRC_URI = "http://www.sqlite.org/2023/sqlite-autoconf-${SQLITE_PV}.tar.gz" +SRC_URI[sha256sum] = "49f77ac53fd9aa5d7395f2499cb816410e5621984a121b858ccca05310b05c70" # -19242 is only an issue in specific development branch commits CVE_CHECK_IGNORE += "CVE-2019-19242" From patchwork Thu Mar 9 15:19: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: 20664 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 30933C76188 for ; Thu, 9 Mar 2023 15:20:22 +0000 (UTC) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.groups.io with SMTP id smtpd.web10.16123.1678375210112749934 for ; Thu, 09 Mar 2023 07:20:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=nL4ax6sx; spf=pass (domain: gmail.com, ip: 209.85.221.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f50.google.com with SMTP id g3so2242573wri.6 for ; Thu, 09 Mar 2023 07:20:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375212; 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=v+9NSuRI6dvwImEm2enNmBMQxXichP7OU7jbBMaS/VI=; b=nL4ax6sxdDrJFGypMSM8TIyd9yhrb2uFKnMh+D1PvgRYxr7QtSvJTS28/Hy785abnm ukGRL9HsG/fjSFE3/DRsXni8/PXsJQPpEYSoH0VCC5ZFuwsuNGYcYB4vFd24+Dti5onB 8JksMmfqLc82AhyU0zjVsI7gnJU8IYHRAUbyJSyO6r6trYgCXbYmViumoc3CTxBNeIXz aJkFTm8SntIOBVnQttcH0XF+NKtP2O4CAQ6FvvDx3TfQCdXNvWnWD4vQRYShW64gvDZw 1Yk5fWVH+qPF/fALKadLarGEyl+GrSW4dGVw7zS4d1fqQForrXxEHGGOIaXZvH9dccMa wjNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375212; 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=v+9NSuRI6dvwImEm2enNmBMQxXichP7OU7jbBMaS/VI=; b=20yYtvfNmTGxGHTtdmf2/MUR6gPOUraSaFKku6GBUziRAqqLxfGCV5pqqtdOIqcYfy Zu1USiypFSt9EBUnVzhzR/h8B/cBCngupYwz5638AKek9d8htGD4W18kj2wlRpzXKuUw TFknn6CLLFAt2xHIb2bD689wQfI0zt/9AASbThVdcrbOLvId3xo2ffzF014Z/zMKIfCd ew5zO3ENk3/fIkR2k3GsiVrdxmMq3B+GlOnotsHzTmNx40yFk9GtKSHNHD39mKeSX80y rPfc97Rg/mHyhv20ufp6Qx1kHQ8sKFnamuoixBi32meqtwckNzKoLXrVuurIisv3WzXj 33uQ== X-Gm-Message-State: AO0yUKXabeH/PfLqmyuXdzQbQDn+H/NUgx/EDI5htjRQ6uJZ5A7GVgrH X9/ZJ4pemV5jqpoVuPr8TkWsr6IO3Y8= X-Google-Smtp-Source: AK7set+mG+m2+BLyDC12ZeXEX0hBPrSzRlk55K5Wlxb9rqPu2naV40QJH72D+CnjOChNFlp0X8XMZQ== X-Received: by 2002:adf:f751:0:b0:2cd:ceab:970d with SMTP id z17-20020adff751000000b002cdceab970dmr17761747wrp.24.1678375212813; Thu, 09 Mar 2023 07:20:12 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:12 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 16/26] enchant2: upgrade 2.3.3 -> 2.3.4 Date: Thu, 9 Mar 2023 16:19:48 +0100 Message-Id: <20230309151958.3619193-16-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178241 Signed-off-by: Alexander Kanavin --- .../enchant/{enchant2_2.3.3.bb => enchant2_2.3.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/enchant/{enchant2_2.3.3.bb => enchant2_2.3.4.bb} (89%) diff --git a/meta/recipes-support/enchant/enchant2_2.3.3.bb b/meta/recipes-support/enchant/enchant2_2.3.4.bb similarity index 89% rename from meta/recipes-support/enchant/enchant2_2.3.3.bb rename to meta/recipes-support/enchant/enchant2_2.3.4.bb index c892f570c4..5a6a3157a6 100644 --- a/meta/recipes-support/enchant/enchant2_2.3.3.bb +++ b/meta/recipes-support/enchant/enchant2_2.3.4.bb @@ -7,12 +7,12 @@ BUGTRACKER = "https://github.com/AbiWord/enchant/issues/" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" -DEPENDS = "glib-2.0" +DEPENDS = "glib-2.0 groff-native" inherit autotools pkgconfig github-releases SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/enchant-${PV}.tar.gz" -SRC_URI[sha256sum] = "3da12103f11cf49c3cf2fd2ce3017575c5321a489e5b9bfa81dd91ec413f3891" +SRC_URI[sha256sum] = "1f7e26744db1c9a0fea61d2169f4e5c1ce435cf8c2731c37e3e4054119e994a0" GITHUB_BASE_URI = "https://github.com/AbiWord/enchant/releases" From patchwork Thu Mar 9 15:19: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: 20671 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 41D45C7618D for ; Thu, 9 Mar 2023 15:20:22 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.web10.16129.1678375214732099128 for ; Thu, 09 Mar 2023 07:20:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=P2KBZP36; spf=pass (domain: gmail.com, ip: 209.85.128.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f52.google.com with SMTP id p16so1397944wmq.5 for ; Thu, 09 Mar 2023 07:20:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375213; 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=6hvi0eLB+Md97g29FKCIjwT7rEAUy/stboqe0zOg3+w=; b=P2KBZP36qeVH3rL0oeHLMkhJU9CVAegRZnPclpS+Tr9MSnGFwFsOegqpVj9Ge/S8jx GZnwcaUsP7yO/1C7y08FTeL3w3gE9vUoKxpCy7tOQWqb/zfdsmpyDmKjTiyllHYJbGwV b8xcuJrdnq7z2ICHzF0FVbPDgkB+7EeUNh52ZhXprFPYIWoZioRJ0w3lTn0Z2T/N0PDf mjlQZ5FgOzLvSNrlYXq9yEZxn2XDfgAIA0UmCZCU5ZNkFeXZjel9dK+6C2LyNchatclY As4GQPB+LHRUcQMkiSj/rSfnLGf+eJ9PouXc2jg5Q08y7ElycyVNXYkeYrgOjIcI/Kj6 FlsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375213; 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=6hvi0eLB+Md97g29FKCIjwT7rEAUy/stboqe0zOg3+w=; b=GuDV3NB959bOWTWt/QyZMFwZD+0bImZRWKA+L8S7FYPGWYB5LN8mOenVAHvRnXCwxk +1XP1WiAqu9rQKYLvfBfbgnY7qieOXr7pID8dkoI5luRw3u6yZ3pI+1kxnFxiBgF1i9T sDzrSSTVyT2Reo/vY/o2u8uNPsOK6MguqRvuYqw+Fm0YcCuPteko0lK2KM4ybAwlwvqw AAjRRkfT9VG+XeoXYZFi1YNX8JDKaWBWmUmHomsg2rK8KbbTZDopKQEXEDKffNVjuZ5F hNtJ5unmjipsJktO0YiwSO7lkT7Xo84XorWS5qz72yWSrs69NfuhSKY6JY0rfJjPJNmj Qk8Q== X-Gm-Message-State: AO0yUKU5B7k+M/qqpRhOxlZHM+dxo6A7xC1WXWC6Q55FMfB5hCNdkeFY 9y+weiMWE8EUfd70gvy/JOFEgOO4Rnw= X-Google-Smtp-Source: AK7set+mwTCuQqPQ0ORdYaNAFC56yvCcqN2NePUk7NsPBQ22lpLH9eGCWAKThrB3og9GzqO4h366qw== X-Received: by 2002:a05:600c:a42:b0:3e2:d3:b2b6 with SMTP id c2-20020a05600c0a4200b003e200d3b2b6mr16053858wmq.14.1678375213275; Thu, 09 Mar 2023 07:20:13 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:13 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 17/26] make: upgrade 4.4 -> 4.4.1 Date: Thu, 9 Mar 2023 16:19:49 +0100 Message-Id: <20230309151958.3619193-17-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178243 Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/make/make.inc | 5 +++ meta/recipes-devtools/make/make/sigpipe.patch | 42 ------------------- .../make/{make_4.4.bb => make_4.4.1.bb} | 3 +- 3 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-devtools/make/make/sigpipe.patch rename meta/recipes-devtools/make/{make_4.4.bb => make_4.4.1.bb} (70%) diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index a0a72b6295..56b863480c 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -11,3 +11,8 @@ SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.gz \ inherit autotools gettext pkgconfig texinfo PROVIDES = "virtual/make" + +# Otherwise $CXX leaks into /usr/bin/make +do_configure:prepend() { + unset CXX +} diff --git a/meta/recipes-devtools/make/make/sigpipe.patch b/meta/recipes-devtools/make/make/sigpipe.patch deleted file mode 100644 index a7270fdbda..0000000000 --- a/meta/recipes-devtools/make/make/sigpipe.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 92ab2e642d2c04b3dcb5a736ae6193680bfd5f74 Mon Sep 17 00:00:00 2001 -From: Paul Smith -Date: Sun, 6 Nov 2022 15:22:02 -0500 -Subject: * src/main.c (main): [SV 63307] Handle SIGPIPE as a fatal signal - -Always ignoring SIGPIPE is visible to child processes. - -Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/make.git/commit/?id=92ab2e642d2c04b3dcb5a736ae6193680bfd5f74] -Signed-off-by: Alexander Kanavin ---- - src/main.c | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/src/main.c b/src/main.c -index eec9365..f2caf7a 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -1182,11 +1182,6 @@ main (int argc, char **argv, char **envp) - /* Useful for attaching debuggers, etc. */ - SPIN ("main-entry"); - -- /* Don't die if our stdout sends us SIGPIPE. */ --#ifdef SIGPIPE -- bsd_signal (SIGPIPE, SIG_IGN); --#endif -- - #ifdef HAVE_ATEXIT - if (ANY_SET (check_io_state (), IO_STDOUT_OK)) - atexit (close_stdout); -@@ -1265,6 +1260,9 @@ main (int argc, char **argv, char **envp) - #ifdef SIGQUIT - FATAL_SIG (SIGQUIT); - #endif -+#ifdef SIGPIPE -+ FATAL_SIG (SIGPIPE); -+#endif - FATAL_SIG (SIGINT); - FATAL_SIG (SIGTERM); - --- -cgit v1.1 - diff --git a/meta/recipes-devtools/make/make_4.4.bb b/meta/recipes-devtools/make/make_4.4.1.bb similarity index 70% rename from meta/recipes-devtools/make/make_4.4.bb rename to meta/recipes-devtools/make/make_4.4.1.bb index 6642c708d8..c73751ddcb 100644 --- a/meta/recipes-devtools/make/make_4.4.bb +++ b/meta/recipes-devtools/make/make_4.4.1.bb @@ -4,11 +4,10 @@ require make.inc SRC_URI += " \ file://0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch \ - file://sigpipe.patch \ " EXTRA_OECONF += "--without-guile" -SRC_URI[sha256sum] = "581f4d4e872da74b3941c874215898a7d35802f03732bdccee1d4a7979105d18" +SRC_URI[sha256sum] = "dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3" BBCLASSEXTEND = "native nativesdk" From patchwork Thu Mar 9 15:19: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: 20667 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 43F56C7618E for ; Thu, 9 Mar 2023 15:20:22 +0000 (UTC) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.groups.io with SMTP id smtpd.web10.16123.1678375210112749934 for ; Thu, 09 Mar 2023 07:20:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=l2RnCEVj; spf=pass (domain: gmail.com, ip: 209.85.221.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f50.google.com with SMTP id g3so2242625wri.6 for ; Thu, 09 Mar 2023 07:20:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375214; 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=hFlkNPPNfmqqGhJIkh0rDDMddgghrcqGAQE2i/rPv34=; b=l2RnCEVjSkpfgkd1vC88WMAOkzgPCk4BWT/+jeLqUGFOa1nn0jTgYfB3R3cTxNg3S8 lCgcXYy7dypwLINchKneq2W4TC7ab7GAPCZiRCl1e4pk5MynMQygp3qBJDv1jUqABh/t szaINeGGv2IONl2t0eZocoJSzzq08PtWrTxyFl7PWtVfx5ESmNrcd05/vVeE2e3T1Q59 qULPQL2HncX5FcBBIo6QGKZt5HUlYLGb5JhuBqf5w1Y7/BXhnEl54XJ27TAv1FVeHxzg gNblmTfHUkCLSdB5L/NA47R6ca1zdeMhoW/6piHZT9PNuRxfZ8M2wY2FUXUgUzd+MSE8 HzDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375214; 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=hFlkNPPNfmqqGhJIkh0rDDMddgghrcqGAQE2i/rPv34=; b=XaJ5MySeYC7WggU8RqzNYAlu1kUfyp07J4Jvqa+tWrF5eELpM/ddUJ4d+9GtxsVWk7 CEYo5hjIi7dfvAf8zF6/5DOXZLPnJEB33lTlFH7jF4TrBQ9G9JrChpl9GwDENVhxDWMB Jeu9LDone25RodHnZKxmXYDyP6HyZqTcrHeO/zsABSs3ptcDAdIbh/vSAbhMRsAu7mE3 x0saPVu1/EU8cLDp/kLli4hsS/sYsSM4mjuuZ0FQKZDc7DL7DgwCh5cJCRrOyMIqbXfe 4Yp0EpafSlJ8hh0YZjs4o7NF442uplMAR89zeW11XcgNZ+vrohmn6Z87lRnnY/VBHOTd 04Lw== X-Gm-Message-State: AO0yUKUL6hxatpn5LTukhIayocENGi0yIFjbikwKM0s0UhMqAMM+vAQL T8YlGL2BzHE+yEaartJvtLNbCXlY65Y= X-Google-Smtp-Source: AK7set9iW4dn3NfczFG9NgY4nc1lZQZ2xRUQQ//IBqADtcrG1bOTqo91nbXKdi2T2AYNnCtyz0tvSA== X-Received: by 2002:adf:f7c4:0:b0:2c8:60de:c849 with SMTP id a4-20020adff7c4000000b002c860dec849mr16154032wrq.22.1678375213807; Thu, 09 Mar 2023 07:20:13 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:13 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 18/26] vte: upgrade 0.70.2 -> 0.70.3 Date: Thu, 9 Mar 2023 16:19:50 +0100 Message-Id: <20230309151958.3619193-18-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178242 Signed-off-by: Alexander Kanavin --- meta/recipes-support/vte/{vte_0.70.2.bb => vte_0.70.3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/vte/{vte_0.70.2.bb => vte_0.70.3.bb} (95%) diff --git a/meta/recipes-support/vte/vte_0.70.2.bb b/meta/recipes-support/vte/vte_0.70.3.bb similarity index 95% rename from meta/recipes-support/vte/vte_0.70.2.bb rename to meta/recipes-support/vte/vte_0.70.3.bb index 001f413c19..6da76a3053 100644 --- a/meta/recipes-support/vte/vte_0.70.2.bb +++ b/meta/recipes-support/vte/vte_0.70.3.bb @@ -22,7 +22,7 @@ inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-intr # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \ file://0001-vtepty.cc-Do-not-typecast-to-GSpawnFlags.patch" -SRC_URI[archive.sha256sum] = "4d15b4380de3f564d57eabd006389c407c705df5b0c70030fdcc24971a334d80" +SRC_URI[archive.sha256sum] = "9457134a02f3157fca04f7e0d39bdb0f3099be0a3ce82b7139d0c98a80748f23" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" From patchwork Thu Mar 9 15:19: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: 20662 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 30902C74A4B for ; Thu, 9 Mar 2023 15:20:22 +0000 (UTC) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.groups.io with SMTP id smtpd.web11.16023.1678375215730355927 for ; Thu, 09 Mar 2023 07:20:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=W1w+byxR; spf=pass (domain: gmail.com, ip: 209.85.221.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f43.google.com with SMTP id bw19so2212422wrb.13 for ; Thu, 09 Mar 2023 07:20:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375214; 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=FFwfwd4JkMTBp0Nz67m7rBJf93hXW0OpTJ3/J6fDdc0=; b=W1w+byxRAGnYOhBeBwFtpg/NOh4qKrRj0DLOl5IWYHv0Py/NolzpzmCrldg8o5hicl yGh8C0qwpXzxVrPl24yq6SFyPi4zTvW9gA2kw69HAWMBpmk6yRXtM8Tojs1OV3Unn5/2 Ks0wPS0ufRQuBz51szC7KbPYV5/pg32okIcixt7SMX8INwlANDWA+M5erXEfcNPVSUGF 3fYlHFt2sfTnyi6y92wIisP1ICU7e2w08n1UQDBTpiD6jNTmzrEQxspVqt39UopLqjM4 h0vY9/VJaGSERmw6QFQTXDk+67qpV+tJDOuXdt7s69AM08uB2mTtPMki2JVoZC8DMA2J 8jcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375214; 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=FFwfwd4JkMTBp0Nz67m7rBJf93hXW0OpTJ3/J6fDdc0=; b=YIYBONkci1314r+QWpEHmpA/USrjLdYgZIPcbOESAwC1CI4LRJg4Gv/I5HoJSTaMLH TJsHuOaVfVW00uaQq5R3fKCY5u2i9e7HVcx7H6xVtExRUPFZVy/ACXM04SDiDRREXLRq F95sGWYGxdxLJSMRK7r7lBaNoZWTyUfOo9DshElDTEfjkv2S1hGl4/RO1vp6G/sjrygY WO46oCF1UEAjf2fKMIC5tpS73pcpd3KuwuVqyf8/nehPtPSCOu/zmYN2fp0PhFu75/0X G/Ap0zDBZ+JgPPmRqG03MI4gf6k9SSSWK0lmOQp58xrPsGsn297qh3VWvxi2YirMCGIt WSXg== X-Gm-Message-State: AO0yUKUrO4XRlpe/oOXk4DFankq1/V10LlOx9sjUc/T8q6AKujemdH7h KD81OTOh6ur2vJaym5w5x1BoQrj/zmQ= X-Google-Smtp-Source: AK7set/emE1gKOpCFlyfM1n2rPJNoH52FbqEPpdoSqXonRhChGivCni7cS6W6CpdXPfK+EZ/2y9H0g== X-Received: by 2002:adf:f70d:0:b0:2c7:1d97:bdcb with SMTP id r13-20020adff70d000000b002c71d97bdcbmr14627232wrp.36.1678375214321; Thu, 09 Mar 2023 07:20:14 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:14 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 19/26] pango: upgrade 1.50.12 -> 1.50.13 Date: Thu, 9 Mar 2023 16:19:51 +0100 Message-Id: <20230309151958.3619193-19-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178244 Signed-off-by: Alexander Kanavin --- .../pango/{pango_1.50.12.bb => pango_1.50.13.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/pango/{pango_1.50.12.bb => pango_1.50.13.bb} (94%) diff --git a/meta/recipes-graphics/pango/pango_1.50.12.bb b/meta/recipes-graphics/pango/pango_1.50.13.bb similarity index 94% rename from meta/recipes-graphics/pango/pango_1.50.12.bb rename to meta/recipes-graphics/pango/pango_1.50.13.bb index 6779f39c4f..e673366dc7 100644 --- a/meta/recipes-graphics/pango/pango_1.50.12.bb +++ b/meta/recipes-graphics/pango/pango_1.50.13.bb @@ -24,7 +24,7 @@ SRC_URI += "file://run-ptest \ file://0001-Skip-running-test-layout-test.patch \ " -SRC_URI[archive.sha256sum] = "caef96d27bbe792a6be92727c73468d832b13da57c8071ef79b9df69ee058fe3" +SRC_URI[archive.sha256sum] = "5cdcf6d761d26a3eb9412b6cb069b32bd1d9b07abf116321167d94c2189299fd" DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" From patchwork Thu Mar 9 15:19:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 20668 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 59619C76195 for ; Thu, 9 Mar 2023 15:20:22 +0000 (UTC) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.groups.io with SMTP id smtpd.web10.16131.1678375216219097959 for ; Thu, 09 Mar 2023 07:20:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=f5D0ljOD; spf=pass (domain: gmail.com, ip: 209.85.221.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f53.google.com with SMTP id f11so2225118wrv.8 for ; Thu, 09 Mar 2023 07:20:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375214; 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=lLZSZj/fyMOV7q4ezNW7X7/GdLXLpqGvOC2BXTn99Ms=; b=f5D0ljODc5aEUpKF+6id+0BJCJuhEGlDuEaCotJTDmx9FnB28W4pGK5SwbDbvMZZZM 1sboSajlALZX0/b1zM2MhwNhOvNCgLwk0zYeSMwE+ACuZDJMfN1Dy8j6nMIbAyOL/Dns fAwHql49dvKYCRhDlHVK/GyyCtSgcyOsm25dkTdNIIcKrGoUz0lldt96kLsjJJ+jpNO+ xpl9n0uk9nQgfBrKuKZ4IU4tNkME/3jWpBeUR/hKHhca20wSwAWvuXHIzaOUORv/jlAn cIW4+Ks8QCGfznucCEiY8DJww+m8nAeHFTPDyP7au3gABX55iJFm9p/NgQFsNbxzjgn2 rP1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375214; 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=lLZSZj/fyMOV7q4ezNW7X7/GdLXLpqGvOC2BXTn99Ms=; b=WsPZYwedZw/CRXLAsOed19TV2f+OYWgD5fGmjNQcG25bDVFpWN0P9fC1QfudiI7bUI iVKbq0G3sFLHHAA2W9zC0kfF03qEwe2ZB2Kh7bkF9r7B63pIOBsBUmEfVwqlyKKCBIXg +hE9m/nu6zhg8oTIhVXXL9ozfNJEJYzK/BV/Uz/81om5BSHTWgeByEhZVrZhM1oE02zd 6zhpNx/T+tGbacNM0Qm7+pohHLqm12Ey7zXkrMbIpUStFGNZzGdvtlv7Tv0xaNjqVSFV aSrHIwmec3137o9Mitpy89pEwVUqQZGv+bJugWl6JF2nFZFlJINZ4cZrFIqbBOTWZTwF qcJQ== X-Gm-Message-State: AO0yUKXP0Lvu8QUh401tmUGWxs0JFS43VqqRHBViWeb8Z3pecsj1k/LW rtOnkkAcdZt8Tbi7HdcCs8WLeHeOpGo= X-Google-Smtp-Source: AK7set/WGOq+JQfIl96IzZnLfDIUhihAhw/nKiOqYddnFsf3/P1ZaSQnXyk2HdbKTutNW57ulxZe4w== X-Received: by 2002:adf:e30f:0:b0:2c8:309d:77b0 with SMTP id b15-20020adfe30f000000b002c8309d77b0mr14678106wrj.0.1678375214793; Thu, 09 Mar 2023 07:20:14 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:14 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 20/26] libnotify: upgrade 0.8.1 -> 0.8.2 Date: Thu, 9 Mar 2023 16:19:52 +0100 Message-Id: <20230309151958.3619193-20-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178245 Signed-off-by: Alexander Kanavin --- .../libnotify/{libnotify_0.8.1.bb => libnotify_0.8.2.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta/recipes-gnome/libnotify/{libnotify_0.8.1.bb => libnotify_0.8.2.bb} (87%) diff --git a/meta/recipes-gnome/libnotify/libnotify_0.8.1.bb b/meta/recipes-gnome/libnotify/libnotify_0.8.2.bb similarity index 87% rename from meta/recipes-gnome/libnotify/libnotify_0.8.1.bb rename to meta/recipes-gnome/libnotify/libnotify_0.8.2.bb index 3bdc70d224..bbfc217df1 100644 --- a/meta/recipes-gnome/libnotify/libnotify_0.8.1.bb +++ b/meta/recipes-gnome/libnotify/libnotify_0.8.2.bb @@ -15,14 +15,13 @@ PACKAGECONFIG ?= "" PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,gtk+3" GNOMEBASEBUILDCLASS = "meson" -GTKDOC_MESON_OPTION = "gtk_doc" GIR_MESON_ENABLE_FLAG = "enabled" GIR_MESON_DISABLE_FLAG = "disabled" -inherit gnomebase gtk-doc features_check gobject-introspection +inherit gnomebase gi-docgen features_check gobject-introspection # depends on gtk+3 if tests are enabled ANY_OF_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'tests', '${GTK3DISTROFEATURES}', '', d)}" -SRC_URI[archive.sha256sum] = "d033e6d4d6ccbf46a436c31628a4b661b36dca1f5d4174fe0173e274f4e62557" +SRC_URI[archive.sha256sum] = "c5f4ed3d1f86e5b118c76415aacb861873ed3e6f0c6b3181b828cf584fc5c616" EXTRA_OEMESON = "-Dman=false" From patchwork Thu Mar 9 15:19:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 20665 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 3116FC7618A for ; Thu, 9 Mar 2023 15:20:22 +0000 (UTC) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.groups.io with SMTP id smtpd.web11.16024.1678375216647153480 for ; Thu, 09 Mar 2023 07:20:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=QnpXTsJY; spf=pass (domain: gmail.com, ip: 209.85.221.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f43.google.com with SMTP id q16so2253548wrw.2 for ; Thu, 09 Mar 2023 07:20:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375215; 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=y+lsqhM6MtrK4ogtLuS+nxQmYWR9zaifZUmwQEtv1Zg=; b=QnpXTsJYUFI2ZBQ5wOd9mytsFvnPlox9slIuT19qt9Dl5gori5RsIZvbyY7+NuLOA4 rRh7eUxMLTJTtelC+r+I7gjkE7RwNC1OrfE4SQ/KmSV+4XhR4eZBi2huXRAQiDwpNl9P wuPS7Rxd+WattzJR+CcRZlzsCFy1hfiKRR89NpflGn+Ih7z6sy9/iYf4gqqSFfg05+Zd xIpOsUg65V9N9ommqFa/DCJCSr09Oh7vMVi87WF8iNZJ6atTHiU0h51xAYzhQT09C74p Rxl8BY6NCnuMAQyJm09hYbl+clgG95hxgNoaf3dO+iFArcaW3FrBvFfjm2SV2csbRyRK 7Shw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375215; 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=y+lsqhM6MtrK4ogtLuS+nxQmYWR9zaifZUmwQEtv1Zg=; b=D6gH4buAZz/frCS8DFlH8OXsAQwZkTZYmphoNfzmkCIAN+DmGFP449a00xAep9hwiJ +hcTh9eEZpyhu1jcmgckakQ8aKefptNZHVoU1qbEfGZ8nFFhyCpGRDwfEiFKTG+8eOpF 8vxf45Zt3wHBS+ygftLjqLjnfueTawoEeHBbnUKpIFoZ51rlfbRtowTTP/s6/8hYVE38 o/ngSFuAAZiCtF2k9qFLunptYhyTSEdMBrAh0CzPKMmpjzVrAWxHSMxcpkSfAFFksEvy JmXYZBbeo/TPts4SE5lWbK1Iy1b6n3KtW1/iyeOjCfPMOqgZb80WZg6+PkUst6lmR+0T YisA== X-Gm-Message-State: AO0yUKVVRUurr6hSTGhGgjNjqkxXwxGbwjv8ndCDXZZa2RN9aCtWRMfC macMQo0nm9G8uvBGUSgwCtdGIk4ZY7c= X-Google-Smtp-Source: AK7set/Vr7unoHLntUlAvMVDV8+L9RD+gvlnl3ijFmlzXp8uZ4QhHZH+9Ywhm4XtnSzLa0+4xaxPQg== X-Received: by 2002:adf:ee86:0:b0:2c8:1247:a858 with SMTP id b6-20020adfee86000000b002c81247a858mr15363809wro.4.1678375215257; Thu, 09 Mar 2023 07:20:15 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:15 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 21/26] puzzles: upgrade to latest revision Date: Thu, 9 Mar 2023 16:19:53 +0100 Message-Id: <20230309151958.3619193-21-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178246 Signed-off-by: Alexander Kanavin --- meta/recipes-sato/puzzles/puzzles_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb index 5998c23dcd..87b6fac024 100644 --- a/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/meta/recipes-sato/puzzles/puzzles_git.bb @@ -10,7 +10,7 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "git://git.tartarus.org/simon/puzzles.git;branch=main" UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "7364ce8e266d947be146d635958a7b282752aac6" +SRCREV = "5a491c5ad333ef34c1e7713f920f51cbb205af60" PE = "2" PV = "0.0+git${SRCPV}" From patchwork Thu Mar 9 15:19:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 20661 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 223E1C6FD1F for ; Thu, 9 Mar 2023 15:20:22 +0000 (UTC) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.groups.io with SMTP id smtpd.web11.16025.1678375217289833752 for ; Thu, 09 Mar 2023 07:20:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=HyXSiL7C; spf=pass (domain: gmail.com, ip: 209.85.221.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f51.google.com with SMTP id l1so2214394wry.12 for ; Thu, 09 Mar 2023 07:20:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375216; 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=1c+OfWBDaTZ6DZA2wTlmWWcoB6GBYxuluApzsTkJMNI=; b=HyXSiL7C783kFNj+6fyNqYQewcuPn9SCkv6uxhDFEF+cF3243F7E8+mZwi/jsaEdOu RFoDOPpVcdu5rti6Wh36G/9L6S1l8Hs8BbnIzwdRh0MH0IANwSAlCMLcZGvcsqaroTy+ 0irlVQWxADyK6JWjsElb2YfaIN35pjSXld8mGbSlL/vIV17nXWsYdh/a3PhHtMDqyqz8 zGXaDQNwzAFSF4Oa0/DeTupFG7J3Kjl+vbNLKjBwCuvFXloTBKZfh6okrkl/pUQK7XF9 g2/twUl/aPBj6PSwfIU6yfiThgNlKBMlm8Dqq5KaXvZtxxpqe2gsjX7NBRYNKDR78v9T bUtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375216; 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=1c+OfWBDaTZ6DZA2wTlmWWcoB6GBYxuluApzsTkJMNI=; b=G541VJKglxr6lLIccFz9dQ9WoOrC245AFIetRZqDsnXF8lj/6761+X+xP4WpfoaU0c YdoAHm4iE/bA6dpxnGob5munwYCqYRqJoVacbyGlAQ+F4M+xxBQ8vTqD5HQQhWccvN7X GjPK1mf+ml1krgPXVXSdGkl2Gm53V8QIpDftO6wm1ymmpRzOeM3WlPN8GoDe4rHpzzGQ jxbFSIW1eIdUvBnNpsxShCeTByAOV+pSJr3iUqIsX+Hy3jJL7Go4E3leX1aaDACFhjZY VXjso7zz5pQQRcby2zTXYtQhQ7bS3JqsFggRvhUo3ZHlxtWvlGr5Tm62JUFf1J6dBxg7 4A0A== X-Gm-Message-State: AO0yUKXaEix1TC3yvUBmVqEXYqwtcvfo9EVLxkPmefaU6rZdpFVRihuK 5L55Gnd6yDCfIgPoQPhMO1tx/ZV3Bss= X-Google-Smtp-Source: AK7set94h/9SYBQvNynTUDUO6nBQt6uRtbqA4ZX2iTaJAHJM8U5+Grz5MrVtbWyMNJfRkOTnKALScQ== X-Received: by 2002:adf:ecc9:0:b0:2ce:3d1d:808a with SMTP id s9-20020adfecc9000000b002ce3d1d808amr14775729wro.62.1678375215733; Thu, 09 Mar 2023 07:20:15 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:15 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 22/26] iproute2: upgrade 6.1.0 -> 6.2.0 Date: Thu, 9 Mar 2023 16:19:54 +0100 Message-Id: <20230309151958.3619193-22-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178247 License-Update: copyright snippet has been dropped from ip.c Signed-off-by: Alexander Kanavin --- .../iproute2/{iproute2_6.1.0.bb => iproute2_6.2.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-connectivity/iproute2/{iproute2_6.1.0.bb => iproute2_6.2.0.bb} (94%) diff --git a/meta/recipes-connectivity/iproute2/iproute2_6.1.0.bb b/meta/recipes-connectivity/iproute2/iproute2_6.2.0.bb similarity index 94% rename from meta/recipes-connectivity/iproute2/iproute2_6.1.0.bb rename to meta/recipes-connectivity/iproute2/iproute2_6.2.0.bb index 7272e8f147..65ddfa8223 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_6.1.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_6.2.0.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/ipr SECTION = "base" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ - file://ip/ip.c;beginline=3;endline=8;md5=689d691d0410a4b64d3899f8d6e31817" + " DEPENDS = "flex-native bison-native iptables libcap" @@ -15,7 +15,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-libc-compat.h-add-musl-workaround.patch \ " -SRC_URI[sha256sum] = "5ce12a0fec6b212725ef218735941b2dab76244db7e72646a76021b0537b43ab" +SRC_URI[sha256sum] = "4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62" inherit update-alternatives bash-completion pkgconfig From patchwork Thu Mar 9 15:19:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 20666 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 41D14C7618B for ; Thu, 9 Mar 2023 15:20:22 +0000 (UTC) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.groups.io with SMTP id smtpd.web10.16132.1678375217925003146 for ; Thu, 09 Mar 2023 07:20:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ZjrCaPhj; spf=pass (domain: gmail.com, ip: 209.85.128.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f45.google.com with SMTP id o11-20020a05600c4fcb00b003eb33ea29a8so1489855wmq.1 for ; Thu, 09 Mar 2023 07:20:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375216; 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=JfL9f5sgchIocS4fSRJoHaeCC2qqm9SBqc/0HMADrO8=; b=ZjrCaPhjmv2t20Oc1qWdGI3W5b+OOkXk+iF6806nYWnLLYkJVGhLPxxXpRrwT43TLy hNPQw5/FOWTY4K9dn+YTZldZ9FRyUhcNQkLUub9ClNSx9S+aEcRhZZZjhVkoA+qOwLs0 FTpM5TZ/yox8nm9XJUgebpTlF7Ve3XxBT7HpXUYHYNPtrCms+tXw2C8diArcV2sn0fu3 pd4CRQU8dNwRSaOzAueSf6peTQnnDHrKQ6bWCWQWBId5rE3UVltaeVV7zGj+B6NuavZC CUEhDEu0xjFxSUAZbXE4Ra+fiFEGQUlZ7MpxsRkOPTDpHRBS5q1xyLYuC9KHmEwIk1hX BVWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375216; 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=JfL9f5sgchIocS4fSRJoHaeCC2qqm9SBqc/0HMADrO8=; b=ztIJ5kM3At9rQMQ66QDJlIoqMzLJagiQDd1fYjK6ZyQwoYw1GFI4CrBgsQ4SYwnuLV 9Np/jYynTXooboi+9im1jnAVriOjlu3gnl5npJ4BCWKehDJoGd8xkh/k88sejkrcgmHi tsVFFkLVFtirBYrEF8MHLDSfdM4HK7PIRwU2HODusnjdZSIfnV2te//8zA+/Lmlh7Vy3 k2vbruj8W3GXWMHFmeM6fvYH36vpA3DEoCymuA75/JB6a6M7ZjtcRo6YItnBGddjs1MT ARF5YCcqGnt+flqB/7jFunRA5AZ7aoCWHjm7DMwHwJxwKSdsNyzYT1sZ3PoZldi9aPpr XFOA== X-Gm-Message-State: AO0yUKVc/vyjXxsxVd0cTilBI0JP1mIZyvrHsIVVPFgQzcS/hVUb/bHL pXuLoC6cdwEkTyuBAJKHfpMPxp7ZUiI= X-Google-Smtp-Source: AK7set9dqAzvbzMxuLUDldmC8KthUgMhnc+bCzmOKpMbDKhOHAIlvF+wWNGnAsLWlyDdQLC+KMCPEQ== X-Received: by 2002:a05:600c:4e90:b0:3ea:bc08:42ad with SMTP id f16-20020a05600c4e9000b003eabc0842admr19441514wmq.2.1678375216357; Thu, 09 Mar 2023 07:20:16 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:16 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 23/26] bind: upgrade 9.18.11 -> 9.18.12 Date: Thu, 9 Mar 2023 16:19:55 +0100 Message-Id: <20230309151958.3619193-23-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178249 Signed-off-by: Alexander Kanavin --- .../0001-avoid-start-failure-with-bind-user.patch | 0 .../0001-named-lwresd-V-and-start-log-hide-build-options.patch | 0 .../bind-ensure-searching-for-json-headers-searches-sysr.patch | 0 .../bind/{bind-9.18.11 => bind-9.18.12}/bind9 | 0 .../bind/{bind-9.18.11 => bind-9.18.12}/conf.patch | 0 .../bind/{bind-9.18.11 => bind-9.18.12}/generate-rndc-key.sh | 0 .../init.d-add-support-for-read-only-rootfs.patch | 0 .../make-etc-initd-bind-stop-work.patch | 0 .../bind/{bind-9.18.11 => bind-9.18.12}/named.service | 0 .../bind/{bind_9.18.11.bb => bind_9.18.12.bb} | 2 +- 10 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-connectivity/bind/{bind-9.18.11 => bind-9.18.12}/0001-avoid-start-failure-with-bind-user.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.11 => bind-9.18.12}/0001-named-lwresd-V-and-start-log-hide-build-options.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.11 => bind-9.18.12}/bind-ensure-searching-for-json-headers-searches-sysr.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.11 => bind-9.18.12}/bind9 (100%) rename meta/recipes-connectivity/bind/{bind-9.18.11 => bind-9.18.12}/conf.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.11 => bind-9.18.12}/generate-rndc-key.sh (100%) rename meta/recipes-connectivity/bind/{bind-9.18.11 => bind-9.18.12}/init.d-add-support-for-read-only-rootfs.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.11 => bind-9.18.12}/make-etc-initd-bind-stop-work.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.11 => bind-9.18.12}/named.service (100%) rename meta/recipes-connectivity/bind/{bind_9.18.11.bb => bind_9.18.12.bb} (97%) diff --git a/meta/recipes-connectivity/bind/bind-9.18.11/0001-avoid-start-failure-with-bind-user.patch b/meta/recipes-connectivity/bind/bind-9.18.12/0001-avoid-start-failure-with-bind-user.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.11/0001-avoid-start-failure-with-bind-user.patch rename to meta/recipes-connectivity/bind/bind-9.18.12/0001-avoid-start-failure-with-bind-user.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.11/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind-9.18.12/0001-named-lwresd-V-and-start-log-hide-build-options.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.11/0001-named-lwresd-V-and-start-log-hide-build-options.patch rename to meta/recipes-connectivity/bind/bind-9.18.12/0001-named-lwresd-V-and-start-log-hide-build-options.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.11/bind-ensure-searching-for-json-headers-searches-sysr.patch b/meta/recipes-connectivity/bind/bind-9.18.12/bind-ensure-searching-for-json-headers-searches-sysr.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.11/bind-ensure-searching-for-json-headers-searches-sysr.patch rename to meta/recipes-connectivity/bind/bind-9.18.12/bind-ensure-searching-for-json-headers-searches-sysr.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.11/bind9 b/meta/recipes-connectivity/bind/bind-9.18.12/bind9 similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.11/bind9 rename to meta/recipes-connectivity/bind/bind-9.18.12/bind9 diff --git a/meta/recipes-connectivity/bind/bind-9.18.11/conf.patch b/meta/recipes-connectivity/bind/bind-9.18.12/conf.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.11/conf.patch rename to meta/recipes-connectivity/bind/bind-9.18.12/conf.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.11/generate-rndc-key.sh b/meta/recipes-connectivity/bind/bind-9.18.12/generate-rndc-key.sh similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.11/generate-rndc-key.sh rename to meta/recipes-connectivity/bind/bind-9.18.12/generate-rndc-key.sh diff --git a/meta/recipes-connectivity/bind/bind-9.18.11/init.d-add-support-for-read-only-rootfs.patch b/meta/recipes-connectivity/bind/bind-9.18.12/init.d-add-support-for-read-only-rootfs.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.11/init.d-add-support-for-read-only-rootfs.patch rename to meta/recipes-connectivity/bind/bind-9.18.12/init.d-add-support-for-read-only-rootfs.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.11/make-etc-initd-bind-stop-work.patch b/meta/recipes-connectivity/bind/bind-9.18.12/make-etc-initd-bind-stop-work.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.11/make-etc-initd-bind-stop-work.patch rename to meta/recipes-connectivity/bind/bind-9.18.12/make-etc-initd-bind-stop-work.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.11/named.service b/meta/recipes-connectivity/bind/bind-9.18.12/named.service similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.11/named.service rename to meta/recipes-connectivity/bind/bind-9.18.12/named.service diff --git a/meta/recipes-connectivity/bind/bind_9.18.11.bb b/meta/recipes-connectivity/bind/bind_9.18.12.bb similarity index 97% rename from meta/recipes-connectivity/bind/bind_9.18.11.bb rename to meta/recipes-connectivity/bind/bind_9.18.12.bb index 55a06eae5f..abce1c0f45 100644 --- a/meta/recipes-connectivity/bind/bind_9.18.11.bb +++ b/meta/recipes-connectivity/bind/bind_9.18.12.bb @@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[sha256sum] = "8ff3352812230cbcbda42df87cad961f94163d3da457c5e4bef8057fd5df2158" +SRC_URI[sha256sum] = "47766bb7b063aabbad054386b190aa7f6c14524427afd427c30ec426512027e7" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # follow the ESV versions divisible by 2 From patchwork Thu Mar 9 15:19:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 20659 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 13FF6C64EC4 for ; Thu, 9 Mar 2023 15:20:22 +0000 (UTC) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.groups.io with SMTP id smtpd.web10.16133.1678375218356977203 for ; Thu, 09 Mar 2023 07:20:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=B9jfoZ1o; spf=pass (domain: gmail.com, ip: 209.85.128.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f41.google.com with SMTP id c18so1401360wmr.3 for ; Thu, 09 Mar 2023 07:20:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375217; 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=cFgM04h3gYXMVaWn5v0bgI+KkyeNTk5ZI1clSnyBG5U=; b=B9jfoZ1oovjKFBkMk5BPlPfayj4IkqSK56TkZLv6nBHyea9q7Zk4a4+IaEmYX1pVYX c2BXBLnj619FBS1LpyL314MM8g22TU8nvlvhBdftaf2jQOt6gXHvsChxauMmeS/ZR7OW j+Dcd/a/HJQahkcvqNTSu5AT/AmzTEfUzmSsxvlvEHVixUM8AcsCr3b5WVcNvIv2G72m mz1A6K2MWghowAFZmkPZhKMebV2c8nVBkOSJdXR4GV+ybFAUTPHETWVcjE5SPmVEq8/E VaDIfvKLDbZrTmkfZsGuQwgNUZ/Np4H4rndsvZ0vNh/+QRSwLuqG4IU6KSu08A1DBrVm E6AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375217; 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=cFgM04h3gYXMVaWn5v0bgI+KkyeNTk5ZI1clSnyBG5U=; b=VHRkCikt5C9kOh7KTvUMHvuIAE8oWG1YoPH/xdih26cBC5iIujSKGqOCaq9JCX71/O WUjbzGdo7lSq2PxGpRmubY600jNoDzpBTbji6E/OEBndC4F1YCb+GB8Vc8mOtgugShLL IROQ1dik+SQ/BTWMSaUUdAdpAaSvncUSYY4tkMHicMkcJLUKmzgmnzrAlEEBmm2cwVdz MFuAaIK58LDWDkPjLLJRDA3K163uK4viTEjnRNmJYBFlFA+0PKyPpyYrLjDlZVNzczIC WnXe+Gb3mcBAxxBeYGjVUPPhoYmclATiI7cDt8CGiFSsXfWLGt46bz7zLp2EWhqtA1C0 tXiA== X-Gm-Message-State: AO0yUKU73mHlS1jSgfkTRO7dZqMmZjOR5CBv4igUqJLcZ8jU0SAMLk7e HRE0+x9ZM5Lu1Xz0Xnqi85n2jzH1kPI= X-Google-Smtp-Source: AK7set/d9h9rtwOb/aNLW2uh6UYy2ff799sdR65jVwgi1wl4UeNUfUJDsYOe5Qosl/gLCgYgfU142g== X-Received: by 2002:a05:600c:45d2:b0:3eb:42fa:39d5 with SMTP id s18-20020a05600c45d200b003eb42fa39d5mr20467904wmo.29.1678375216822; Thu, 09 Mar 2023 07:20:16 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:16 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 24/26] stress-ng: remove obsolete patch Date: Thu, 9 Mar 2023 16:19:56 +0100 Message-Id: <20230309151958.3619193-24-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178250 Upstream has disabled gold support altogether: https://github.com/ColinIanKing/stress-ng/commit/e65f517917fc682784bfa1b3cb53de3f3263b094 Signed-off-by: Alexander Kanavin --- ...1-via-makefile-to-enable-gold-linker.patch | 35 ------------------- .../stress-ng/stress-ng_0.15.04.bb | 1 - 2 files changed, 36 deletions(-) delete mode 100644 meta/recipes-extended/stress-ng/stress-ng/0001-Pass-LD_GOLD-1-via-makefile-to-enable-gold-linker.patch diff --git a/meta/recipes-extended/stress-ng/stress-ng/0001-Pass-LD_GOLD-1-via-makefile-to-enable-gold-linker.patch b/meta/recipes-extended/stress-ng/stress-ng/0001-Pass-LD_GOLD-1-via-makefile-to-enable-gold-linker.patch deleted file mode 100644 index 6742e0d256..0000000000 --- a/meta/recipes-extended/stress-ng/stress-ng/0001-Pass-LD_GOLD-1-via-makefile-to-enable-gold-linker.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5d6fa06b3104637289178a471dd28d7bf3e14e76 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 3 Jan 2023 11:00:09 -0800 -Subject: [PATCH] Pass LD_GOLD=1 via makefile to enable gold linker - -Current logic prefers gold if a toolchain has gold linker installed and -does not offer any option to chose default linker which might not be -gold linker. Its better to pass this control to user instead of auto -detecting and deciding. - -Upstream-Status: Submitted [https://github.com/ColinIanKing/stress-ng/pull/251] -Signed-off-by: Khem Raj - ---- - Makefile | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/Makefile b/Makefile -index 7a969aba..583ae04f 100644 ---- a/Makefile -+++ b/Makefile -@@ -93,6 +93,13 @@ endif - #CFLAGS += -Weverything - #endif - -+# -+# Use gold linker -+# -+ifeq ($(LD_GOLD),1) -+LDFLAGS += -fuse-ld=gold -+endif -+ - GREP = grep - # - # SunOS requires special grep for -e support diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.15.04.bb b/meta/recipes-extended/stress-ng/stress-ng_0.15.04.bb index e891bb738b..74d8356812 100644 --- a/meta/recipes-extended/stress-ng/stress-ng_0.15.04.bb +++ b/meta/recipes-extended/stress-ng/stress-ng_0.15.04.bb @@ -6,7 +6,6 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ - file://0001-Pass-LD_GOLD-1-via-makefile-to-enable-gold-linker.patch \ " SRCREV = "b9a437ec790ad4bcc71d31b2df39d4a601c55fa8" S = "${WORKDIR}/git" From patchwork Thu Mar 9 15:19:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 20663 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 229BBC74A5B for ; Thu, 9 Mar 2023 15:20:22 +0000 (UTC) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.groups.io with SMTP id smtpd.web10.16125.1678375211185558952 for ; Thu, 09 Mar 2023 07:20:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=G7vJPbGw; spf=pass (domain: gmail.com, ip: 209.85.221.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f46.google.com with SMTP id e13so2226134wro.10 for ; Thu, 09 Mar 2023 07:20:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375217; 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=kcy4tVVdvQFbQTXQcWZgVkSYw055hrUyA96XZRWVcBA=; b=G7vJPbGwhWLR60zvt0IykZizrrXEH2Mez5o70o/Ap6oMunitYL8ZciwBwMY/cLNtLL Ujes/EK1D0i3aB4PM/PoDwHalOxaKpZ9P44Ek8LVPh3og2G5hMUOpGHp9F1I187hK7xz FsGiu39QIj+5nWY7XfbGdASNxKCsSdH64PIr7agDKp1Rs93U0896aVYEG1wVrp5244bD g8bET/ezJH3fxnB84+5eW3IQiuOCchHbqS6assdu9s4dpOHKflEFRlhKgNnyebP2y7v9 3jV+/y3FJaZlChz6rzPkXDp9avXfZVTPuoW9n4NH/jGAG/hFYEXrutHI/zwtvnpzvxs/ uoaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375217; 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=kcy4tVVdvQFbQTXQcWZgVkSYw055hrUyA96XZRWVcBA=; b=geYqfCwqA/zT2egBexCwwJDJiOwhZLWvq8r2d0SiLBYeUvatPO3YyoBNe5hq56ZQQK IQTYR6cWN/fy8Cuz1/fh8vPCgwZYylezM0v2qM9qNJ0ly7NQzlTnTGFXt2YzB6Ow2Lpy htuWVf+WuPZc9jSh3Vcx7/fpSbYBrKZD7kbohS5XdRrTAlphCD5R0tI0F6XgaBiS2ZNE 9I5WE6WehqHIvsO8+rbrkTsTY2OX/JxQkVy4h2yRdEIflQDOYWeA9wMMqxihCKkHwm9n ZFQFpWNoqkKh5MEhHAHyCspFeOmXLdleV3JNh2kA9pVXOFXibQNQPJC44kXk6fM+8efH kGJA== X-Gm-Message-State: AO0yUKXc0b5ImM70PTeOKReES97CveUkgB/D0FhrzIAVAans64CZpNau Bjkn70t0h751PAXoAARMdsdWmx0QjG8= X-Google-Smtp-Source: AK7set8v5uM7D/lrtzoE10Afse/a4a7B7ilEfVY3VBUc3zAWRjpXXV/7peVVTYCvWntGmh3LxV0r5Q== X-Received: by 2002:adf:f587:0:b0:2c7:deb:c61 with SMTP id f7-20020adff587000000b002c70deb0c61mr16103581wro.39.1678375217350; Thu, 09 Mar 2023 07:20:17 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:17 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 25/26] piglit: upgrade to latest revision Date: Thu, 9 Mar 2023 16:19:57 +0100 Message-Id: <20230309151958.3619193-25-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178248 Signed-off-by: Alexander Kanavin --- meta/recipes-graphics/piglit/piglit_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index edbca69413..c5537154ae 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -13,7 +13,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=ma " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "590d81bb5fa219353104980108e9f1aa2b1d1b6b" +SRCREV = "0f4a875b05feb44426a2d43146f5e3c6ea5f8038" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}" From patchwork Thu Mar 9 15:19:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 20657 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 134F5C61DA4 for ; Thu, 9 Mar 2023 15:20:22 +0000 (UTC) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.groups.io with SMTP id smtpd.web11.16012.1678375206331469382 for ; Thu, 09 Mar 2023 07:20:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=bzgQIFt6; spf=pass (domain: gmail.com, ip: 209.85.221.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f42.google.com with SMTP id j2so2225365wrh.9 for ; Thu, 09 Mar 2023 07:20:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678375218; 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=sVePOITTLupG7B15UDgcRtdsVPHDT7qrOBQvdUha030=; b=bzgQIFt63rv4ApszbbB4RWi9ijXcKy16+igQOE3cDgBe7SANHGUE6g4igJgd72J4Le Plt3zP3K2ZxAgqxO4/h9KANAoTau4ZBTSbjgEds1ucyxWMW/D8tTAsUibKkpipA9jqdj bn3GRv3Xq5FWAVy91wxPC7kku74JKHYh+sUwjFnA+6SD9zGJagBCMzoJ8z7Xn0RE1xYs ZMYPHGq23qfRgZlxQ6vbJnz7pRmLW70El2aVLSm0pVSMZn1CUcP3R/bfc4RC0dHAv0Sp 6gu6YhQMucELzRqrBsHEbhXhqp6ALyUYuY0SOYi5OdvWSLqM03LBpXCO9DnEQ5TjMOTt 3wbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678375218; 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=sVePOITTLupG7B15UDgcRtdsVPHDT7qrOBQvdUha030=; b=75cnjq7rD477xHVQTfPHSP4C5Gnx0NNrvYe0FGcMtXDiXhnG1AMlWj09P4ZodTS50g DwG4WKe5w8Br+63+nLN7VZDbIV4BhIrxAZ13UwDllXsIKtj/W4kks9oRZNw3fGY/JFt+ tHZ3fEJNq+9Kk3DAOLrrkHmIbyrdWzk84hWatlb1gDIM4drlkyPdPNWMSttg7Fvz86Os 9q2GMnYsq+ezHOggfxFDLhLNMZS3b1wOGEDyR055d59MJYk5Gl5GB/UXc7egefM3dFVt rdzPSG99eU2g/FYclSRQU1lddSYM0+z3Tu0KCc0dQqXUmuUA16GWyuj8Pm/NceuWiGEO tWNQ== X-Gm-Message-State: AO0yUKX+XUi7/1iA3srIxF/i06CsfDAsMAt96vgYc8e/EgOkzRKFWSun 6ouVGlTFvXq0Ozx+bjyP6iDcP5LPEjI= X-Google-Smtp-Source: AK7set+3yxfRfoIKnDLfLf8K5QFdXQ/j8VeEbP30VBqJ9yqldWOUqBTOIDL3JXr1MNaB0SgZSFUUQQ== X-Received: by 2002:adf:ecc9:0:b0:2ce:3d1d:808a with SMTP id s9-20020adfecc9000000b002ce3d1d808amr14775816wro.62.1678375217816; Thu, 09 Mar 2023 07:20:17 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id s10-20020adfea8a000000b002c7e1a39adcsm18314521wrm.23.2023.03.09.07.20.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 07:20:17 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 26/26] apt: re-enable version check Date: Thu, 9 Mar 2023 16:19:58 +0100 Message-Id: <20230309151958.3619193-26-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309151958.3619193-1-alex@linutronix.de> References: <20230309151958.3619193-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 ; Thu, 09 Mar 2023 15:20:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178251 2.6.0 is out and so we can check for latest version again. Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/apt/apt_2.4.5.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-devtools/apt/apt_2.4.5.bb b/meta/recipes-devtools/apt/apt_2.4.5.bb index 7af9792a0d..429cf6e659 100644 --- a/meta/recipes-devtools/apt/apt_2.4.5.bb +++ b/meta/recipes-devtools/apt/apt_2.4.5.bb @@ -39,8 +39,6 @@ UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apt/" # is considered stable, e.g. 1.0, 1.4, 1.8, 2.2, 2.6, etc. As there is no way # to express 'divisible by 4 plus 2' in regex (that I know of), let's hardcode a few. UPSTREAM_CHECK_REGEX = "[^\d\.](?P((2\.2)|(2\.6)|(3\.0)|(3\.4)|(3\.8)|(4\.2))(\.\d+)+)\.tar" -# needs be marked as unknown until 2.6 is out -UPSTREAM_VERSION_UNKNOWN = "1" inherit cmake perlnative bash-completion useradd