From patchwork Sun Sep 17 09:38: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: 30567 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 094F4CD37B3 for ; Sun, 17 Sep 2023 09:39:16 +0000 (UTC) Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by mx.groups.io with SMTP id smtpd.web10.27132.1694943548072323988 for ; Sun, 17 Sep 2023 02:39:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=P0G9TrrC; spf=pass (domain: gmail.com, ip: 209.85.218.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-9aa0495f9cfso1007671266b.1 for ; Sun, 17 Sep 2023 02:39:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943546; x=1695548346; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=mYeJ1ij2R8jG8j2AcDrMxvj7BXDMpkI+ORnKjhm3HmQ=; b=P0G9TrrCg/eGbnTsnnhAXOJBu8GEO+Hfb9Ii9nIS04NYAD9upvCoaOkUY5+4U+jK4j mG78NuS19OD9ujmq4rYPmRITL4/9czkhduWsj8pVXGxQduA3XSge+tm1EveMZb9+dLxd jriLVYhtNzB79viVuv2fIQ/hHd+mytV7sRRjKF0JSWc3LJZuMST8133wLO+iGkKdXqdP UJdkH8/zh8JnhC3gkMtMsQppv0CyEydS3AhVAkzsGisbQqFi0Rz00cjFsNdOgvLd1c1/ RVBSqsTGNPi/qT5crMZXwS0P0jOrVClJRUgoAZzdyO136YXbVKTge4OxZVCm71lHQVcs MZsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943546; x=1695548346; 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=mYeJ1ij2R8jG8j2AcDrMxvj7BXDMpkI+ORnKjhm3HmQ=; b=Ts/SHOoH/LX+Yp/FDsc6ocPrtqVh5/OlZQSYt6dSS6gx+ebERKuNaNmjSBveqa+JX+ GDlDuTeFJhZk8uGYA/HmZQHMcckcwxBNeMBJwKlMe4lIOH3x8CsxIaZL8fRxXVucrPiw xP1KvCOdDKdZOQK0GfSx0fAkJr9u+xgMe/+2Cx9adcG32nzWtoykWYwfkkFKsUbDRDfs Pn1ctJrQfzg9H1Jt94muOTEAO5QNaoWVV1ChNE5ezRlscgX/YYqf2L709p/v/Yne+MVk 6jYaap9d6Re+YJLvqQb37VU/qS0rUyLSPgb6UXr//hx1VwrOBDZjf7eyqJ5oHiWddQYT Dqug== X-Gm-Message-State: AOJu0Yw+smwEOkvAUN4Dz9je7QdvgHYQ8QHi9ufQKgTXxYb5Sx5oDIf7 oaCaxSseUgULPsRrkQgUkCMumKXowdo= X-Google-Smtp-Source: AGHT+IGDZCZLcI6BgbPWtw96LUVNbeIu64Mdz2v8m/qL5vMPtMuOgXIobVJ0GaRspOSupdzCvr6HMw== X-Received: by 2002:a17:907:c27:b0:9ad:8641:e91b with SMTP id ga39-20020a1709070c2700b009ad8641e91bmr14857636ejc.11.1694943546007; Sun, 17 Sep 2023 02:39:06 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:05 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 01/29] sstate.bbclass: setscene_depvalid(): do not exclude shadow-native from task dependency resolution Date: Sun, 17 Sep 2023 11:38:33 +0200 Message-Id: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187774 This results in executables from shadow-native, such as useradd, falling through to host libraries instead of using native ones that they were linked with, because the native libraries would not be installed because of this dependency exclusion. Until now that could be coincidentally fulfilled with host libattr (which is present on all hosts), but latest useradd also wants libbsd and libmd, and those are not typically installed. The original reason to add this exclusion was: https://git.yoctoproject.org/poky/commit/?id=0d2a301bca4eb9d43243f1a03c1cd1ab3f27f30a While I can't be sure the reason no longer applies, sstate and sysroot handling has changed massively since early 2013, testing on a-full revealed no issues, and avoiding incorrect fall-through to host libraries is better than pulling unneeded dependencies. Signed-off-by: Alexander Kanavin --- meta/classes-global/sstate.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-global/sstate.bbclass b/meta/classes-global/sstate.bbclass index c50198449c2..5f8c9c1f809 100644 --- a/meta/classes-global/sstate.bbclass +++ b/meta/classes-global/sstate.bbclass @@ -1137,7 +1137,7 @@ def setscene_depvalid(task, taskdependees, notneeded, d, log=None): # This is due to the [depends] in useradd.bbclass complicating matters # The logic *is* reversed here due to the way hard setscene dependencies are injected - if (taskdependees[task][1] == 'do_package' or taskdependees[task][1] == 'do_populate_sysroot') and taskdependees[dep][0].endswith(('shadow-native', 'shadow-sysroot', 'base-passwd', 'pseudo-native')) and taskdependees[dep][1] == 'do_populate_sysroot': + if (taskdependees[task][1] == 'do_package' or taskdependees[task][1] == 'do_populate_sysroot') and taskdependees[dep][0].endswith(('shadow-sysroot', 'base-passwd', 'pseudo-native')) and taskdependees[dep][1] == 'do_populate_sysroot': continue # Consider sysroot depending on sysroot tasks From patchwork Sun Sep 17 09:38: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: 30566 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 0BAB6CD37B4 for ; Sun, 17 Sep 2023 09:39:16 +0000 (UTC) Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by mx.groups.io with SMTP id smtpd.web10.27133.1694943548383978196 for ; Sun, 17 Sep 2023 02:39:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=PanHjOXa; spf=pass (domain: gmail.com, ip: 209.85.218.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-99bdeae1d0aso428661166b.1 for ; Sun, 17 Sep 2023 02:39:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943547; x=1695548347; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=V7S6YnXiFLREBBCuCCz30lPbY2Xq1AJy8Jzad59s+BA=; b=PanHjOXaLiAO7MF1i3rQ3l9j+bFOkjyIddAxFMzKh3I+OhnYDIpc2zNGOXbyv7ghdQ ngLyTdHxSlMDX/nbi8OAo9p2am24EYkpLZxu6JJZQPAiR/HwhmEUWekLy4Qkuvjdz0nc kPDHRHK0hh4uldAlEiixAftOe8T1W8ie4z8Pddp5Ap1ycIlLEm7Us5SzY8ULKLSuubTw TAMf864DWpi/dy6Azr2m4zl1Ql/NCR9LVjEZnT+jMQQmihjcJBhzOCg9aN/qz4AVrVYT KStJZykAsoBQgQueDxuwhnPgQp1Wjh/YzVABHw1ggQuTkZt7C6OjH3h7pvAI29hB60La 5oQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943547; x=1695548347; 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=V7S6YnXiFLREBBCuCCz30lPbY2Xq1AJy8Jzad59s+BA=; b=SDP0oh2wilrkcCql52Q4n8PVwAsIkQekSp4oorXnAtI+39xYcvM+6AH4O0OUqdEc0v EvrwAfg16jMSPNf6eu7t1u3vluEW6V7giM34be2RcYVwc6n1k17uBCyEKNNXEyq17JyW 57r+YbqlaiXtTQhTk6XbqTqj7yGS60pxTz2EFQ/9aOR2FjtId72wnIhaUVTDbuvQEptd /hfx9fMxWDqblcNJWZO3SAADuS9hw0+Lrq+IcrFpby9eGaV1HfL9tdLgrkw7f8dNKDSz lmxFo8JJ/Fb2e1Yj8O3c3KA0QWyQ/y+4Bwvfw7CzmZz6xKboJLWE4iY8wMut6I32omkH 8Fuw== X-Gm-Message-State: AOJu0YzP2BMYBP0ZuNiwl4XMPL5GNKBa8lD12W168heMkmOMAFN465Z5 cAjHciej5ft2BvQVtxZlCPsiiPll9eI= X-Google-Smtp-Source: AGHT+IGPSQ3Qx8Wb7zIP4VWcdWZS+mfOwVB693lyw8/cg8TV5de0W9ynasbals7V+XCt5wCh7yHy1A== X-Received: by 2002:a17:906:2d1:b0:9a1:c399:14c9 with SMTP id 17-20020a17090602d100b009a1c39914c9mr6348689ejk.15.1694943546509; Sun, 17 Sep 2023 02:39:06 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:06 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 02/29] useradd.bbclass: list all needed items for package_setscene task Date: Sun, 17 Sep 2023 11:38:34 +0200 Message-Id: <20230917093901.428214-2-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187775 Latest shadow-native links with additional libraries; I was unable to find a way to resolve those in setscene context where tasks do not contain such dependencies. Signed-off-by: Alexander Kanavin --- meta/classes/useradd.bbclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 4d3bd9a5f56..a35785c9c23 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass @@ -179,7 +179,13 @@ SSTATEPREINSTFUNCS:append:class-target = " useradd_sysroot_sstate" do_package_setscene[depends] += "${USERADDSETSCENEDEPS}" do_populate_sysroot_setscene[depends] += "${USERADDSETSCENEDEPS}" -USERADDSETSCENEDEPS:class-target = "${MLPREFIX}base-passwd:do_populate_sysroot_setscene pseudo-native:do_populate_sysroot_setscene shadow-native:do_populate_sysroot_setscene ${MLPREFIX}shadow-sysroot:do_populate_sysroot_setscene" +USERADDSETSCENEDEPS:class-target = "${MLPREFIX}base-passwd:do_populate_sysroot_setscene \ + pseudo-native:do_populate_sysroot_setscene \ + shadow-native:do_populate_sysroot_setscene \ + attr-native:do_populate_sysroot_setscene \ + libbsd-native:do_populate_sysroot_setscene \ + libmd-native:do_populate_sysroot_setscene \ + ${MLPREFIX}shadow-sysroot:do_populate_sysroot_setscene" USERADDSETSCENEDEPS = "" # Recipe parse-time sanity checks From patchwork Sun Sep 17 09:38: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: 30572 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 0EADECD13D1 for ; Sun, 17 Sep 2023 09:39:16 +0000 (UTC) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by mx.groups.io with SMTP id smtpd.web10.27134.1694943549099218495 for ; Sun, 17 Sep 2023 02:39:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=j9mkOsqQ; spf=pass (domain: gmail.com, ip: 209.85.218.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-9a9d82d73f9so430721866b.3 for ; Sun, 17 Sep 2023 02:39:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943547; x=1695548347; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LQsNPJYYQbYfILYgW3KrAFG7KOteveEW6K0ZATtRAn8=; b=j9mkOsqQWaRd5cLQEAQmIK8tBAzMU0PKtK8EfVaie4kLANzW6LIhL4nqAyvGN/4K7b FU3t5w7DlaOGNa3o9A9kdWPIRBIYaOQm4FCKejsmphDYh1ZsN3ve+Mb6RxQaehsyCxxS sctiaoS50iY5kMiO8yE20J0h329jiyIRbt0Oog7FkFDbnCfgdzOVu/Ws7Yzc/SCXiAF6 KUGPl1Gw2yIr0lHVZr3tU9mx1t3xKixj+L8SrPRjiINEct2+gNhSCaHrBNNGps5w8ksL VtB5s91sXftGM7Tx/23T0trIJBYT9bE3vMtsqOOta8zzjNTj4bwwTlrMOVv5HAbBUS9y g3XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943547; x=1695548347; 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=LQsNPJYYQbYfILYgW3KrAFG7KOteveEW6K0ZATtRAn8=; b=WS81FSMReYNCuLxUfKk1VNE/GFk356JibU3NgTI6Y43StZosQaUxjcHddTfgNgnCRo h50EGHMb6rYvJcDTZCt608FsdBqqzxo2MQlsPwfY4hxSGidUyMbgF8v1AfwZ6LwIWFLE hJXwNKvMYwInzmi9lpGUeTMD+RmQSO5lk/yzQ3W3My/Lzydm3ys1EE25C04K03MqRC+x JiOjozFwn3yyF/Unw15zVCtSQrpFGWqvUvAj6RxiTUDxYAlTGV37Szn7Fyp4TrJcsRLS /PERS6W5giezdf2fg0jXXGtZGqiUJSIPhW9WXWB2dPb78E07sugnm5adwC+KqP+uNUla 9yLA== X-Gm-Message-State: AOJu0YzZKRfyB/dYVNnlUbE+s9RvCs2aZoPY3w5/ilvJkrIJhdipkCNb P9rmBVtSNY/MzEFYOUB+qGAaBxwCUaU= X-Google-Smtp-Source: AGHT+IFAkg93/aHE6q/ernnRgscV03HsV2dJu+KVpgIqM1D09iT8z67vugGI6PzYcwc0aJWuqypQcg== X-Received: by 2002:a17:906:8a61:b0:9a2:185b:5375 with SMTP id hy1-20020a1709068a6100b009a2185b5375mr5221206ejc.18.1694943547033; Sun, 17 Sep 2023 02:39:07 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:06 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 03/29] shadow: update 4.13 -> 4.14.0 Date: Sun, 17 Sep 2023 11:38:35 +0200 Message-Id: <20230917093901.428214-3-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187776 License-Update: formatting, spdx conversion Drop: 0001-Disable-use-of-syslog-for-sysroot.patch (issue fixed upstream) 0001-Fix-can-not-print-full-login.patch 0001-Overhaul-valid_field.patch CVE-2023-29383.patch (backports) libbsd is a new native dependency, as otherwise glibc >= 2.38 is needed. A similar fix is added to musl in order to define non-standard __BEGIN_DECLS/__END_DECLS. Signed-off-by: Alexander Kanavin --- ...01-Disable-use-of-syslog-for-sysroot.patch | 52 --------------- .../0001-Fix-can-not-print-full-login.patch | 41 ------------ .../files/0001-Overhaul-valid_field.patch | 65 ------------------- .../shadow/files/CVE-2023-29383.patch | 53 --------------- ...nexpected-open-failure-in-chroot-env.patch | 16 +++-- meta/recipes-extended/shadow/shadow.inc | 18 ++--- .../{shadow_4.13.bb => shadow_4.14.0.bb} | 0 7 files changed, 16 insertions(+), 229 deletions(-) delete mode 100644 meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch delete mode 100644 meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch delete mode 100644 meta/recipes-extended/shadow/files/0001-Overhaul-valid_field.patch delete mode 100644 meta/recipes-extended/shadow/files/CVE-2023-29383.patch rename meta/recipes-extended/shadow/{shadow_4.13.bb => shadow_4.14.0.bb} (100%) diff --git a/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch b/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch deleted file mode 100644 index fa1532c8317..00000000000 --- a/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 85d0444229ee3d14fefcf10d093f49c862826f82 Mon Sep 17 00:00:00 2001 -From: Richard Purdie -Date: Thu, 14 Apr 2022 23:11:53 +0000 -Subject: [PATCH] Disable use of syslog for shadow-native tools - -Disable use of syslog to prevent sysroot user and group additions from -writing entries to the host's syslog. This patch should only be used -with the shadow-native recipe. - -Upstream-Status: Inappropriate [OE specific configuration] -Signed-off-by: Richard Purdie -Signed-off-by: Peter Kjellerstedt - ---- - configure.ac | 2 +- - src/login_nopam.c | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 924254a..603af81 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -191,7 +191,7 @@ AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$shadow_cv_passwd_dir/passwd", - [Path to passwd program.]) - - dnl XXX - quick hack, should disappear before anyone notices :). --AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().]) -+#AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().]) - if test "$ac_cv_func_ruserok" = "yes"; then - AC_DEFINE(RLOGIN, 1, [Define if login should support the -r flag for rlogind.]) - AC_DEFINE(RUSEROK, 0, [Define to the ruserok() "success" return value (0 or 1).]) -diff --git a/src/login_nopam.c b/src/login_nopam.c -index df6ba88..fc24e13 100644 ---- a/src/login_nopam.c -+++ b/src/login_nopam.c -@@ -29,7 +29,6 @@ - #ifndef USE_PAM - #ident "$Id$" - --#include "prototypes.h" - /* - * This module implements a simple but effective form of login access - * control based on login names and on host (or domain) names, internet -@@ -57,6 +56,8 @@ - #include - #include /* for inet_ntoa() */ - -+#include "prototypes.h" -+ - #if !defined(MAXHOSTNAMELEN) || (MAXHOSTNAMELEN < 64) - #undef MAXHOSTNAMELEN - #define MAXHOSTNAMELEN 256 diff --git a/meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch b/meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch deleted file mode 100644 index 37ba5f3dc21..00000000000 --- a/meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch +++ /dev/null @@ -1,41 +0,0 @@ -commit 670cae834827a8f794e6f7464fa57790d911b63c -Author: SoumyaWind <121475834+SoumyaWind@users.noreply.github.com> -Date: Tue Dec 27 17:40:17 2022 +0530 - - shadow: Fix can not print full login timeout message - - Login timed out message prints only first few bytes when write is immediately followed by exit. - Calling exit from new handler provides enough time to display full message. - -Upstream-Status: Accepted [https://github.com/shadow-maint/shadow/commit/670cae834827a8f794e6f7464fa57790d911b63c] - -diff --git a/src/login.c b/src/login.c -index 116e2cb3..c55f4de0 100644 ---- a/src/login.c -+++ b/src/login.c -@@ -120,6 +120,7 @@ static void get_pam_user (char **ptr_pam_user); - - static void init_env (void); - static void alarm_handler (int); -+static void exit_handler (int); - - /* - * usage - print login command usage and exit -@@ -391,11 +392,16 @@ static void init_env (void) - #endif /* !USE_PAM */ - } - -+static void exit_handler (unused int sig) -+{ -+ _exit (0); -+} - - static void alarm_handler (unused int sig) - { - write (STDERR_FILENO, tmsg, strlen (tmsg)); -- _exit (0); -+ signal(SIGALRM, exit_handler); -+ alarm(2); - } - - #ifdef USE_PAM diff --git a/meta/recipes-extended/shadow/files/0001-Overhaul-valid_field.patch b/meta/recipes-extended/shadow/files/0001-Overhaul-valid_field.patch deleted file mode 100644 index ac08be515bf..00000000000 --- a/meta/recipes-extended/shadow/files/0001-Overhaul-valid_field.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 2eaea70111f65b16d55998386e4ceb4273c19eb4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= -Date: Fri, 31 Mar 2023 14:46:50 +0200 -Subject: [PATCH] Overhaul valid_field() - -e5905c4b ("Added control character check") introduced checking for -control characters but had the logic inverted, so it rejects all -characters that are not control ones. - -Cast the character to `unsigned char` before passing to the character -checking functions to avoid UB. - -Use strpbrk(3) for the illegal character test and return early. - -Upstream-Status: Backport [https://github.com/shadow-maint/shadow/commit/2eaea70111f65b16d55998386e4ceb4273c19eb4] - -Signed-off-by: Xiangyu Chen ---- - lib/fields.c | 24 ++++++++++-------------- - 1 file changed, 10 insertions(+), 14 deletions(-) - -diff --git a/lib/fields.c b/lib/fields.c -index fb51b582..53929248 100644 ---- a/lib/fields.c -+++ b/lib/fields.c -@@ -37,26 +37,22 @@ int valid_field (const char *field, const char *illegal) - - /* For each character of field, search if it appears in the list - * of illegal characters. */ -+ if (illegal && NULL != strpbrk (field, illegal)) { -+ return -1; -+ } -+ -+ /* Search if there are non-printable or control characters */ - for (cp = field; '\0' != *cp; cp++) { -- if (strchr (illegal, *cp) != NULL) { -+ unsigned char c = *cp; -+ if (!isprint (c)) { -+ err = 1; -+ } -+ if (iscntrl (c)) { - err = -1; - break; - } - } - -- if (0 == err) { -- /* Search if there are non-printable or control characters */ -- for (cp = field; '\0' != *cp; cp++) { -- if (!isprint (*cp)) { -- err = 1; -- } -- if (!iscntrl (*cp)) { -- err = -1; -- break; -- } -- } -- } -- - return err; - } - --- -2.34.1 - diff --git a/meta/recipes-extended/shadow/files/CVE-2023-29383.patch b/meta/recipes-extended/shadow/files/CVE-2023-29383.patch deleted file mode 100644 index f53341d3fc2..00000000000 --- a/meta/recipes-extended/shadow/files/CVE-2023-29383.patch +++ /dev/null @@ -1,53 +0,0 @@ -From e5905c4b84d4fb90aefcd96ee618411ebfac663d Mon Sep 17 00:00:00 2001 -From: tomspiderlabs <128755403+tomspiderlabs@users.noreply.github.com> -Date: Thu, 23 Mar 2023 23:39:38 +0000 -Subject: [PATCH] Added control character check - -Added control character check, returning -1 (to "err") if control characters are present. - -CVE: CVE-2023-29383 -Upstream-Status: Backport - -Reference to upstream: -https://github.com/shadow-maint/shadow/commit/e5905c4b84d4fb90aefcd96ee618411ebfac663d - -Signed-off-by: Xiangyu Chen ---- - lib/fields.c | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/lib/fields.c b/lib/fields.c -index 640be931..fb51b582 100644 ---- a/lib/fields.c -+++ b/lib/fields.c -@@ -21,9 +21,9 @@ - * - * The supplied field is scanned for non-printable and other illegal - * characters. -- * + -1 is returned if an illegal character is present. -- * + 1 is returned if no illegal characters are present, but the field -- * contains a non-printable character. -+ * + -1 is returned if an illegal or control character is present. -+ * + 1 is returned if no illegal or control characters are present, -+ * but the field contains a non-printable character. - * + 0 is returned otherwise. - */ - int valid_field (const char *field, const char *illegal) -@@ -45,10 +45,13 @@ int valid_field (const char *field, const char *illegal) - } - - if (0 == err) { -- /* Search if there are some non-printable characters */ -+ /* Search if there are non-printable or control characters */ - for (cp = field; '\0' != *cp; cp++) { - if (!isprint (*cp)) { - err = 1; -+ } -+ if (!iscntrl (*cp)) { -+ err = -1; - break; - } - } --- -2.34.1 - diff --git a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch b/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch index 85d91751056..4a932d2dbb1 100644 --- a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch +++ b/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch @@ -1,4 +1,4 @@ -From 21583da072aa66901d859ac00ce209bac87ddecc Mon Sep 17 00:00:00 2001 +From a773c6b240d27e23d6be41decef0edf24fcee523 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 17 Jul 2014 15:53:34 +0800 Subject: [PATCH] commonio.c-fix-unexpected-open-failure-in-chroot-env @@ -15,35 +15,37 @@ Note that this patch doesn't change the logic in the code, it just expands the codes. Signed-off-by: Chen Qi - --- lib/commonio.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/commonio.c b/lib/commonio.c -index 9a02ce1..61384ec 100644 +index 73fdb3a..d1231e9 100644 --- a/lib/commonio.c +++ b/lib/commonio.c -@@ -616,10 +616,18 @@ int commonio_open (struct commonio_db *db, int mode) +@@ -606,10 +606,18 @@ int commonio_open (struct commonio_db *db, int mode) db->cursor = NULL; db->changed = false; - fd = open (db->filename, - (db->readonly ? O_RDONLY : O_RDWR) -- | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW); +- | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW | O_CLOEXEC); - saved_errno = errno; + if (db->readonly) { + fd = open (db->filename, + (true ? O_RDONLY : O_RDWR) -+ | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW); ++ | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW | O_CLOEXEC); + saved_errno = errno; + } else { + fd = open (db->filename, + (false ? O_RDONLY : O_RDWR) -+ | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW); ++ | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW| O_CLOEXEC); + saved_errno = errno; + } + db->fp = NULL; if (fd >= 0) { #ifdef WITH_TCB +-- +2.30.2 + diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 83e1a847693..bba69d523c3 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -5,7 +5,7 @@ BUGTRACKER = "http://github.com/shadow-maint/shadow/issues" SECTION = "base/utils" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=c9a450b7be84eac23e6353efecb60b5b \ - file://src/passwd.c;beginline=2;endline=30;md5=758c26751513b6795395275969dd3be1 \ + file://src/passwd.c;beginline=2;endline=7;md5=67bcf314687820b2f010d4863fce3fc5 \ " DEPENDS = "virtual/crypt" @@ -14,9 +14,6 @@ GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases" SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ file://useradd \ - file://0001-Fix-can-not-print-full-login.patch \ - file://CVE-2023-29383.patch \ - file://0001-Overhaul-valid_field.patch \ " SRC_URI:append:class-target = " \ @@ -25,13 +22,9 @@ SRC_URI:append:class-target = " \ " SRC_URI:append:class-native = " \ - file://0001-Disable-use-of-syslog-for-sysroot.patch \ file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ " -SRC_URI:append:class-nativesdk = " \ - file://0001-Disable-use-of-syslog-for-sysroot.patch \ - " -SRC_URI[sha256sum] = "813057047499c7fe81108adcf0cffa3ad4ec75e19a80151f9cbaa458ff2e86cd" +SRC_URI[sha256sum] = "51833444e3b183e023eb12da0cc1cecfcb839ba77f12f4ad551b2e3a9e950597" # Additional Policy files for PAM @@ -43,7 +36,7 @@ PAM_SRC_URI = "file://pam.d/chfn \ file://pam.d/passwd \ file://pam.d/su" -inherit autotools gettext github-releases +inherit autotools gettext github-releases pkgconfig export CONFIG_SHELL="/bin/sh" @@ -53,6 +46,8 @@ EXTRA_OECONF += "--without-libcrack \ --without-sssd \ ${NSCDOPT}" +CFLAGS:append:libc-musl = " -DLIBBSD_OVERLAY" + NSCDOPT = "" NSCDOPT:class-native = "--without-nscd" NSCDOPT:class-nativesdk = "--without-nscd" @@ -72,13 +67,14 @@ PAM_PLUGINS = "libpam-runtime \ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" -PACKAGECONFIG:class-native ??= "${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" +PACKAGECONFIG:class-native ??= "${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} libbsd" PACKAGECONFIG:class-nativesdk = "" PACKAGECONFIG[pam] = "--with-libpam,--without-libpam,libpam,${PAM_PLUGINS}" PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit" PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux libsemanage" +PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" RDEPENDS:${PN} = "shadow-securetty \ base-passwd \ diff --git a/meta/recipes-extended/shadow/shadow_4.13.bb b/meta/recipes-extended/shadow/shadow_4.14.0.bb similarity index 100% rename from meta/recipes-extended/shadow/shadow_4.13.bb rename to meta/recipes-extended/shadow/shadow_4.14.0.bb From patchwork Sun Sep 17 09:38: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: 30569 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 18CA0CD13CF for ; Sun, 17 Sep 2023 09:39:16 +0000 (UTC) Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) by mx.groups.io with SMTP id smtpd.web10.27135.1694943549554770049 for ; Sun, 17 Sep 2023 02:39:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=m8OJszSX; spf=pass (domain: gmail.com, ip: 209.85.208.181, mailfrom: alex.kanavin@gmail.com) Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-2c008d8fd07so1728701fa.1 for ; Sun, 17 Sep 2023 02:39:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943548; x=1695548348; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FxQ3tC6f5gQVb8C4PT6rPYtWl7oJTqQfb+qCIMEfPVA=; b=m8OJszSXw//MdmdcDXmEyadtvl1dXeLwsGog5cttziuoNRBfnuwukyP9IAJwClcuOK OBfa7ECiCVxmcS1pn9HZXQuuv1HcL3LlULIqg30/L1fvX82Qtw0UmoQ5SsZisrj6ozNB ikLQjBQ1mHyitPXSFzfl1kjy/+AB4bzkGq+yWwAHW3HjFPKUyMl6l5XbWlmlOqJ90xAk 9a5wZhSc/iwaQMJwHjYkyMK3bi9ht1BQYZaWyk6uXlriCmTim/tfSJ8+iA0qs8f/3Evv VCcGMFGvF+4vCFfqK+pAJFKIN7nJfYs+mAoAhza9JgtAQvIEZXkKSciRdMlEtD2pEpvO 1SHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943548; x=1695548348; 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=FxQ3tC6f5gQVb8C4PT6rPYtWl7oJTqQfb+qCIMEfPVA=; b=d2kumWUpa+j6wpw8X2UV4IWBwdj06T8RHBeGqZabJ0Bf+tcOWX/HHLvwzAvFelgzvO 6mM4YFREQu8KF5D0Cs6txW/qXsZmS7dnqonNFXWjyCRqJQ8caVvmsKKoDcEE2uz3pef4 9UClCbbCXdBaUEWDRZ19u3T9CYOmUkgaVoDTlHaAoWlKJPf3AEEm/8VOLBO3d1zwuZVk 5FACQxCcuJytxNlQFV+KrVm0UQttHc+Igd/coX0qqwQIYKnIhSZVaKru23Gt9W/bmz6W i+6P/lTcXviCyExd/zC0kYDz4mA7K2D4IcTXB/sZREySnwMOG3ZPmKUk+fLHrBQ/oQrB pA+w== X-Gm-Message-State: AOJu0YwUBFzggibT0X31mUjJtm5u/WKulXRoT+ZhZ1XKuRYW1vi7plja eL0WzWHJY74+bOtHs03wu29SeYPCUUg= X-Google-Smtp-Source: AGHT+IE/2S39MbNsfxw7WfNSR1OdiCz1OoKfb307s5+UC12hJkAg0gix4pZjxc96ypu/7//HqC1WOg== X-Received: by 2002:a2e:87c9:0:b0:2bf:c5c7:757d with SMTP id v9-20020a2e87c9000000b002bfc5c7757dmr5556208ljj.4.1694943547667; Sun, 17 Sep 2023 02:39:07 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:07 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 04/29] curl: build and run the full set of ptests Date: Sun, 17 Sep 2023 11:38:36 +0200 Message-Id: <20230917093901.428214-4-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187777 Not running make in the top level tests/ directory excluded about a third of them (those that consisted of running small test binaries). Also, run tests in parallel, which reduces total time from five minutes to about 75 seconds. Signed-off-by: Alexander Kanavin --- meta/recipes-support/curl/curl/run-ptest | 2 +- meta/recipes-support/curl/curl_8.2.1.bb | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/curl/curl/run-ptest b/meta/recipes-support/curl/curl/run-ptest index 2c74c58f5da..95af2bd7b34 100644 --- a/meta/recipes-support/curl/curl/run-ptest +++ b/meta/recipes-support/curl/curl/run-ptest @@ -1,6 +1,6 @@ #!/bin/sh cd tests -{ ./runtests.pl -a -n -s || echo "FAIL: curl" ; } | sed \ +{ ./runtests.pl -a -n -s -j4 || echo "FAIL: curl" ; } | sed \ -e 's|\([^ ]* *\) \([^ ]* *\)...OK|PASS: \1 \2|' \ -e 's|\([^ ]* *\) \([^ ]* *\)...FAILED|FAIL: \1 \2|' \ -e 's/Warning: test[0-9]\+ not present in tests\/data\/Makefile.inc//' diff --git a/meta/recipes-support/curl/curl_8.2.1.bb b/meta/recipes-support/curl/curl_8.2.1.bb index 068486a3521..b86c6f3bbae 100644 --- a/meta/recipes-support/curl/curl_8.2.1.bb +++ b/meta/recipes-support/curl/curl_8.2.1.bb @@ -85,14 +85,18 @@ do_install:append:class-target() { } do_compile_ptest() { - oe_runmake test - oe_runmake -C ${B}/tests/server + oe_runmake -C ${B}/tests } do_install_ptest() { cat ${WORKDIR}/disable-tests >> ${S}/tests/data/DISABLED rm -f ${B}/tests/configurehelp.pm cp -rf ${B}/tests ${D}${PTEST_PATH} + rm -f ${D}${PTEST_PATH}/tests/libtest/.libs/libhostname.la + rm -f ${D}${PTEST_PATH}/tests/libtest/libhostname.la + mv ${D}${PTEST_PATH}/tests/libtest/.libs/* ${D}${PTEST_PATH}/tests/libtest/ + mv ${D}${PTEST_PATH}/tests/libtest/libhostname.so ${D}${PTEST_PATH}/tests/libtest/.libs/ + mv ${D}${PTEST_PATH}/tests/http/clients/.libs/* ${D}${PTEST_PATH}/tests/http/clients/ cp -rf ${S}/tests ${D}${PTEST_PATH} find ${D}${PTEST_PATH}/ -type f -name Makefile.am -o -name Makefile.in -o -name Makefile -delete install -d ${D}${PTEST_PATH}/src From patchwork Sun Sep 17 09:38: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: 30568 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 1FAD9CD13D2 for ; Sun, 17 Sep 2023 09:39:16 +0000 (UTC) Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by mx.groups.io with SMTP id smtpd.web10.27136.1694943549766960816 for ; Sun, 17 Sep 2023 02:39:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=TreImJ3y; spf=pass (domain: gmail.com, ip: 209.85.208.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-52bcd4db4e6so4313621a12.0 for ; Sun, 17 Sep 2023 02:39:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943548; x=1695548348; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YATx016Rfb9QnR6FRkWjXSEF3t9m/9xOUI/kglxCOEQ=; b=TreImJ3yPXPWhLH65PZSefh4KcDpWQoMP9eh+vjBzSQA3HaEAvXNdVCsoMkuaznIVy sgw4C3SNXzidpZ7ldJBIItUWXAFHY9q7YtoHYSs0w1/HKRh0JmT7329sQDb2QpZ0/qrv /7HL5DWJWtZZ9BVWOh/Mo4S/UN1Iby0Rx5WTqfFGhHGTwEPuvlfeE/yX70ddrxyPrz8o 35OqZiorXEkcRniI00YgaHwKMHni00/8CXFweJvSm5cy0mLH1/D/UKjLCw7i1irkPDGG AHvgcA+BcuSOe1omxSPeCQ20QHV9OJPH8l3kPEVNpQRcyuiVh4LlGdqtVMGAVTER2J4n q5eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943548; x=1695548348; 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=YATx016Rfb9QnR6FRkWjXSEF3t9m/9xOUI/kglxCOEQ=; b=BQPAecyoIHSIPpjvO3Z8xbXn1qg3YfZbh5iEnL8Q2jgfetpr1D6wIIqEb3YzcoHvnf vvep2P+fc/mTz4qfPuw0gVe8Qkn3s2kSH0u4hDKrftHnHSFcwWo4m08oUVZk1Fyg0Ipu 4qoiPPjkelT/H/yzmz+WLDB4Y7cxz8Q+rdiu7FbDxlHQueIZbEs7zOqYbEDJcWAWDtO9 ByhI4uhHgWMGCtu864f+gujgiLJjsXU0MRn5kfOAkq4pmDg5D2wFFaWo4ncEqVkuin93 hiGsOZxx9/gMocA1Wivm/dede1ekTc/oWskdCGK+8Bqd4Msa6EZfzX/zmg2nwFqgzqH3 5T3w== X-Gm-Message-State: AOJu0YxskhL1J+I+WHPDgO/GkkSJE0Za0icbhlD6zrvsDWEp6gc8l0KO 0dYKcSVYsMGwpGEsWL9xNb3dokPtcWA= X-Google-Smtp-Source: AGHT+IEGFpgw3RhO5hBm+TR1VOhijl1ES0Z4tVgwYabcXsUJfoLF/BsjU7Bzup/1+rhhq0Y//tfhog== X-Received: by 2002:a17:906:2cf:b0:9aa:2bd:b59b with SMTP id 15-20020a17090602cf00b009aa02bdb59bmr5246155ejk.39.1694943548215; Sun, 17 Sep 2023 02:39:08 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:07 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 05/29] ptest: report tests that were killed on timeout Date: Sun, 17 Sep 2023 11:38:37 +0200 Message-Id: <20230917093901.428214-5-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187778 I'm not sure if this was reported correctly before, but it currently is not. Test that is stuck is an error in itself. Signed-off-by: Alexander Kanavin --- meta/lib/oeqa/runtime/cases/ptest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/runtime/cases/ptest.py b/meta/lib/oeqa/runtime/cases/ptest.py index 23a71ea064c..fbaeb84d006 100644 --- a/meta/lib/oeqa/runtime/cases/ptest.py +++ b/meta/lib/oeqa/runtime/cases/ptest.py @@ -96,7 +96,7 @@ class PtestRunnerTest(OERuntimeTestCase): failed_tests = {} for section in sections: - if 'exitcode' in sections[section].keys(): + if 'exitcode' in sections[section].keys() or 'timeout' in sections[section].keys(): failed_tests[section] = sections[section]["log"] for section in results: From patchwork Sun Sep 17 09:38: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: 30570 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 26F56CD13D3 for ; Sun, 17 Sep 2023 09:39:16 +0000 (UTC) Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by mx.groups.io with SMTP id smtpd.web11.27409.1694943550253294106 for ; Sun, 17 Sep 2023 02:39:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=HrO3si5o; spf=pass (domain: gmail.com, ip: 209.85.218.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-9ad8a33fd0dso441889366b.3 for ; Sun, 17 Sep 2023 02:39:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943549; x=1695548349; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JoGeMiYOyEqobtZXLa7zXXm0VI37q+toHZTXkfwmOfg=; b=HrO3si5oVogfa5wpJZp6LLmtiK3PWmKF6mCvqQHx8iqFiZ0lnwlODatcaS6573NtJE K7saooVinLoMZzlDXrQjrV8+espG5CbYoxkTs7/p21kvCWQu1UuwD13hJOXSpDNBm/oN OuS7r4Ca41dH+BDj7qkueBr5hl0RXBRIYf4sUdMmkkwJx1taF9YOz+/+4ZeradfASC1A G0NNMy0ZpHeaVw6Mmx/5PCR+3Qp5Fb+WLrJZw/uZ2AYZ4yeBTASbPRN3qOlLvNE6PRbR P1t9wuN2Sx4O1/bjWIe4RJJHe3gyHGclQHhdII33F9jsQkiXHDAkLHNggwWjthUgzpH4 6QFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943549; x=1695548349; 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=JoGeMiYOyEqobtZXLa7zXXm0VI37q+toHZTXkfwmOfg=; b=Sg9L7qZ2cV/1vPi81Kx/+JqBZjo/NLYeT5a2No+YCFq5b9AwOBUm6He3AefnXgBO25 fOmYpqQCvuRR2D+xYru665gy1n6o/rGMEOkvRkycAw0kPZmeFYMIyuTaeWj9+rQ9PuYH m50rRHL7CWxfdhqDC4/dXDdNtO3nY2PHuakZ7OIVuMHsgw/xNQj+gnyyCLe9DQJwyX4j bibNrJ2az9clWtUiFgVsw+kfF4abpzwjHCaEy7aNAtf3WS90/zfy1/eEDHyi3uigv3n0 E9wRqXR2VuTBZdeCdM4VkejcOxcx0amyLmw4MxvCy5MItEpMpH5NLwJ2gAglA724uoOz ImCw== X-Gm-Message-State: AOJu0Yw9MTa5B+2utG7mSYArL/Uo3pIebqX4FHi4OkOjds21nXEu9cTI rYcm0LM2F52SS8WQM+lZIVGOD+KJKKQ= X-Google-Smtp-Source: AGHT+IHh/xBY6CHMtRHRnG1Q4XVpb57SzZIMtclViSFqaJW+ukptxh6p+tRqDZVbL3vI+ZDqAIehjw== X-Received: by 2002:a17:906:76c2:b0:9a6:1560:42da with SMTP id q2-20020a17090676c200b009a6156042damr5397459ejn.15.1694943548728; Sun, 17 Sep 2023 02:39:08 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:08 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 06/29] perl: use 64 bit integers across all targets Date: Sun, 17 Sep 2023 11:38:38 +0200 Message-Id: <20230917093901.428214-6-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187779 Otherwise perl would use 32 bit integers on 32 bit targets, causing loss of bits when copying 64 bit time_t into an internal representation. Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/perl/perl_5.38.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/perl/perl_5.38.0.bb b/meta/recipes-devtools/perl/perl_5.38.0.bb index a8623b6e84b..956e4d64d70 100644 --- a/meta/recipes-devtools/perl/perl_5.38.0.bb +++ b/meta/recipes-devtools/perl/perl_5.38.0.bb @@ -58,6 +58,7 @@ do_configure:prepend() { do_configure:class-target() { ./configure --prefix=${prefix} --libdir=${libdir} \ --target=${TARGET_SYS} \ + -Duse64bitint \ -Duseshrplib \ -Dusethreads \ -Dsoname=libperl.so.5 \ From patchwork Sun Sep 17 09:38: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: 30571 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 2D479CD13D9 for ; Sun, 17 Sep 2023 09:39:16 +0000 (UTC) Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) by mx.groups.io with SMTP id smtpd.web10.27137.1694943551371207073 for ; Sun, 17 Sep 2023 02:39:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hYvvqHt3; spf=pass (domain: gmail.com, ip: 209.85.208.174, mailfrom: alex.kanavin@gmail.com) Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-2bfd3790178so36940271fa.2 for ; Sun, 17 Sep 2023 02:39:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943549; x=1695548349; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I75PL7VgJt+NbiOmK3xFiDTGsRffpDgg3leyzFPIBWA=; b=hYvvqHt3xgthY8gcssb8SExsW4Z6Ze5jtPXEgtd5JvhUD1d/n4d1ty8N9EyHZh0zhf ihII7Ag6ijsw8C7bi+X5Rs6lJO72CO8RIDssZlIELx5mtJKr2lAB7O+voUy7vi+YgjOh EIFnK6l2xkEhzxxvR+J/2aiWddVFjCB6gNXP7fF1VYW/8slUvmu3Wd78z5LnqFHtkg/r FHRyuY4P591++TAQEt9ACpYOr8GTObidhxp960RKTvws9Ngch+i8FUeOb2jU2eoyiAU1 29vDRZh9KixJir17cx1cLgR7DzSOEq0nCKToS+Y00ybAk5r5N4FDqUOLRi/rLgREBjmw ghCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943549; x=1695548349; 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=I75PL7VgJt+NbiOmK3xFiDTGsRffpDgg3leyzFPIBWA=; b=avuhAqRI+Yc9reySDO6TJFu11q1OOcUxEB7xVbCAh5AAXvR/cwaaCoC71tKkj0xz9C wf2LoqRzLCDvUb5s68sDtOH7cyxB0nabZv96qRwn6FfXK4fAFB4mRYI4b3EZgDahJFv1 8Q0i0X7td3ALKx6MLp8T3g5GukPJhnyfGLdUtOfOLEjb0RL7pv1tTfbbTOAw3uCWSUVc 1IFhSd8ksGyd9C41Dc+Dd6ahWuA/o34xAxx7nWSYilvi+ofVpUCA9DV4x2B+IkcuCx5U 7mqk+cmVo1ehnA9cATolyf9hxH2gVUU2OGc1lxtE6WWf43q25x0sm8CRABj3+xOoahal ieTg== X-Gm-Message-State: AOJu0YxjSkZ/PW8Pk+pfp/HFLcpRpot+tcnuQ2iNlgR/dMfz6yi47uY6 h7+VqL8k4Vkx5kwNAoamfKF9ccPkjUQ= X-Google-Smtp-Source: AGHT+IEIp8yJSq0gXQu0vwVXrVzrQ5AiOIH9iOaKxs8R85mB309G/zfEfuswC/Hh5+Esv4qtDsDy8A== X-Received: by 2002:a2e:1f11:0:b0:2bf:f497:52d6 with SMTP id f17-20020a2e1f11000000b002bff49752d6mr2640192ljf.22.1694943549248; Sun, 17 Sep 2023 02:39:09 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:09 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 07/29] perl: ensure all failures are caught Date: Sun, 17 Sep 2023 11:38:39 +0200 Message-Id: <20230917093901.428214-7-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187780 Sed expression may miss some failures, and | obscures the non-zero return code which would otherwise indicate them. Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/perl/files/run-ptest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/perl/files/run-ptest b/meta/recipes-devtools/perl/files/run-ptest index dad4d429160..0547f818b22 100644 --- a/meta/recipes-devtools/perl/files/run-ptest +++ b/meta/recipes-devtools/perl/files/run-ptest @@ -1,2 +1,2 @@ #!/bin/sh -cd t && PERL_BUILD_PACKAGING=1 ./TEST | sed -u -e 's|\(.*\) .* ok$|PASS: \1|' -e 's|\(.*\) .* skipped|SKIP: \1|' -e 's|\(.*\) \.\(.*\)|FAIL: \1|' +{ cd t && PERL_BUILD_PACKAGING=1 ./TEST || echo "FAIL: perl" ; } | sed -u -e 's|\(.*\) .* ok$|PASS: \1|' -e 's|\(.*\) .* skipped|SKIP: \1|' -e 's|\(.*\) \.\(.*\)|FAIL: \1|' From patchwork Sun Sep 17 09:38: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: 30574 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 35245CD13D8 for ; Sun, 17 Sep 2023 09:39:16 +0000 (UTC) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by mx.groups.io with SMTP id smtpd.web10.27138.1694943551436301738 for ; Sun, 17 Sep 2023 02:39:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=TYm+aNEe; spf=pass (domain: gmail.com, ip: 209.85.218.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-99bf3f59905so464793766b.3 for ; Sun, 17 Sep 2023 02:39:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943550; x=1695548350; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=O28GYRbBsUT1LxVpkv2wZI7Fu9feuwCQRVk6m6/ofe8=; b=TYm+aNEe2umQubI49uh6xy/GxU1qZHTB34Uxn1wgZfU8VWDNoRG0syE+yKDfhZdVeA zmoMG146glySbFss+EVBHHRz+wlChYLdTeYkbW9FRJunQW21v+ebGRi8FWDhsyZEuTPd msZw9P2D2nYa06rgkrCuKwmBGwfiZXMBhJ/y6fhvdg9TMf+NYxuLWdcMr1yWEkBJSFBi 0fEazzwAAdIU2nsytwxHME2+mvZ0VCEpCZIHKnnfV4+0MZbckQtyYrVntUvdqv35eF64 KuxBI0C29olR6VSLxshFLfa/U2jpjeYqzyIcwz6px06OwdtOiOr6LbqE4SQP+uFeV/Qr dYLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943550; x=1695548350; 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=O28GYRbBsUT1LxVpkv2wZI7Fu9feuwCQRVk6m6/ofe8=; b=SnwBQxxm2b6/WnpQNOoJxFxRVsDLNx12Ade0HyYjbgS2AcSMGhC8v+4zTrOVLvSJ7R y9omrr9JTKMATUrq+R64Y9nPwMpRcvlPHojBoxntQNKA+JeVtwm0ClIkJ/EUmlIgPtX2 thlgrU0fZ96fJOHQfvgddrT8HHe4WXAs6gLCCnVZoEZyVEidMOu9XaCoxNLvtymO7KmC dqErYgKMW2ed9Cwm4yspf1vfuZ+dsBCDD8i8RdZPBohzsvbK6mSDe5uCk6BLM0ArTo78 zlX5imYTUMhTQ9sTlFIsAqbF1lmtVUNd5MqJIrqKI0bnQGe/Sn+4deQK+uWB1NgdnlDS kEEw== X-Gm-Message-State: AOJu0YyO8L6PntbOJgPPS/JJSVWo7bgCW7v8ohufV2eeJZDnbdkoAZbK by2AKJG7fLVcSbXvPolzSx1RjWCGdLU= X-Google-Smtp-Source: AGHT+IFbYO+oHUcOW27IctnbirRCn3vi9KjLiX78kBE7mNuNohWiZumytCsdh0dgk4zG/hrnYR9BZA== X-Received: by 2002:a17:907:2716:b0:9a5:c5a8:a1a0 with SMTP id w22-20020a170907271600b009a5c5a8a1a0mr5342452ejk.49.1694943549823; Sun, 17 Sep 2023 02:39:09 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:09 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 08/29] strace: parallelize ptest Date: Sun, 17 Sep 2023 11:38:40 +0200 Message-Id: <20230917093901.428214-8-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187781 strace is one of the slowest tests otherwise (can take 40 minutes or more), and this brings it to under 10 minutes \0/ Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/strace/strace/run-ptest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/strace/strace/run-ptest b/meta/recipes-devtools/strace/strace/run-ptest index 86daed92201..1224229e8fc 100755 --- a/meta/recipes-devtools/strace/strace/run-ptest +++ b/meta/recipes-devtools/strace/strace/run-ptest @@ -3,7 +3,7 @@ set -u export TIMEOUT_DURATION=240 -make -B -C tests -k test-suite.log +make -j4 -B -C tests -k test-suite.log res=$? if [ $res -ne 0 ]; then cat tests/test-suite.log From patchwork Sun Sep 17 09:38: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: 30573 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 3C883CD13DA for ; Sun, 17 Sep 2023 09:39:16 +0000 (UTC) Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by mx.groups.io with SMTP id smtpd.web10.27139.1694943552097616220 for ; Sun, 17 Sep 2023 02:39:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jo35y4vl; spf=pass (domain: gmail.com, ip: 209.85.208.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-52fe27898e9so4060907a12.0 for ; Sun, 17 Sep 2023 02:39:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943550; x=1695548350; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BauezyssRgbLiRO3M7e752WRXVQDW4vicrZyEFoBx/M=; b=jo35y4vlCWLeJiMAmOs5x8SNptkg9a0KYMyAkrfQUqbZ/xxkParQMGlLO5vhhb/j/3 M2ehJeQHvqoyrlBL/wVyGdNTvhefG2cyl/HTg6521Uqj+4gfavOadDqwcKTlt0WXhz+o YV1sJ8KmqVqvCvzxHRZ+j7Zyo4Qy7qHwOM8KEvwanSxIpJjYzR+RQ2G9Xq2r0oiAHe5C oUdkPSEphUNMTdtOXZngnZVXj4TXmFo2qNZObTadTXg1XOB1Imqu/7FqJ+oVAcUzr1Sc ANARakMbDvAcvaENPmJ+PEZbShGOZF7xXFgOLP3dJtDnmsRH3haE3xGtXbxcDH3WbhE7 eK0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943550; x=1695548350; 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=BauezyssRgbLiRO3M7e752WRXVQDW4vicrZyEFoBx/M=; b=QiunPvM3H+mreJr4LNNoMUyzzQY2+0s8onD4dKBpGgKO2ep/5e57pDB5wtGmB46x0n MQzpobwvkjq5iz45BGa0bfnUb5sj+0/7cJvhS4+4RWLYIShjZbkApJs8idG5WMZNwx0A c1Qt2L6hNS0bVd1mFyoCgXeZSJ2WA2AW/DIQb4b3gssvF4fLAcQRNivVE0wpKTUMMj0Z 49P4fYEzaUdOoBwtvnlYfBGPRWBLXOD+XXgCocSjXJDhItgCdAoQRA1mGjV4VvgXJPM5 3hm6+PDwYWFpS2llH0mBSOCu9vThwcEcjfDmNONHwcszfXN3ML14GrhZ5oMR8/jQc82U Jt6A== X-Gm-Message-State: AOJu0YxQGTLqKsX0MANvshsUIKox8OHjhCX9O6HE/nePXAci3m4PfFMw kBVqOaQFZmhAro48Ds4FUCCUW8YWLJg= X-Google-Smtp-Source: AGHT+IHWy0yJwGstCDRpyUI5OWHdWh3GAQ8gkbs/zkrPwXxVWYCaM4DTnpZfIphCRCm4oRMkbJBvQg== X-Received: by 2002:a17:906:73cb:b0:9a5:9038:b1e7 with SMTP id n11-20020a17090673cb00b009a59038b1e7mr5622113ejl.36.1694943550307; Sun, 17 Sep 2023 02:39:10 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:10 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 09/29] strace: remove from time64.inc exception list Date: Sun, 17 Sep 2023 11:38:41 +0200 Message-Id: <20230917093901.428214-9-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187782 The issues were resolved via https://github.com/strace/strace/pull/263 https://github.com/strace/strace/pull/264 https://github.com/strace/strace/pull/265 and the fixes were released in strace 6.5. Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/time64.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/conf/distro/include/time64.inc b/meta/conf/distro/include/time64.inc index bc0c72226ba..83b0dfae6cb 100644 --- a/meta/conf/distro/include/time64.inc +++ b/meta/conf/distro/include/time64.inc @@ -32,8 +32,6 @@ GLIBC_64BIT_TIME_FLAGS:pn-pulseaudio = "" # Undefines _FILE_OFFSET_BITS on purpose in # libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp GLIBC_64BIT_TIME_FLAGS:pn-gcc-sanitizers = "" -# https://github.com/strace/strace/issues/250 -GLIBC_64BIT_TIME_FLAGS:pn-strace = "" # Caused by the flags exceptions above INSANE_SKIP:append:pn-gcc-sanitizers = " 32bit-time" From patchwork Sun Sep 17 09:38: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: 30575 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 4B73ECD13DF for ; Sun, 17 Sep 2023 09:39:16 +0000 (UTC) Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by mx.groups.io with SMTP id smtpd.web11.27410.1694943552326687925 for ; Sun, 17 Sep 2023 02:39:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=MhZWZDTb; spf=pass (domain: gmail.com, ip: 209.85.218.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-991c786369cso472569366b.1 for ; Sun, 17 Sep 2023 02:39:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943551; x=1695548351; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nWVD+caor+omBFjRU+15zTZw4sdEj/UVOScD5hWNfP8=; b=MhZWZDTbfSUTbp2hgsuaMfLyswNptUxh1PUN4p2602bI4CleCLarxtgg15AFoOjOeE LvsYHun9IZhaWS9Q6m14uRUsB3SIjgn9KqAvO5mZjPzkkZBnY6fRw17fRnW/y6uASj8a cFna7xvt0+ccjAZ2/2PDku+vt53U8xNeVv7P1pQMZ14+LVvkbVBzWOHmtfJVPVtsrbxE t6IjaEjnV44Kup9Yjv4UO8UWsXbwLYrn/rEBWfGKF4GGjszhFjxB3Z4mF8Eh0AaXxYr+ ul5IOh3GPMqkcbjFp29SS6lMBTYamuZssQOj1b5lw3yBBunBlVOOSnLQ7hFGSpeKUjf4 rR+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943551; x=1695548351; 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=nWVD+caor+omBFjRU+15zTZw4sdEj/UVOScD5hWNfP8=; b=NsIRKmNylDPbEitHG94c+a66dFwfMEBrOXd0n6s/xADacm2CWc637eJwrbyDNKQnLy gfgdO8gJJT9In2FCj92brJSc2lhYYwiyCnSjWlYVW1D3/ftoE1m5szsx26ogDItHA09Q 22T4defpxiJ9xALwqKoDLX1Ke3wwbxnlGGAPL6wqaHlIR4dtQxISW4N+yOTcFGsRGYSI q8lQJ0Q1jvFecCb2c/1f1kkVeMuE1L9Pm+chcSicuQAwBb8f74Wv+3Y4j7mncWAbe5I5 xhTcON98S9nubK8voRJ0rWGvnG0lR45Yndf+ILd3vWwNNa/HDIpAEzTwpY4mpyylpgsu H9iQ== X-Gm-Message-State: AOJu0Yy85LBGCcIiBVVItsa3DTdfhgrG03w/ygoKxbFWqsWPJdytoY5b sJrS55YJFq5/l/PtwMKXNhczfZNN4uQ= X-Google-Smtp-Source: AGHT+IFpIhSkZp22/bgJJ7PS9RcZ3S349c5aI+jSFc/1fvUzH7fd0w4M6kA4opX4gploaNZ25dueMg== X-Received: by 2002:a17:906:20ce:b0:99c:3b4:940f with SMTP id c14-20020a17090620ce00b0099c03b4940fmr6635589ejc.27.1694943550823; Sun, 17 Sep 2023 02:39:10 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:10 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 10/29] busybox: enable 64 bit shell arithmetic (via long long type) Date: Sun, 17 Sep 2023 11:38:42 +0200 Message-Id: <20230917093901.428214-10-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187783 This matters on 32 bit systems where otherwise timestamp manipulation in shell scripts would overflow after 2038. One of the scripts in strace test suite exposed the issue. Signed-off-by: Alexander Kanavin --- meta/recipes-core/busybox/busybox/defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig index 3d36447c63e..f3d545dc3fb 100644 --- a/meta/recipes-core/busybox/busybox/defconfig +++ b/meta/recipes-core/busybox/busybox/defconfig @@ -1190,7 +1190,7 @@ CONFIG_ASH_CMDCMD=y # Options common to all shells # CONFIG_FEATURE_SH_MATH=y -# CONFIG_FEATURE_SH_MATH_64 is not set +CONFIG_FEATURE_SH_MATH_64=y CONFIG_FEATURE_SH_MATH_BASE=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set From patchwork Sun Sep 17 09:38: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: 30576 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 4904ECD13DD for ; Sun, 17 Sep 2023 09:39:16 +0000 (UTC) Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by mx.groups.io with SMTP id smtpd.web11.27411.1694943552867663787 for ; Sun, 17 Sep 2023 02:39:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=NLNdYDIP; spf=pass (domain: gmail.com, ip: 209.85.218.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-99c93638322so765971466b.1 for ; Sun, 17 Sep 2023 02:39:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943551; x=1695548351; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=t6n+SSmAYQF+bX9qlLwYV1MT/+6SepRHTahZvHieEvA=; b=NLNdYDIP94USLfS28/1nXwOfVgBw97w41lIApeoX1BpxIhKjYKUZW1EIcORxcEA6Ml W/2T1cA402qcOZCuF/muEYV4Un7t0kPo2cKR6fdCJeb4uqeqmkqAy3wca70wUlgToafJ 7FXorSl3s96daE16gOJxEbt5ZNwTYRXYhu9FOFRKLl8jq/6WY9rWJ4G/kLYaw0joLfNX fRW2wpsRAIwKorWC+aLEsKq++07LY6CGZKG+iQWl/y8V3pGlCOOi3UsWTeaNiGK7PqIQ FGSCVaqnbWiJVbVpjRXdRQgxcB3QvvcxxAzK9XZEs2qGPelFOBgbugyVx4pVkJFEceNF SCag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943551; x=1695548351; 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=t6n+SSmAYQF+bX9qlLwYV1MT/+6SepRHTahZvHieEvA=; b=kBnvztE2GeS2tIX9aWgO4nDjncuJ0UXvlGKNn5kmD0WDrppYJ9kBZv88f68RRwuJhe ZqTQFIV1819+1eHyUk9r0R94I8U126yyOcwYLApLbn5TV7nhxjyodx3yFI8m5bXd0ato 6E96neUlx06OeRFFbKPnk9bg5I+6iFSrbHygDKcGMNn3nXMoEc3SGotBGARnlZkzs6QQ EX0i79X8673d/kuyj8X9sMgOBkT0BBc6Ve2d72u38OHj6b/7g0Gyzj8MAFnibFVJZUYd tKcoS1JHCARpTFeA079zeUY+usqctq9gQe8jAECuqi2UJNneINhE7gcPwp1eG/VGKeua 5Xeg== X-Gm-Message-State: AOJu0YwoxKcgDWmtFRF27V0p8rkpe4lXiwbBZlEJETrHhWBtCLaT0iXU hh3G6jAPfsEFYJ4lfxyhaZn5llE0Ago= X-Google-Smtp-Source: AGHT+IEIxyhI0+HcNe5r/X4m86JaOP+z9RdOdHkoXLU8hYA6ZBokXb17DY/51ugh2RK67F4EynytPA== X-Received: by 2002:a17:907:75fb:b0:9ad:b046:bc50 with SMTP id jz27-20020a17090775fb00b009adb046bc50mr8203067ejc.10.1694943551329; Sun, 17 Sep 2023 02:39:11 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:11 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 11/29] openssl: parallelize tests Date: Sun, 17 Sep 2023 11:38:43 +0200 Message-Id: <20230917093901.428214-11-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187784 This brings them from 15 minutes to just over 4. Signed-off-by: Alexander Kanavin --- meta/recipes-connectivity/openssl/openssl/run-ptest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl/run-ptest b/meta/recipes-connectivity/openssl/openssl/run-ptest index 8dff79101fa..10c9b49e4ad 100644 --- a/meta/recipes-connectivity/openssl/openssl/run-ptest +++ b/meta/recipes-connectivity/openssl/openssl/run-ptest @@ -9,4 +9,4 @@ export TOP=. # OPENSSL_ENGINES is relative from the test binaries export OPENSSL_ENGINES=../engines -perl ./test/run_tests.pl $* | sed -u -r -e '/(.*) \.*.ok/ s/^/PASS: /g' -r -e '/Dubious(.*)/ s/^/FAIL: /g' -e '/(.*) \.*.skipped: (.*)/ s/^/SKIP: /g' +HARNESS_JOBS=4 perl ./test/run_tests.pl $* | sed -u -r -e '/(.*) \.*.ok/ s/^/PASS: /g' -r -e '/Dubious(.*)/ s/^/FAIL: /g' -e '/(.*) \.*.skipped: (.*)/ s/^/SKIP: /g' From patchwork Sun Sep 17 09:38: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: 30577 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 596F2CD13DE for ; Sun, 17 Sep 2023 09:39:16 +0000 (UTC) Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by mx.groups.io with SMTP id smtpd.web11.27412.1694943553559933828 for ; Sun, 17 Sep 2023 02:39:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Rn7sFUDE; spf=pass (domain: gmail.com, ip: 209.85.208.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-52a4737a08fso4178493a12.3 for ; Sun, 17 Sep 2023 02:39:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943552; x=1695548352; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vj8aSFgsMwq5FCqB8fDWKaW/Xd1yr3A7voiVOYAk/RI=; b=Rn7sFUDEK3/Gn1xe6ExUuAfQUzSGl6fdUnHD/dHjxQL2qSR7Nkxe0RTlX4TG4WHvCf exrNEujHYmsbAKD/S9lx0O+2vPaGyiFhMW89+2/5Y3KN1ZfIuaFn+z2sjkMRprqG/HBJ 3YWoBYWUxi4lc/hz5v1paVL33ekMoG/Wz63cXrQ/fMrBJOrn1VJNg6y7z4UwVtJSWrY2 4+yyRmzcyRSYafGXXpC1bWfpFfWJMfv0CGiunJrsZhfHcc9HMAOoZJWBgkMpeKCQeA2k imWVmKaNUYHIyK2giwgDLUqO9tNP2S4LFo6lD70UZmF5+ph92t1tjE0S/nlyZSq66Tng skcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943552; x=1695548352; 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=vj8aSFgsMwq5FCqB8fDWKaW/Xd1yr3A7voiVOYAk/RI=; b=tnMU8t+onZFSGJBcCW4+2J5aSu2yB1NyjCrQGJy3yXmGUMrE4ccQT99ZypE3s1KoB2 qMx5y7zCLbrGRHoQM4B9jJjcppi4f666Fbp5dMbHYLASnyUD0VFwgenDq8JMtt3S9okJ lgQLL8+h9lUfpAZZqJLv4ScfixzWEIuG95ILfA5dPfebo0ULpneq7Bdogat9gMxKc6+b 4+q7Vzy0lr25TIEbo2nSls5doGXdzMS+hIP9gGoDv7vyEsLbKGeZdrhIinc2krmkvBJf nJNtQNG3a35LBh3Vu9ogP1wt2R1gPqBYeTZVtVLBxgXj0x/WuIHLHzbGZad4aiAAfzie g7mw== X-Gm-Message-State: AOJu0YzE6sY1bCsRDcSFB2iep47ljLbiJh9LUBhRqsKKpxeBg6J4A1gG z4u+qh3AWpTNhzFatL8Ytny2YYZwfnE= X-Google-Smtp-Source: AGHT+IHBD7l6nnAOqQTdc3KylvYALgjYxMNfB3FHdFwMcRMqPQW89osfiKUwkuj0qE24DO8CNn0rGg== X-Received: by 2002:a17:906:2921:b0:9a5:8eab:49da with SMTP id v1-20020a170906292100b009a58eab49damr5573687ejd.19.1694943551853; Sun, 17 Sep 2023 02:39:11 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:11 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 12/29] openssl: ensure all ptest fails are caught Date: Sun, 17 Sep 2023 11:38:44 +0200 Message-Id: <20230917093901.428214-12-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187785 Piping results through sed may mask failures that sed isn't catching. Signed-off-by: Alexander Kanavin --- meta/recipes-connectivity/openssl/openssl/run-ptest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl/run-ptest b/meta/recipes-connectivity/openssl/openssl/run-ptest index 10c9b49e4ad..c89ec5afa1b 100644 --- a/meta/recipes-connectivity/openssl/openssl/run-ptest +++ b/meta/recipes-connectivity/openssl/openssl/run-ptest @@ -9,4 +9,4 @@ export TOP=. # OPENSSL_ENGINES is relative from the test binaries export OPENSSL_ENGINES=../engines -HARNESS_JOBS=4 perl ./test/run_tests.pl $* | sed -u -r -e '/(.*) \.*.ok/ s/^/PASS: /g' -r -e '/Dubious(.*)/ s/^/FAIL: /g' -e '/(.*) \.*.skipped: (.*)/ s/^/SKIP: /g' +{ HARNESS_JOBS=4 perl ./test/run_tests.pl $* || echo "FAIL: openssl" ; } | sed -u -r -e '/(.*) \.*.ok/ s/^/PASS: /g' -r -e '/Dubious(.*)/ s/^/FAIL: /g' -e '/(.*) \.*.skipped: (.*)/ s/^/SKIP: /g' From patchwork Sun Sep 17 09:38: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: 30578 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 5A5A1CD3420 for ; Sun, 17 Sep 2023 09:39:16 +0000 (UTC) Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) by mx.groups.io with SMTP id smtpd.web10.27140.1694943554435055392 for ; Sun, 17 Sep 2023 02:39:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=HzJUYNAG; spf=pass (domain: gmail.com, ip: 209.85.208.173, mailfrom: alex.kanavin@gmail.com) Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-2bff7d81b5eso10984061fa.0 for ; Sun, 17 Sep 2023 02:39:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943552; x=1695548352; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kM4QCJVgLPEynIgaF/BptlcRuGDuQKPSNpynwY1DMxM=; b=HzJUYNAGlVkyXw2wgMOag2B7xxX+I+eVXqRp3o4WOVJugMK4A8Yt3hlkTNPRAWsuIF Hfvpx8r66PLrqDNDe91LdRhO3RDTEZLQO67T5h8Iv6i5npwT93KBAeW8kxeCZf9OjP2Z 2WP2aq9glUtpFF51+K9QfKAJi39e3lm617Nx5AI0bClM+39hcmW5EmupfaHc452VrRis 0LDXgMwmi/M2WfSb7LLDdxxB7WfPASTtLAp/YbsjSFdt3rPlhI0/m2IgUnVLumpghj8D bMYmnnp4DkYjAEollJDrYMMxu2Ax8ZVS7eY3xKRX5OYBwGGlUEowZhKsBPxrfHHNNKHs jIZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943552; x=1695548352; 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=kM4QCJVgLPEynIgaF/BptlcRuGDuQKPSNpynwY1DMxM=; b=oJEdpoU9fSwTcf8tlDF/WiKy2GeFn1q4xyJiBIShEVqKdhczC0PTh9ECAHEmiOCJPT 2X+XIMuOmoffoVFo5SAvef6DaMsoJvP83cgkElFnS8lP0JZgl6uzeXo6FLcP6ihiSrnk dWBMuAHOXGUfAJD/hUgJEcinBvZ8WnX2M/WnPqsUIBuQ9J7PeFWJWLha7sXspGudVRcN qN/nktDJuJ37igM5WswVQv7O0bM7GiCBR/BOOcNm7DIcra8YUmzuTOtauP3rPDHt5/3c zyoWPsbOGgyosBmZza8YZQbUkdaBXBMvPB4fh5oVPuBPJUAJSetVP3dAQsWREDUOZhg+ z6yQ== X-Gm-Message-State: AOJu0YylQKbetJgoB9CaAtrD40YDu7cHd/LFB9YOBnDvs8x7r0Y/6nux +5Q6Bkp5SfYoiiTNQ5/ZDX4hHosoGXs= X-Google-Smtp-Source: AGHT+IHFAcrhhzRjCipjWWxJHlZT8NtSzs5Za1RVGJcO1VcrJ2iZ/dbTUoFZUdEA4g3DDq5Pmxbl8A== X-Received: by 2002:a2e:8816:0:b0:2b6:cff1:cd1c with SMTP id x22-20020a2e8816000000b002b6cff1cd1cmr5044595ljh.34.1694943552536; Sun, 17 Sep 2023 02:39:12 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:12 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 13/29] glibc-tests: rename to glibc-y2038-tests Date: Sun, 17 Sep 2023 11:38:45 +0200 Message-Id: <20230917093901.428214-13-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187786 The recipe originates from meta-y2038 where the name was not confusing, but in oe-core it is. Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/maintainers.inc | 2 +- meta/conf/distro/include/ptest-packagelists.inc | 4 ++-- meta/conf/distro/include/time64.inc | 4 ++-- .../glibc/{glibc-tests_2.38.bb => glibc-y2038-tests_2.38.bb} | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename meta/recipes-core/glibc/{glibc-tests_2.38.bb => glibc-y2038-tests_2.38.bb} (96%) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 3619588ae66..fece29e4c54 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -208,7 +208,7 @@ RECIPE_MAINTAINER:pn-glibc = "Khem Raj " RECIPE_MAINTAINER:pn-glibc-locale = "Khem Raj " RECIPE_MAINTAINER:pn-glibc-mtrace = "Khem Raj " RECIPE_MAINTAINER:pn-glibc-scripts = "Khem Raj " -RECIPE_MAINTAINER:pn-glibc-tests = "Lukasz Majewski " +RECIPE_MAINTAINER:pn-glibc-y2038-tests = "Lukasz Majewski " RECIPE_MAINTAINER:pn-glibc-testsuite = "Khem Raj " RECIPE_MAINTAINER:pn-gmp = "Khem Raj " RECIPE_MAINTAINER:pn-glslang = "Jose Quaresma " diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 9160103cb0a..e023891b7b2 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -77,8 +77,8 @@ PTESTS_FAST = "\ zlib \ libexif \ " -PTESTS_FAST:append:libc-glibc = " glibc-tests" -PTESTS_PROBLEMS:remove:libc-glibc = "glibc-tests" +PTESTS_FAST:append:libc-glibc = " glibc-y2038-tests" +PTESTS_PROBLEMS:remove:libc-glibc = "glibc-y2038-tests" PTESTS_FAST:remove:mips64 = "qemu" PTESTS_PROBLEMS:append:mips64 = " qemu" PTESTS_FAST:remove:riscv32 = "qemu" diff --git a/meta/conf/distro/include/time64.inc b/meta/conf/distro/include/time64.inc index 83b0dfae6cb..2e85753e55a 100644 --- a/meta/conf/distro/include/time64.inc +++ b/meta/conf/distro/include/time64.inc @@ -19,7 +19,7 @@ TARGET_CC_ARCH:append:powerpc = "${@bb.utils.contains('TUNE_FEATURES', 'm32', '$ TARGET_CC_ARCH:append:x86 = "${@bb.utils.contains('TUNE_FEATURES', 'm32', '${GLIBC_64BIT_TIME_FLAGS}', '', d)}" GLIBC_64BIT_TIME_FLAGS:pn-glibc = "" -GLIBC_64BIT_TIME_FLAGS:pn-glibc-tests = "" +GLIBC_64BIT_TIME_FLAGS:pn-glibc-y2038-tests = "" GLIBC_64BIT_TIME_FLAGS:pn-glibc-testsuite = "" # pipewire-v4l2 explicitly sets _FILE_OFFSET_BITS=32 to get access to # both 32 and 64 bit file APIs. But it does not handle the time side? @@ -36,7 +36,7 @@ GLIBC_64BIT_TIME_FLAGS:pn-gcc-sanitizers = "" # Caused by the flags exceptions above INSANE_SKIP:append:pn-gcc-sanitizers = " 32bit-time" INSANE_SKIP:append:pn-glibc = " 32bit-time" -INSANE_SKIP:append:pn-glibc-tests = " 32bit-time" +INSANE_SKIP:append:pn-glibc-y2038-tests = " 32bit-time" INSANE_SKIP:append:pn-pulseaudio = " 32bit-time" # Strace has tests that call 32 bit API directly, which is fair enough, e.g. diff --git a/meta/recipes-core/glibc/glibc-tests_2.38.bb b/meta/recipes-core/glibc/glibc-y2038-tests_2.38.bb similarity index 96% rename from meta/recipes-core/glibc/glibc-tests_2.38.bb rename to meta/recipes-core/glibc/glibc-y2038-tests_2.38.bb index 95eb774db70..be49ca4cb73 100644 --- a/meta/recipes-core/glibc/glibc-tests_2.38.bb +++ b/meta/recipes-core/glibc/glibc-y2038-tests_2.38.bb @@ -8,7 +8,7 @@ SRC_URI += "\ file://run-ptest \ " -SUMMARY = "glibc tests to be run with ptest" +SUMMARY = "glibc tests using time32/time64 interfaces to be run with ptest for the purpose of checking y2038 compatiblity" # Erase some variables already set by glibc_${PV} python __anonymous() { From patchwork Sun Sep 17 09:38: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: 30579 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 60866CD3421 for ; Sun, 17 Sep 2023 09:39:16 +0000 (UTC) Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) by mx.groups.io with SMTP id smtpd.web10.27141.1694943555264520931 for ; Sun, 17 Sep 2023 02:39:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=WXNkhOcu; spf=pass (domain: gmail.com, ip: 209.85.208.169, mailfrom: alex.kanavin@gmail.com) Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-2bfbbd55158so56085161fa.1 for ; Sun, 17 Sep 2023 02:39:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943553; x=1695548353; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wZxocIspBXdyqLm1fjp/y22YOukLXrPLRkaXUiqIvZA=; b=WXNkhOcuGDXa2H5WJc2e1piMpWDuBHDpXESby8OQ2hrqSbmD5WcRugrrA7uBQnkZBY y8MHGbep3EP+JVa17+/0MzjUP5yHUhlFTKdKH7jYdWIoLOc7oX5tolu6n19npy8bI7YE xZFMvfsZeAwd0i8t6z7MVEuW21x5IcYOdDQknk3GHm6qe4NeJteGTTGIqnO9h8YqK57P wrsapJG9BH2iG5jshANXbAstLWRJFP1j1UUpIvA/8E6zVg7ldTxq8icNOR09QUmxRKSU PXQ1rQLICUIzYcMrPGqG+CcydM7oEHYptt18g7pt9IvV5N0rKsBp8nS9VD7+BN0EHLEL RvrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943553; x=1695548353; 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=wZxocIspBXdyqLm1fjp/y22YOukLXrPLRkaXUiqIvZA=; b=Yb7VsJ9p0cq6e8dAMWfOiZxpnYTz1QyytRVbplFDaoP02ZfDg+9I828RKAUdBwI4km Ks5UtKsxHWnwYhU0KMYA/koX4PXah67gZ+lFAmMLvwSS+40vyeCxDDMxkB+b5WOWdPQ0 0yMBqIdamcFE1Sfxa2gDE2rwL3/En/3UElAa9Sgqj8CWknCxhJbPRHs+z8OmqUpNcc0a 66sMEovDUh7iJ/XQXRD13yPuwHCQO8ZEPO0PY/vICJY7jQRwk0aQdhchXjL3A02/KDAr XtMDG0b2Yn9hWHBsw8UnZP72SSp+2bcsGCG8XY+q2j4tb6XXZfMx6uFHcknKpj5NFyFB 2QaQ== X-Gm-Message-State: AOJu0Yx2nE0eE88EMaNAMwkAisrzjcjV9bT8wLctA8K4t9mlj7MWzx8n yZGcpSU5YTbKaGEvi6v0ZiNA8wyP0OA= X-Google-Smtp-Source: AGHT+IE8+V39XDxsMupGW3jtgaXxoKqY/fhhaTh7sm8VNEeEmXWjJa1lfHwKskgEbAGGGRnqjqN6kg== X-Received: by 2002:a05:6512:2142:b0:4ff:80d4:e132 with SMTP id s2-20020a056512214200b004ff80d4e132mr4759803lfr.29.1694943553316; Sun, 17 Sep 2023 02:39:13 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:12 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 14/29] sysstat: merge .inc into .bb Date: Sun, 17 Sep 2023 11:38:46 +0200 Message-Id: <20230917093901.428214-14-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187787 Signed-off-by: Alexander Kanavin --- meta/recipes-extended/sysstat/sysstat.inc | 71 ----------------- .../sysstat/sysstat_12.6.2.bb | 78 +++++++++++++++++-- 2 files changed, 73 insertions(+), 76 deletions(-) delete mode 100644 meta/recipes-extended/sysstat/sysstat.inc diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc deleted file mode 100644 index 77337722eaa..00000000000 --- a/meta/recipes-extended/sysstat/sysstat.inc +++ /dev/null @@ -1,71 +0,0 @@ -SUMMARY = "System performance tools" -DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux." -HOMEPAGE = "http://sebastien.godard.pagesperso-orange.fr/" -LICENSE = "GPL-2.0-or-later" -SECTION = "console/utils" - -SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/${BP}.tar.xz \ - file://99_sysstat \ - file://sysstat.service \ - " - -UPSTREAM_CHECK_URI = "http://sebastien.godard.pagesperso-orange.fr/download.html" - -DEPENDS += "base-passwd" - -# autotools-brokensep as this package doesn't use automake -inherit autotools-brokensep gettext systemd upstream-version-is-even - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[lm-sensors] = "--enable-sensors,--disable-sensors,lmsensors,lmsensors-libsensors" -PACKAGECONFIG[cron] = "--enable-install-cron --enable-copy-only,--disable-install-cron --disable-copy-only" -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}" - -EXTRA_OECONF += "--disable-stripping" - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE:${PN} = "sysstat.service" -SYSTEMD_AUTO_ENABLE = "enable" - -do_configure:prepend() { - export sa_lib_dir=${libexecdir}/sa -} - -do_install() { - autotools_do_install - - # Don't version the documentation - mv ${D}${docdir}/${BP} ${D}${docdir}/${BPN} - - # don't install /var/log/sa when populating rootfs. Do it through volatile - rm -rf ${D}/var - if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}/etc/default/volatiles - install -m 0644 ${WORKDIR}/99_sysstat ${D}/etc/default/volatiles - fi - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d - echo "d ${localstatedir}/log/sa - - - -" \ - > ${D}${sysconfdir}/tmpfiles.d/sysstat.conf - - # Unless both cron and systemd are enabled, install our own - # systemd unit file. Otherwise the package will install one. - if ${@bb.utils.contains('PACKAGECONFIG', 'cron systemd', 'false', 'true', d)}; then - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_system_unitdir} - sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_system_unitdir}/sysstat.service - fi - fi -} - -pkg_postinst:${PN} () { - if [ ! -n "$D" ]; then - if [ -e /etc/init.d/populate-volatile.sh ]; then - /etc/init.d/populate-volatile.sh update - fi - fi -} - -FILES:${PN} += "${systemd_system_unitdir} ${nonarch_base_libdir}/systemd" - -TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta/recipes-extended/sysstat/sysstat_12.6.2.bb b/meta/recipes-extended/sysstat/sysstat_12.6.2.bb index b5014eaefb9..335ddd5746c 100644 --- a/meta/recipes-extended/sysstat/sysstat_12.6.2.bb +++ b/meta/recipes-extended/sysstat/sysstat_12.6.2.bb @@ -1,9 +1,77 @@ -require sysstat.inc +SUMMARY = "System performance tools" +DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux." +HOMEPAGE = "http://sebastien.godard.pagesperso-orange.fr/" +LICENSE = "GPL-2.0-or-later" +SECTION = "console/utils" -LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" +SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/${BP}.tar.xz \ + file://99_sysstat \ + file://sysstat.service \ + file://0001-configure.in-remove-check-for-chkconfig.patch \ + file://CVE-2023-33204.patch \ + " -SRC_URI += "file://0001-configure.in-remove-check-for-chkconfig.patch \ - file://CVE-2023-33204.patch \ - " +LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" SRC_URI[sha256sum] = "3e77134aedaa6fc57d9745da67edfd8990e19adee71ac47196229261c563fb48" +UPSTREAM_CHECK_URI = "http://sebastien.godard.pagesperso-orange.fr/download.html" + +DEPENDS += "base-passwd" + +# autotools-brokensep as this package doesn't use automake +inherit autotools-brokensep gettext systemd upstream-version-is-even + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[lm-sensors] = "--enable-sensors,--disable-sensors,lmsensors,lmsensors-libsensors" +PACKAGECONFIG[cron] = "--enable-install-cron --enable-copy-only,--disable-install-cron --disable-copy-only" +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}" + +EXTRA_OECONF += "--disable-stripping" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "sysstat.service" +SYSTEMD_AUTO_ENABLE = "enable" + +do_configure:prepend() { + export sa_lib_dir=${libexecdir}/sa +} + +do_install() { + autotools_do_install + + # Don't version the documentation + mv ${D}${docdir}/${BP} ${D}${docdir}/${BPN} + + # don't install /var/log/sa when populating rootfs. Do it through volatile + rm -rf ${D}/var + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}/etc/default/volatiles + install -m 0644 ${WORKDIR}/99_sysstat ${D}/etc/default/volatiles + fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d ${localstatedir}/log/sa - - - -" \ + > ${D}${sysconfdir}/tmpfiles.d/sysstat.conf + + # Unless both cron and systemd are enabled, install our own + # systemd unit file. Otherwise the package will install one. + if ${@bb.utils.contains('PACKAGECONFIG', 'cron systemd', 'false', 'true', d)}; then + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_system_unitdir} + sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_system_unitdir}/sysstat.service + fi + fi +} + +pkg_postinst:${PN} () { + if [ ! -n "$D" ]; then + if [ -e /etc/init.d/populate-volatile.sh ]; then + /etc/init.d/populate-volatile.sh update + fi + fi +} + +FILES:${PN} += "${systemd_system_unitdir} ${nonarch_base_libdir}/systemd" + +TARGET_CC_ARCH += "${LDFLAGS}" + From patchwork Sun Sep 17 09:38: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: 30580 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 61398CD37B3 for ; Sun, 17 Sep 2023 09:39:26 +0000 (UTC) Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) by mx.groups.io with SMTP id smtpd.web10.27142.1694943555933954670 for ; Sun, 17 Sep 2023 02:39:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=OiD74Yl2; spf=pass (domain: gmail.com, ip: 209.85.208.170, mailfrom: alex.kanavin@gmail.com) Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-2bf5bf33bcdso59416931fa.0 for ; Sun, 17 Sep 2023 02:39:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943554; x=1695548354; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jJe8g6RhOARaN6FISWY0rNffu4kYDY4uBi0QNM4AX5I=; b=OiD74Yl2csKkie+8MdVVFaq3f1/ewvGzBcg0K9C2e6oUPQw/66dl844aIc3npX/4TB HP/ytG4TcojyoU8EmY2SPlsfeNlkUXcZ2CswR+gMFLwVVFn0OOfRe6vH7wW3aTdUhesg kg6C/b/wsPMpBke3QYCEBbNAU+wj81H1p65BHNo4UehQNrF/uNr5kZftowdvdYOd2+hL K2pYkzbPrFnrtRmaT8NjHkrq8lLIbGBsMK7o7ogh9GqOcRDPuSYstR8ADAHi/KFxCuOf LSauLTOpvKk8p+0ZVJHPMCg1phFrZwSq47WgPX/TqTPMSNv2h03+39ZcdA9RvJoRNADl 7L4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943554; x=1695548354; 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=jJe8g6RhOARaN6FISWY0rNffu4kYDY4uBi0QNM4AX5I=; b=ra7RrLWK1DEidovupvawNW3wSniB+qCHCrzcwd3V3dK9OVQq2TSoSpNB6ceQllfYqH o4Dqy2aSjwQt4RwcpagbyNDPkUIdoZSEdzHpDEOnjuX7Rb2vV+QyrCi+4eZ0D0UD/ume U40K/q9Kcmo8TwcGwMOOi+2ukxM1Bg2P35imGPj/eKhDW1DrDWIP7xbuFtofiIPw0ed1 BUMsLpK6LjPKbmQuc9li0BMW5k9imM+S1BBOFhQiRYHuHudPNqrVzCbKsBaShojIaNgO L8IglHc2K7tZp2XzA/+n0whIZQrov2gs/TIym10dIqzv+iHBgTkHfj6JOtvK+GtZPeTv ELzg== X-Gm-Message-State: AOJu0YzuSeFYhkEw9SwSwAtC1urAIIDlpgJJoXfQrQCtz4yUa9TdvSsK 8YH7VSjHjtGuFOJQH0S2XRSVVm2UXM8= X-Google-Smtp-Source: AGHT+IE168UoBlIllqWtx7RzqP+yR5Wc7aEx010iUBREgJp/EVLxL/DlLlTOxhOWtA79wAqfSFfSsw== X-Received: by 2002:a2e:9dc1:0:b0:2b6:df71:cff1 with SMTP id x1-20020a2e9dc1000000b002b6df71cff1mr4430454ljj.52.1694943553943; Sun, 17 Sep 2023 02:39:13 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:13 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 15/29] sysstat: update 12.6.2 -> 12.7.4 Date: Sun, 17 Sep 2023 11:38:47 +0200 Message-Id: <20230917093901.428214-15-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187788 Old homepage is no longer being updated and will be taken down soon. Let's switch to git, as the new homepage is still being set up. Upstream has confirmed that odd-even version scheme is no longer in place: https://github.com/sysstat/sysstat/issues/373 Signed-off-by: Alexander Kanavin --- ...figure.in-remove-check-for-chkconfig.patch | 10 ++-- .../sysstat/sysstat/CVE-2023-33204.patch | 46 ------------------- .../{sysstat_12.6.2.bb => sysstat_12.7.4.bb} | 11 ++--- 3 files changed, 10 insertions(+), 57 deletions(-) delete mode 100644 meta/recipes-extended/sysstat/sysstat/CVE-2023-33204.patch rename meta/recipes-extended/sysstat/{sysstat_12.6.2.bb => sysstat_12.7.4.bb} (85%) diff --git a/meta/recipes-extended/sysstat/sysstat/0001-configure.in-remove-check-for-chkconfig.patch b/meta/recipes-extended/sysstat/sysstat/0001-configure.in-remove-check-for-chkconfig.patch index 4067bb983bc..84383f955f9 100644 --- a/meta/recipes-extended/sysstat/sysstat/0001-configure.in-remove-check-for-chkconfig.patch +++ b/meta/recipes-extended/sysstat/sysstat/0001-configure.in-remove-check-for-chkconfig.patch @@ -1,7 +1,7 @@ From 1590cc614aaf0fb81cd804414d6c9d5a9227352c Mon Sep 17 00:00:00 2001 From: Wenlin Kang Date: Tue, 5 Nov 2019 16:16:44 +0800 -Subject: [PATCH] configure.in: remove check for chkconfig +Subject: [PATCH] configure.ac: remove check for chkconfig chkconfig can't work on cross-platform, so should remove check for it. @@ -9,13 +9,13 @@ Upstream-Status: Inappropriate [ embedded specific ] Signed-off-by: Wenlin Kang --- - configure.in | 3 ++- + configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/configure.in b/configure.in +diff --git a/configure.ac b/configure.ac index 48b9a31..cedeb43 100644 ---- a/configure.in -+++ b/configure.in +--- a/configure.ac ++++ b/configure.ac @@ -42,7 +42,8 @@ AC_SUBST(VER_JSON) AC_SUBST(VER_XML) diff --git a/meta/recipes-extended/sysstat/sysstat/CVE-2023-33204.patch b/meta/recipes-extended/sysstat/sysstat/CVE-2023-33204.patch deleted file mode 100644 index a7b51f3217f..00000000000 --- a/meta/recipes-extended/sysstat/sysstat/CVE-2023-33204.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0764cb56df4a5afdf04980c9eb6735f789f5aa42 Mon Sep 17 00:00:00 2001 -From: Pavel Kopylov -Date: Wed, 17 May 2023 11:33:45 +0200 -Subject: [PATCH] Fix an overflow which is still possible for some values. - -CVE: CVE-2023-33204 -Upstream-Status: Backport [https://github.com/sysstat/sysstat/commit/954ff2e2673c] - -Backport Changes: -Adopt additional changes as per following merge commit of pull request: -https://github.com/sysstat/sysstat/commit/6f8dc568e6ab - -Signed-off-by: Xiangyu Chen -Signed-off-by: Sanjay Chitroda ---- - common.c | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/common.c b/common.c -index a3d31a5..138920c 100644 ---- a/common.c -+++ b/common.c -@@ -447,15 +447,17 @@ int check_dir(char *dirname) - void check_overflow(unsigned int val1, unsigned int val2, - unsigned int val3) - { -- if ((unsigned long long) val1 * (unsigned long long) val2 * -- (unsigned long long) val3 > UINT_MAX) { -+ if ((val1 != 0) && (val2 != 0) && (val3 != 0) && -+ (((unsigned long long)UINT_MAX / (unsigned long long)val1 < -+ (unsigned long long)val2) || -+ ((unsigned long long)UINT_MAX / ((unsigned long long)val1 * -+ (unsigned long long)val2) < (unsigned long long)val3))) { - #ifdef DEBUG -- fprintf(stderr, "%s: Overflow detected (%llu). Aborting...\n", -- __FUNCTION__, (unsigned long long) val1 * (unsigned long long) val2 * -- (unsigned long long) val3); -+ fprintf(stderr, "%s: Overflow detected (%u,%u,%u). Aborting...\n", -+ __FUNCTION__, val1, val2, val3); - #endif - exit(4); -- } -+ } - } - - #ifndef SOURCE_SADC diff --git a/meta/recipes-extended/sysstat/sysstat_12.6.2.bb b/meta/recipes-extended/sysstat/sysstat_12.7.4.bb similarity index 85% rename from meta/recipes-extended/sysstat/sysstat_12.6.2.bb rename to meta/recipes-extended/sysstat/sysstat_12.7.4.bb index 335ddd5746c..134fd5cf964 100644 --- a/meta/recipes-extended/sysstat/sysstat_12.6.2.bb +++ b/meta/recipes-extended/sysstat/sysstat_12.7.4.bb @@ -1,25 +1,24 @@ SUMMARY = "System performance tools" DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux." -HOMEPAGE = "http://sebastien.godard.pagesperso-orange.fr/" +HOMEPAGE = "https://sysstat.github.io/" LICENSE = "GPL-2.0-or-later" SECTION = "console/utils" -SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/${BP}.tar.xz \ +SRC_URI = "git://github.com/sysstat/sysstat.git;protocol=https;branch=master \ file://99_sysstat \ file://sysstat.service \ file://0001-configure.in-remove-check-for-chkconfig.patch \ - file://CVE-2023-33204.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" -SRC_URI[sha256sum] = "3e77134aedaa6fc57d9745da67edfd8990e19adee71ac47196229261c563fb48" -UPSTREAM_CHECK_URI = "http://sebastien.godard.pagesperso-orange.fr/download.html" +SRCREV = "1df0d61306ae826c896a5cf6f665d58c671c0498" +S = "${WORKDIR}/git" DEPENDS += "base-passwd" # autotools-brokensep as this package doesn't use automake -inherit autotools-brokensep gettext systemd upstream-version-is-even +inherit autotools-brokensep gettext systemd PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[lm-sensors] = "--enable-sensors,--disable-sensors,lmsensors,lmsensors-libsensors" From patchwork Sun Sep 17 09:38:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 30581 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 67AA1CD13CF for ; Sun, 17 Sep 2023 09:39:26 +0000 (UTC) Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by mx.groups.io with SMTP id smtpd.web11.27414.1694943556182434943 for ; Sun, 17 Sep 2023 02:39:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=MaYoHnyB; spf=pass (domain: gmail.com, ip: 209.85.218.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-98377c5d53eso443250866b.0 for ; Sun, 17 Sep 2023 02:39:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943554; x=1695548354; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3bVagTOtSQ0cBS/yzpK1YOvTZfrw4yDnjoP/g+N7LIo=; b=MaYoHnyBUXBDs3Cqrf10M+WZR9gDegOLZ0jywIFUtve46OxGULtbi44jxxr0xSu+7G wLKUzfgmCznaLkhEm7NI3LV02klC4+dcPlCmpQPujXML+11Xm8S3MXl1PM8i+3KWpKp8 Rad8KUAj3uvoypp+NCq6Wo9T3xs1GbJi7sEkYYvroeLu94HDpYr3BAKDD+l9tFPxyVmE i7W1PH/wV6EMug30x8m+5BdD426MgCdmohChCqLaLmBYSSbf3zcyRSaPtR3HchGG1Xbv j+9vjdHu19jNRyOEnnYyOEck6/WKkEUoRwGg5xrh1h41mIhD0yyfZ2Ty2C85X9E0zd97 sf7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943554; x=1695548354; 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=3bVagTOtSQ0cBS/yzpK1YOvTZfrw4yDnjoP/g+N7LIo=; b=p60ViSHERRmqmR0vQWp+nahyECQKstRUIh8WV46yhjyFl204B352dLcx+0ZTZVpF9H X6R4H/YrqB2KMqTcKLy5wogKEHCqWjA6IJYUFfy4SMR23C2Fi5pSbdJYeFIDMSUEFu2b 17Fe1KHDw4Kp9EAqWKAoCTeeo5aS5cm8qmoFee4uvYymwq/z0rXNz0WeFW9CGlz3Rb66 QMKtowMOXmdtPZLSg0WInt6hRliAZwEa1Ex4hUT/oGZIHr1YY2H0CCIIP3TIAmTDp83s hU2DU92HIaX/R2PhrZKnq3mLwGYUWJyRpAI5GdNxArJXBaPnz2WlLfS6z3MOHEBVi3ot jtOw== X-Gm-Message-State: AOJu0YxQxr/cp3rtuZFx5SFdn0RZ1iA7nWKg5LcGbjvE9qQRtDHSGgyV 0mbATawMrd52/dXICvz3QPxrir7wddo= X-Google-Smtp-Source: AGHT+IH9uzYL2fLYhR65Jwcq9cL3O7zbISg9UhyHljDEUdqwv+rBT0Jv/mPAzdexL2f4LOZWvLMeYg== X-Received: by 2002:a17:906:530e:b0:9a1:f21e:cdfc with SMTP id h14-20020a170906530e00b009a1f21ecdfcmr5511749ejo.41.1694943554523; Sun, 17 Sep 2023 02:39:14 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:14 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 16/29] glib-2.0: update 2.76.4 -> 2.78.0 Date: Sun, 17 Sep 2023 11:38:48 +0200 Message-Id: <20230917093901.428214-16-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187789 Add a patch so that native glib executables do not error out on systems with kernels less than 5.4. Signed-off-by: Alexander Kanavin --- ...t-write-bindir-into-pkg-config-files.patch | 74 ++++++------ ...-support-Fix-snap-test-ordering-race.patch | 107 ------------------ ...pparent-size-only-for-files-and-syml.patch | 105 ----------------- ...ot-enable-pidfd-features-on-native-g.patch | 32 ++++++ .../glib-2.0/glib-2.0/relocate-modules.patch | 20 ++-- ...{glib-2.0_2.76.4.bb => glib-2.0_2.78.0.bb} | 8 +- meta/recipes-core/glib-2.0/glib.inc | 1 + 7 files changed, 84 insertions(+), 263 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-portal-support-Fix-snap-test-ordering-race.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch rename meta/recipes-core/glib-2.0/{glib-2.0_2.76.4.bb => glib-2.0_2.78.0.bb} (87%) diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch index 9bdd99d8a21..0d44ddf299a 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch @@ -1,4 +1,4 @@ -From 4a41bf7b050168726cc4fad4c1c72fc7c18ab779 Mon Sep 17 00:00:00 2001 +From 9ec4eedeb3f67db0bff09f5d859318d05ff47964 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 15 Feb 2019 11:17:27 +0100 Subject: [PATCH] Do not write $bindir into pkg-config files @@ -16,46 +16,46 @@ Signed-off-by: Alexander Kanavin 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gio/meson.build b/gio/meson.build -index 36b5bad..137e75a 100644 +index a320c0f..86ce7c4 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -862,14 +862,14 @@ pkg.generate(libgio, - 'schemasdir=' + join_paths('${datadir}', schemas_subdir), - 'bindir=' + join_paths('${prefix}', get_option('bindir')), - 'giomoduledir=' + pkgconfig_giomodulesdir, -- 'gio=' + join_paths('${bindir}', 'gio'), -- 'gio_querymodules=@0@'.format(pkgconfig_multiarch_bindir / 'gio-querymodules'), -- 'glib_compile_schemas=@0@'.format(pkgconfig_multiarch_bindir / 'glib-compile-schemas'), -- 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), -- 'gdbus=' + join_paths('${bindir}', 'gdbus'), -- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'), -- 'gresource=' + join_paths('${bindir}', 'gresource'), -- 'gsettings=' + join_paths('${bindir}', 'gsettings')], -+ 'gio=gio', -+ 'gio_querymodules=gio-querymodules', -+ 'glib_compile_schemas=glib-compile-schemas', -+ 'glib_compile_resources=glib-compile-resources', -+ 'gdbus=gdbus', -+ 'gdbus_codegen=gdbus-codegen', -+ 'gresource=gresource', -+ 'gsettings=gsettings'], +@@ -884,14 +884,14 @@ pkg.generate(libgio, + 'dtdsdir=' + '${datadir}' / dtds_subdir, + 'bindir=' + '${prefix}' / get_option('bindir'), + 'giomoduledir=' + pkgconfig_giomodulesdir, +- 'gio=' + '${bindir}' / 'gio', +- 'gio_querymodules=' + pkgconfig_multiarch_bindir / 'gio-querymodules', +- 'glib_compile_schemas=' + pkgconfig_multiarch_bindir / 'glib-compile-schemas', +- 'glib_compile_resources=' + '${bindir}' / 'glib-compile-resources', +- 'gdbus=' + '${bindir}' /'gdbus', +- 'gdbus_codegen=' + '${bindir}' / 'gdbus-codegen', +- 'gresource=' + '${bindir}' / 'gresource', +- 'gsettings=' + '${bindir}' / 'gsettings', ++ 'gio=gio', ++ 'gio_querymodules=gio-querymodules', ++ 'glib_compile_schemas=glib-compile-schemas', ++ 'glib_compile_resources=glib-compile-resources', ++ 'gdbus=gdbus', ++ 'gdbus_codegen=gdbus-codegen', ++ 'gresource=gresource', ++ 'gsettings=gsettings', + ], version : glib_version, install_dir : glib_pkgconfigreldir, - filebase : 'gio-2.0', diff --git a/glib/meson.build b/glib/meson.build -index c365901..c3d6601 100644 +index c26a35e..1d8ca6b 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -397,9 +397,9 @@ pkg.generate(libglib, - subdirs : ['glib-2.0'], - extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, - variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), -- 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), -- 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), -- 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], -+ 'glib_genmarshal=glib-genmarshal', -+ 'gobject_query=gobject-query', -+ 'glib_mkenums=glib-mkenums'], - version : glib_version, - install_dir : glib_pkgconfigreldir, - filebase : 'glib-2.0', +@@ -447,9 +447,9 @@ pkg.generate(libglib, + variables : [ + 'bindir=' + '${prefix}' / get_option('bindir'), + 'datadir=' + '${prefix}' / get_option('datadir'), +- 'glib_genmarshal=' + '${bindir}' / 'glib-genmarshal', +- 'gobject_query=' + '${bindir}' / 'gobject-query', +- 'glib_mkenums=' + '${bindir}' / 'glib-mkenums', ++ 'glib_genmarshal=glib-genmarshal', ++ 'gobject_query=gobject-query', ++ 'glib_mkenums=glib-mkenums', + 'glib_valgrind_suppressions=' + '${datadir}' / + valgrind_suppression_file_install_subdir / + fs.name(valgrind_suppression_file), diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-portal-support-Fix-snap-test-ordering-race.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-portal-support-Fix-snap-test-ordering-race.patch deleted file mode 100644 index 9e2bc1338b1..00000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-portal-support-Fix-snap-test-ordering-race.patch +++ /dev/null @@ -1,107 +0,0 @@ -From f47503cc5ae10de6dee319ba6cff257eddabf33e Mon Sep 17 00:00:00 2001 -From: Richard Purdie -Date: Tue, 30 May 2023 11:52:38 +0100 -Subject: [PATCH] gio/tests/portal-support: Fix snap test ordering race - -When the gnome test runner executes the tests, the test appear to execute in disk -order. This means it sometimes works and sometimes we see breakage in portal-support-snap -and portal-support-snap-classic. - -The issue is that some tests create config files but some don't. If they run -in the wrong order, tests see config files they shouldn't and break. - -Fix this by deleting the files after each test run, properly cleaning up after -themselves. The cleanup code is based upon gtestutils.c:rm_rf(). - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/c63cf19d9a8a6ae315a7f9a3fe4ea60c8cf5dece] - -Signed-off-by: Richard Purdie ---- - gio/tests/portal-support-snap-classic.c | 3 +++ - gio/tests/portal-support-snap.c | 3 +++ - gio/tests/portal-support-utils.c | 27 +++++++++++++++++++++++++ - gio/tests/portal-support-utils.h | 2 ++ - 4 files changed, 35 insertions(+) - -diff --git a/gio/tests/portal-support-snap-classic.c b/gio/tests/portal-support-snap-classic.c -index 8c0ed90c2..5b67865e7 100644 ---- a/gio/tests/portal-support-snap-classic.c -+++ b/gio/tests/portal-support-snap-classic.c -@@ -66,6 +66,9 @@ tests_teardown (SetupData *setup_data, - else - g_unsetenv ("SNAP"); - -+ cleanup_snapfiles (setup_data->snap_path); -+ cleanup_snapfiles (setup_data->bin_path); -+ - g_clear_pointer (&setup_data->old_path, g_free); - g_clear_pointer (&setup_data->old_snap, g_free); - } -diff --git a/gio/tests/portal-support-snap.c b/gio/tests/portal-support-snap.c -index 7dd14d82f..cd904678f 100644 ---- a/gio/tests/portal-support-snap.c -+++ b/gio/tests/portal-support-snap.c -@@ -67,6 +67,9 @@ tests_teardown (SetupData *setup_data, - else - g_unsetenv ("SNAP"); - -+ cleanup_snapfiles (setup_data->snap_path); -+ cleanup_snapfiles (setup_data->bin_path); -+ - g_clear_pointer (&setup_data->old_path, g_free); - g_clear_pointer (&setup_data->old_snap, g_free); - } -diff --git a/gio/tests/portal-support-utils.c b/gio/tests/portal-support-utils.c -index ae7073a3a..b7ee22630 100644 ---- a/gio/tests/portal-support-utils.c -+++ b/gio/tests/portal-support-utils.c -@@ -26,6 +26,33 @@ - #include - #include - -+ -+void -+cleanup_snapfiles (const gchar *path) -+{ -+ GDir *dir = NULL; -+ const gchar *entry; -+ -+ dir = g_dir_open (path, 0, NULL); -+ if (dir == NULL) -+ { -+ /* Assume it’s a file. Ignore failure. */ -+ (void) g_remove (path); -+ return; -+ } -+ -+ while ((entry = g_dir_read_name (dir)) != NULL) -+ { -+ gchar *sub_path = g_build_filename (path, entry, NULL); -+ cleanup_snapfiles (sub_path); -+ g_free (sub_path); -+ } -+ -+ g_dir_close (dir); -+ -+ g_rmdir (path); -+} -+ - void - create_fake_snapctl (const char *path, - const char *supported_op) -diff --git a/gio/tests/portal-support-utils.h b/gio/tests/portal-support-utils.h -index 40c035b43..defbdcd4e 100644 ---- a/gio/tests/portal-support-utils.h -+++ b/gio/tests/portal-support-utils.h -@@ -23,6 +23,8 @@ - - #include - -+void cleanup_snapfiles (const gchar *path); -+ - void create_fake_snap_yaml (const char *snap_path, - gboolean is_classic); - --- -2.39.2 - diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch deleted file mode 100644 index a881b25ef3e..00000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch +++ /dev/null @@ -1,105 +0,0 @@ -From d1a2117dc18dbcf87685891de7e2898108b66fc9 Mon Sep 17 00:00:00 2001 -From: Joan Bruguera -Date: Thu, 23 Mar 2023 02:24:30 +0000 -Subject: [PATCH] glocalfile: Sum apparent size only for files and symlinks - -Since GNU Coreutils 9.2 (commit 110bcd28386b1f47a4cd876098acb708fdcbbb25), -`du --apparent-size` (including `du --bytes`) no longer counts all kinds of -files (directories, FIFOs, etc.), but only those for which `st_size` in -`struct stat` is defined by POSIX, namely regular files and symlinks -(and also rarely supported memory objects). - -This aligns the behaviour of GLib's `G_FILE_MEASURE_APPARENT_SIZE` flag -with the new GNU Coreutils `du` and correct POSIX use. - -Note that this may be a breaking change for some uses. - -Link: https://lists.gnu.org/archive/html/bug-coreutils/2023-03/msg00007.html -Fixes: https://gitlab.gnome.org/GNOME/glib/-/issues/2965 - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin ---- - gio/gioenums.h | 3 +++ - gio/glocalfile.c | 37 +++++++++++++++++++++++++++++++++++++ - 2 files changed, 40 insertions(+) - -diff --git a/gio/gioenums.h b/gio/gioenums.h -index 7fd74a43e..c820cd36d 100644 ---- a/gio/gioenums.h -+++ b/gio/gioenums.h -@@ -224,6 +224,9 @@ typedef enum { - * sizes. Normally, the block-size is used, if available, as this is a - * more accurate representation of disk space used. - * Compare with `du --apparent-size`. -+ * Since GLib 2.78. and similarly to `du` since GNU Coreutils 9.2, this will -+ * ignore the sizes of file types other than regular files and links, as the -+ * sizes of other file types are not specified in a standard way. - * @G_FILE_MEASURE_NO_XDEV: Do not cross mount point boundaries. - * Compare with `du -x`. - * -diff --git a/gio/glocalfile.c b/gio/glocalfile.c -index 67d4b99fb..dbb56902d 100644 ---- a/gio/glocalfile.c -+++ b/gio/glocalfile.c -@@ -86,6 +86,9 @@ - #define FILE_READ_ONLY_VOLUME 0x00080000 - #endif - -+#ifndef S_ISREG -+#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG) -+#endif - #ifndef S_ISDIR - #define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR) - #endif -@@ -2777,6 +2780,39 @@ g_local_file_measure_size_of_contents (gint fd, - MeasureState *state, - GError **error); - -+/* -+ * _g_stat_is_size_usable: -+ * @buf: a #GLocalFileStat. -+ * -+ * Checks if the file type is such that the `st_size` field of `struct stat` is -+ * well-defined by POSIX. -+ * (see https://pubs.opengroup.org/onlinepubs/009696799/basedefs/sys/stat.h.html) -+ * -+ * This behaviour is aligned with `du` from GNU Coreutils 9.2+ -+ * (see https://lists.gnu.org/archive/html/bug-coreutils/2023-03/msg00007.html) -+ * and makes apparent size sums well-defined; formerly, they depended on the -+ * implementation, and could differ across filesystems. -+ * -+ * Returns: %TRUE if the size field is well-defined, %FALSE otherwise. -+ **/ -+inline static gboolean -+_g_stat_is_size_usable (const GLocalFileStat *buf) -+{ -+#ifndef HAVE_STATX -+ /* Memory objects are defined by POSIX, but are not supported by statx nor Windows */ -+#ifdef S_TYPEISSHM -+ if (S_TYPEISSHM (buf)) -+ return TRUE; -+#endif -+#ifdef S_TYPEISTMO -+ if (S_TYPEISTMO (buf)) -+ return TRUE; -+#endif -+#endif -+ -+ return S_ISREG (_g_stat_mode (buf)) || S_ISLNK (_g_stat_mode (buf)); -+} -+ - static gboolean - g_local_file_measure_size_of_file (gint parent_fd, - GSList *name, -@@ -2836,6 +2872,7 @@ g_local_file_measure_size_of_file (gint parent_fd, - state->disk_usage += _g_stat_blocks (&buf) * G_GUINT64_CONSTANT (512); - else - #endif -+ if (_g_stat_is_size_usable (&buf)) - state->disk_usage += _g_stat_size (&buf); - - if (S_ISDIR (_g_stat_mode (&buf))) --- -2.39.2 - diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch new file mode 100644 index 00000000000..788f420d118 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch @@ -0,0 +1,32 @@ +From 9aa9574861fad39d0679025e35fe1e188345f685 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sat, 16 Sep 2023 22:28:27 +0200 +Subject: [PATCH] meson.build: do not enable pidfd features on native glib + builds + +We still use host distros like alma 8 with kernels older than 5.4, +where these features are not implemented. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 1c36993..bbf97fc 100644 +--- a/meson.build ++++ b/meson.build +@@ -981,7 +981,8 @@ if cc.links('''#include + waitid (P_PIDFD, 0, &child_info, WEXITED | WNOHANG); + return 0; + }''', name : 'pidfd_open(2) system call') +- glib_conf.set('HAVE_PIDFD', 1) ++ #requires kernel 5.4+ ++ #glib_conf.set('HAVE_PIDFD', 1) + endif + + # Check for __uint128_t (gcc) by checking for 128-bit division +-- +2.30.2 + diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index 3dba599fc0b..841fedef8af 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch @@ -1,4 +1,4 @@ -From 38e401969a2ff8269919cbeacec733a67f041735 Mon Sep 17 00:00:00 2001 +From b90d13900dd2777c2ab90c5b0be1a872c10a17da Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds @@ -13,25 +13,28 @@ Signed-off-by: Ross Burton Port patch to 2.48 Signed-off-by: Jussi Kukkonen + --- - gio/giomodule.c | 5 ----- - 1 file changed, 5 deletions(-) + gio/giomodule.c | 7 ------- + 1 file changed, 7 deletions(-) diff --git a/gio/giomodule.c b/gio/giomodule.c -index 11ce7d8..cc27ecd 100644 +index 17fabe6..8021208 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c -@@ -1271,9 +1271,6 @@ get_gio_module_dir (void) +@@ -1271,11 +1271,6 @@ get_gio_module_dir (void) g_free (install_dir); #else module_dir = g_strdup (GIO_MODULE_DIR); -#ifdef __APPLE__ -#include "TargetConditionals.h" --#if TARGET_OS_OSX +-/* Only auto-relocate on macOS, not watchOS etc; older macOS SDKs only define TARGET_OS_MAC */ +-#if (defined (TARGET_OS_OSX) && TARGET_OS_OSX) || \ +- (!defined (TARGET_OS_OSX) && defined (TARGET_OS_MAC) && TARGET_OS_MAC) #include { g_autofree gchar *path = NULL; -@@ -1292,8 +1289,6 @@ get_gio_module_dir (void) +@@ -1294,8 +1289,6 @@ get_gio_module_dir (void) } } } @@ -40,6 +43,3 @@ index 11ce7d8..cc27ecd 100644 #endif } --- -2.30.2 - diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.76.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.78.0.bb similarity index 87% rename from meta/recipes-core/glib-2.0/glib-2.0_2.76.4.bb rename to meta/recipes-core/glib-2.0/glib-2.0_2.78.0.bb index 64a3c6d80cf..500e4e873e9 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.76.4.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.78.0.bb @@ -14,12 +14,12 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ - file://0001-gio-tests-portal-support-Fix-snap-test-ordering-race.patch \ - file://0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch \ " -SRC_URI:append:class-native = " file://relocate-modules.patch" +SRC_URI:append:class-native = " file://relocate-modules.patch \ + file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ + " -SRC_URI[sha256sum] = "5a5a191c96836e166a7771f7ea6ca2b0069c603c7da3cba1cd38d1694a395dda" +SRC_URI[sha256sum] = "44eaab8b720877ce303c5540b657b126f12dc94972d9880b52959f43fb537b30" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 878dd107de4..c314594d493 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -54,6 +54,7 @@ FILES:${PN} = "${libdir}/lib*${SOLIBS} \ ${libdir}/gio \ ${libexecdir}/*gio-querymodules \ ${libexecdir}/*gio-launch-desktop \ + ${datadir}/glib-2.0/dtds \ ${datadir}/glib-2.0/schemas" FILES:${PN}-utils += "${bindir}/glib-genmarshal \ From patchwork Sun Sep 17 09:38: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: 30583 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 6F2E4CD37B4 for ; Sun, 17 Sep 2023 09:39:26 +0000 (UTC) Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by mx.groups.io with SMTP id smtpd.web11.27415.1694943556685800667 for ; Sun, 17 Sep 2023 02:39:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=gVr+iPGp; spf=pass (domain: gmail.com, ip: 209.85.218.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-9ada609bb62so441650166b.2 for ; Sun, 17 Sep 2023 02:39:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943555; x=1695548355; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=A5qVoLrhj6UITdCcBSMZZ8z7lFQgxfRV/9Im76vwiVE=; b=gVr+iPGpZvgXzVwLKvWeRmuQhlBgg5iHp7iCLDgauw4opwGihmDDprHNa9YXVwm3nD YuY7Pj3NVyds9sIQyx52oGYYgE3mTpUVZQ5VBjJaNlfLJzWEQCVDjF62lH6ppCaTL6D1 8ru+GyVEq2l/m7GrmGtxyaV2NS72g+Dme5hXCT/CGubmWrckL/WiSBjfCCbOYyyoop/6 0YniOzPayPDGynvQ34sdT7BciPGVzOyG/mFXWXuNGm/Al/Az7DbEa0g/RjsZUcbhbhIi nLwZRbm9niMJCfOMk/6AnoTsGLCHtyHN+e3UgcUZB8ISgGUcMqNYUc2q99Uyw0hSmZ/r ehrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943555; x=1695548355; 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=A5qVoLrhj6UITdCcBSMZZ8z7lFQgxfRV/9Im76vwiVE=; b=otqONm8Ypk2+sQWi4EtA0o1pyzm/ygXCorlRCmizBuOzUqHORfrKsPShXnwYcORTVM Q/M3cEByncELWYwOQQYXlhKev88QkdWidIIzGXmi+FrxI59nmy0w706ul4MNWghjNj29 34eujOxQ9IupcscYBGyX/FLOy2xd48Q2R6BgAcFo5niT2feFlEh5WcQhHlghB4m7FwXm ESnLTlaVSss89SbPCXkDQR8OWlX8hFMyflJp11/0pQ929hdHt5N0JCLLNx6oFsEUHTmc Gv+rwaC/WPEuGoXd6sz8f2aIcBOdTWO/uYTWDI5eRckU6C0X7zodllMdmLWpBsGDxRch 0TTA== X-Gm-Message-State: AOJu0YxIP6DmlIWVKA1yYnJ+rVF7WJntrxYNa6MuPvTl0c3V4NP8HNmR xGMrkw2k3bhjTc1QtrrHfZxXpv+s1u0= X-Google-Smtp-Source: AGHT+IGTcurRIkgjAkp+YVurlQgyCMaMP4HzJxUviT8yIU54Xh7sttRItutNJG4WG1x258eeHjkDyQ== X-Received: by 2002:a17:906:cc4a:b0:9a2:ecd:d963 with SMTP id mm10-20020a170906cc4a00b009a20ecdd963mr4852768ejb.44.1694943555081; Sun, 17 Sep 2023 02:39:15 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:14 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 17/29] ovmf: update edk2-stable202305 -> edk2-stable202308 Date: Sun, 17 Sep 2023 11:38:49 +0200 Message-Id: <20230917093901.428214-17-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187790 Signed-off-by: Alexander Kanavin --- ...ols-makefile-adjust-to-build-in-under-bitbake.patch | 10 +++++----- meta/recipes-core/ovmf/ovmf_git.bb | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch index efabc8febc9..eeedc9e20f0 100644 --- a/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch +++ b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch @@ -1,7 +1,7 @@ -From 7675a67b8bb207de38ff5a9dc416e8b1028eb8ce Mon Sep 17 00:00:00 2001 +From ac9df4fb92965f1f95a5bdbde5f2f86d0c569711 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Fri, 26 Jul 2019 17:34:26 -0400 -Subject: [PATCH 2/4] BaseTools: makefile: adjust to build in under bitbake +Subject: [PATCH] BaseTools: makefile: adjust to build in under bitbake Prepend the build flags with those of bitbake. This is to build using the bitbake native sysroot include and library directories. @@ -18,13 +18,13 @@ Upstream-Status: Inappropriate [needs to be converted to in-recipe fixups] 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile -index 1bf003523b..28757aed63 100644 +index d369908a09..22c670f316 100644 --- a/BaseTools/Source/C/Makefiles/header.makefile +++ b/BaseTools/Source/C/Makefiles/header.makefile -@@ -82,35 +82,34 @@ $(error Bad HOST_ARCH) - endif +@@ -85,35 +85,34 @@ endif INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) + INCLUDE += -I $(EDK2_PATH)/MdePkg/Include -CPPFLAGS = $(INCLUDE) +CPPFLAGS += $(INCLUDE) diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index 761c2654530..6bbe21ac5c6 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb @@ -26,8 +26,8 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ file://0004-reproducible.patch \ " -PV = "edk2-stable202305" -SRCREV = "ba91d0292e593df8528b66f99c1b0b14fadc8e16" +PV = "edk2-stable202308" +SRCREV = "819cfc6b42a68790a23509e4fcc58ceb70e1965e" UPSTREAM_CHECK_GITTAGREGEX = "(?Pedk2-stable.*)" inherit deploy From patchwork Sun Sep 17 09:38: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: 30585 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 757C5CD13D1 for ; Sun, 17 Sep 2023 09:39:26 +0000 (UTC) Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by mx.groups.io with SMTP id smtpd.web10.27144.1694943557627263446 for ; Sun, 17 Sep 2023 02:39:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=TO+qLwTs; spf=pass (domain: gmail.com, ip: 209.85.167.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-50305abe5f0so1270325e87.2 for ; Sun, 17 Sep 2023 02:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943556; x=1695548356; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wSZE1XxhvEgq1lTIO/4VX2KPjNk95IY9gNkJfwz8Uqo=; b=TO+qLwTsJqgYTFKIoARmPZbPMiJnaYAaiyo54Q9ZQf8YA0JTznQLBBgDIusCD3AIaf rSmHEjM2AGu3FQ1q0wvRPgcMUJ0EPQID45871ABZjo5ff7K+uplB8OUiuZvfb0NKIyS/ 4MyFuLt3Cj2UuQe3CscI/Jn6LdUym59zJA7GmZz2dvCaIYRBqZlIz5CQrobACm/UeMNd hocoDy+N4oOxMIYSChj+g3hINBnxLd2SKQxqaSRZSk6xMl7vPpqt9fWIgN5wUpFIEqoX KqIQ3UauihGOoMqmrIJz9kRFGlaMsuKKXhVmTSR1EPUMYE0TA3/9JrqRWn/Ils++Z/n+ ujuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943556; x=1695548356; 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=wSZE1XxhvEgq1lTIO/4VX2KPjNk95IY9gNkJfwz8Uqo=; b=ss+dJ62R4qc42958QpKo8/eIfOwpbYJ89h7/JH0Ih533j+Aij/byZLmBPBYto8AvuI eI7K1x8yN0/yQGAG6BIBcGSPbunLsJPHbobtsVqTcyarEN5+U45EU4hMPX3HtbnqKB4Q L8S5AEq6fJ05V6yF3wNqo4yKknvbThwzauv+CH8Ow+zEPzL5fnR9qHb3sYl+xYok27jz Kw8k/pG9c2swkz6iJdXcVyFejibeDxk2DY1W5S0SjYcZXSRdWYwG0J7+5YZGjyRkqxOi tBLNqgrtIiueBzeKZrSLzvf4zXNS6WmyUXGYIi93BW6djzasOm4Xfrdr3OLKJ/Mr0l0J QQTA== X-Gm-Message-State: AOJu0Yxu8R5Nhu1bT7iXc+KNUT6zgsc8/shWUIyzYT4LPE0r3S1hQv3p hcoN5COwLKKDBta2SurgxNG59xZcLCk= X-Google-Smtp-Source: AGHT+IGrjawgfZe+DvyYE2oumM2U7zFNwEIu6VeplvdKB41dtqUoWfIpPrRTaai8bLTXVDDfcyvSYw== X-Received: by 2002:a19:6756:0:b0:502:ff3b:7671 with SMTP id e22-20020a196756000000b00502ff3b7671mr2942713lfj.9.1694943555743; Sun, 17 Sep 2023 02:39:15 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:15 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 18/29] libdnf: update 0.70.1 -> 0.71.0 Date: Sun, 17 Sep 2023 11:38:50 +0200 Message-Id: <20230917093901.428214-18-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187791 Signed-off-by: Alexander Kanavin --- ...ers-for-both-libsolv-and-libsolvext-libdn.patch | 10 +++++----- ...-variables-with-pkg-config-cmake-s-own-mo.patch | 8 ++++---- .../libdnf/libdnf/enable_test_data_dir_set.patch | 14 +++++++++++--- .../libdnf/{libdnf_0.70.1.bb => libdnf_0.71.0.bb} | 2 +- 4 files changed, 21 insertions(+), 13 deletions(-) rename meta/recipes-devtools/libdnf/{libdnf_0.70.1.bb => libdnf_0.71.0.bb} (97%) diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch index c7b2af89d18..08d08599539 100644 --- a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch +++ b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch @@ -1,4 +1,4 @@ -From 9294cd19e5e3121fb8d37b44ee82dd7c4b3ab2c7 Mon Sep 17 00:00:00 2001 +From b87ae6860ea44996b677ad1c4a9793720b77c67c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 7 Feb 2017 12:16:03 +0200 Subject: [PATCH] Get parameters for both libsolv and libsolvext (libdnf is @@ -13,15 +13,15 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index b722d4fb..ce88b9e3 100644 +index e99b28d0..548a9137 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -52,7 +52,7 @@ endif() +@@ -51,7 +51,7 @@ endif() + # build dependencies - find_package(Gpgme REQUIRED) -PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) +PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv libsolvext) set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) - + diff --git a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch index 643a5f37b6a..32f2bb6ad0b 100644 --- a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch +++ b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch @@ -1,4 +1,4 @@ -From fbb181d25ad85778add7ed45b6aaf114e02d0f79 Mon Sep 17 00:00:00 2001 +From 0b8eceb9161711003cd25ab400cadde7c1601733 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 30 Dec 2016 18:24:50 +0200 Subject: [PATCH] Set libsolv variables with pkg-config (cmake's own module @@ -13,13 +13,13 @@ Signed-off-by: Alexander Kanavin 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 405dc4e8..53837448 100644 +index 6444c374..e99b28d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -52,7 +52,8 @@ endif() +@@ -51,7 +51,8 @@ endif() + # build dependencies - find_package(Gpgme REQUIRED) -find_package(LibSolv 0.7.21 REQUIRED COMPONENTS ext) +PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) +set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) diff --git a/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch b/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch index e3784cc9e47..8b1a5972001 100644 --- a/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch +++ b/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch @@ -1,4 +1,7 @@ -libdnf: allow reproducible binary builds +From dc83a79053597546b2b42fcf578f3a7727b13f3b Mon Sep 17 00:00:00 2001 +From: Joe Slater +Date: Wed, 22 Jul 2020 13:31:11 -0700 +Subject: [PATCH] libdnf: allow reproducible binary builds Use a dummy directory for test data if not built WITH_TESTS. Allow for overriding TESTDATADIR, since the default is guaranteed to be wrong for target builds. @@ -7,11 +10,16 @@ Upstream-Status: Pending Signed-off-by: Joe Slater +--- + CMakeLists.txt | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 548a9137..c378e7d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -133,7 +133,12 @@ add_definitions(-DG_LOG_DOMAIN=\\"libdnf - add_definitions(-D_FILE_OFFSET_BITS=64) +@@ -132,7 +132,12 @@ add_definitions(-DGETTEXT_DOMAIN=\\"libdnf\\") + add_definitions(-DG_LOG_DOMAIN=\\"libdnf\\") # tests -add_definitions(-DTESTDATADIR=\\"${CMAKE_SOURCE_DIR}/data/tests\\") diff --git a/meta/recipes-devtools/libdnf/libdnf_0.70.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.71.0.bb similarity index 97% rename from meta/recipes-devtools/libdnf/libdnf_0.70.1.bb rename to meta/recipes-devtools/libdnf/libdnf_0.71.0.bb index c44ae2729b0..396a6664bca 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.70.1.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.71.0.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p file://0001-drop-FindPythonInstDir.cmake.patch \ " -SRCREV = "3b8e59ad8ed3a3eb736d8a2e16b4fc04313d1f12" +SRCREV = "39098f39806becdc87cf93e03a49ae89a33e7ede" UPSTREAM_CHECK_GITTAGREGEX = "(?P(?!4\.90)\d+(\.\d+)+)" S = "${WORKDIR}/git" From patchwork Sun Sep 17 09:38:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 30584 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 81112CD13D2 for ; Sun, 17 Sep 2023 09:39:26 +0000 (UTC) Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) by mx.groups.io with SMTP id smtpd.web10.27145.1694943558344170913 for ; Sun, 17 Sep 2023 02:39:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ZmGl9hAN; spf=pass (domain: gmail.com, ip: 209.85.208.169, mailfrom: alex.kanavin@gmail.com) Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-2bcbfb3705dso55972741fa.1 for ; Sun, 17 Sep 2023 02:39:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943556; x=1695548356; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4LcZ6gzsU4nuW6mOt6U4QXSnGMbJW1B2D6B194/cD00=; b=ZmGl9hANijhtv+cy5faSjFUwusMSh1fxZK2+OMbIHrWlnDkUaICrbVd6a5P1TyL8f9 /Lf7OyuEQehffPjY/enmxGDZU+Q3VDlOUpxH4OtZMrXJFuHqyrIKAMiOe+U4KDGNj10i Wlmv4SzqNfUtNI//ZL8ShkbxygKQQlhuUkJze2ruVwhzY0jbkV81CiduVz5RmzwyNoN3 xhPNGu33KnoHbyTcOjuT0xMYe4nU1cGUFWm8oMRGO3qmNn9kxiz8Utw4hLaWEmpiIAMe gvVE1tbS6paLPeFWaQZqToelcAaR2RSjACdc6mPzqD1AWRVbI9uIqw3GcU0ZYSbO5GBm ok3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943556; x=1695548356; 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=4LcZ6gzsU4nuW6mOt6U4QXSnGMbJW1B2D6B194/cD00=; b=DmS1cOxRNU2GYM85y4q9Gu49pJzgmyyz8UHh5Hnzkrt/WNHY1LOKA+F13+kaJmEG5z xtQBknE9APTVp13ZYROgjk7UCEgDkNXWZK/TJsWTgP5tbE4p8oOx+v0BKRdJ5Ej9gFY6 X9dQNXiIHhylaBzDa5RJk3SY95i7y8z4zCXtUr1OnfyaffJ1H9JidXp55uc0x6t/gkfD FJlrn4A9XXC3p04CZy7IcNbiCS+j36uAqsi5I5ZRNMlcqcjGX1WEfVQ1BP+zjt7UROoL st3pcUWtlvFr7AVpAe5grUotiqClJlsImTWhmrJosHJBw3P3IN0m6P+EuCX0it4Eftqe MP2w== X-Gm-Message-State: AOJu0YzhxBtukI5jDL6Yt7CvrlPUNNi5ZlBOPNSCfk1VMQWu0yUg4m3d 76s1DvpWRN+Z0bem32bpQgxmqKwf8dw= X-Google-Smtp-Source: AGHT+IGOKwd1MdNgthGDbKn8VhU2xvNk881tpT8hGOS3f2oe0prGdeuuTeFeYp2ZkzlusHKCWPiF4g== X-Received: by 2002:a2e:8055:0:b0:2bd:1d02:5026 with SMTP id p21-20020a2e8055000000b002bd1d025026mr5854849ljg.15.1694943556355; Sun, 17 Sep 2023 02:39:16 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:16 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 19/29] liburi-perl: update 5.17 -> 5.21 Date: Sun, 17 Sep 2023 11:38:51 +0200 Message-Id: <20230917093901.428214-19-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187792 License-Update: formatting Signed-off-by: Alexander Kanavin --- .../0001-Skip-TODO-test-cases-that-fail.patch | 12 ++++++------ .../{liburi-perl_5.17.bb => liburi-perl_5.21.bb} | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) rename meta/recipes-devtools/perl/{liburi-perl_5.17.bb => liburi-perl_5.21.bb} (89%) diff --git a/meta/recipes-devtools/perl/liburi-perl/0001-Skip-TODO-test-cases-that-fail.patch b/meta/recipes-devtools/perl/liburi-perl/0001-Skip-TODO-test-cases-that-fail.patch index 68ccd061202..ed1f25125f9 100644 --- a/meta/recipes-devtools/perl/liburi-perl/0001-Skip-TODO-test-cases-that-fail.patch +++ b/meta/recipes-devtools/perl/liburi-perl/0001-Skip-TODO-test-cases-that-fail.patch @@ -1,4 +1,4 @@ -From 858daa5047b00e7d5aa795302a9fad5504c8f0b9 Mon Sep 17 00:00:00 2001 +From 5a4271456104bdf027644c81c3a208cde5cf522e Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Thu, 17 Nov 2022 16:33:20 -0800 Subject: [PATCH] Skip TODO test cases that fail @@ -47,19 +47,19 @@ index c6ce79c..5e62ad5 100644 { my $str = "http://foo/\xE9"; diff --git a/t/iri.t b/t/iri.t -index 2eb64b2..9c663c9 100644 +index cf983d6..884b36e 100644 --- a/t/iri.t +++ b/t/iri.t @@ -6,7 +6,7 @@ use Test::More; use Config qw( %Config ); if (defined $Config{useperlio}) { -- plan tests=>26; -+ plan tests=>24; +- plan tests=>30; ++ plan tests=>28; } else { - plan skip_all=>'this perl doesn\'t support PerlIO layers'; + plan skip_all=>"this perl doesn't support PerlIO layers"; } -@@ -60,17 +60,17 @@ is $u->as_iri, "http://➡.ws/"; +@@ -67,17 +67,17 @@ is $u->as_iri, "http://➡.ws/"; # draft-duerst-iri-bis.txt examples (section 3.7.1): is(URI->new("http://www.example.org/D%C3%BCrst")->as_iri, "http://www.example.org/D\xFCrst"); is(URI->new("http://www.example.org/D%FCrst")->as_iri, "http://www.example.org/D%FCrst"); diff --git a/meta/recipes-devtools/perl/liburi-perl_5.17.bb b/meta/recipes-devtools/perl/liburi-perl_5.21.bb similarity index 89% rename from meta/recipes-devtools/perl/liburi-perl_5.17.bb rename to meta/recipes-devtools/perl/liburi-perl_5.21.bb index 5e15004dd0f..0356469d986 100644 --- a/meta/recipes-devtools/perl/liburi-perl_5.17.bb +++ b/meta/recipes-devtools/perl/liburi-perl_5.21.bb @@ -6,13 +6,13 @@ HOMEPAGE = "https://metacpan.org/dist/URI" SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d8ca5f628bf2cd180bc4fa044cb8ef41" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9944b87af51186f848ae558344aded9f" SRC_URI = "${CPAN_MIRROR}/authors/id/O/OA/OALDERS/URI-${PV}.tar.gz \ file://0001-Skip-TODO-test-cases-that-fail.patch \ " -SRC_URI[sha256sum] = "5f7e42b769cb27499113cfae4b786c37d49e7c7d32dbb469602cd808308568f8" +SRC_URI[sha256sum] = "96265860cd61bde16e8415dcfbf108056de162caa0ac37f81eb695c9d2e0ab77" S = "${WORKDIR}/URI-${PV}" From patchwork Sun Sep 17 09:38: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: 30582 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 8BB11CD13D3 for ; Sun, 17 Sep 2023 09:39:26 +0000 (UTC) Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) by mx.groups.io with SMTP id smtpd.web11.27418.1694943558447967458 for ; Sun, 17 Sep 2023 02:39:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jFeDlJq5; spf=pass (domain: gmail.com, ip: 209.85.208.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-51e28cac164so9905168a12.1 for ; Sun, 17 Sep 2023 02:39:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943557; x=1695548357; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vs1Fk3wCiAV6ApgrVYz/7WlFhzc9UoPYGuFlJZOaLFY=; b=jFeDlJq5Po5gBx8P7ETUrGkm1lP/Guro7Askg9/9jWYd2g8gi8vMMiGzsQwV7+ymoy W1Mp9h+AiUg2CD1T1vzoe6rgNOSq+7Xvr0TaHjS1fRzMMuWV95ywG8gWhsccYJzXl2e8 5CT7yyZdHZlSpqzVPZRaoUWCgUfnAIdHJJwMlmOiLL3hTjlZ6Sz8/LFDe92ZfV0Jcxnw Jytqr6+rP7924vwZ+eXsec/5NI66IBGsip8kpRq695CO2+tmVzKym6k/1wfUCbh6M8MK 1Lf65i+Py7vwMI5ZdbCJrpcTngR9cNfUigb00H1wS0bDJRJohY04kH0fE9a04D2SsWOY jIeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943557; x=1695548357; 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=vs1Fk3wCiAV6ApgrVYz/7WlFhzc9UoPYGuFlJZOaLFY=; b=kRMVQBn24V0p+WxwHi33ni60DjPjngboqC27viW+iGSfGCZ2gv0uoGTI6tbL4r83XK 2iwR30cCmS/zfxXYytD2KeTGvHWwHBySH2jXp/hd8fxoM7J16N9RetzAicSmokNDiINf 0Da2QuEW3g16b2t5qgRG0jCE7WKYvFteHys2/GVW1SIt9vcc1WBRu8BBsLVmPIkZ3/3u 99HOpPzOPvhdodwWeEhxzsc7r/YsqfnOsRxoxeoLc4NyZ6Y3P1NxaIiZRflyRzzpTnzO gJ9Zp/GpUKiEW0bMMI44kLY0T/JhHT1qlVuSku7F9gOrObacCE63BKTU8fLs11J8J38I zJZQ== X-Gm-Message-State: AOJu0Ywjh0dS/yoYZx5Xl69zBcSq6dBA8B2xhnSGgRHcjmhRvKvaf09L ycv0T+ZjF/wuYrztdTsUV1k+o8nGQvY= X-Google-Smtp-Source: AGHT+IG9lGGSHSFi1xk9bhaVddOuRGRnJ89okH7ypoI4JLFYB41jrN9y1UlRv81Yq9XzFY9Ke8w1LA== X-Received: by 2002:a17:907:775a:b0:9a9:f0e6:904e with SMTP id kx26-20020a170907775a00b009a9f0e6904emr8678253ejc.16.1694943556909; Sun, 17 Sep 2023 02:39:16 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:16 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 20/29] python3-pygobject: update 3.44.1 -> 3.46.0 Date: Sun, 17 Sep 2023 11:38:52 +0200 Message-Id: <20230917093901.428214-20-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187793 Replace a patch with a recipe option. Signed-off-by: Alexander Kanavin --- .../0001-Do-not-build-tests.patch | 30 ------------------- ..._3.44.1.bb => python3-pygobject_3.46.0.bb} | 8 ++--- 2 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch rename meta/recipes-devtools/python/{python3-pygobject_3.44.1.bb => python3-pygobject_3.46.0.bb} (82%) diff --git a/meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch b/meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch deleted file mode 100644 index 0f2465bb520..00000000000 --- a/meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c125a806de951359ab7e302b0584f7c92fa451ad Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 12 Apr 2019 16:25:58 +0200 -Subject: [PATCH] Do not build tests - -They require installing tests from g-i, which we do not do. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 278fa16f..aacbd4a2 100644 ---- a/meson.build -+++ b/meson.build -@@ -175,6 +175,6 @@ configure_file(input : 'PKG-INFO.in', - subdir('gi') - subdir('pygtkcompat') - with_tests = get_option('tests') --if with_tests --subdir('tests') --endif -+#if with_tests -+#subdir('tests') -+#endif --- -2.17.1 - diff --git a/meta/recipes-devtools/python/python3-pygobject_3.44.1.bb b/meta/recipes-devtools/python/python3-pygobject_3.46.0.bb similarity index 82% rename from meta/recipes-devtools/python/python3-pygobject_3.44.1.bb rename to meta/recipes-devtools/python/python3-pygobject_3.46.0.bb index 797a7cec8ba..28129fd66ab 100644 --- a/meta/recipes-devtools/python/python3-pygobject_3.44.1.bb +++ b/meta/recipes-devtools/python/python3-pygobject_3.46.0.bb @@ -19,11 +19,8 @@ DEPENDS += "python3 glib-2.0" SRCNAME="pygobject" -SRC_URI = " \ - http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \ - file://0001-Do-not-build-tests.patch \ -" -SRC_URI[sha256sum] = "3c6805d1321be90cc32e648215a562430e0d3d6edcda8f4c5e7a9daffcad5710" +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz" +SRC_URI[sha256sum] = "426008b2dad548c9af1c7b03b59df0440fde5c33f38fb5406b103a43d653cafc" S = "${WORKDIR}/${SRCNAME}-${PV}" @@ -37,6 +34,7 @@ RDEPENDS:${PN} += " \ # python3-pycairo is checked on configuration -> DEPENDS # we don't link against python3-pycairo -> RDEPENDS PACKAGECONFIG[cairo] = "-Dpycairo=enabled,-Dpycairo=disabled, cairo python3-pycairo, python3-pycairo" +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false," BBCLASSEXTEND = "native" PACKAGECONFIG:class-native = "" From patchwork Sun Sep 17 09:38: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: 30586 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 8B30ECD13D8 for ; Sun, 17 Sep 2023 09:39:26 +0000 (UTC) Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by mx.groups.io with SMTP id smtpd.web11.27419.1694943558994775839 for ; Sun, 17 Sep 2023 02:39:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=VAYu2VF4; spf=pass (domain: gmail.com, ip: 209.85.218.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-9adc75f6f09so316307266b.0 for ; Sun, 17 Sep 2023 02:39:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943557; x=1695548357; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EXh2TR3IFHz+w1o3cWio5W4b/uEPWdFcmxUEYBbbXVE=; b=VAYu2VF4hZOZKy8cvv3g2dI7Y/QteyzUn12IkjWdU3w3XiZ5hPb391qEXYuYlA0rbq Aof/jn+BvSzAEMdNtxcOYi3u2qbkHHGFwsfhi5YuLymim+KtKcNLCB2f1AB4ULdtvpfX 2U50LmNVhdbu2+j7UwRIX/7qwRDviuOBz466a6u58dZLgL3jlQr7ccDnhwoiMupjA2cF XwVO+eFzs6TN8fqTMWhUU/joioiJuMKDjMNZ/cj85X5v0CuykoXPoP/P3BNzNm0d7ldJ yPS48dguWrS/I8LH9NlEf3t2DZBkKbF2QKWf01PsADF3hVdzHtJnsQ4+f7uvDRwfZUrN 7AXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943557; x=1695548357; 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=EXh2TR3IFHz+w1o3cWio5W4b/uEPWdFcmxUEYBbbXVE=; b=S7e/z/BXAyiHaULagz1niVChLNZ5vKWTwpeq8ecsodBIUmIbJZ1H5ufmd/QYt/IMGc Q0SLEn/4VqDJKyHgR9KX3htEBGuk8gaPn1zCtMH8BaVAwuExukeHAwTVIiLWnx/RjcJ+ oKNsF8dQmfxtJRBtvxgDhmoq0Mt8CBJeHrbyl4m42ipMfG4cU1bPapkf/HirXjhhGX6k wk23Gb8E7wQO+W9IGjZ+jCJq/3FC2pNnvAbeh/uQ2UVnIKoUxZhyAZc8wfq7nrJE77Y/ PNj8V5hvp8oeCiSsLZ9A13kZ5tKIG9Zy0Wp4CAA2xWui3w3McuGjuOrnL71qp+oTfBX7 YHbg== X-Gm-Message-State: AOJu0Yz8ETQIXtdarfylNzyNimdhcOmV4DD7j3J+jNCr6UgMHSBXM1q5 Ak2fxBpjIGJN8RrgGgIAXWalifmHnQU= X-Google-Smtp-Source: AGHT+IHI/1uNw5xibXerGvJtaAnKDDbYts031K1Of6bwfN2BE4dDY9BoIF2IlZZJlpirfgjq39nzDQ== X-Received: by 2002:a17:906:5dda:b0:9ad:7d5b:dc11 with SMTP id p26-20020a1709065dda00b009ad7d5bdc11mr5254895ejv.33.1694943557421; Sun, 17 Sep 2023 02:39:17 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:17 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 21/29] go-helloworld: update to latest revision Date: Sun, 17 Sep 2023 11:38:53 +0200 Message-Id: <20230917093901.428214-21-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187794 Fix up test case to match what binary prints. Signed-off-by: Alexander Kanavin --- meta/lib/oeqa/runtime/cases/go.py | 2 +- meta/recipes-extended/go-examples/go-helloworld_0.1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/go.py b/meta/lib/oeqa/runtime/cases/go.py index 7514d108f1a..39a80f4dcae 100644 --- a/meta/lib/oeqa/runtime/cases/go.py +++ b/meta/lib/oeqa/runtime/cases/go.py @@ -18,4 +18,4 @@ class GoHelloworldTest(OERuntimeTestCase): self.assertEqual(status, 0, msg=msg) msg = 'Incorrect output: %s' % output - self.assertEqual(output, "Hello, Go examples!", msg=msg) + self.assertEqual(output, "Hello, world!", msg=msg) diff --git a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb index ce6ec08c59b..98cd4d81033 100644 --- a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb +++ b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb @@ -6,7 +6,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = "git://go.googlesource.com/example;branch=master;protocol=https" -SRCREV = "5bec756976671f30903223ec46ff8a70dced4954" +SRCREV = "d9923f6970e9ba7e0d23aa9448ead71ea57235ae" UPSTREAM_CHECK_COMMITS = "1" GO_IMPORT = "golang.org/x/example" From patchwork Sun Sep 17 09:38: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: 30587 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 996C6CD13D9 for ; Sun, 17 Sep 2023 09:39:26 +0000 (UTC) Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by mx.groups.io with SMTP id smtpd.web11.27420.1694943559513902985 for ; Sun, 17 Sep 2023 02:39:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=emfKByEP; spf=pass (domain: gmail.com, ip: 209.85.218.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-9ad8d47ef2fso432045666b.1 for ; Sun, 17 Sep 2023 02:39:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943558; x=1695548358; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=is+8//lgkZOLtcY2Eig4f7VLEJ0n3241ETnsMngWbns=; b=emfKByEPh/jMryfpnI+r9Q2TLhdokby+fGZXo78Iu5eShKzTMO2NBjUg2kAO+tf/YZ pFtI5ojCNXOdZ+0dT9oupckk2ZJKfaK/EqK4iP3yYDaLkqtG2SqEPPwSizg8lFrMXPmr j7/pttOhZzKTOxS8KbwFss/re6G/kWZFtq6Uo7lA8U8WC8o0O68PDDef4HbDVjT+TMwQ eB0PQSU1XdchVZ4MWMY/PR4sItzUz3B1Ckbpdx+l1+86/Klm0V6ZyS7COBoUXyEtDYI1 lwS9t1Vv+MWhx+EyKLjD1ulKyw4ZKI2OqpPP9fmNO6UWxeblyEkyOfpxZRuoSi04IRSs pGvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943558; x=1695548358; 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=is+8//lgkZOLtcY2Eig4f7VLEJ0n3241ETnsMngWbns=; b=rBiamJQ1kHVG7vhEitVooSdGgZEq0GzK4u8TJKNBouW7M0qHqBNPKjCXpPGGTu6iWy Y0NMexpajiB2N99gCNQhcYW2epm2D0gK92wbC4HUM81jenCPS50XWEls0a2jHM/7yN0S +4NnnbkwX0SA323X+UJNllOu8+Bwv37jxtWlsIRk89jk+/UM2FVfETPyyPYvqs1y8yqZ LErdF3V0Bcq+B/gTYxGiIONycAJY/hrh6lBCJiXHHWe8LlbRUxveTVSgHni07Kb56a9b l8yiD3nBe12s3Jz3T9p/oyHCRz2HNYpkqYR1EAABBHp1p7qUmw18bOfu2Hra6Dcdp/S7 NgXA== X-Gm-Message-State: AOJu0Yzctb9c538CNAqdtlVvfckuUZhRR4Wxv1ZlC9VFMMEUhW4GrO3I T9qzLd3YMMnRaQB8g5opI8aJ1XRg+fg= X-Google-Smtp-Source: AGHT+IF7IF8Gpo5qezSjfZg4kYDHjse+yvj8ptxBE/i97AVYFgsAYSb7pOQupK1sqi1CwdO259f7PA== X-Received: by 2002:a17:906:300e:b0:9a6:6c5b:ae0c with SMTP id 14-20020a170906300e00b009a66c5bae0cmr5526553ejz.23.1694943557961; Sun, 17 Sep 2023 02:39:17 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:17 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 22/29] gzip: update 1.12 -> 1.13 Date: Sun, 17 Sep 2023 11:38:54 +0200 Message-Id: <20230917093901.428214-22-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187795 Drop autoconf-2.73.patch as issue resolved upstream. License-update: http -> https Signed-off-by: Alexander Kanavin --- .../gzip/gzip-1.12/autoconf-2.73.patch | 24 ------------------- .../wrong-path-fix.patch | 0 .../gzip/{gzip_1.12.bb => gzip_1.13.bb} | 7 +++--- 3 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 meta/recipes-extended/gzip/gzip-1.12/autoconf-2.73.patch rename meta/recipes-extended/gzip/{gzip-1.12 => gzip-1.13}/wrong-path-fix.patch (100%) rename meta/recipes-extended/gzip/{gzip_1.12.bb => gzip_1.13.bb} (86%) diff --git a/meta/recipes-extended/gzip/gzip-1.12/autoconf-2.73.patch b/meta/recipes-extended/gzip/gzip-1.12/autoconf-2.73.patch deleted file mode 100644 index 18f992beb87..00000000000 --- a/meta/recipes-extended/gzip/gzip-1.12/autoconf-2.73.patch +++ /dev/null @@ -1,24 +0,0 @@ -The gnulib largefile macro needs updating to work with autoconf 2.73. Rather -than the full code: - -https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb - -Just tweak the exiting code to work with 2.73. The next gzip upgrade should -update to new gnulib - -Upstream-Status: Inappropriate -Signed-off-by: Richard Purdie - -Index: findutils-4.9.0/gl/m4/largefile.m4 -=================================================================== ---- findutils-4.9.0.orig/m4/largefile.m4 -+++ findutils-4.9.0/m4/largefile.m4 -@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], - # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: - # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, - # or configures them incorrectly in some cases. --m4_version_prereq([2.70], [], [ -+m4_version_prereq([2.73], [], [ - - # _AC_SYS_LARGEFILE_TEST_INCLUDES - # ------------------------------- diff --git a/meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.13/wrong-path-fix.patch similarity index 100% rename from meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch rename to meta/recipes-extended/gzip/gzip-1.13/wrong-path-fix.patch diff --git a/meta/recipes-extended/gzip/gzip_1.12.bb b/meta/recipes-extended/gzip/gzip_1.13.bb similarity index 86% rename from meta/recipes-extended/gzip/gzip_1.12.bb rename to meta/recipes-extended/gzip/gzip_1.13.bb index 35eb7c4da23..fd846b30a55 100644 --- a/meta/recipes-extended/gzip/gzip_1.12.bb +++ b/meta/recipes-extended/gzip/gzip_1.13.bb @@ -5,12 +5,11 @@ require gzip.inc LICENSE = "GPL-3.0-or-later" SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \ - file://autoconf-2.73.patch \ file://run-ptest \ - " + " SRC_URI:append:class-target = " file://wrong-path-fix.patch" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" PROVIDES:append:class-native = " gzip-replacement-native" @@ -39,4 +38,4 @@ do_install_ptest() { ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile } -SRC_URI[sha256sum] = "5b4fb14d38314e09f2fc8a1c510e7cd540a3ea0e3eb9b0420046b82c3bf41085" +SRC_URI[sha256sum] = "20fc818aeebae87cdbf209d35141ad9d3cf312b35a5e6be61bfcfbf9eddd212a" From patchwork Sun Sep 17 09:38:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 30589 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 99AC7CD13DD for ; Sun, 17 Sep 2023 09:39:26 +0000 (UTC) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by mx.groups.io with SMTP id smtpd.web10.27146.1694943560136148410 for ; Sun, 17 Sep 2023 02:39:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=kOUku9J2; spf=pass (domain: gmail.com, ip: 209.85.218.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-9a9d6b98845so1014903666b.0 for ; Sun, 17 Sep 2023 02:39:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943558; x=1695548358; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=V3PVbFTI1PRTnHlCVGxsuzDSfECaiW8HH0Egx6I3MYg=; b=kOUku9J2JaRFCn7uNpswX+R2BMGikaIlXOJx8dNHxsYXm8+/dZ4N41vx/AD946rtwE wG0+JLDw/N3ZBpsskGuoEiteNmsl2WyZALkq6cDui04+5KDM1XCLDkFAgMWx95FESL/c 8lphWdXjcQ41+sTM+XKMY6HYMG7Czw+RbueB/Dy5k5hYlANr0okMUHCGZEK6UJqxTI72 fA238T2WyoZeCyBPgw3czvDbKf7D9ZsIJQbzeIkVlJwA4ZFC3c2Z9fLoUTOeYZypaN2q lYcR8+VfTd+2KlN0n7mPntw01YLKX6pav79UovcIvG0dkPCz7NZwufmCB9xYR5S51DWI fMfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943558; x=1695548358; 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=V3PVbFTI1PRTnHlCVGxsuzDSfECaiW8HH0Egx6I3MYg=; b=gNDC/Oq/1oIJDIB5fPErjuhOKxYM5PpzAuSPfvUHkcFGPVCR4Ps9GwejyPVUrd+4R9 p7vf2OPWM+J+BdkYSAOMYizOMlo+x0VMBjoWpk+b/sh4Kfwrg7y4M1HzCMGNxh6KmYLX OtaiUDlRK/tRtzLHXLi/M6g4DqFLJKovXGN3lbH3VNM3H+wzj5rRnPiLtdVZL3H4uDnR 4sdUjLVJ9tjnG9vVaedqZ4EClZiYN01UMWLOY5OPb0cucPrwquVTqMw0JP2gdYgZaGxW +YvQ0sIDGmM4ZYN6AVILeVEpKDfkvjqTufPAsfI2k7bDEsO/GWESCFBj/fXBouINdBo4 W9IQ== X-Gm-Message-State: AOJu0Yz+TdrHRrrOSizPSihUshP1krIdBWGzlPrj5oSOTO3N0INcsyNX 17h4g5TGddyJE0OFLyPTQRBD1Xxregs= X-Google-Smtp-Source: AGHT+IG3BIxqVRrSklaMM0JH8xbvGLAPPKg0aWky49sSFXXuUWjALw5kuWp7cJ0UdFNXlbGRluG5/Q== X-Received: by 2002:a17:906:794f:b0:9a5:962c:cb6c with SMTP id l15-20020a170906794f00b009a5962ccb6cmr13932216ejo.31.1694943558566; Sun, 17 Sep 2023 02:39:18 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:18 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 23/29] procps: update 4.0.3 -> 4.0.4 Date: Sun, 17 Sep 2023 11:38:55 +0200 Message-Id: <20230917093901.428214-23-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187796 Drop patches as all issues resolved upstream; one of them is a CVE backport. Signed-off-by: Alexander Kanavin --- ...o-address-failures-with-gettext-0.22.patch | 37 ---------- .../procps/0001-src-w.c-use-utmp.h-only.patch | 65 ----------------- .../procps/procps/CVE-2023-4016.patch | 73 ------------------- .../{procps_4.0.3.bb => procps_4.0.4.bb} | 5 +- 4 files changed, 1 insertion(+), 179 deletions(-) delete mode 100644 meta/recipes-extended/procps/procps/0001-po-fr.po-address-failures-with-gettext-0.22.patch delete mode 100644 meta/recipes-extended/procps/procps/0001-src-w.c-use-utmp.h-only.patch delete mode 100644 meta/recipes-extended/procps/procps/CVE-2023-4016.patch rename meta/recipes-extended/procps/{procps_4.0.3.bb => procps_4.0.4.bb} (94%) diff --git a/meta/recipes-extended/procps/procps/0001-po-fr.po-address-failures-with-gettext-0.22.patch b/meta/recipes-extended/procps/procps/0001-po-fr.po-address-failures-with-gettext-0.22.patch deleted file mode 100644 index 805517900de..00000000000 --- a/meta/recipes-extended/procps/procps/0001-po-fr.po-address-failures-with-gettext-0.22.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1d685477c254e5b10a81e32c87786e0f001b70f1 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 24 Jul 2023 18:06:51 +0200 -Subject: [PATCH] po/fr.po: address failures with gettext 0.22 - -Specifically: -| fr.1po:3027: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 4, the argument size specifier is invalid. -| fr.1po:3820: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 1, the argument size specifier is invalid. - -Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/199] -Signed-off-by: Alexander Kanavin ---- - po/fr.po | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/po/fr.po b/po/fr.po -index 715c2b69..700834e1 100644 ---- a/po/fr.po -+++ b/po/fr.po -@@ -3800,7 +3800,7 @@ msgid "" - "Type 'q' or to continue " - msgstr "" - "Aide pour les commandes interactives~2 - %s\n" --"Fenêtre ~1%s~6: ~1Mode cumulatif ~3%s~2. ~1Système~6: ~1Délai ~3%.1lf " -+"Fenêtre ~1%s~6: ~1Mode cumulatif ~3%s~2. ~1Système~6: ~1Délai ~3%.1f " - "secs~2; ~1Mode sûr ~3%s~2.\n" - "\n" - " Z~5,~1B~5,E,e Global: «~1Z~2» couleurs; «~1B~2» gras; «~1E~2»/«~1e~2» " -@@ -4723,7 +4723,7 @@ msgstr " -v, --version affiche les informations de version et sort\n" - #: src/watch.c:486 - #, c-format - msgid "Every %.1fs: " --msgstr "Toutes les %.1lfs: " -+msgstr "Toutes les %.1fs: " - - #: src/watch.c:487 - #, c-format 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 deleted file mode 100644 index 23c91ec7751..00000000000 --- a/meta/recipes-extended/procps/procps/0001-src-w.c-use-utmp.h-only.patch +++ /dev/null @@ -1,65 +0,0 @@ -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/CVE-2023-4016.patch b/meta/recipes-extended/procps/procps/CVE-2023-4016.patch deleted file mode 100644 index 202fea91f1d..00000000000 --- a/meta/recipes-extended/procps/procps/CVE-2023-4016.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 2c933ecba3bb1d3041a5a7a53a7b4078a6003413 Mon Sep 17 00:00:00 2001 -From: Craig Small -Date: Thu, 10 Aug 2023 21:18:38 +1000 -Subject: [PATCH] ps: Fix possible buffer overflow in -C option - -ps allocates memory using malloc(length of arg * len of struct). -In certain strange circumstances, the arg length could be very large -and the multiplecation will overflow, allocating a small amount of -memory. - -Subsequent strncpy() will then write into unallocated memory. -The fix is to use calloc. It's slower but this is a one-time -allocation. Other malloc(x * y) calls have also been replaced -by calloc(x, y) - -References: - https://www.freelists.org/post/procps/ps-buffer-overflow-CVE-20234016 - https://nvd.nist.gov/vuln/detail/CVE-2023-4016 - https://gitlab.com/procps-ng/procps/-/issues/297 - https://bugs.debian.org/1042887 - -Signed-off-by: Craig Small - -CVE: CVE-2023-4016 -Upstream-Status: Backport [https://gitlab.com/procps-ng/procps/-/commit/2c933ecba3bb1d3041a5a7a53a7b4078a6003413] -Signed-off-by: Ross Burton ---- - NEWS | 1 + - src/ps/parser.c | 8 ++++---- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/src/ps/parser.c b/src/ps/parser.c -index 248aa741..15873dfa 100644 ---- a/src/ps/parser.c -+++ b/src/ps/parser.c -@@ -189,7 +189,6 @@ static const char *parse_list(const char *arg, const char *(*parse_fn)(char *, s - const char *err; /* error code that could or did happen */ - /*** prepare to operate ***/ - node = xmalloc(sizeof(selection_node)); -- node->u = xmalloc(strlen(arg)*sizeof(sel_union)); /* waste is insignificant */ - node->n = 0; - buf = strdup(arg); - /*** sanity check and count items ***/ -@@ -210,6 +209,7 @@ static const char *parse_list(const char *arg, const char *(*parse_fn)(char *, s - } while (*++walk); - if(need_item) goto parse_error; - node->n = items; -+ node->u = xcalloc(items, sizeof(sel_union)); - /*** actually parse the list ***/ - walk = buf; - while(items--){ -@@ -1050,15 +1050,15 @@ static const char *parse_trailing_pids(void){ - thisarg = ps_argc - 1; /* we must be at the end now */ - - pidnode = xmalloc(sizeof(selection_node)); -- pidnode->u = xmalloc(i*sizeof(sel_union)); /* waste is insignificant */ -+ pidnode->u = xcalloc(i, sizeof(sel_union)); /* waste is insignificant */ - pidnode->n = 0; - - grpnode = xmalloc(sizeof(selection_node)); -- grpnode->u = xmalloc(i*sizeof(sel_union)); /* waste is insignificant */ -+ grpnode->u = xcalloc(i,sizeof(sel_union)); /* waste is insignificant */ - grpnode->n = 0; - - sidnode = xmalloc(sizeof(selection_node)); -- sidnode->u = xmalloc(i*sizeof(sel_union)); /* waste is insignificant */ -+ sidnode->u = xcalloc(i, sizeof(sel_union)); /* waste is insignificant */ - sidnode->n = 0; - - while(i--){ --- -GitLab - diff --git a/meta/recipes-extended/procps/procps_4.0.3.bb b/meta/recipes-extended/procps/procps_4.0.4.bb similarity index 94% rename from meta/recipes-extended/procps/procps_4.0.3.bb rename to meta/recipes-extended/procps/procps_4.0.4.bb index 9ef679c6bd8..800384f22f7 100644 --- a/meta/recipes-extended/procps/procps_4.0.3.bb +++ b/meta/recipes-extended/procps/procps_4.0.4.bb @@ -14,11 +14,8 @@ inherit autotools gettext pkgconfig update-alternatives SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \ file://sysctl.conf \ - file://0001-src-w.c-use-utmp.h-only.patch \ - file://0001-po-fr.po-address-failures-with-gettext-0.22.patch \ - file://CVE-2023-4016.patch \ " -SRCREV = "806eb270f217ff7e1e745c7bda2b002b5be74be4" +SRCREV = "4ddcef2fd843170c8e2d59a83042978f41037a2b" S = "${WORKDIR}/git" From patchwork Sun Sep 17 09:38: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: 30592 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 A784BCD13DE for ; Sun, 17 Sep 2023 09:39:26 +0000 (UTC) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by mx.groups.io with SMTP id smtpd.web10.27147.1694943560659153964 for ; Sun, 17 Sep 2023 02:39:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=RVU94faT; spf=pass (domain: gmail.com, ip: 209.85.218.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-9a645e54806so432618566b.0 for ; Sun, 17 Sep 2023 02:39:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943559; x=1695548359; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NnDvR1XXZrZsivP9GoVJqitJy5qP+rngxlgJYzcNBmM=; b=RVU94faTj3WK+EdWVfknrVEX5oSheNzkI1503SpWrUfVWSxvmCHVqBq7nEZ4p8t/5g +iJiw2YadIBucGnnU23slJ6oKCIrlEDOp91PgVFAK6aw/Xp/ECacfq1t7whoMQ7u0DRf 41YfSDzWwfGMZQaV5n7qdKVxejgJL1oNUW9fjVzWpjHV/4CzFuUm/naqOAh9AxMie8Qh DyFLiH+qQHAcdkVlgdyCFRxZmBANXaQxwdKnGCxUWLnRgDU55LkyfY4EfCLgSpoZOgws CYSXbN3IMc8CZOASzD9ctHcjsu6DrxQ1h1iudsXHzgHMrSerhMBtHUPE42F8Xio094s2 aW9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943559; x=1695548359; 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=NnDvR1XXZrZsivP9GoVJqitJy5qP+rngxlgJYzcNBmM=; b=NWrz52jztvYtrpZQQ3N32vi3m55grKk6Uidpnos6tDQT0hsZwkAehY66fCiEFNbglJ akis6+CfaKSpUEcKMj5F1tYd993+NbIlft85D8katv1YZX22lWWRarubdx2jx1EhKUyi viVFJIdBsvB2IJRkCrCXa8SDpX7zIm4P9UY/q8Q420W0tc2RZwLP9d9MUI0S6FSTBqOE EZHb+SyAn16diFUXKz2pQ1sEK8Bx/PYoHB5fE/J9We0QT32Wz3yxgH8IChgt8EbKiEnh vsB6CK66tDDdIKnKKmPtRDIdfXGdCBD4did+hF5VlCpaWI15kfqMzz9NDXR/szWv3ze4 Hc1w== X-Gm-Message-State: AOJu0YwxwdProD+mG/9nCB4atXUSLS2WRNK8Jc3+9UILdreLspq1Pzp4 57d6jKXKre/IGxaUsv5DWnvrWwBLCpU= X-Google-Smtp-Source: AGHT+IEu9LsisO2qCeB4PGyPYGQ7zSD+aEMBI52/m/6tumncr6I7vNMFB1Lg49Vv8Q0nyGtQpEWBbw== X-Received: by 2002:a17:906:5306:b0:9ad:eb9c:dd00 with SMTP id h6-20020a170906530600b009adeb9cdd00mr2714622ejo.12.1694943559111; Sun, 17 Sep 2023 02:39:19 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:18 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 24/29] screen: update 4.9.0 -> 4.9.1 Date: Sun, 17 Sep 2023 11:38:56 +0200 Message-Id: <20230917093901.428214-24-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187797 Remove patches; they are merged upstream or backported. Signed-off-by: Alexander Kanavin --- ...-Add-needed-system-headers-in-checks.patch | 151 ------------------ .../screen/screen/signal-permission.patch | 40 ----- .../{screen_4.9.0.bb => screen_4.9.1.bb} | 4 +- 3 files changed, 1 insertion(+), 194 deletions(-) delete mode 100644 meta/recipes-extended/screen/screen/0001-configure-Add-needed-system-headers-in-checks.patch delete mode 100644 meta/recipes-extended/screen/screen/signal-permission.patch rename meta/recipes-extended/screen/{screen_4.9.0.bb => screen_4.9.1.bb} (89%) diff --git a/meta/recipes-extended/screen/screen/0001-configure-Add-needed-system-headers-in-checks.patch b/meta/recipes-extended/screen/screen/0001-configure-Add-needed-system-headers-in-checks.patch deleted file mode 100644 index 80659942c73..00000000000 --- a/meta/recipes-extended/screen/screen/0001-configure-Add-needed-system-headers-in-checks.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 4e102de2e6204c1d8e8be00bb5ffd4587e70350c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 15 Aug 2022 10:35:53 -0700 -Subject: [PATCH] configure: Add needed system headers in checks - -Newer compilers throw warnings when a funciton is used with implicit -declaration and enabling -Werror can silently fail these tests and -result in wrong configure results. Therefore add the needed headers in -the AC_TRY_LINK macros - - * configure.ac: Add missing system headers in AC_TRY_LINK. - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/screen-devel/2022-08/msg00000.html] -Signed-off-by: Khem Raj ---- - configure.ac | 57 +++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 43 insertions(+), 14 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c0f02df..d308079 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -233,6 +233,7 @@ AC_CHECKING(BSD job jontrol) - AC_TRY_LINK( - [#include - #include -+#include - ], [ - #ifdef POSIX - tcsetpgrp(0, 0); -@@ -250,12 +251,16 @@ dnl - dnl **** setresuid(), setreuid(), seteuid() **** - dnl - AC_CHECKING(setresuid) --AC_TRY_LINK(,[ --setresuid(0, 0, 0); -+AC_TRY_LINK([ -+#include -+],[ -+return setresuid(0, 0, 0); - ], AC_DEFINE(HAVE_SETRESUID)) - AC_CHECKING(setreuid) --AC_TRY_LINK(,[ --setreuid(0, 0); -+AC_TRY_LINK([ -+#include -+],[ -+return setreuid(0, 0); - ], AC_DEFINE(HAVE_SETREUID)) - dnl - dnl seteuid() check: -@@ -274,7 +279,9 @@ seteuid(0); - - dnl execvpe - AC_CHECKING(execvpe) --AC_TRY_LINK(,[ -+AC_TRY_LINK([ -+ #include -+],[ - execvpe(0, 0, 0); - ], AC_DEFINE(HAVE_EXECVPE) - CFLAGS="$CFLAGS -D_GNU_SOURCE") -@@ -284,10 +291,18 @@ dnl **** select() **** - dnl - - AC_CHECKING(select) --AC_TRY_LINK(,[select(0, 0, 0, 0, 0);],, -+AC_TRY_LINK([ -+ #include -+],[ -+ select(0, 0, 0, 0, 0); -+],, - LIBS="$LIBS -lnet -lnsl" - AC_CHECKING(select with $LIBS) --AC_TRY_LINK(,[select(0, 0, 0, 0, 0);],, -+AC_TRY_LINK([ -+ #include -+],[ -+ select(0, 0, 0, 0, 0); -+],, - AC_MSG_ERROR(!!! no select - no screen)) - ) - dnl -@@ -624,11 +639,19 @@ dnl - dnl **** termcap or terminfo **** - dnl - AC_CHECKING(for tgetent) --AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, -+AC_TRY_LINK([ -+ #include -+ #include -+],[ -+ tgetent((char *)0, (char *)0); -+],, - olibs="$LIBS" - LIBS="-lcurses $olibs" - AC_CHECKING(libcurses) --AC_TRY_LINK(,[ -+AC_TRY_LINK([ -+ #include -+ #include -+],[ - #ifdef __hpux - __sorry_hpux_libcurses_is_totally_broken_in_10_10(); - #else -@@ -871,7 +894,7 @@ test -f /usr/lib/libutil.a && LIBS="$LIBS -lutil" - fi - - AC_CHECKING(getloadavg) --AC_TRY_LINK(,[getloadavg((double *)0, 0);], -+AC_TRY_LINK([#include ],[getloadavg((double *)0, 0);], - AC_DEFINE(LOADAV_GETLOADAVG) load=1, - if test "$cross_compiling" = no && test -f /usr/lib/libkvm.a ; then - olibs="$LIBS" -@@ -1109,10 +1132,10 @@ AC_CHECKING(IRIX sun library) - AC_TRY_LINK(,,,LIBS="$oldlibs") - - AC_CHECKING(syslog) --AC_TRY_LINK(,[closelog();], , [oldlibs="$LIBS" -+AC_TRY_LINK([#include ],[closelog();], , [oldlibs="$LIBS" - LIBS="$LIBS -lbsd" - AC_CHECKING(syslog in libbsd.a) --AC_TRY_LINK(, [closelog();], AC_NOTE(- found.), [LIBS="$oldlibs" -+AC_TRY_LINK([#include ], [closelog();], AC_NOTE(- found.), [LIBS="$oldlibs" - AC_NOTE(- bad news: syslog missing.) AC_DEFINE(NOSYSLOG)])]) - - AC_EGREP_CPP(YES_IS_DEFINED, -@@ -1149,7 +1172,7 @@ AC_CHECKING(getspnam) - AC_TRY_LINK([#include ], [getspnam("x");],AC_DEFINE(SHADOWPW)) - - AC_CHECKING(getttyent) --AC_TRY_LINK(,[getttyent();], AC_DEFINE(GETTTYENT)) -+AC_TRY_LINK([#include ],[getttyent();], AC_DEFINE(GETTTYENT)) - - AC_CHECKING(fdwalk) - AC_TRY_LINK([#include ], [fdwalk(NULL, NULL);],AC_DEFINE(HAVE_FDWALK)) -@@ -1204,7 +1227,13 @@ main() { - AC_SYS_LONG_FILE_NAMES - - AC_MSG_CHECKING(for vsprintf) --AC_TRY_LINK([#include ],[va_list valist; vsprintf(0,0,valist);], AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS), AC_MSG_RESULT(no)) -+AC_TRY_LINK([ -+ #include -+ #include -+],[ -+ va_list valist; -+ vsprintf(0,0,valist); -+], AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS), AC_MSG_RESULT(no)) - - AC_HEADER_DIRENT - diff --git a/meta/recipes-extended/screen/screen/signal-permission.patch b/meta/recipes-extended/screen/screen/signal-permission.patch deleted file mode 100644 index 77dc649090a..00000000000 --- a/meta/recipes-extended/screen/screen/signal-permission.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e9ad41bfedb4537a6f0de20f00b27c7739f168f7 Mon Sep 17 00:00:00 2001 -From: Alexander Naumov -Date: Mon, 30 Jan 2023 17:22:25 +0200 -Subject: fix: missing signal sending permission check on failed query messages - -Signed-off-by: Alexander Naumov - -CVE: CVE-2023-24626 -Upstream-Status: Backport -Signed-off-by: Ross Burton ---- - src/socket.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/socket.c b/src/socket.c -index 147dc54..54d8cb8 100644 ---- a/socket.c -+++ b/socket.c -@@ -1285,11 +1285,16 @@ ReceiveMsg() - else - queryflag = -1; - -- Kill(m.m.command.apid, -+ if (CheckPid(m.m.command.apid)) { -+ Msg(0, "Query attempt with bad pid(%d)!", m.m.command.apid); -+ } -+ else { -+ Kill(m.m.command.apid, - (queryflag >= 0) - ? SIGCONT - : SIG_BYE); /* Send SIG_BYE if an error happened */ -- queryflag = -1; -+ queryflag = -1; -+ } - } - break; - case MSG_COMMAND: --- -cgit v1.1 - diff --git a/meta/recipes-extended/screen/screen_4.9.0.bb b/meta/recipes-extended/screen/screen_4.9.1.bb similarity index 89% rename from meta/recipes-extended/screen/screen_4.9.0.bb rename to meta/recipes-extended/screen/screen_4.9.1.bb index 235cd8c6cfc..7b040e6b578 100644 --- a/meta/recipes-extended/screen/screen_4.9.0.bb +++ b/meta/recipes-extended/screen/screen_4.9.1.bb @@ -21,11 +21,9 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ file://0002-comm.h-now-depends-on-term.h.patch \ file://0001-fix-for-multijob-build.patch \ file://0001-Remove-more-compatibility-stuff.patch \ - file://0001-configure-Add-needed-system-headers-in-checks.patch \ - file://signal-permission.patch \ " -SRC_URI[sha256sum] = "f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4" +SRC_URI[sha256sum] = "26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69" inherit autotools texinfo From patchwork Sun Sep 17 09:38: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: 30590 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 A7468CD13DA for ; Sun, 17 Sep 2023 09:39:26 +0000 (UTC) Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by mx.groups.io with SMTP id smtpd.web11.27421.1694943561337163591 for ; Sun, 17 Sep 2023 02:39:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Agi2g1h7; spf=pass (domain: gmail.com, ip: 209.85.208.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-52f9a45b4bdso4270971a12.3 for ; Sun, 17 Sep 2023 02:39:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943560; x=1695548360; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IMm7+/NV/WdTnhZF+Ahp1g//QHDiig8jIZ7H7mfYEAs=; b=Agi2g1h7uwe+KQXIfmErEzlSAMTQnKGBo8H5HhAtKQBntRFhyVHJgxixDanHUO4K2r 2fXPgUBi+zUGnmcL6fKthpn6dMhQlQfxrhkcpaNXZ2bF7YFEOoPwG3WTp8ZSTbqBXHkA 0ct+r32UV/4//rg/zvaV9ymcMvWuPHUJK20gDumTVrZ9bLTZ+Xls+qAlSQIEYG1W1D+s bUZQ5/lcXIvWWq/YAfnzNaArL+RyoEkP8WeY4zlCNCPVrM4ST/r9XI9sVnE+ttkbLsMY W66yJsH4HdXDTTvBp8qKv7xr4wSgSX7I3CLzpdZNuKPeKu21Xf8aJwIP4VoZ1QlRdCoO 3/uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943560; x=1695548360; 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=IMm7+/NV/WdTnhZF+Ahp1g//QHDiig8jIZ7H7mfYEAs=; b=W09QtSIAssNdO1MpBd3fZdBmpiLEPgsfM3XT9fAdJK5OqeJwJsz68JB1QLgi1RatEM Z5UABaHFq3w3u846NIowGmhcOU1Rd295PD/7VQ0sNPWxVcVVXXayTlib1ztYqRHlex/m JLNHLpVNHbWrESts+1p28QedsTGbF3HUtYuS5WPFlWXJOX2fbMWVJkFctq/DHR9fgpK3 HJiNp+R0vsA8XxffjxpBAlehevpcaoddvu2buzx4KFBWbj/vlmEfQZtW57Mpa5KxQAik vfGAy5RDrQCHe1F1ZWtm/wwf2fDmozMK0n9wzK9qGWnAIHfo8uzMZ5HnQomGOG0gXxZY rbEw== X-Gm-Message-State: AOJu0Yx3W3sxhidOGrYAkufoZCnS/61aFR73TxWxdLlMk5V2BZhnRVrw 6M5X91sBvpwGgCl5cPX+A4arzlwDYUA= X-Google-Smtp-Source: AGHT+IG/j6+McpKTcfydbLNx+R0ne5xLEkuf0x1ik0DSKtJMV+oRW8hf/E07zO2Qxhw4murf6ujuhw== X-Received: by 2002:a17:907:b0c:b0:9ad:a46c:2936 with SMTP id h12-20020a1709070b0c00b009ada46c2936mr5691814ejl.8.1694943559641; Sun, 17 Sep 2023 02:39:19 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:19 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 25/29] gobject-introspection: update 1.76.1 -> 1.78.0 Date: Sun, 17 Sep 2023 11:38:57 +0200 Message-Id: <20230917093901.428214-25-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187798 Remove patch as issue fixed upstream. Signed-off-by: Alexander Kanavin --- ...pository-directory-for-native-builds.patch | 2 +- ...-ir-tool-template.in-fix-girdir-path.patch | 33 ------------------- ...6.1.bb => gobject-introspection_1.78.0.bb} | 3 +- 3 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch rename meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.76.1.bb => gobject-introspection_1.78.0.bb} (98%) diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch index 9ba8bcfd71a..c9e1afffd0f 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch @@ -1,4 +1,4 @@ -From 2c31944eabbb42a86a4ddaa2998a3b100a13138d Mon Sep 17 00:00:00 2001 +From aeb5532f8be42d42f4e8725ca42e239b36983a4d Mon Sep 17 00:00:00 2001 From: Sascha Silbe Date: Fri, 8 Jun 2018 13:55:10 +0200 Subject: [PATCH] Relocate the repository directory for native builds diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch deleted file mode 100644 index 5c78649de48..00000000000 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b01b448613b76f9acefdfd89ee01686dc7a67df4 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 13 Jul 2021 02:05:11 -0700 -Subject: [PATCH] g-ir-tool-template.in: fix girdir path - -In case gir_dir_prefix is set, it's possible that g-ir-scanner -cannot find the .gir files. This is because that the girdir -is set to gir_dir_prefix, which is wrong. It's not a prefix, -it the actual gir dir. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/329] - -Signed-off-by: Chen Qi ---- - tools/g-ir-tool-template.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in -index 6e98f52e..62c07c31 100755 ---- a/tools/g-ir-tool-template.in -+++ b/tools/g-ir-tool-template.in -@@ -55,7 +55,7 @@ builtins.__dict__['DATADIR'] = datadir - - # Respect gir_dir_prefix - girdir = '' --girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@')) -+girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@', 'gir-1.0')) - builtins.__dict__['GIRDIR'] = [girdir] - - # Again, relative paths first so that the installation prefix is relocatable --- -2.30.2 - diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.76.1.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.78.0.bb similarity index 98% rename from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.76.1.bb rename to meta/recipes-gnome/gobject-introspection/gobject-introspection_1.78.0.bb index 6d006338251..42b0979aafd 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.76.1.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.78.0.bb @@ -14,10 +14,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ " SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ - file://0001-g-ir-tool-template.in-fix-girdir-path.patch \ " -SRC_URI[sha256sum] = "196178bf64345501dcdc4d8469b36aa6fe80489354efe71cb7cb8ab82a3738bf" +SRC_URI[sha256sum] = "84f5bd2038bd52abbce74a639832c5b46a2d17e9c5a8ae14f9788e8516c04166" SRC_URI:append:class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" From patchwork Sun Sep 17 09:38: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: 30594 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 B0927CD13DF for ; Sun, 17 Sep 2023 09:39:26 +0000 (UTC) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by mx.groups.io with SMTP id smtpd.web10.27148.1694943561890177828 for ; Sun, 17 Sep 2023 02:39:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ig1uwudH; spf=pass (domain: gmail.com, ip: 209.85.218.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-9a65f9147ccso455658566b.1 for ; Sun, 17 Sep 2023 02:39:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943560; x=1695548360; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QdGGyFgU76bOHd7E6586serwto/k4CV70F0dfvVkTS0=; b=ig1uwudHL8LMg1U9O7crH7RgvNX6VPhhbdHolIJYOQGbuZYOEj/KtRNXhKMB1m6SAb gzJ67xyWVTgfJU9j6JmDeEzBoDm1avMHoScc93TkkYresxISlVRXkbY25+xMabCCgTFU F3NObYypjCBmarjFUcpTsXA6B+7VjN8Q6h3HjFdkzidJ9AM+DGmTlvBXI2CAJD/nMp6Z SrRV1En/qS48l8HnsRAfPTzrB2gaWgyKUPruOFk7ip2o2tLIgrBKXu48lEGlpiMkjJRH aaPw9KjcnEtQ6f1lgNSR+838hzAvHp6ohhcABFYhkV47DZzBW8OTSDhFT84aKbZZaNGX 3xhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943560; x=1695548360; 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=QdGGyFgU76bOHd7E6586serwto/k4CV70F0dfvVkTS0=; b=vLt+ldBYVrSTicWnmqa4OhXKIWs6ZDRZLo9DWc+CQnSKTN4/nAd4WjekqZJr8LJqDS 70pItdJ44XnM7u12/WMY/yMsJys0FQ7e8cmUZtDJ/xhKf2zwl6JpG/hWmy+AuKyi7I8C zwAVLkqdJEp3MEHXx1L8cg8etzmioi6q3Csxe2mkm0mh40j0i4zW/rENrLz6+eoTTkhe 4G4lgv+HefVs68wsZpOYz59tb8fUsZkj97FoRncGiPeFRPUeguhv7lzYsrbI/kKYGinu sIPTQpJUvXRWUBPTmYm4dL8QQnVPXCIqXPUilOiApi8JePpCQ86b0/9+96eMGzxJAb5I q69w== X-Gm-Message-State: AOJu0YzcN0xOjiixaMXk7xqLF/xhJzODNpDIIqo3uQmfhcABC6222uaR BdXEYy8YsSxDiZjyuJfrBMXZ2gdwdWk= X-Google-Smtp-Source: AGHT+IEUuITcrPrxOYL82uL0VAYzD/YJdyl/Tmi96hNygIOpMDbbgdk4GFn8KS4iRfQqgkBdp1v0jg== X-Received: by 2002:a17:906:256:b0:99b:c86b:1d25 with SMTP id 22-20020a170906025600b0099bc86b1d25mr5631862ejl.26.1694943560205; Sun, 17 Sep 2023 02:39:20 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:19 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 26/29] igt-gpu-tools: update 1.27.1 -> 1.28 Date: Sun, 17 Sep 2023 11:38:58 +0200 Message-Id: <20230917093901.428214-26-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187799 Drop procps 4 patch as upstream fixed the issue. Signed-off-by: Alexander Kanavin --- .../0001-Support-procps-4.x.patch | 502 ------------------ .../igt-gpu-tools/igt-gpu-tools_git.bb | 8 +- 2 files changed, 3 insertions(+), 507 deletions(-) delete mode 100644 meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-Support-procps-4.x.patch 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 deleted file mode 100644 index fe9663b6eb4..00000000000 --- a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-Support-procps-4.x.patch +++ /dev/null @@ -1,502 +0,0 @@ -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 f4799fbc773..74110b75d1b 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 @@ -9,12 +9,10 @@ LICENSE = "MIT" inherit meson pkgconfig -SRCREV = "2b29e8ac07fbcfadc48b9d60e4d736a6e3b289ab" -PV = "1.27.1" +SRCREV = "31ec677ca24e7ed86e35f367f40a29d3d9f51c06" +PV = "1.28" -SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https;branch=master \ - file://0001-Support-procps-4.x.patch \ - " +SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https;branch=master" S = "${WORKDIR}/git" From patchwork Sun Sep 17 09:38:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 30588 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 B44E3CD3421 for ; Sun, 17 Sep 2023 09:39:26 +0000 (UTC) Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by mx.groups.io with SMTP id smtpd.web10.27149.1694943562279010810 for ; Sun, 17 Sep 2023 02:39:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=c/DLDFIN; spf=pass (domain: gmail.com, ip: 209.85.208.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-530fa34ab80so467876a12.0 for ; Sun, 17 Sep 2023 02:39:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943561; x=1695548361; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QxyUW+il14rNrqpOmg6VBCwsR9NxiELaSK1VW6aIf4E=; b=c/DLDFINjLu/nqivCtAo6Od6SMMhcvPTW+UDby7ReT+W62gY/yA2IUDeJOZH267DWI r7af30+c2zoP1rdaxMYBXnDzMT3TpjwQN9/4Yie3fDQgIygrMQYeqQXZTJGWC9y2obDT Zi1xB1FuRamJelSQL4PwZT1gbrBRmDMPfafJEOPXSTFJDK8X7jmfcSFtoIheov/5TTf3 r/2oITxQp58zSkiZuvdPG5L2mrFps4xf9T/yrRi9TvHmhI4u1uxFYu1Qvs+tXhfFicaZ SNPuv5BdHPhCoGLJOkB4xwrPDKibFMwTuqHeys2hg6w8/STGOULqtccFI/hnUPhsoF1H 5/xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943561; x=1695548361; 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=QxyUW+il14rNrqpOmg6VBCwsR9NxiELaSK1VW6aIf4E=; b=TWz/IwL8PcDrW9JUWf6YqHlCECbdUnWbIYK+4phd8tZV3QEcbRPS/IbubDrZpqmeDg HQsRodmV/0o9lxghCiS4nDqVPPCXoscV+pCvhh1oFpmyj75OpccH7zxxBdNnDGydgPbK UQA96LCWBSdvk7/jlgTmu+gMeCNDWH4CNqD3FYTwe6nFV1cs0CfS2aD82X0+FCbpg1W5 4u1AAy/vcCFHkBlAJtmGNEibOFXMUYTFKhBmxTsipp6rDmBJHHHzpWXbRtRrAO5L2TWN lpSPuQTNHQmMph/cRDKgolaB1lLCN+AI/m3lDXw3nMfoAgSpvghXeQ/c987KH50d0gPG bmjQ== X-Gm-Message-State: AOJu0YyDfi027OIjVgu31cECKbZJXloEHXSd0RcHqLVPKOFmfXrdUOWC Oo+SKHsWyohUozMGXKclmp/iitv3wRc= X-Google-Smtp-Source: AGHT+IEbiK6clSPFXES6AGygohFll3ZFsqM38Y2rhoVgc3WUdIHklVREZG2fyR13BjKuvNvix8819g== X-Received: by 2002:a17:906:cc4d:b0:9a2:26e4:a5e2 with SMTP id mm13-20020a170906cc4d00b009a226e4a5e2mr9259939ejb.25.1694943560763; Sun, 17 Sep 2023 02:39:20 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:20 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 27/29] libva-utils: update 2.19.0 -> 2.20.0 Date: Sun, 17 Sep 2023 11:38:59 +0200 Message-Id: <20230917093901.428214-27-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187800 Signed-off-by: Alexander Kanavin --- .../libva/{libva-utils_2.19.0.bb => libva-utils_2.20.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/libva/{libva-utils_2.19.0.bb => libva-utils_2.20.0.bb} (90%) diff --git a/meta/recipes-graphics/libva/libva-utils_2.19.0.bb b/meta/recipes-graphics/libva/libva-utils_2.20.0.bb similarity index 90% rename from meta/recipes-graphics/libva/libva-utils_2.19.0.bb rename to meta/recipes-graphics/libva/libva-utils_2.20.0.bb index acb25a3f0d8..2e1fd094068 100644 --- a/meta/recipes-graphics/libva/libva-utils_2.19.0.bb +++ b/meta/recipes-graphics/libva/libva-utils_2.20.0.bb @@ -14,8 +14,8 @@ SECTION = "x11" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e" -SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.19-branch;protocol=https" -SRCREV = "5bf107ec4f7b18a6457d23abf57560dfb382a751" +SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.20-branch;protocol=https" +SRCREV = "0c8373e62af3e4d9a3831334c5402ad255797e67" S = "${WORKDIR}/git" UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))$" From patchwork Sun Sep 17 09:39:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 30593 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 BD061CD3420 for ; Sun, 17 Sep 2023 09:39:26 +0000 (UTC) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by mx.groups.io with SMTP id smtpd.web11.27422.1694943562795289892 for ; Sun, 17 Sep 2023 02:39:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=MXwFWumS; spf=pass (domain: gmail.com, ip: 209.85.208.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-530fa34ab80so467882a12.0 for ; Sun, 17 Sep 2023 02:39:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943561; x=1695548361; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=z7wCpk5C/D8bA6+ZIIF003clqGH1n2y011vy8JUMoQw=; b=MXwFWumS5zfkH+TmNUe6q0BVps4Nl2CyXmaJhPSh83Q6b9T2OqSYZBsIJcUPmRufDo ZW2v0VgUfmojtjpDnzD1K6FhXA3xe+gKGwjZKW+U/o2qybNaY3Sc5cfHFs46Wx0Hr908 TiOWYIi7q7Gtr6vs4Z4PJDIjpE/vBQB0beXvADuugcITieoTX8zSz6yY2cELw6fahWNd pAcO2U7AI3GlUlzHbqDiJOGbgLXwDt+5WAgX+qq+Kh9TUYpYsgK0JofVn90NXqpVQLog GPanjLV40pbLd08rHSkRmXVUwF254WumPtlfR3bCZm3dTYcDwob0Dlj6NZrfsr4Tznzp tkUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943561; x=1695548361; 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=z7wCpk5C/D8bA6+ZIIF003clqGH1n2y011vy8JUMoQw=; b=crmEwS2pVg2PNyT/WKpK4mbr/nJxgmY0/KW7uqzDLxnwNTjpkHS4csZia7tsq6c/IH mmcGFIMqM1sc7R18m26/UA385eLlwxcs7o5mh/d7bdKDeRX5+JAgn5SnkiTlGR9cqA/g sfvjSGAUpvxF5f6sLAFn1sTAuTN8Ng2iveEvaytzI/fhKT0hVNVjrNDqSZCcm8vh5gFq l0HEKGX7vnEj085rn57yibXPvOKIoogCxF9tRub8GM+CduhjLQ4KlRsVhxBLAUrRjq1I eeyn00MksVcDcbDuDc2ibQS2OBMBJpHYMvF6AirY7SaVirXihCtbLXgIbv7Zt5S2siYe kpUw== X-Gm-Message-State: AOJu0YwW7lm4dNTnonDQ2oRskQLJktNLmLc2cO34S1RpyNNt1Z1E3iqJ Y1zch8VQ+PdCvUu9Z17V/sE1O8Qxltk= X-Google-Smtp-Source: AGHT+IH2R6mMGW7w4ljaKVxF9FEwf797ONkzuie9ivjaX3I643245ARMSakjWPPeTjj+hw/Nv0AH5w== X-Received: by 2002:a17:906:530e:b0:9a9:e326:d0c2 with SMTP id h14-20020a170906530e00b009a9e326d0c2mr9155851ejo.4.1694943561252; Sun, 17 Sep 2023 02:39:21 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:21 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 28/29] piglit: update to latest revision Date: Sun, 17 Sep 2023 11:39:00 +0200 Message-Id: <20230917093901.428214-28-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187801 Drop patch as issue finally fixed upstream. Signed-off-by: Alexander Kanavin --- ...-bash-completions-in-the-right-place.patch | 35 ------------------- meta/recipes-graphics/piglit/piglit_git.bb | 3 +- 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch diff --git a/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch b/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch deleted file mode 100644 index e07e810a733..00000000000 --- a/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 26faa2c157a27a18a9f767976730fe0c115e3af4 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Wed, 13 Jul 2016 19:19:02 +0300 -Subject: [PATCH] cmake: install bash-completions in the right place - -The completionsdir variable is a full path and should not be -prefixed. - -This does mean the files may be installed outside of -CMAKE_INSTALL_PREFIX -- the alternative is more difficult and -means that bash completion files may be installed where -bash-completion can't find them. - -Signed-off-by: Jussi Kukkonen -Upstream-Status: Submitted [mailing list] ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8e2abba..784a8f9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -532,7 +532,7 @@ install ( - if (BASH_COMPLETION_FOUND) - install( - FILES completions/bash/piglit -- DESTINATION ${CMAKE_INSTALL_PREFIX}/${BASH_COMPLETION_COMPLETIONSDIR}/ -+ DESTINATION ${BASH_COMPLETION_COMPLETIONSDIR}/ - ) - endif (BASH_COMPLETION_FOUND) - --- -2.8.1 - diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index 62cada75906..69294c6c946 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -7,14 +7,13 @@ LICENSE = "MIT & LGPL-2.0-or-later & GPL-3.0-only & GPL-2.0-or-later & BSD-3-Cla LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0" SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=main \ - file://0001-cmake-install-bash-completions-in-the-right-place.patch \ file://0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \ file://0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch \ file://0001-tests-Fix-narrowing-errors-seen-with-clang.patch \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "5036601c43fff63f7be5cd8ad7b319a5c1f6652c" +SRCREV = "71c21b1157c4f9a96453bdfcb9f4dda091360afd" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr" From patchwork Sun Sep 17 09:39:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 30591 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 BEE57CD3422 for ; Sun, 17 Sep 2023 09:39:26 +0000 (UTC) Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by mx.groups.io with SMTP id smtpd.web10.27150.1694943563493293568 for ; Sun, 17 Sep 2023 02:39:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=WwgkkVj8; spf=pass (domain: gmail.com, ip: 209.85.218.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-99bf3f59905so464811266b.3 for ; Sun, 17 Sep 2023 02:39:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694943562; x=1695548362; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=p7iWulFnPZiLrNDvXNsbGRfD7UwKG4ybIy2Q6RV+vAs=; b=WwgkkVj8tA4O3cdVIgH0jEO2bEKEqxbHhJEPSmObb/ayPCbQ7qkq1tVJelibR3d6Ij yUutJMyOMXy0Uc27gckGVj8qJkDu74SoOHOfAm0On8hQJ/xpCBZKilnJozNx5A0+6YA3 44sjtZqQYngkywm4eYGZMBfHTGF+JiYxoGBbVice9sQx0txy0bI2YAc30UEjOkLAC1Ru G39QQJeOQRw1aYdy6iAZJnQpejCY+XpBzRDPM+JF+sJc/Ax5EWZi1CC4TENPGT22KDvU W0M+y2+sEChPtPPaa8MoWmAiPdhnKFZ/XBIYRG0Bi42iayP6yIXtZkv78lxq0SbWsw0p zD9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694943562; x=1695548362; 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=p7iWulFnPZiLrNDvXNsbGRfD7UwKG4ybIy2Q6RV+vAs=; b=NtFvCQOTv/o4Xk6nGqsHZ++FpB+JUIqq1PsxxDh7FrbvlPaPZv1FApBRussjF1KCcm 1hKdRWwFj8N7FlQG1HiksaxG+mw4aruscJ+NTQogkhDb5vj09nUf9/k0qaJLfjtYFRta o09zSY9LP0pnWLvjtOIbPthDMcMEdR2v9TnMYP3bsz9mDJMC1lcbwLWb3k6rcgrt/fRN YJ1N7nZy0L7y5I+qW+Eh5zvccHpRFX1+E4DlSSUWyHmVUpifOg1mFaW7a4E6cXqLfJOV M1P6OyVzvHGIV7uBAgVgHOmqVm2W3nBCJ56bJk3E+kU74WaAjLkTzDtjdQorumHdk7Ia Wfsg== X-Gm-Message-State: AOJu0Yzn7NMjXCX71f24A7vpIOr/Tyi8h+kub4+d2F6ewtQezdl5eMHO qPeshRGWl3AMaJiXa1MWOOL/+xxEG0I= X-Google-Smtp-Source: AGHT+IElJCme0gx7G3ZVJEKNPRZjyv+PgCvIqrZDBho9+Tdhdi2SH/bBqfb2/CsrcjyD5X8CPlf7ag== X-Received: by 2002:a17:906:53da:b0:9a9:e659:a8aa with SMTP id p26-20020a17090653da00b009a9e659a8aamr5380893ejo.57.1694943561746; Sun, 17 Sep 2023 02:39:21 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d8-20020a17090694c800b0099ce188be7fsm4779683ejy.3.2023.09.17.02.39.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:39:21 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 29/29] groff: add a patch to resolve build races Date: Sun, 17 Sep 2023 11:39:01 +0200 Message-Id: <20230917093901.428214-29-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230917093901.428214-1-alex@linutronix.de> References: <20230917093901.428214-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 ; Sun, 17 Sep 2023 09:39:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187802 Signed-off-by: Alexander Kanavin --- ...d-Fix-Savannah-64681-webpage.ps-deps.patch | 51 +++++++++++++++++++ meta/recipes-extended/groff/groff_1.23.0.bb | 1 + 2 files changed, 52 insertions(+) create mode 100644 meta/recipes-extended/groff/files/0001-build-Fix-Savannah-64681-webpage.ps-deps.patch diff --git a/meta/recipes-extended/groff/files/0001-build-Fix-Savannah-64681-webpage.ps-deps.patch b/meta/recipes-extended/groff/files/0001-build-Fix-Savannah-64681-webpage.ps-deps.patch new file mode 100644 index 00000000000..eae5dc99982 --- /dev/null +++ b/meta/recipes-extended/groff/files/0001-build-Fix-Savannah-64681-webpage.ps-deps.patch @@ -0,0 +1,51 @@ +From c75965053124149381ada3c394da74be078076cf Mon Sep 17 00:00:00 2001 +From: "G. Branden Robinson" +Date: Sat, 16 Sep 2023 16:28:00 -0500 +Subject: [PATCH] [build]: Fix Savannah #64681 (webpage.ps deps). + +* doc/doc.am (doc/webpage.ps, doc/webpage.html): Update and parallelize + target dependencies. Resolve race by requiring "grn" and "soelim" to + be built first. Also add dependency on `$(TMAC_PACKAGE_MS)`. + +Fixes . Thanks to Alexander +Kanavin for the report. + +ANNOUNCE: Acknowledge Alexander. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin +--- + doc/doc.am | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/doc/doc.am b/doc/doc.am +index cddc51907..d3c9ab6b7 100644 +--- a/doc/doc.am ++++ b/doc/doc.am +@@ -346,6 +346,9 @@ doc/pic.ps: $(doc_srcdir)/pic.ms eqn pic tbl + $(GROFF_V)$(MKDIR_P) `dirname $@` \ + && $(DOC_GROFF) -pet -Tps -ms $(doc_srcdir)/pic.ms >$@ + ++# groff(1)'s `-I` implies `-g` and `-s`, so we must depend on grn and ++# soelim even though the document doesn't require them. ++doc/webpage.ps: grn soelim + doc/webpage.ps: $(DOC_GNU_EPS) tmac/www.tmac tbl + doc/webpage.ps: $(doc_srcdir)/webpage.ms + $(GROFF_V)$(MKDIR_P) `dirname $@` \ +@@ -365,11 +368,12 @@ doc/pic.html: $(doc_srcdir)/pic.ms + && $(DOC_GROFF) -pet -P-Ipic -P-Dimg -P-jpic -Thtml -ms \ + $(doc_srcdir)/pic.ms > pic.html + +-doc/webpage.html: tbl +-doc/webpage.html: tmac/www.tmac +-doc/webpage.html: $(DOC_GNU_EPS) ++# groff(1)'s `-I` implies `-g` and `-s`, so we must depend on grn and ++# soelim even though the document doesn't require them. ++doc/webpage.html: grn soelim ++doc/webpage.html: $(DOC_GNU_EPS) tmac/www.tmac tbl + doc/webpage.html: $(doc_srcdir)/groff.css +-doc/webpage.html: $(doc_srcdir)/webpage.ms ++doc/webpage.html: $(doc_srcdir)/webpage.ms $(TMAC_PACKAGE_MS) + $(GROFF_V)$(MKDIR_P) $(doc_builddir) \ + && cd $(doc_builddir) \ + && $(DOC_GROFF) -t -I $(doc_srcdir) -P-jwebpage -P-nrb \ diff --git a/meta/recipes-extended/groff/groff_1.23.0.bb b/meta/recipes-extended/groff/groff_1.23.0.bb index 1dcd0bb605c..370817c9f27 100644 --- a/meta/recipes-extended/groff/groff_1.23.0.bb +++ b/meta/recipes-extended/groff/groff_1.23.0.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ file://groff-not-search-fonts-on-build-host.patch \ file://0001-Make-manpages-mulitlib-identical.patch \ + file://0001-build-Fix-Savannah-64681-webpage.ps-deps.patch \ " SRC_URI[sha256sum] = "6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13"