From patchwork Fri May 26 02:28:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24529 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 6C797C7EE33 for ; Fri, 26 May 2023 02:29:31 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web11.103.1685068166159755700 for ; Thu, 25 May 2023 19:29:26 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=hJoWCu2C; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-64f47448aeaso345216b3a.0 for ; Thu, 25 May 2023 19:29:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068165; x=1687660165; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PX7VJG8BqOoGE7M/mNMo5GWlW1zBLCsAhIhCIbxWSmI=; b=hJoWCu2CjnlUJ8jqVXRDOH7yFGQgoMfU8d1hrSVqEebKpU0+1hbqt/8WMe7s2zmmjr YQqUIkL/pRbe8jjDPAZkbXqbjnIgz/POMmt51cDutHgE1rTFYjZkwGV7ONx2JoGFd0mM DJ/bOOLTyzgRch3I3fwxaYVCB+HZdw9ZYdVjyNMZu3WrLiY+ICqvO6E11q6b5VVMXTlb aTis6+vVs/XwMMfjpezFaz33VhgCMoZNnmB5KTRZ7v9RQqFWP0PzO0mDGOxKY8IYadVn yUjxmga0pYG8Sp0pxrPi0BbOVNS1Dr5vnmO1KeF9hTsfScW0XW4d4WXIxeL0Hj4p6sC5 dTog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068165; x=1687660165; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PX7VJG8BqOoGE7M/mNMo5GWlW1zBLCsAhIhCIbxWSmI=; b=IQyHxmLoHHURQjcnIjzUfGshWMzQ4G716zIBbWLCPGijy6/LDZ79W0EQ/nQI6fCK4f qh8WLTUtOOvMxvIrC4OzjxQZ/VHncpp4stX+mG7aioSha3e6CIAG89vNTWJMXIu4vge+ MCe5l6vwGZR9qIvlJ03J1ZjVjpb7yD0It/mlABi4MQPAQSdARLRkibXBkUjg10lBvOTV own0ebN/ldIPshi4z8PicKkkHf0iQEHO2wbIEGbpzNjeHh4/z1GilAzQ/g8qrTz0bNnH K63HyzLirDtHwEnk9LC3AbK+ioqo9DLm2QBB+vUDrL2QEVZmp/x5g6nLfANoySwUXvZe VzfQ== X-Gm-Message-State: AC+VfDyqbj2S62Dg3i8lbpxNKEhZ4ndo+hncRvajPt2LcPkNVySGdvJP UdOfuwn+wmeMvLXDrj6hmrpHBSzbRdx3JKSBCJM= X-Google-Smtp-Source: ACHHUZ6QOR/gEYBdTE32F3QRS4G2sBlBWgKISTp9cW2j5RbqkR2TccTzRQEh7OMOiNejxt/3qwVzEw== X-Received: by 2002:a17:902:b211:b0:19d:1bc1:ce22 with SMTP id t17-20020a170902b21100b0019d1bc1ce22mr991970plr.5.1685068165029; Thu, 25 May 2023 19:29:25 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:24 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 01/21] git: ignore CVE-2023-25815 Date: Thu, 25 May 2023 16:28:49 -1000 Message-Id: <472a3e05270deace2862973dee2e65e60f9c0c19.1685068004.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:29:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181733 From: Archana Polampalli This is specific to Git-for-Windows. Signed-off-by: Archana Polampalli Signed-off-by: Steve Sakoman --- meta/recipes-devtools/git/git_2.35.7.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/git/git_2.35.7.bb b/meta/recipes-devtools/git/git_2.35.7.bb index 99d3d70683..9e7b0a8cff 100644 --- a/meta/recipes-devtools/git/git_2.35.7.bb +++ b/meta/recipes-devtools/git/git_2.35.7.bb @@ -37,6 +37,8 @@ CVE_CHECK_IGNORE += "CVE-2022-24975" CVE_CHECK_IGNORE += "CVE-2022-41953" # specific to Git for Windows CVE_CHECK_IGNORE += "CVE-2023-22743" +# This is specific to Git-for-Windows +CVE_CHECK_IGNORE += "CVE-2023-25815" PACKAGECONFIG ??= "expat curl" PACKAGECONFIG[cvsserver] = "" From patchwork Fri May 26 02:28:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24530 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 4DF5CC7EE32 for ; Fri, 26 May 2023 02:29:31 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mx.groups.io with SMTP id smtpd.web11.104.1685068167880388677 for ; Thu, 25 May 2023 19:29:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=V6guVzkg; spf=softfail (domain: sakoman.com, ip: 209.85.215.173, mailfrom: steve@sakoman.com) Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-53482b44007so148951a12.2 for ; Thu, 25 May 2023 19:29:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068167; x=1687660167; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=hDg0quUs/zW4aPnngJwbUpUx/2b6nNhGFzmMrRvFCxA=; b=V6guVzkgV+WhqTemlVY137CxqX7oPC5OoZkO7bedBc+e+LAgogVK8WIuRSeLzq4QYu Wx42D8fHK1WavVr2NIBBGZtpD0ytNC8rVSqJDZgGRAxQQxEzJDCkbdtAYHUhAplBoBLD XHVaAIP+AiVDRMW5agwmXYmo5QM1+w1wBaNninW7EG2DnjxV2PbHlOfjY0WxQLy4lZ/5 BfSHF6sOwxwGjKaTCYzocvMMEqxyyqIIA481DVN3uezRQC7pQItxiDSgAJin1qlSJQkx nSNojDGK0e5t4ki5r4XzyFSwf5uKuJtFasKXC12uTCZKOLwdsMpR6nUHkCSV1znyNTr5 s4Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068167; x=1687660167; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hDg0quUs/zW4aPnngJwbUpUx/2b6nNhGFzmMrRvFCxA=; b=RsurhVv5/lixy01cX85OV57HsdMEt9FxCD24yKQzyyjYrbcQDk+GgiJu0AfGUX4OYj IuATBTcW5Fx5wc1f5XfZwftAXYKW4RLmSeHpb2VLonES+NHf98KFT7Z0obK7UpqDF0dr xVYhu9B1t3fg3EjPn86OsUBj3iq6VFkuR9lAfWI2RYLHxI9X/h33ACMCvJwO6hISybJ2 q9nO/VEfV8RU9ETt8nniNObQ1qWO2bT0dmyzbdYCQm7sREyASNkOtBv1CPSCsKWDimBE LL1UMKV4HlRYzgpyT+9S1cp+YmKF3tJ/X1OcvrCWkt265+6+T9QMoQ77d/5ydxDIHVzS O4YA== X-Gm-Message-State: AC+VfDwC1/9w+Cj/jnTN5aZwtY2XePuOYvp+D++FVauUgwaYqmkVgkwJ dcNLBkGRpoHZLkQKgcFF8CXVu+PQhN07Fy36OD8= X-Google-Smtp-Source: ACHHUZ7gmh/gUxyPLS/i9CXILhJtpnqkFDpHWma9de44Fdim0NnQFpAI8rYdOoj79YOJJJtTFNP3qA== X-Received: by 2002:a17:903:1105:b0:1af:cbe4:d953 with SMTP id n5-20020a170903110500b001afcbe4d953mr831614plh.60.1685068166758; Thu, 25 May 2023 19:29:26 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:26 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 02/21] go: fix CVE-2023-24540 Date: Thu, 25 May 2023 16:28:50 -1000 Message-Id: <5defed7d5dc8bc6f68f021d19c4f42832d33472b.1685068004.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:29:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181734 From: Sakib Sajal References: https://nvd.nist.gov/vuln/detail/CVE-2023-24540 Upstream patch: https://github.com/golang/go/commit/ce7bd33345416e6d8cac901792060591cafc2797 (go 1.19.9) Signed-off-by: Sakib Sajal Signed-off-by: Steve Sakoman --- meta/recipes-devtools/go/go-1.17.13.inc | 1 + .../go/go-1.19/CVE-2023-24540.patch | 93 +++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 meta/recipes-devtools/go/go-1.19/CVE-2023-24540.patch diff --git a/meta/recipes-devtools/go/go-1.17.13.inc b/meta/recipes-devtools/go/go-1.17.13.inc index d7cb47ebf4..e5e9d841c4 100644 --- a/meta/recipes-devtools/go/go-1.17.13.inc +++ b/meta/recipes-devtools/go/go-1.17.13.inc @@ -30,6 +30,7 @@ SRC_URI += "\ file://CVE-2023-24537.patch \ file://CVE-2023-24534.patch \ file://CVE-2023-24538.patch \ + file://CVE-2023-24540.patch \ " SRC_URI[main.sha256sum] = "a1a48b23afb206f95e7bbaa9b898d965f90826f6f1d1fc0c1d784ada0cd300fd" diff --git a/meta/recipes-devtools/go/go-1.19/CVE-2023-24540.patch b/meta/recipes-devtools/go/go-1.19/CVE-2023-24540.patch new file mode 100644 index 0000000000..7e6e871e38 --- /dev/null +++ b/meta/recipes-devtools/go/go-1.19/CVE-2023-24540.patch @@ -0,0 +1,93 @@ +From 2305cdb2aa5ac8e9960bd64e548a119c7dd87530 Mon Sep 17 00:00:00 2001 +From: Roland Shoemaker +Date: Tue, 11 Apr 2023 16:27:43 +0100 +Subject: [PATCH] html/template: handle all JS whitespace characters + +Rather than just a small set. Character class as defined by \s [0]. + +Thanks to Juho Nurminen of Mattermost for reporting this. + +For #59721 +Fixes #59813 +Fixes CVE-2023-24540 + +[0] https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Character_Classes + +Change-Id: I56d4fa1ef08125b417106ee7dbfb5b0923b901ba +Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1821459 +Reviewed-by: Julie Qiu +Run-TryBot: Roland Shoemaker +Reviewed-by: Damien Neil +Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1851497 +Run-TryBot: Damien Neil +Reviewed-by: Roland Shoemaker +Reviewed-on: https://go-review.googlesource.com/c/go/+/491355 +Reviewed-by: Dmitri Shuralyov +Reviewed-by: Carlos Amedee +TryBot-Bypass: Carlos Amedee +Run-TryBot: Carlos Amedee + +CVE: CVE-2023-24540 +Upstream-Status: Backport [https://github.com/golang/go/commit/ce7bd33345416e6d8cac901792060591cafc2797] + +Signed-off-by: Sakib Sajal +--- + src/html/template/js.go | 8 +++++++- + src/html/template/js_test.go | 11 +++++++---- + 2 files changed, 14 insertions(+), 5 deletions(-) + +diff --git a/src/html/template/js.go b/src/html/template/js.go +index b888eaf..35994f0 100644 +--- a/src/html/template/js.go ++++ b/src/html/template/js.go +@@ -13,6 +13,11 @@ import ( + "unicode/utf8" + ) + ++// jsWhitespace contains all of the JS whitespace characters, as defined ++// by the \s character class. ++// See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_expressions/Character_classes. ++const jsWhitespace = "\f\n\r\t\v\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000\ufeff" ++ + // nextJSCtx returns the context that determines whether a slash after the + // given run of tokens starts a regular expression instead of a division + // operator: / or /=. +@@ -26,7 +31,8 @@ import ( + // JavaScript 2.0 lexical grammar and requires one token of lookbehind: + // https://www.mozilla.org/js/language/js20-2000-07/rationale/syntax.html + func nextJSCtx(s []byte, preceding jsCtx) jsCtx { +- s = bytes.TrimRight(s, "\t\n\f\r \u2028\u2029") ++ // Trim all JS whitespace characters ++ s = bytes.TrimRight(s, jsWhitespace) + if len(s) == 0 { + return preceding + } +diff --git a/src/html/template/js_test.go b/src/html/template/js_test.go +index d7ee47b..8f5d76d 100644 +--- a/src/html/template/js_test.go ++++ b/src/html/template/js_test.go +@@ -81,14 +81,17 @@ func TestNextJsCtx(t *testing.T) { + {jsCtxDivOp, "0"}, + // Dots that are part of a number are div preceders. + {jsCtxDivOp, "0."}, ++ // Some JS interpreters treat NBSP as a normal space, so ++ // we must too in order to properly escape things. ++ {jsCtxRegexp, "=\u00A0"}, + } + + for _, test := range tests { +- if nextJSCtx([]byte(test.s), jsCtxRegexp) != test.jsCtx { +- t.Errorf("want %s got %q", test.jsCtx, test.s) ++ if ctx := nextJSCtx([]byte(test.s), jsCtxRegexp); ctx != test.jsCtx { ++ t.Errorf("%q: want %s got %s", test.s, test.jsCtx, ctx) + } +- if nextJSCtx([]byte(test.s), jsCtxDivOp) != test.jsCtx { +- t.Errorf("want %s got %q", test.jsCtx, test.s) ++ if ctx := nextJSCtx([]byte(test.s), jsCtxDivOp); ctx != test.jsCtx { ++ t.Errorf("%q: want %s got %s", test.s, test.jsCtx, ctx) + } + } + +-- +2.40.0 + From patchwork Fri May 26 02:28:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24531 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 4CD84C7EE2F for ; Fri, 26 May 2023 02:29:31 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web10.75.1685068169763358614 for ; Thu, 25 May 2023 19:29:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=2pdkcTl2; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1ae3ed1b0d6so1625745ad.3 for ; Thu, 25 May 2023 19:29:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068169; x=1687660169; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Tx43A/zJjy4Wi2v5t+7e26jCzZTbw26+3Biztfv7/UQ=; b=2pdkcTl2bL5NSp5gkUaOCDijayM1wb49SAwe28nDAIPoJLfczWjBd8AYcTETnyAEcL U/JcJ8MiuZAZKOR30Vgl9ud74nK0NRusEKkymYq8OX/6J3mApthL8ANH/82y11fCMhip v+w9EdygVxOGlYRP+li9XMC5ER7v+lejiYqT+M4bCInhFRzZejfipjWd05EgopwjT5Bn cUmS+kWpST3vo2xklz9Pbpvro1x5RpAWgq/Vg1P2z1/a9yOeugL7R5l38yXu7pAZQCaF w2lMsnQeZSoRVZOdBkUNVk3P2F55vWOQZlyd/yq0Wj4yBei1BFVJpNhwVE+UJu31P6LQ uc/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068169; x=1687660169; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Tx43A/zJjy4Wi2v5t+7e26jCzZTbw26+3Biztfv7/UQ=; b=kPh+VmjqhltBcFYqdtiCqSuCvgoNiwVsXP5k71KRf9v/Jtx27pnswb9KwIJ50kkbqn dVx/0dH+TQKNplGwG8YPlk7bICgAnfzq+NCxRROoyFj9Q/mUql7gKQLI8yI12gmX6A4Q C6dpx7porbRwqM6rUl325dK91qB6NM/c2JSvai/ne7ROw3JylplEWU7xZspQ4BZK4po7 5qi9h0gq9tQAeh2EHXwdXwBV7LqJAdadh6ZmqM1Gp0FA3OH3SHcafgr2OauLit2dhece XkCJlZM3FoIoOd+nt5nVZXnzHVbpHFdIsvLL7tSB5C/F93GtHwjLkddqJvLOCewO7LaB zT/w== X-Gm-Message-State: AC+VfDw0fTF+iCU47qIUVVea/QqpVjZtsT4SQ+He4NcVFda9Jb2Mh5yU LZ9/idVlopwwHVCBqxUvC+FZGnp+SKERvhgYTKg= X-Google-Smtp-Source: ACHHUZ79aHv47nuvdtY2sklM4Q9RJJDp4W+SJ1fXYr2BGS13O4XXXztsl8d8oC6rg9FjRZ9d90NqwA== X-Received: by 2002:a17:902:e752:b0:1ac:40f7:8b52 with SMTP id p18-20020a170902e75200b001ac40f78b52mr767837plf.64.1685068168542; Thu, 25 May 2023 19:29:28 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:28 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 03/21] gstreamer1.0: upgrade 1.20.5 -> 1.20.6 Date: Thu, 25 May 2023 16:28:51 -1000 Message-Id: <102c453668f71dd30c3f0f13502f0993a051d7fe.1685068004.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:29:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181735 From: Pablo Saavedra Changelog: =========== audio: channel-mix: allow up to 64 channels instead of up to 63 channels AOM AV1 encoder timestamp handling improvements AV1 video codec caps handling improvements in aom plugin, isomp4 and matroska muxers/demuxers. avvidenc: fix bitrate control and timestamps off FFmpeg-based video encoders h264parse: fix missing timestamps on outputs when splitting a frame rtspsrc: more workarounds for servers with broken control uri handling playbin3: fix issue with UDP streams, making sure there's enough buffering qmlglsrc: Fix deadlock when stopping and some other fixes qtmux: fix default timescale unit for N/1001 framerates v4l2h264dec: Fix Raspberry Pi4 will not play video in application vtdec: Fix non-deterministic frame output after seeks wasapi2src: Fix loopback capture on Windows 10 Anniversary Update macOS, iOS: Fix Xcode 14 ABI breakage with older Xcode cerbero: Fix some regressions for CentOS in the 1.20 branch cerbero: Fix setuptools site.py breakage in Python 3.11 Fix gst-libav build against FFmpeg from git gobject-introspection annotation fixes for bindings Miscellaneous bug fixes, memory leak fixes, and other stability and reliability improvements Performance improvements Signed-off-by: Steve Sakoman --- ...tools_1.20.5.bb => gst-devtools_1.20.6.bb} | 2 +- ...1.20.5.bb => gstreamer1.0-libav_1.20.6.bb} | 2 +- ...x_1.20.5.bb => gstreamer1.0-omx_1.20.6.bb} | 2 +- ....bb => gstreamer1.0-plugins-bad_1.20.6.bb} | 2 +- ...bb => gstreamer1.0-plugins-base_1.20.6.bb} | 2 +- ...bb => gstreamer1.0-plugins-good_1.20.6.bb} | 2 +- ...bb => gstreamer1.0-plugins-ugly_1.20.6.bb} | 2 +- ....20.5.bb => gstreamer1.0-python_1.20.6.bb} | 2 +- ....bb => gstreamer1.0-rtsp-server_1.20.6.bb} | 2 +- ...1.20.5.bb => gstreamer1.0-vaapi_1.20.6.bb} | 2 +- ...005-bin-Fix-race-conditions-in-tests.patch | 300 ------------------ ...er1.0_1.20.5.bb => gstreamer1.0_1.20.6.bb} | 3 +- 12 files changed, 11 insertions(+), 312 deletions(-) rename meta/recipes-multimedia/gstreamer/{gst-devtools_1.20.5.bb => gst-devtools_1.20.6.bb} (95%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-libav_1.20.5.bb => gstreamer1.0-libav_1.20.6.bb} (91%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.20.5.bb => gstreamer1.0-omx_1.20.6.bb} (95%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.20.5.bb => gstreamer1.0-plugins-bad_1.20.6.bb} (98%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.20.5.bb => gstreamer1.0-plugins-base_1.20.6.bb} (97%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.20.5.bb => gstreamer1.0-plugins-good_1.20.6.bb} (97%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.20.5.bb => gstreamer1.0-plugins-ugly_1.20.6.bb} (94%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.20.5.bb => gstreamer1.0-python_1.20.6.bb} (91%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.20.5.bb => gstreamer1.0-rtsp-server_1.20.6.bb} (90%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.20.5.bb => gstreamer1.0-vaapi_1.20.6.bb} (95%) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-bin-Fix-race-conditions-in-tests.patch rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.20.5.bb => gstreamer1.0_1.20.6.bb} (95%) diff --git a/meta/recipes-multimedia/gstreamer/gst-devtools_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gst-devtools_1.20.6.bb similarity index 95% rename from meta/recipes-multimedia/gstreamer/gst-devtools_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gst-devtools_1.20.6.bb index 9db31c18e4..2eee50e6d8 100644 --- a/meta/recipes-multimedia/gstreamer/gst-devtools_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gst-devtools_1.20.6.bb @@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV} file://0001-connect-has-a-different-signature-on-musl.patch \ " -SRC_URI[sha256sum] = "5684436121b8bae07fd00b74395f95e44b5f26323dce4fa045fa665676807bba" +SRC_URI[sha256sum] = "2c64037c823fb88751a47dacf3d4752a52b7951190d6e05fc44855e912e81d71" DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" RRECOMMENDS:${PN} = "git" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.6.bb similarity index 91% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.6.bb index e5925c6510..c54913e8a1 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.6.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \ " SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz" -SRC_URI[sha256sum] = "b152e3cc49d014899f53c39d8a6224a44e1399b4cf76aa5f9a903fdf9793c3cc" +SRC_URI[sha256sum] = "7d619a030542a4a5a11e0302742a3d9b05f8e5cfc453025683a0379bc50aa013" S = "${WORKDIR}/gst-libav-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.20.6.bb similarity index 95% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.20.6.bb index ec5efcd408..b29d393bfe 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.20.6.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" -SRC_URI[sha256sum] = "bcccbc02548cdc123fd49944dd44a4f1adc5d107e36f010d320eb526e2107806" +SRC_URI[sha256sum] = "48e82008a2a0ad5f4b525aba8a6c49c4ca2d7d25c6b1b14d107dd747e26d5a8e" S = "${WORKDIR}/gst-omx-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.6.bb similarity index 98% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.6.bb index 80766b9166..fdb4509691 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.6.bb @@ -11,7 +11,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad file://0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch \ file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ " -SRC_URI[sha256sum] = "f431214b0754d7037adcde93c3195106196588973e5b32dcb24938805f866363" +SRC_URI[sha256sum] = "d98c73fa5cdddb372a91199464515cfc80c89bbe05e3d4387ea4381e4224483a" S = "${WORKDIR}/gst-plugins-bad-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.6.bb similarity index 97% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.6.bb index c37b542c57..8d1aef1fc8 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.6.bb @@ -11,7 +11,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba file://0003-viv-fb-Make-sure-config.h-is-included.patch \ file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ " -SRC_URI[sha256sum] = "11f911ef65f3095d7cf698a1ad1fc5242ac3ad6c9270465fb5c9e7f4f9c19b35" +SRC_URI[sha256sum] = "54eac357d6cd66f183b94a26e493bf4d5781bc76bc60cad122742626caf8f1a3" S = "${WORKDIR}/gst-plugins-base-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.6.bb similarity index 97% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.6.bb index 80aed01973..81f5dd0932 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.6.bb @@ -8,7 +8,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-go file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ " -SRC_URI[sha256sum] = "e83ab4d12ca24959489bbb0ec4fac9b90e32f741d49cda357cb554b2cb8b97f9" +SRC_URI[sha256sum] = "e51365cfa9b19bd736dafe2c8828254a55d66996a3c60550bb0d50041c381a44" S = "${WORKDIR}/gst-plugins-good-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.20.6.bb similarity index 94% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.20.6.bb index f765e626c9..e62e9e9815 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.20.6.bb @@ -14,7 +14,7 @@ LICENSE_FLAGS = "commercial" SRC_URI = " \ https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "af67d8ba7cab230f64d0594352112c2c443e2aa36a87c35f9f98a43d11430b87" +SRC_URI[sha256sum] = "ca3fb6abc9f6e981d204a736c254e50cc1786a2f5038d83023e42ea009b10246" S = "${WORKDIR}/gst-plugins-ugly-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.20.6.bb similarity index 91% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.20.6.bb index 05e9ace276..77745b8ba9 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.20.6.bb @@ -8,7 +8,7 @@ LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[sha256sum] = "27487652318659cfd7dc42784b713c78d29cc7a7df4fb397134c8c125f65e3b2" +SRC_URI[sha256sum] = "aa619e08ddd9f92755f4bd24ba9577e81ae4c86bff170c3e574153ec3cdc80cc" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.20.6.bb similarity index 90% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.20.6.bb index c9cf42903d..017edec426 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.20.6.bb @@ -10,7 +10,7 @@ PNREAL = "gst-rtsp-server" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[sha256sum] = "ba398a7ddd559cce56ef4b91f448d174e0dccad98a493563d2d59c41a2ef39c5" +SRC_URI[sha256sum] = "800122a798387bd4b18b558737d30a010d94154f41bd210d4c4cc2d80ecae90f" S = "${WORKDIR}/${PNREAL}-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.20.6.bb similarity index 95% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.20.6.bb index 716f50ebe1..d67abf408c 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.20.6.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "510c6fb4ff3f676d7946ce1800e04ccf5aabe5a586d4e164d1961808fab8c94b" +SRC_URI[sha256sum] = "57028a2cdabb749eb38a53f45cfa36f02b4e5368fb6d8684ef31d9e73ddf653b" S = "${WORKDIR}/${REALPN}-${PV}" DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-bin-Fix-race-conditions-in-tests.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-bin-Fix-race-conditions-in-tests.patch deleted file mode 100644 index f1fac2df57..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-bin-Fix-race-conditions-in-tests.patch +++ /dev/null @@ -1,300 +0,0 @@ -From e1e2d8d58c1e09e065849cdb1f6466c0537a7c51 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= -Date: Tue, 21 Jun 2022 11:51:35 +0300 -Subject: [PATCH] bin: Fix race conditions in tests - -The latency messages are non-deterministic and can arrive before/after -async-done or during state-changes as they are posted by e.g. sinks from -their streaming thread but bins are finishing asynchronous state changes -from a secondary helper thread. - -To solve this, expect latency messages at any time and assert that we -receive one at some point during the test. - -Part-of: - -Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2643] -Signed-off-by: Jose Quaresma ---- - .../gstreamer/tests/check/gst/gstbin.c | 132 ++++++++++++------ - 1 file changed, 92 insertions(+), 40 deletions(-) - -diff --git a/subprojects/gstreamer/tests/check/gst/gstbin.c b/subprojects/gstreamer/tests/check/gst/gstbin.c -index e366d5fe20f..88ff44db0c3 100644 ---- a/subprojects/gstreamer/tests/check/gst/gstbin.c -+++ b/subprojects/gstreamer/tests/check/gst/gstbin.c -@@ -27,50 +27,95 @@ - #include - - static void --pop_async_done (GstBus * bus) -+pop_async_done (GstBus * bus, gboolean * had_latency) - { - GstMessage *message; -+ GstMessageType types = GST_MESSAGE_ASYNC_DONE; -+ -+ if (!*had_latency) -+ types |= GST_MESSAGE_LATENCY; - - GST_DEBUG ("popping async-done message"); -- message = gst_bus_poll (bus, GST_MESSAGE_ASYNC_DONE, -1); - -- fail_unless (message && GST_MESSAGE_TYPE (message) -- == GST_MESSAGE_ASYNC_DONE, "did not get GST_MESSAGE_ASYNC_DONE"); -+ do { -+ message = gst_bus_poll (bus, types, -1); - -- gst_message_unref (message); -- GST_DEBUG ("popped message"); -+ fail_unless (message); -+ GST_DEBUG ("popped message %s", -+ gst_message_type_get_name (GST_MESSAGE_TYPE (message))); -+ -+ if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_LATENCY) { -+ fail_unless (*had_latency == FALSE); -+ *had_latency = TRUE; -+ gst_clear_message (&message); -+ types &= ~GST_MESSAGE_LATENCY; -+ continue; -+ } -+ -+ fail_unless (GST_MESSAGE_TYPE (message) -+ == GST_MESSAGE_ASYNC_DONE, "did not get GST_MESSAGE_ASYNC_DONE"); -+ -+ gst_clear_message (&message); -+ break; -+ } while (TRUE); - } - - static void --pop_latency (GstBus * bus) -+pop_latency (GstBus * bus, gboolean * had_latency) - { - GstMessage *message; - -- GST_DEBUG ("popping async-done message"); -+ if (*had_latency) -+ return; -+ -+ GST_DEBUG ("popping latency message"); - message = gst_bus_poll (bus, GST_MESSAGE_LATENCY, -1); - -- fail_unless (message && GST_MESSAGE_TYPE (message) -+ fail_unless (message); -+ fail_unless (GST_MESSAGE_TYPE (message) - == GST_MESSAGE_LATENCY, "did not get GST_MESSAGE_LATENCY"); - -- gst_message_unref (message); -- GST_DEBUG ("popped message"); -+ GST_DEBUG ("popped message %s", -+ gst_message_type_get_name (GST_MESSAGE_TYPE (message))); -+ gst_clear_message (&message); -+ -+ *had_latency = TRUE; - } - - static void --pop_state_changed (GstBus * bus, int count) -+pop_state_changed (GstBus * bus, int count, gboolean * had_latency) - { - GstMessage *message; -- -+ GstMessageType types = GST_MESSAGE_STATE_CHANGED; - int i; - -+ if (!*had_latency) -+ types |= GST_MESSAGE_LATENCY; -+ - GST_DEBUG ("popping %d messages", count); - for (i = 0; i < count; ++i) { -- message = gst_bus_poll (bus, GST_MESSAGE_STATE_CHANGED, -1); -- -- fail_unless (message && GST_MESSAGE_TYPE (message) -- == GST_MESSAGE_STATE_CHANGED, "did not get GST_MESSAGE_STATE_CHANGED"); -- -- gst_message_unref (message); -+ do { -+ message = gst_bus_poll (bus, types, -1); -+ -+ fail_unless (message); -+ GST_DEBUG ("popped message %s", -+ gst_message_type_get_name (GST_MESSAGE_TYPE (message))); -+ -+ if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_LATENCY) { -+ fail_unless (*had_latency == FALSE); -+ *had_latency = TRUE; -+ gst_clear_message (&message); -+ types &= ~GST_MESSAGE_LATENCY; -+ continue; -+ } -+ -+ fail_unless (GST_MESSAGE_TYPE (message) -+ == GST_MESSAGE_STATE_CHANGED, -+ "did not get GST_MESSAGE_STATE_CHANGED"); -+ -+ gst_message_unref (message); -+ break; -+ } while (TRUE); - } - GST_DEBUG ("popped %d messages", count); - } -@@ -538,6 +583,7 @@ GST_START_TEST (test_message_state_changed_children) - GstBus *bus; - GstStateChangeReturn ret; - GstState current, pending; -+ gboolean had_latency = FALSE; - - pipeline = GST_PIPELINE (gst_pipeline_new (NULL)); - fail_unless (pipeline != NULL, "Could not create pipeline"); -@@ -576,7 +622,7 @@ GST_START_TEST (test_message_state_changed_children) - ASSERT_OBJECT_REFCOUNT (sink, "sink", 2); - ASSERT_OBJECT_REFCOUNT (pipeline, "pipeline", 2); - -- pop_state_changed (bus, 3); -+ pop_state_changed (bus, 3, &had_latency); - fail_if (gst_bus_have_pending (bus), "unexpected pending messages"); - - ASSERT_OBJECT_REFCOUNT (bus, "bus", 2); -@@ -619,9 +665,9 @@ GST_START_TEST (test_message_state_changed_children) - * its state_change message */ - ASSERT_OBJECT_REFCOUNT_BETWEEN (pipeline, "pipeline", 3, 4); - -- pop_state_changed (bus, 3); -- pop_async_done (bus); -- pop_latency (bus); -+ pop_state_changed (bus, 3, &had_latency); -+ pop_async_done (bus, &had_latency); -+ pop_latency (bus, &had_latency); - fail_if ((gst_bus_pop (bus)) != NULL); - - ASSERT_OBJECT_REFCOUNT_BETWEEN (bus, "bus", 2, 3); -@@ -648,7 +694,7 @@ GST_START_TEST (test_message_state_changed_children) - ASSERT_OBJECT_REFCOUNT_BETWEEN (sink, "sink", 2, 4); - ASSERT_OBJECT_REFCOUNT (pipeline, "pipeline", 3); - -- pop_state_changed (bus, 3); -+ pop_state_changed (bus, 3, &had_latency); - fail_if ((gst_bus_pop (bus)) != NULL); - - ASSERT_OBJECT_REFCOUNT (bus, "bus", 2); -@@ -669,7 +715,7 @@ GST_START_TEST (test_message_state_changed_children) - ASSERT_OBJECT_REFCOUNT_BETWEEN (sink, "sink", 3, 4); - ASSERT_OBJECT_REFCOUNT (pipeline, "pipeline", 3); - -- pop_state_changed (bus, 6); -+ pop_state_changed (bus, 6, &had_latency); - fail_if ((gst_bus_pop (bus)) != NULL); - - ASSERT_OBJECT_REFCOUNT (src, "src", 1); -@@ -696,6 +742,7 @@ GST_START_TEST (test_watch_for_state_change) - GstElement *src, *sink, *bin; - GstBus *bus; - GstStateChangeReturn ret; -+ gboolean had_latency = FALSE; - - bin = gst_element_factory_make ("bin", NULL); - fail_unless (bin != NULL, "Could not create bin"); -@@ -722,9 +769,9 @@ GST_START_TEST (test_watch_for_state_change) - GST_CLOCK_TIME_NONE); - fail_unless (ret == GST_STATE_CHANGE_SUCCESS); - -- pop_state_changed (bus, 6); -- pop_async_done (bus); -- pop_latency (bus); -+ pop_state_changed (bus, 6, &had_latency); -+ pop_async_done (bus, &had_latency); -+ pop_latency (bus, &had_latency); - - fail_unless (gst_bus_have_pending (bus) == FALSE, - "Unexpected messages on bus"); -@@ -732,16 +779,17 @@ GST_START_TEST (test_watch_for_state_change) - ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PLAYING); - fail_unless (ret == GST_STATE_CHANGE_SUCCESS); - -- pop_state_changed (bus, 3); -+ pop_state_changed (bus, 3, &had_latency); - -+ had_latency = FALSE; - /* this one might return either SUCCESS or ASYNC, likely SUCCESS */ - ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PAUSED); - gst_element_get_state (GST_ELEMENT (bin), NULL, NULL, GST_CLOCK_TIME_NONE); - -- pop_state_changed (bus, 3); -+ pop_state_changed (bus, 3, &had_latency); - if (ret == GST_STATE_CHANGE_ASYNC) { -- pop_async_done (bus); -- pop_latency (bus); -+ pop_async_done (bus, &had_latency); -+ pop_latency (bus, &had_latency); - } - - fail_unless (gst_bus_have_pending (bus) == FALSE, -@@ -898,6 +946,7 @@ GST_START_TEST (test_children_state_change_order_flagged_sink) - GstStateChangeReturn ret; - GstState current, pending; - GstBus *bus; -+ gboolean had_latency = FALSE; - - pipeline = gst_pipeline_new (NULL); - fail_unless (pipeline != NULL, "Could not create pipeline"); -@@ -951,10 +1000,11 @@ GST_START_TEST (test_children_state_change_order_flagged_sink) - ASSERT_STATE_CHANGE_MSG (bus, sink, GST_STATE_READY, GST_STATE_PAUSED, 107); - #else - -- pop_state_changed (bus, 2); /* pop remaining ready => paused messages off the bus */ -+ pop_state_changed (bus, 2, &had_latency); /* pop remaining ready => paused messages off the bus */ - ASSERT_STATE_CHANGE_MSG (bus, pipeline, GST_STATE_READY, GST_STATE_PAUSED, - 108); -- pop_async_done (bus); -+ pop_async_done (bus, &had_latency); -+ pop_latency (bus, &had_latency); - #endif - /* PAUSED => PLAYING */ - GST_DEBUG ("popping PAUSED -> PLAYING messages"); -@@ -972,8 +1022,8 @@ GST_START_TEST (test_children_state_change_order_flagged_sink) - fail_if (ret != GST_STATE_CHANGE_SUCCESS, "State change to READY failed"); - - /* TODO: do we need to check downwards state change order as well? */ -- pop_state_changed (bus, 4); /* pop playing => paused messages off the bus */ -- pop_state_changed (bus, 4); /* pop paused => ready messages off the bus */ -+ pop_state_changed (bus, 4, &had_latency); /* pop playing => paused messages off the bus */ -+ pop_state_changed (bus, 4, &had_latency); /* pop paused => ready messages off the bus */ - - while (GST_OBJECT_REFCOUNT_VALUE (pipeline) > 1) - THREAD_SWITCH (); -@@ -1002,6 +1052,7 @@ GST_START_TEST (test_children_state_change_order_semi_sink) - GstStateChangeReturn ret; - GstState current, pending; - GstBus *bus; -+ gboolean had_latency = FALSE; - - /* (2) Now again, but check other code path where we don't have - * a proper sink correctly flagged as such, but a 'semi-sink' */ -@@ -1056,10 +1107,11 @@ GST_START_TEST (test_children_state_change_order_semi_sink) - ASSERT_STATE_CHANGE_MSG (bus, src, GST_STATE_READY, GST_STATE_PAUSED, 206); - ASSERT_STATE_CHANGE_MSG (bus, sink, GST_STATE_READY, GST_STATE_PAUSED, 207); - #else -- pop_state_changed (bus, 2); /* pop remaining ready => paused messages off the bus */ -+ pop_state_changed (bus, 2, &had_latency); /* pop remaining ready => paused messages off the bus */ - ASSERT_STATE_CHANGE_MSG (bus, pipeline, GST_STATE_READY, GST_STATE_PAUSED, - 208); -- pop_async_done (bus); -+ pop_async_done (bus, &had_latency); -+ pop_latency (bus, &had_latency); - - /* PAUSED => PLAYING */ - GST_DEBUG ("popping PAUSED -> PLAYING messages"); -@@ -1076,8 +1128,8 @@ GST_START_TEST (test_children_state_change_order_semi_sink) - fail_if (ret != GST_STATE_CHANGE_SUCCESS, "State change to READY failed"); - - /* TODO: do we need to check downwards state change order as well? */ -- pop_state_changed (bus, 4); /* pop playing => paused messages off the bus */ -- pop_state_changed (bus, 4); /* pop paused => ready messages off the bus */ -+ pop_state_changed (bus, 4, &had_latency); /* pop playing => paused messages off the bus */ -+ pop_state_changed (bus, 4, &had_latency); /* pop paused => ready messages off the bus */ - - GST_DEBUG ("waiting for pipeline to reach refcount 1"); - while (GST_OBJECT_REFCOUNT_VALUE (pipeline) > 1) --- -GitLab - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.6.bb similarity index 95% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.6.bb index ce9c1c116f..7ceb319d9b 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.6.bb @@ -21,9 +21,8 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x file://0002-tests-add-support-for-install-the-tests.patch;striplevel=3 \ file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \ file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \ - file://0005-bin-Fix-race-conditions-in-tests.patch;striplevel=3 \ " -SRC_URI[sha256sum] = "5a19083faaf361d21fc391124f78ba6d609be55845a82fa8f658230e5fa03dff" +SRC_URI[sha256sum] = "0545b030960680f71a95f9d39c95daae54b4d317d335e8f239d81138773c9b90" PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ check \ From patchwork Fri May 26 02:28:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24535 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 23F0EC7EE31 for ; Fri, 26 May 2023 02:29:41 +0000 (UTC) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.web10.76.1685068171447257329 for ; Thu, 25 May 2023 19:29:31 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=x/t1LJYM; spf=softfail (domain: sakoman.com, ip: 209.85.215.177, mailfrom: steve@sakoman.com) Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-53f04fdd77dso112865a12.3 for ; Thu, 25 May 2023 19:29:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068170; x=1687660170; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=/vmLMWPDaw0FPfF1hIA2UgTpyQ61GdU5rOcjjXf+VCg=; b=x/t1LJYMzy0+L2uW2HH0B0nRtgQDA017JS/TBMJ9/A4o6NFvlz6ZUOP23KwJmwcjnZ Ks7XQbLcG2/r0OnzhTYRVIIZ69e6kS6UDEjE8xZyTNDxLE8ctezIEXJ6wYUFXYdcz6Md b12DaCiYzop51W9ULKAxlokx8Ac8QmR447AXKfirPHmdweFdWsXfTkHUNg/iBaCHF9pd XQggF41J8ZKDJVQ/gjrlY8JfY55MUGfLFnA+STCbgGjGIQc/4OgJ35T2/BwebnvsCU2Z INEJxGhclvdB5K1jy0h0NPnoSkiGiScDY1nxFYQiibgQzznlop1CJqZF4QCxUMgkPmkl Gkog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068170; x=1687660170; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/vmLMWPDaw0FPfF1hIA2UgTpyQ61GdU5rOcjjXf+VCg=; b=WVJv/54EeqUpXta6LtU1XO1N00cbvckUIVoigpceW/21tJ+apAw5XuRNa8ONugfMrR h75x6sfKHy5dw6pOfEhQACA7BJzwgrVWffV2WxwIm1Inu2tNi2eSLt4Fjr+nA/aE2T9S AzjjkTzJIdjdHumzUflfE2nFISZREDDMl1op8cIe5yx+e9ptmMU/l1a0v+yvtVHVf3f0 yY/XFyW1nxjBIzsYicKdapnHDr2wTXxUnZ+m4f5QW3vdv0H+NAP1o6MDSqb0n2Gk/vYM 6L4u1kwV7qxtU9SRoRieS2y6CimNptoBUBgNyB9jF1QP4zTukFLG951pnB4kCgLaQqdw WAXQ== X-Gm-Message-State: AC+VfDxozedzTX1natY4M6IUnlqMMIa1xAyf70DYzyqG5GHGaB42WH+U TbXRYqK1FIQmsky9yjtBeisshT55U/OGmTmVYuI= X-Google-Smtp-Source: ACHHUZ7b4xnf6jpd3qk/rnsrL+USocnJUoD7k9DwHQEaBeNYnnSyPivUAy43WrvSOTo0n231Sqho3w== X-Received: by 2002:a17:902:c40e:b0:1ac:b259:87ea with SMTP id k14-20020a170902c40e00b001acb25987eamr1355885plk.0.1685068170135; Thu, 25 May 2023 19:29:30 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:29 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 04/21] waffle: upgrade 1.7.0 -> 1.7.2 Date: Thu, 25 May 2023 16:28:52 -1000 Message-Id: <6b1d94fe5d8728e3eb152426cde08634d248e1f7.1685068004.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:29:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181736 From: Upgrade Helper The Waffle bugfix release 1.7.1 is now available. What is new in this release: - cmake: pass deps' cflags to the build - gbm: fix crash when platform lacks modifier support - gitlab-ci: stabilise CI runs under X - gitlab-ci: add more warnings, make all warnings fatal - gitlab-ci: update to bullseye - meson: add override_* support, when using waffle as submodule - meson: skip installing bash completion when custom prefix is used - meson: silence deprecation warnings - meson: generate cmake files only on Windows - meson: find wayland.xml from wayland-scanner.pc - misc: zsh completion - misc: fix dozens of compiler warnings - misc: update website references - wayland: fix build against wayland 1.20 The Waffle bugfix release 1.7.2 is now available. What is new in this release: - all: use format(gnu_printf), enable in mingw - meson: don't run TLS checks on mingw - wgl: remove unused dummy wgl_error.[ch] Upstream now only generates CMake files on Windows, so remove all references to CMake. A zsh completion is now installed, remove this for now as we don't really use zsh. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 94cf6ef11bba381ab6f65b03ed1ed14022438151) Signed-off-by: Steve Sakoman (cherry picked from commit e4ebfb5c7892488fc834d9837e9a5a4c28eb676f) Signed-off-by: Steve Sakoman --- ...build-request-native-wayland-scanner.patch | 9 ++++---- ...-make-core-protocol-into-the-library.patch | 23 ++++--------------- .../{waffle_1.7.0.bb => waffle_1.7.2.bb} | 8 +++---- 3 files changed, 13 insertions(+), 27 deletions(-) rename meta/recipes-graphics/waffle/{waffle_1.7.0.bb => waffle_1.7.2.bb} (92%) diff --git a/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch b/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch index 1b62db92e9..4b3a0e7c4a 100644 --- a/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch +++ b/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch @@ -1,4 +1,4 @@ -From 2195cec1e5bc66128d72049c11ff381ca4516a4b Mon Sep 17 00:00:00 2001 +From 0961787d2bf0d359a3ead89e9cec642818b32dea Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 5 Jul 2022 11:51:39 +0200 Subject: [PATCH] meson.build: request native wayland-scanner @@ -8,15 +8,16 @@ try to use a cross-binary, and fail. Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/110] Signed-off-by: Alexander Kanavin + --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 0bb6128..0b6da1f 100644 +index ca6a212..3177bde 100644 --- a/meson.build +++ b/meson.build -@@ -108,7 +108,7 @@ else +@@ -110,7 +110,7 @@ else 'wayland-egl', version : '>= 9.1', required : get_option('wayland'), ) dep_wayland_scanner = dependency( @@ -24,4 +25,4 @@ index 0bb6128..0b6da1f 100644 + 'wayland-scanner', version : '>= 1.15', required : get_option('wayland'), native: true, ) if dep_wayland_scanner.found() - prog_wayland_scanner = find_program(dep_wayland_scanner.get_pkgconfig_variable('wayland_scanner')) + prog_wayland_scanner = find_program(dep_wayland_scanner.get_variable(pkgconfig: 'wayland_scanner')) diff --git a/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch b/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch index 24b2de5d9c..60e6318f7a 100644 --- a/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch +++ b/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch @@ -1,4 +1,4 @@ -From 7610ec4b572d3a54d30fca6798f0c406f3fd8a46 Mon Sep 17 00:00:00 2001 +From 71f9399d6cea1e2e885a98b98d82eb628832a86e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 26 Oct 2021 08:52:17 +0200 Subject: [PATCH] waffle: do not make core protocol into the library @@ -9,28 +9,13 @@ wayland.xml from the host. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin + --- - meson.build | 4 ---- src/waffle/meson.build | 7 ------- - 2 files changed, 11 deletions(-) + 1 file changed, 7 deletions(-) -diff --git a/meson.build b/meson.build -index ffc02ff..0bb6128 100644 ---- a/meson.build -+++ b/meson.build -@@ -104,10 +104,6 @@ else - dep_wayland_client = dependency( - 'wayland-client', version : '>= 1.10', required : get_option('wayland'), - ) -- if dep_wayland_client.found() -- wayland_core_xml = join_paths(dep_wayland_client.get_pkgconfig_variable('pkgdatadir'), -- 'wayland.xml') -- endif - dep_wayland_egl = dependency( - 'wayland-egl', version : '>= 9.1', required : get_option('wayland'), - ) diff --git a/src/waffle/meson.build b/src/waffle/meson.build -index 01898c8..6245868 100644 +index e2636c7..3ff5762 100644 --- a/src/waffle/meson.build +++ b/src/waffle/meson.build @@ -88,12 +88,6 @@ if build_surfaceless diff --git a/meta/recipes-graphics/waffle/waffle_1.7.0.bb b/meta/recipes-graphics/waffle/waffle_1.7.2.bb similarity index 92% rename from meta/recipes-graphics/waffle/waffle_1.7.0.bb rename to meta/recipes-graphics/waffle/waffle_1.7.2.bb index dc475908d0..cb917d8894 100644 --- a/meta/recipes-graphics/waffle/waffle_1.7.0.bb +++ b/meta/recipes-graphics/waffle/waffle_1.7.2.bb @@ -9,16 +9,16 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \ file://include/waffle-1/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf" -SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=master \ +SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=maint-1.7 \ file://0001-waffle-do-not-make-core-protocol-into-the-library.patch \ file://0001-meson.build-request-native-wayland-scanner.patch \ " -SRCREV = "905c6c10f2483adf0cbfa024e2d3c2ed541fb300" +SRCREV = "f3b42a7216105498842bc6ba77d8481b90d6f5f9" S = "${WORKDIR}/git" inherit meson features_check lib_package bash-completion pkgconfig -DEPENDS:append = " python3 cmake-native" +DEPENDS:append = " python3" # This should be overridden per-machine to reflect the capabilities of the GL # stack. @@ -47,5 +47,5 @@ PACKAGECONFIG[surfaceless-egl] = "-Dsurfaceless_egl=enabled,-Dsurfaceless_egl=di # TODO: optionally build manpages and examples do_install:append() { - sed -i -e "s,${WORKDIR},,g" ${D}/${libdir}/cmake/Waffle/WaffleConfig.cmake + rm -rf ${D}${datadir}/zsh } From patchwork Fri May 26 02:28:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24537 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 4D79DC7EE2F for ; Fri, 26 May 2023 02:29:41 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web10.77.1685068172711843750 for ; Thu, 25 May 2023 19:29:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=QWbvI4hU; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-528dd896165so157880a12.2 for ; Thu, 25 May 2023 19:29:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068172; x=1687660172; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=SokiEDlC0iCqk4PD7QN4n5oKTvjiooa8OusbefO9Lh8=; b=QWbvI4hUw8ef0x31Mbdt79iBcgGvWzhKGBuaRWHeD+O87lV8PYw9y9hhF+JcXX3Qpl HIrYnpf9gYqBZGA2pn5fWDu1Q09s6AlSqpkcEcsjaDcQ6wALBIjMr2nXChmJBS7veuY8 +RSbhFx7F8D6v/NQi89yjHbBFNjYIT18lBpPy56ZvBgAExelDKtzE/l6elIruQ2Cz0nQ yRl0sCuE6T5so8g9ACtmQS4OF4JHuMdmPrv9N6ZJa8nRDniaiJhV281qj6GHqwPCVNWZ wEgsnPjODxf/fDjKIAJqqHWms1MpGSSVZeds3IleMVRKYmZjd+z1DZ36fxMLWbTzSdiK KChw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068172; x=1687660172; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SokiEDlC0iCqk4PD7QN4n5oKTvjiooa8OusbefO9Lh8=; b=e+yuKoaER7FRagohHOR+VAXruANv4Lyd2zyfpbHJnpoAtZMekNvC2GloPuhCDimFU1 crcZJjG2t/1kdDqizJ9pwJtbtJcWp0GUBjkde6II+Ev2s0hOGjt3sdjx8ZB9sgCRpWLD vVJiab5EEiHH7MQbc0/w4a2rVT/n9vuw3oIft9bNoc8ZnQQh3f5MkMl3U8yWmK5HiIMt TKY8SeREaIbi69rzxrmUlDCPMyUtxTcZoyi732Em43quBMHEPu9644kviQtVmgl8aGrR VdaKYFRZsJ5KE1TbMwp5tSsk5b9NUBxjStLeicTw38ASHgx+y9/JM5Ub4iHZ4FONvkTb wlQA== X-Gm-Message-State: AC+VfDwprelXLhGttQSSKIrs0EGTBf1HDbUk+g6tNgRb3oa/d0EjnGfi 7Igd6cSUyAdVDN35odOtR92cgnpUH2QfaIOveUo= X-Google-Smtp-Source: ACHHUZ4ks4ExHJjySl14b/LicsPgEydcqZ5KB/R/NZhhisYpkPBTs2ET/+PBOr5EKk+GvYTRj2yLPQ== X-Received: by 2002:a17:902:f693:b0:1ac:aac1:e344 with SMTP id l19-20020a170902f69300b001acaac1e344mr1004208plg.36.1685068171722; Thu, 25 May 2023 19:29:31 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:31 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 05/21] cpio: Fix wrong CRC with ASCII CRC for large files Date: Thu, 25 May 2023 16:28:53 -1000 Message-Id: <8320097487cc46045482f5d0d41ad799a2435bce.1685068004.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:29:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181737 From: Marek Vasut Due to signedness, the checksum is not computed when filesize is bigger a 2GB. Pick a fix for this problem from CPIO ML, where the fix has been posted for 5 years. Since CPIO upstream is effectively unresponsive and any and all attempts to communicate with the maintainer and get the fix applied upstream failed, add the fix here instead. (From OE-Core rev: bfff138af4bdd356ac66571e6ad91c1a5599b935) Signed-off-by: Marek Vasut Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- ...g-CRC-with-ASCII-CRC-for-large-files.patch | 39 +++++++++++++++++++ meta/recipes-extended/cpio/cpio_2.13.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta/recipes-extended/cpio/cpio-2.13/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch diff --git a/meta/recipes-extended/cpio/cpio-2.13/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch b/meta/recipes-extended/cpio/cpio-2.13/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch new file mode 100644 index 0000000000..4b96e4316c --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.13/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch @@ -0,0 +1,39 @@ +From 77ff5f1be394eb2c786df561ff37dde7f982ec76 Mon Sep 17 00:00:00 2001 +From: Stefano Babic +Date: Fri, 28 Jul 2017 13:20:52 +0200 +Subject: [PATCH] Wrong CRC with ASCII CRC for large files + +Due to signedness, the checksum is not computed when filesize is bigger +a 2GB. + +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-cpio/2017-07/msg00004.html] +Signed-off-by: Stefano Babic +--- + src/copyout.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/copyout.c b/src/copyout.c +index 1f0987a..727aeca 100644 +--- a/src/copyout.c ++++ b/src/copyout.c +@@ -34,13 +34,13 @@ + compute and return a checksum for them. */ + + static uint32_t +-read_for_checksum (int in_file_des, int file_size, char *file_name) ++read_for_checksum (int in_file_des, unsigned int file_size, char *file_name) + { + uint32_t crc; + char buf[BUFSIZ]; +- int bytes_left; +- int bytes_read; +- int i; ++ unsigned int bytes_left; ++ unsigned int bytes_read; ++ unsigned int i; + + crc = 0; + +-- +2.7.4 + diff --git a/meta/recipes-extended/cpio/cpio_2.13.bb b/meta/recipes-extended/cpio/cpio_2.13.bb index e72a114de9..dd3541096f 100644 --- a/meta/recipes-extended/cpio/cpio_2.13.bb +++ b/meta/recipes-extended/cpio/cpio_2.13.bb @@ -10,6 +10,7 @@ SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0002-src-global.c-Remove-superfluous-declaration-of-progr.patch \ file://CVE-2021-38185.patch \ + file://0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch \ " SRC_URI[md5sum] = "389c5452d667c23b5eceb206f5000810" From patchwork Fri May 26 02:28:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24538 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 4F6BCC7EE39 for ; Fri, 26 May 2023 02:29:41 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web10.78.1685068174234047285 for ; Thu, 25 May 2023 19:29:34 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=dYUkcADM; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-25376483f66so290172a91.0 for ; Thu, 25 May 2023 19:29:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068173; x=1687660173; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=0CnDIDblaaai06IYBWngN85t0xWtWgp17a+FWHrropg=; b=dYUkcADMJ9GvmE4KyU8QhwF7SNTZqRiUj2vCe0BQaT8xRMeTy9oSXmLfVeQuI3ZHoF A+fSObj9EAlPcm74lJINAvGgDka4Uc6W401ztUJCBKAOS+C9B8tZ5ihc9IwjAUs+cB+D 5JFbIwHUf2LoS87my9EyWuDCwNdCY2A/ptGV7gDu6vFi9GBATD2ZKyQNuRv4x2V141xh 7eMNNG5e5QxBZOoi5DNgJ/UutmNfUpKn2VS5HUSlyRhUQvXbTk4YXmciK0H0T/n++m6h nn4+wmBHkPQ492cI/1hSNOzGPjCEChRTIit1snWqC1EtS6985GGL1RDcZkR4kHlbQKSp 5fTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068173; x=1687660173; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0CnDIDblaaai06IYBWngN85t0xWtWgp17a+FWHrropg=; b=NGsO9AdfzSpVezU6aFUCmMExjgqCms6MGZ3XPgxPFd1Ubt5dj2yzxFvL7QfCLj24km 5z5WbN3AfFVKnVJuy0HZ0gFiCeLOKtlKKcNSMtgUnJRM9fDiOya7vWFd+wt1Lf6E8l81 cw+/hr7hdKvWsHy1F1witjZvIXmzSmPO26VyxAGJDMm4Iu7sG1G/819ggiM4q4QmDA5T 2XG9LgymPNzCsp7alhWV8bLrJQE19JQAWNU2zKhpapWcH2E2kPwnMyZ0YOfCR/V+re5c Ka8dp9kMAOCoptJqT5yEKPkSpuHLGOhmKI15fGWttKZRpvAschxJJkVkMkmZY8pnD3ZU k7XQ== X-Gm-Message-State: AC+VfDy83u/t0wqVeN7pptPq7iWTOaonGYF6Q8KMvKMugaWMvTRRRvNB xeWPFFRVBvGg0NipQUPmxMjJNWjeBKu+4k7z8rk= X-Google-Smtp-Source: ACHHUZ6tqb1pNXw4WyDde4eBrrbhsKB0a55VEI2EvHhprQ3yNqZeLiHVzBeGU48nvAIvaDda8XppfQ== X-Received: by 2002:a17:902:c64b:b0:1ae:7421:82b8 with SMTP id s11-20020a170902c64b00b001ae742182b8mr877429pls.28.1685068173366; Thu, 25 May 2023 19:29:33 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:33 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 06/21] gcc-runtime: Use static dummy libstdc++ Date: Thu, 25 May 2023 16:28:54 -1000 Message-Id: <4ee9d5839669560ec10f23445fa8bbc03a4c5406.1685068004.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:29:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181738 From: Khem Raj some standalone targets e.g. riscv64-elf disable shared linking for baremetal ELF ABI in ld, therefore lets make it a static library (From OE-Core rev: 3c6219dfcbcbde314648ba8cc54a90b32ea1c952) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/recipes-devtools/gcc/gcc-runtime.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc index 8074bf1025..d019b0790b 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime.inc +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc @@ -68,7 +68,8 @@ do_configure () { # libstdc++ isn't built yet so CXX would error not able to find it which breaks stdc++'s configure # tests. Create a dummy empty lib for the purposes of configure. mkdir -p ${WORKDIR}/dummylib - ${CC} -x c /dev/null -nostartfiles -shared -o ${WORKDIR}/dummylib/libstdc++.so + ${CC} -x c /dev/null -c -o ${WORKDIR}/dummylib/dummylib.o + ${AR} rcs ${WORKDIR}/dummylib/libstdc++.a ${WORKDIR}/dummylib/dummylib.o for d in libgcc ${RUNTIMETARGET}; do echo "Configuring $d" rm -rf ${B}/${TARGET_SYS}/$d/ From patchwork Fri May 26 02:28:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24536 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 3DD45C7EE37 for ; Fri, 26 May 2023 02:29:41 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web11.105.1685068175922039092 for ; Thu, 25 May 2023 19:29:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=PLIQETdo; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1ae40dcdc18so1717895ad.2 for ; Thu, 25 May 2023 19:29:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068175; x=1687660175; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=hY7+Aygn/5XaIKrT64r2viNcP/z5hrhYzi79YOcpr4Y=; b=PLIQETdomWBDdWtK2oL9FO3HN0MrATM8LT9zFUC+eQeIjRE/nJYrFRgJXr3j1tesZD dtl47piEA/IE7q/siax8+W+4cZBvpX2omDwEfVUn5/Izk/USRBl75JYP+5aIztU523jR dc8KMG72dWurhAnmaCW6zivtZ0CchBcg1G7Q8Cy5NPBMfjDpUN+kyWm8yKuBuWqdTroH gt1abdo3C+ZtmI+mOdByEj6ZVtWuxkD4MK1ys6tZvRCRex1ZIuO8od85baKAWm5F0FZ4 1oXjhPoAtAg1trBGOCO7KWNG+Kbvef+ulaajEAoj2dvS2KQNY9JeJ4rZKqCb1tGQ62hc hV4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068175; x=1687660175; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hY7+Aygn/5XaIKrT64r2viNcP/z5hrhYzi79YOcpr4Y=; b=hPx+55khj98grRvYsxLgXJQ+Gz6GRNViPoV0OlUn1yINg0nXEO+STawt4WI8m2w+NN wHpbHaueulOxA17GI3C1i3YnoKYSejYghZpnzlSKcl+FFX1FrqFUyZE1/HOVAVHVyxom cNeYMsLq2Q1rm2FQdaT3+wd6u8GawztAEE+xx5oPST6ZGaAGRJR/UPcgaFqwzbKkBkAO cFdY0cDPWvBnur9fAG+WKeMqX36+BFu0smPZ4B/x7FlELe5+RvsPIt2Ww/p6p0aZFOl9 tAWJShCkgyXvACIP5LOXz8ZRX4RX5Wjs+hxKRp99vmaKzUp8+igYBP06XPGl/ViWIF3h kjOw== X-Gm-Message-State: AC+VfDxq2gO12675elkKW5VEO6e6HZXtYTAZzoWtiYWtUslH5LQRWlyT boQX1HO3EdYxbe/mgHp6UPkqm1ULoWQ5cvPVrP4= X-Google-Smtp-Source: ACHHUZ5mlaw+6Q1Mfvuvm5lPBelr5vDpWjQArkDRd8Zpasdjk753MNPBVepX9fCMjP+qCPVIXaR4/Q== X-Received: by 2002:a17:902:ed54:b0:1ac:8ee4:5e1b with SMTP id y20-20020a170902ed5400b001ac8ee45e1bmr875694plb.14.1685068174982; Thu, 25 May 2023 19:29:34 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:34 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 07/21] llvm: backport a fix for build with gcc-13 Date: Thu, 25 May 2023 16:28:55 -1000 Message-Id: <3382759cb6c5cee42151e72fd94e99a3060317f5.1685068004.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:29:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181739 From: Martin Jansa * needed for llvm-native on hosts with gcc-13 Signed-off-by: Martin Jansa Signed-off-by: Steve Sakoman --- ...-missing-cstdint-header-to-Signals.h.patch | 31 +++++++++++++++++++ meta/recipes-devtools/llvm/llvm_git.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-devtools/llvm/llvm/0001-Support-Add-missing-cstdint-header-to-Signals.h.patch diff --git a/meta/recipes-devtools/llvm/llvm/0001-Support-Add-missing-cstdint-header-to-Signals.h.patch b/meta/recipes-devtools/llvm/llvm/0001-Support-Add-missing-cstdint-header-to-Signals.h.patch new file mode 100644 index 0000000000..fdb6307ab5 --- /dev/null +++ b/meta/recipes-devtools/llvm/llvm/0001-Support-Add-missing-cstdint-header-to-Signals.h.patch @@ -0,0 +1,31 @@ +From a94bf34221fc4519bd8ec72560c2d363ffe2de4c Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 23 May 2022 08:03:23 +0100 +Subject: [PATCH] [Support] Add missing header to Signals.h + +Without the change llvm build fails on this week's gcc-13 snapshot as: + + [ 0%] Building CXX object lib/Support/CMakeFiles/LLVMSupport.dir/Signals.cpp.o + In file included from llvm/lib/Support/Signals.cpp:14: + llvm/include/llvm/Support/Signals.h:119:8: error: variable or field 'CleanupOnSignal' declared void + 119 | void CleanupOnSignal(uintptr_t Context); + | ^~~~~~~~~~~~~~~ + +Upstream-Status: Backport [llvmorg-15.0.0 ff1681ddb303223973653f7f5f3f3435b48a1983] +Signed-off-by: Martin Jansa +--- + llvm/include/llvm/Support/Signals.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/llvm/include/llvm/Support/Signals.h b/llvm/include/llvm/Support/Signals.h +index 44f5a750ff5c..937e0572d4a7 100644 +--- a/llvm/include/llvm/Support/Signals.h ++++ b/llvm/include/llvm/Support/Signals.h +@@ -14,6 +14,7 @@ + #ifndef LLVM_SUPPORT_SIGNALS_H + #define LLVM_SUPPORT_SIGNALS_H + ++#include + #include + + namespace llvm { diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index 9400bf0821..cedbfb138e 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -32,6 +32,7 @@ SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=http file://0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch;striplevel=2 \ file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ + file://0001-Support-Add-missing-cstdint-header-to-Signals.h.patch;striplevel=2 \ " UPSTREAM_CHECK_GITTAGREGEX = "llvmorg-(?P\d+(\.\d+)+)" From patchwork Fri May 26 02:28:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24532 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 3D216C7EE32 for ; Fri, 26 May 2023 02:29:41 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web10.79.1685068177522902176 for ; Thu, 25 May 2023 19:29:37 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=utXUoK95; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2536e522e47so396585a91.1 for ; Thu, 25 May 2023 19:29:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068176; x=1687660176; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PAVv+4xH1p9AN+or8si4V4c2VY6m6eoMjwlUO+RYUaQ=; b=utXUoK95/53W77q8o5R4KXSmE85paJaOcurqVI7kpQxGflJW5+D17HNjjoURpXG81T dmAtPGqJmlyDPM55Aq885L+KuBQxNjDvI1tiUTFYeKFribqkBBLc4jlHhIkheFsjHOwz BNTPvjDQH53ixMZMGXa0wYYWpvlCboZDy8RTkb7ITuzpTQeGpR3IgqODlGUCLTDaejVr BsKC87okPl3YsbbzKedrwEHOhhDezlo8SqsoXK9Q5KW58lGbrjZAaXOFwTmtGQ9+6JYO iW23mcY8X7I6ynvcrU3YcYjXSr+3+l0kEasDZLmLApoWwZSbVsV9e+KXricezKtMFAL3 4SIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068176; x=1687660176; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PAVv+4xH1p9AN+or8si4V4c2VY6m6eoMjwlUO+RYUaQ=; b=Ed3R1j2P+MMb93l1WVS5dmwqx9cIpVDtnPrD4t0S21OxgCca3NHw7IXhAeF0gD6Pgq KvKbgGa8t1VH0RLVJUvoO2cBW5YUHYMFtVxJW44ClOy+prW+2l6uW19fhZawIqdX03vG /uNOOJ+4eOkVL3PiL0r4OC5G/aHfnjkjexmP6A2gapx2GunQ/1Hcd4ox8BE2A3v+XvJo 9Oja4bgAg6JuTwwfmpkPwo/UVBQyrWjSVupR1xRSh7aHumN2Y7zdreoBRbJs0tyEvVvy coddiWlaT0Eta+CACS/dUw0OwV+LJl5nJMeg1GzaYc2fdHdqb6HNn5Cs1A06jZV4cBzI w7vQ== X-Gm-Message-State: AC+VfDyaj3vL8JmaKI2qxP++br7sxbsrY6GECR1tHmkAX/q5MvZFlIjc zXOZOdf+X+S+rly38HoTQr0uhW/hkJLBPfwsaNo= X-Google-Smtp-Source: ACHHUZ6NMszizXPCHBx4NiiqLQ+DIkqwz9J/NDB6Oz6uHTK02u1njlBUd8af3VwG0UBpdUtN8nXVZA== X-Received: by 2002:a17:902:ce86:b0:1ad:cba5:5505 with SMTP id f6-20020a170902ce8600b001adcba55505mr1055152plg.14.1685068176633; Thu, 25 May 2023 19:29:36 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:36 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 08/21] nghttp2: Deleted the entries for -client and -server, and removed a dependency on them from the main package. Date: Thu, 25 May 2023 16:28:56 -1000 Message-Id: <619a643f71eceab73bbbe4dacd1eb42b6d6b01d1.1685068004.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:29:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181740 From: leimaohui By default there is nothing in nghttp2-client and nghttp2-server ,nghttp2-client and nghttp2-server aren't created. So there are dependences error if install main package. Problem: conflicting requests - nothing provides nghttp2-client >= 1.52.0 needed by nghttp2-1.52.0-r0.core2_64 - nothing provides nghttp2-server >= 1.52.0 needed by nghttp2-1.52.0-r0.core2_64 Upstream-Status: Backport [OE-core d2cbe060955c598bd81923ecd554fbe82c17af99] Signed-off-by: Lei Maohui Signed-off-by: Alexandre Belloni Signed-off-by: Steve Sakoman --- meta/recipes-support/nghttp2/nghttp2_1.47.0.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/nghttp2/nghttp2_1.47.0.bb b/meta/recipes-support/nghttp2/nghttp2_1.47.0.bb index becacd4502..90d3286ac6 100644 --- a/meta/recipes-support/nghttp2/nghttp2_1.47.0.bb +++ b/meta/recipes-support/nghttp2/nghttp2_1.47.0.bb @@ -23,17 +23,15 @@ EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=OFF -DENABLE_HPACK_TOOLS=OFF # EXTRA_OECMAKE += "-DENABLE_PYTHON_BINDINGS=OFF" -PACKAGES =+ "lib${BPN} ${PN}-client ${PN}-proxy ${PN}-server" +PACKAGES =+ "lib${BPN} ${PN}-proxy " -RDEPENDS:${PN} = "${PN}-client (>= ${PV}) ${PN}-proxy (>= ${PV}) ${PN}-server (>= ${PV})" +RDEPENDS:${PN} = "${PN}-proxy (>= ${PV})" RDEPENDS:${PN}:class-native = "" RDEPENDS:${PN}-proxy = "openssl python3-core python3-io python3-shell" ALLOW_EMPTY:${PN} = "1" FILES:${PN} = "" FILES:lib${BPN} = "${libdir}/*${SOLIBS}" -FILES:${PN}-client = "${bindir}/h2load ${bindir}/nghttp" FILES:${PN}-proxy = "${bindir}/nghttpx ${datadir}/${BPN}/fetch-ocsp-response" -FILES:${PN}-server = "${bindir}/nghttpd" BBCLASSEXTEND = "native nativesdk" From patchwork Fri May 26 02:28:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24534 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 3D350C7EE33 for ; Fri, 26 May 2023 02:29:41 +0000 (UTC) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by mx.groups.io with SMTP id smtpd.web10.81.1685068179210567935 for ; Thu, 25 May 2023 19:29:39 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=ePoNZM6O; spf=softfail (domain: sakoman.com, ip: 209.85.216.51, mailfrom: steve@sakoman.com) Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2537909d28cso299941a91.0 for ; Thu, 25 May 2023 19:29:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068178; x=1687660178; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Hti6Y2j5citvZ7loHxQY6XsC/72NYTLiJ1JCdvc/vsI=; b=ePoNZM6ONjc4PVSzeaQhkukX8B1rEvwWVxj9cWm4DbfozYmMSD4IIYX3UqMhjWVSEm 7sArzdWh0/YKog7V/MLm7AMu+ai4AUVijOO3n9jcx0gJ6aDL01/9O2QdH3xNSJOTH+IK ZfpAkLvsIoLtA+iu+fWHbosjr9NvzwKfmazfCvSa4HNzfYGMjYj54MSOWWlp9em04N3B r2YBTm0T8PBvLvN0+bElkuvWsxeQi30I5Z6cJno4qFXMUyP43tu9pUuRzvvNGqClqXI7 SMnr8/Yhy6pqhWIaDEHTWrujzb2oRMDhSsIc2yTDE6VPhiYx/lgPrzPCOEDx9LUUvZ5P 6XOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068178; x=1687660178; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Hti6Y2j5citvZ7loHxQY6XsC/72NYTLiJ1JCdvc/vsI=; b=WRJQwfMk0sFiMhmG/g4v46J6iCuCDMIdtiy9BVrT5STeM+7InD75SamYUiuelW2AT8 fYDiB+XRUr/9j/5tW1xQP26YuZYAM+q9av4+i09TSLgxfFmOt1Kh7RD2EViPe0D3ku2H CdFzpULZN3zFiI2598fHbcUd+qXYVAhCuUqHwPDMqqBL3YQzWDY53PDDpfVPKnaRj/dx teK3GoO9XZf/Ssv3+RuBqSlqgyDzmn+hkskgcXjGW0vPwLTjHlitzkMZlJ2UgGycAohd /whd+2w46cAkoiNCh8Ng+e9mpm9DAsHpVOLJMLckBVpEppmCsb7T8TcFC9rabg4S/hc1 VtMQ== X-Gm-Message-State: AC+VfDxZuNKHHY+VZ6DDzs8pHOHGq/9s9fwJgdTnYT6nRU1dhYR5gshM QofScOnfySXOhZ2sBSEiVo4W1HiaGuQB1sB2pz0= X-Google-Smtp-Source: ACHHUZ4qbgI1e44rg6AgdD+1pGlMVwdfeH4rWRXIlFB3PaXwRFh4bbmz7pp88QP4qe0a1TpEepDmQA== X-Received: by 2002:a17:902:e5cc:b0:1ac:6d4c:c24b with SMTP id u12-20020a170902e5cc00b001ac6d4cc24bmr1020704plf.3.1685068178339; Thu, 25 May 2023 19:29:38 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:37 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 09/21] avahi: fix D-Bus introspection Date: Thu, 25 May 2023 16:28:57 -1000 Message-Id: <45714f9ea8bde1c8047d493667b1a1d808ea7949.1685068004.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:29:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181741 From: Eero Aaltonen Install and package the D-Bus introspection files. Signed-off-by: Eero Aaltonen Signed-off-by: Alexandre Belloni (cherry picked from commit b8183ad25af3bcf23f04dd649b6ef665569fac8c) Signed-off-by: Eero Aaltonen Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/avahi/avahi_0.8.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb b/meta/recipes-connectivity/avahi/avahi_0.8.bb index 9bb5e5861e..b5c966c102 100644 --- a/meta/recipes-connectivity/avahi/avahi_0.8.bb +++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb @@ -83,7 +83,6 @@ RRECOMMENDS:${PN}:append:libc-glibc = " libnss-mdns" do_install() { autotools_do_install rm -rf ${D}/run - rm -rf ${D}${datadir}/dbus-1/interfaces test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1 rm -rf ${D}${libdir}/avahi @@ -135,7 +134,7 @@ FILES:avahi-daemon = "${sbindir}/avahi-daemon \ ${sysconfdir}/avahi/services \ ${sysconfdir}/dbus-1 \ ${sysconfdir}/init.d/avahi-daemon \ - ${datadir}/avahi/introspection/*.introspect \ + ${datadir}/dbus-1/interfaces \ ${datadir}/avahi/avahi-service.dtd \ ${datadir}/avahi/service-types \ ${datadir}/dbus-1/system-services" From patchwork Fri May 26 02:28:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24533 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 23841C7EE2E for ; Fri, 26 May 2023 02:29:41 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web11.106.1685068180800091188 for ; Thu, 25 May 2023 19:29:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=Ruo3VjYc; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1ae58e4b295so1666005ad.2 for ; Thu, 25 May 2023 19:29:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068180; x=1687660180; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=MT2RtDjbdq9/MSNOi9K+66iB05wFvxGZ2uhaXF06BRY=; b=Ruo3VjYcpirbyZGt8vSuuat0SDg56VRqP8IkvwE61d8Y5Ubl+51OGVs5zGXdz3hxzO AM3qrXgrpNirexKLSR3xnCvsIkItWKLYMmzZF1xBoh8JqllLKXzfNqjyiSrf25fiuR1b OVjp/92J53pIbG5t1fMk2MmafI7ueaXXebz9f7hqW5hKv/tiXK7VDL5+PCsyFCkINLIZ 2sgTROBXbdgxjmFiXnm9fPinAdbN9zNIazaCo9S+nppS5vpGRTaForKYq8fDehlviFOe mhHmTdE1rxK3JeAkjkK/76USv1UPRlVd+pdnMtIEPYxdgNgMV8VZrXb29IJmS1TewabB Sl7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068180; x=1687660180; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MT2RtDjbdq9/MSNOi9K+66iB05wFvxGZ2uhaXF06BRY=; b=hSzyhZkGdK9Olv/JSUF92ftes9L+52Ub8pZv9cIJLfwlsflxcuWqAYaML+m0Q5hQgI 0sO/vvL/sNdG/B4j0RkJtkijcqT+T/Ph5BodqN6GGK3l8Gs6ww1QXbjGOHNgQTxpdwry GuTDnn2oamxbnW7bTIQt3RJPT4g3mbnx/xlGbhChw8QjaXgd4vpGb99arzXhulpTWEq0 RyrMkV+uB7t5xgwJLHre1ko7pGjPCmut94Am+pX0dFQBttzMmQDgqg1OUoQgDaBqtjvr 9+wtYHgvULvCdBaCqI4VPd+DDm+ssPUO+RZ3nsiY4eHGq+myi665WrO093ncuCWsU2qz ANRQ== X-Gm-Message-State: AC+VfDw7r6e4EJheQSsH45wTlybJDKWxL3oiDc/9bxeluSWWgjgyTwwU cOM39yjfjnmVs9U3VdBX5LHlXy7JRfEngca6XHs= X-Google-Smtp-Source: ACHHUZ7icZC5hdFhLgvXHIseOfxiYf5LxeUyx0Kf77GCe982ETavDfvxiw6HDIl83Yy0oiJ0t6tVrQ== X-Received: by 2002:a17:903:2cc:b0:1aa:ef83:34be with SMTP id s12-20020a17090302cc00b001aaef8334bemr845395plk.47.1685068179941; Thu, 25 May 2023 19:29:39 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:39 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 10/21] p11-kit: add native to BBCLASSEXTEND Date: Thu, 25 May 2023 16:28:58 -1000 Message-Id: <19498bea309f19d841187a7063286b2a68ce2587.1685068004.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:29:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181742 From: Jan Luebbe This recipe is needed to build softhsm (in meta-oe) in with p11-kit support, which is useful when multiple PKCS#11 modules need to be used. Signed-off-by: Jan Luebbe Signed-off-by: Richard Purdie (cherry picked from commit 4942a42d5a071b283fe49047dcb4fee2c96422e8) Signed-off-by: Steve Sakoman --- meta/recipes-support/p11-kit/p11-kit_0.24.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/p11-kit/p11-kit_0.24.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.24.1.bb index 59cbb67961..72b446204a 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.24.1.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.24.1.bb @@ -29,4 +29,4 @@ FILES:${PN} += " \ # PN contains p11-kit-proxy.so, a symlink to a loadable module INSANE_SKIP:${PN} = "dev-so" -BBCLASSEXTEND = "nativesdk" +BBCLASSEXTEND = "native nativesdk" From patchwork Fri May 26 02:28:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24540 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 3F375C7EE2F for ; Fri, 26 May 2023 02:29:51 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web10.83.1685068182554096545 for ; Thu, 25 May 2023 19:29:42 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=UnxOQ4+r; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1ae763f9c0bso1793145ad.2 for ; Thu, 25 May 2023 19:29:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068181; x=1687660181; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cSWFCvBo3YeMHpqxjDLYuOwLwA2FLHPMe8Hk5LDphuc=; b=UnxOQ4+roMROM+Ii47CXuKjG1LrBAOfPZTun//a5pcwnUknmWHn8VFZnXXFbtnOu+C gi+x3UgPqQHtvsGO2FN8UC9jYqbNDsyREp5JsHtG9zXwpG68pqTRKaYh1EGZplvY/xdx MhGOFwKGvB1u75iqxUL3YKuQ+afDfbtJpv38YJVZjfDDTdyBijgnI/Xm6Q/0JFnr+bAk ozz5njYkZoKK8fvb3ZJFJvDTmyNTa7iKcvPYzqYlHhsgoGNGYIMsQ7yF/QQm0KXSKbNZ 9OdTY52w161j1L3uXilqFXaavPNXkFZQQ6WODGgdkCfjWmcoAanL/1Oo55OlvEew0VU2 EAFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068181; x=1687660181; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cSWFCvBo3YeMHpqxjDLYuOwLwA2FLHPMe8Hk5LDphuc=; b=PIThv7XnRDkN/CgQABx19CvL1YGWX4hO4/BtHAwvJkKuj9pCHZoXP43cqJnQmY4T5I vo75rYLmRKWR4afj2Q7olnFKlUHD1u9u6AbLksBQVZFTnsNF53W0ITVuXy6uWtSorDlu UNiiUkNlqPrl4NAeEJTVrZ1odLuaO5PWRakMqjMrH1iLrtxznC4Ii6ps0f5LwNgptV0q iYik+pBUhDOdVOIMsCe4JXe7Ouv0UL9EGdFqVNSJjpqFT+5Ye6R4RJoXTorXioLBPngA rAANWdjMbc8+w3Z8ZZPJARYnNZqCA/27dVtBAYPn9NvWCKT/wM9zVyXcYcSB6MlaiA2j rI0g== X-Gm-Message-State: AC+VfDzs1UFAznSJtCN2oBV2OkarAift6MfPaiSGCRrUDSFoVq0kqDy+ FE7b7Peo6ZOnXnJzjym1V31xCGAmFN0Bj5Q7iNA= X-Google-Smtp-Source: ACHHUZ6q/3uBKVeVs4Bv9+fBc1ES6ZEnTZ5/snustid4H55cc8WmHvJhfBVHw7SUTPFYs63VUcRGMw== X-Received: by 2002:a17:902:e5cc:b0:1ae:2c87:f771 with SMTP id u12-20020a170902e5cc00b001ae2c87f771mr898769plf.20.1685068181610; Thu, 25 May 2023 19:29:41 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:41 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 11/21] systemd-systemctl: fix instance template WantedBy symlink construction Date: Thu, 25 May 2023 16:28:59 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:29:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181743 From: Martin Siegumfeldt Fix issue of the below instance template systemd service dependency [Install] WantedBy=svc-wants@%i.service creating the symlink (instance "a" example) /etc/systemd/system/svc-wants@%i.service.wants/svc-wanted-by@a.service which should be /etc/systemd/system/svc-wants@a.service.wants/svc-wanted-by@a.service as implemented by this change. The functionality appears regressed just after "thud" baseline when the logic was refactored from shell script into python (commit 925e30cb104ece7bfa48b78144e758a46dc9ec3f) (From OE-Core rev: 308397f0bb3d6f3d4e9ec2c6a10823184049c9b5) Signed-off-by: Martin Siegumfeldt Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman (cherry picked from commit 372b29c8ad270d4d430c26a4e614976c7029afaf) Signed-off-by: Steve Sakoman --- .../systemd/systemd-systemctl/systemctl | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-systemctl/systemctl b/meta/recipes-core/systemd/systemd-systemctl/systemctl index 6d19666d82..1c87beadad 100755 --- a/meta/recipes-core/systemd/systemd-systemctl/systemctl +++ b/meta/recipes-core/systemd/systemd-systemctl/systemctl @@ -184,12 +184,19 @@ class SystemdUnit(): raise SystemdUnitNotFoundError(self.root, unit) - def _process_deps(self, config, service, location, prop, dirstem): + def _process_deps(self, config, service, location, prop, dirstem, instance): systemdir = self.root / SYSCONFDIR / "systemd" / "system" target = ROOT / location.relative_to(self.root) try: for dependent in config.get('Install', prop): + # determine whether or not dependent is a template with an actual + # instance (i.e. a '@%i') + dependent_is_template = re.match(r"[^@]+@(?P[^\.]*)\.", dependent) + if dependent_is_template: + # if so, replace with the actual instance to achieve + # svc-wants@a.service.wants/svc-wanted-by@a.service + dependent = re.sub(dependent_is_template.group('instance'), instance, dependent, 1) wants = systemdir / "{}.{}".format(dependent, dirstem) / service add_link(wants, target) @@ -229,8 +236,8 @@ class SystemdUnit(): else: service = self.unit - self._process_deps(config, service, path, 'WantedBy', 'wants') - self._process_deps(config, service, path, 'RequiredBy', 'requires') + self._process_deps(config, service, path, 'WantedBy', 'wants', instance) + self._process_deps(config, service, path, 'RequiredBy', 'requires', instance) try: for also in config.get('Install', 'Also'): From patchwork Fri May 26 02:29:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24541 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 49672C7EE31 for ; Fri, 26 May 2023 02:29:51 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web11.107.1685068184343302256 for ; Thu, 25 May 2023 19:29:44 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=tZHHdS4Z; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1afa6afcf4fso2666845ad.0 for ; Thu, 25 May 2023 19:29:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068183; x=1687660183; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=YGD0SwMU/VFzuL4G1TIFxDd6etE5DC6hvDXNJTtVoYI=; b=tZHHdS4Zkxey5K1a859BM/ihS1RcE1lhY8Knm/IFX8T1fXKcnkYm+CvBr8UO27Q28G oWs/4qLXFXdpigtsuifNVbt+TazL5rFQIzeDrThl5DY0klHDe8utrm8lrl0KkaOuc4ID AQlW6bQp19Arfpa4X0Qr6PcWexn1xQmNpMdNVLgUs/qd9TncHAZD4hvby5J9pXc+WzKH S4TpJmhji3lfIKaa+DGZGleOOAIdHZE4+MhrWZecXG1/WJ2Ig8I36jgx6OYy94rW/nOl uufrxvYkO3OZkCkVrHuqi9k5v5ySg0KsU3P2cyUROxH+fjV0yW2F7jx4Rt6UaalNGjUj FXMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068183; x=1687660183; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YGD0SwMU/VFzuL4G1TIFxDd6etE5DC6hvDXNJTtVoYI=; b=SEXGeHxZusl5SOADJI065vWeOskjihnko1253rw+Edj/hsQqn++3vt/7BINNaG7OqI DS0m+qndvC8/7VbF8rBe3SzVFdwpFImDks1NunrRmRK4SkJwt6raUSxZp1aob2RorupB 094GQTt2HdY4ukfuUAI27/s64gUHJd02XVP2I6ndqWFd+ghQojJ/GOsCTMLTvb0+5YOw xHI3lvkVYcaOdppJsR/BWs9eR2PLdXyYIJ6t9DuSdk3A1EEqFlhKD4vEMQii3m3tX4lB /3w3DURA8rNBeeH+PyoTfV8H/eGglp1j+cy3ZRSaxbzDwZNbuIlidHeqKlqxCrhmbZmJ bCXA== X-Gm-Message-State: AC+VfDzI/W8mwQeZmJvaCQiLIBVN5jTFCkWmjQEg/6wP7vUYAh7XzMOn Oe1qH2zfHMRBF2EzwHaFbFyxKsYs6QMjQZtA1XQ= X-Google-Smtp-Source: ACHHUZ5z9mkdlAQOZL2INcikrDKTYGoWK59GFfLdfQetfRkecI3KPwk+Js/WHVzfVA7OCc+NuDTmJw== X-Received: by 2002:a17:902:6bc4:b0:1aa:cddd:57d8 with SMTP id m4-20020a1709026bc400b001aacddd57d8mr772549plt.30.1685068183431; Thu, 25 May 2023 19:29:43 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:43 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 12/21] maintainers.inc: Fix email address typo Date: Thu, 25 May 2023 16:29:00 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:29:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181744 From: Richard Purdie Signed-off-by: Richard Purdie (cherry picked from commit 2a86ca028980b501e386f6bb8293a094fd77f97b) Signed-off-by: Steve Sakoman --- meta/conf/distro/include/maintainers.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 4778b1e5e6..207d889acd 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -280,7 +280,7 @@ RECIPE_MAINTAINER:pn-intltool = "Alexander Kanavin " RECIPE_MAINTAINER:pn-iproute2 = "Changhyeok Bae " RECIPE_MAINTAINER:pn-iptables = "Changhyeok Bae " RECIPE_MAINTAINER:pn-iputils = "Changhyeok Bae " -RECIPE_MAINTAINER:pn-iso-codes = "Wang Mingyu " +RECIPE_MAINTAINER:pn-iso-codes = "Wang Mingyu " RECIPE_MAINTAINER:pn-itstool = "Andreas Müller " RECIPE_MAINTAINER:pn-iw = "Changhyeok Bae " RECIPE_MAINTAINER:pn-libjpeg-turbo = "Anuj Mittal " From patchwork Fri May 26 02:29:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24539 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 41BC8C7EE2E for ; Fri, 26 May 2023 02:29:51 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web11.109.1685068185974335007 for ; Thu, 25 May 2023 19:29:46 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=x+dGEIXH; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-51452556acdso137096a12.2 for ; Thu, 25 May 2023 19:29:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068185; x=1687660185; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PlyHX/BjcWM3D7/TqDPBOf3hm6k7bYn8SDfgdDgYKeg=; b=x+dGEIXHKdYq/UYLwHdSdvsGyvU9iR1H5U0ov9+yuN4r+ir7yYfzGWKHp2zkUZnw4c titt9LqnlW2nEjpBLxUd2DBRS7luD1pvwdiiACADabsIo2XkCnBU8gIG3fT//w4Mvans f8M/KT3hz+OundhJAMnt0g4guNVHu3lmWRFUloFEhAKO3gHon1Pa7yFd8ru6mMxjNBjb A4u8sY32heDSwWv8Cua40ctnAN9TSONZyQ+twp0iFY0oVQGmXzkYmXYGw88brXgwLCWt fTQ2ZxVIp3yCjx3CJ9r0dDZRt6jX7f9IOHw1xKNxaYpy5BoEm/P4DLdCAWxc5UL+hd1V H1OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068185; x=1687660185; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PlyHX/BjcWM3D7/TqDPBOf3hm6k7bYn8SDfgdDgYKeg=; b=SFIe4yB22wP3Bgw9Tm/1SI7QL5el/4t/gXZfuQGbO/pRTk4o0ahDAKCZi/d4r5bA4I Q4P3XP1QnwK1UzG0MMXvRRL+HfHmkkeqYl3gwwxrO7hieETIS5ODCliBdBfqi3fy8mc9 1q/u35wanRYEdOUS2dyL1no8Ouh5veuHKfeI9FO9hcCaSZDtFbR53bAesqlccGrfydPL 3mmtuynPZ/fmDGL2h3KDOp2G1AXY/iXZPdnYuqk9aOEPBSW2IKL894HSWLJhcVZF/svI 2FzZb29TtRUPXLkuD4yx2c595fTIbybSEF4vYU7P7heHNlgA1Eqo2CpCGKTozP4nAFwr 5qwA== X-Gm-Message-State: AC+VfDxpiNij8Nzl3+Ttwg3aba0TSfWxI2BCjhBuwuTK8qWpi9U6Upj6 l8/LJiwPWE4zHwQ5G+VS84uzGudOoo/69uYNkMw= X-Google-Smtp-Source: ACHHUZ55C/0A7nNWU4hL9JQq1bDDjHb0L9ZtKRTxqBjpDrr+TWffVFFCroVt/9SBHEk6m/Sg5AltVg== X-Received: by 2002:a17:902:c94a:b0:1a2:8c7e:f310 with SMTP id i10-20020a170902c94a00b001a28c7ef310mr1069295pla.35.1685068185126; Thu, 25 May 2023 19:29:45 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:44 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 13/21] maintainers.inc: Move repo to unassigned Date: Thu, 25 May 2023 16:29:01 -1000 Message-Id: <2309f14f37636f0c2da7471c982e373c4ef5e35c.1685068004.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:29:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181745 From: Richard Purdie Signed-off-by: Richard Purdie (cherry picked from commit a51a069bad78c578122ae1a5b500f715246d413d) Signed-off-by: Steve Sakoman --- meta/conf/distro/include/maintainers.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 207d889acd..19bc29708c 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -700,7 +700,7 @@ RECIPE_MAINTAINER:pn-quilt-native = "Robert Yang " RECIPE_MAINTAINER:pn-quota = "Anuj Mittal " RECIPE_MAINTAINER:pn-re2c = "Khem Raj " RECIPE_MAINTAINER:pn-readline = "Hongxu Jia " -RECIPE_MAINTAINER:pn-repo = "Jasper Orschulko " +RECIPE_MAINTAINER:pn-repo = "Unassigned " RECIPE_MAINTAINER:pn-resolvconf = "Chen Qi " RECIPE_MAINTAINER:pn-rgb = "Unassigned " RECIPE_MAINTAINER:pn-rpcbind = "Hongxu Jia " From patchwork Fri May 26 02:29:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24542 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 3A5ABC77B7E for ; Fri, 26 May 2023 02:29:51 +0000 (UTC) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.web10.76.1685068171447257329 for ; Thu, 25 May 2023 19:29:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=nsFgh0YU; spf=softfail (domain: sakoman.com, ip: 209.85.215.177, mailfrom: steve@sakoman.com) Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-53f04fdd77dso112928a12.3 for ; Thu, 25 May 2023 19:29:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068187; x=1687660187; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=vsJ4Gd0blhwham31+ZCp/xbohAuic8e+NQa6aOXN/mI=; b=nsFgh0YUYD9WXOBTSd5NIgatm7qP9lZqqHtL20iW+uSB/eh+he5jNrD//otOcrXZEJ JWM2+Q1+cgOI1b0gsJMVOJWJ0r5T1g1JMg486HU34bCYZrRZu55h29dD0qKJaY8f8LMj Wf7xqh60IoI1idaCVonDoh2XXsucAELYuXVgMLZX+4WHSPenEYQir560RW3jXUXYmeDb 2J48fzL9GTSWlzdVyjjmQ1FFQ00AVRzEHC+8MsME3QUB7aBTRv4izpZGt/4cHnB1SfiF Hxc00BwT1KfdBMsS2JqVPPLPag5ea7XlOocjCVuETPN2F9UP6WkWFSIXO6u+MIq61yfW A1PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068187; x=1687660187; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vsJ4Gd0blhwham31+ZCp/xbohAuic8e+NQa6aOXN/mI=; b=ERQ+IAk892AAgatAt2S4PGQTCzRxaWRKeYvl7HczQEQj3scGX2AB3xPFT8pr2dkeVb MrB4Paot2iPqHw/hTx218nSq9H3aRXtUk1I/KVSA+k7dQbNTJEE2DGxvzKQZxn/rBv2B RRsk8xW3A+uiuoNR9e0rrUl3RBdciaJblLVakh+9ifDsV2F89SPNy663m72HUYWubc9L wm1PwsaMexM+6hG3K9+9+YOnBIvh1QlCz5vUaC0rlrOOw1ed8YT7DnTan7cKEdv4GdWP TzwWs02zFukX2NS1BT8iMKDoPWZZinuRnIw5IeTeR/HmQ2juC/J2ZpOO/AAVIHt3BUqt Xc5g== X-Gm-Message-State: AC+VfDxzXADz7MkIvuDKyCKkiCAJU5F8CEDU2CmGHqyakswz+Qp6tpuY u2O5MY2YQ9eG6RxZ6akceiCrBIDJFLWU0W8/x0I= X-Google-Smtp-Source: ACHHUZ4DHr6r8a0Td6SrIfshfsGYZSwL4OuNQruRTBkG3BOJe6V9AQGQE+3v8GTByI/AUOnsHjyEzA== X-Received: by 2002:a17:902:e5cc:b0:1ae:2c87:f771 with SMTP id u12-20020a170902e5cc00b001ae2c87f771mr898975plf.20.1685068186868; Thu, 25 May 2023 19:29:46 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:46 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 14/21] quilt: Fix merge.test race condition Date: Thu, 25 May 2023 16:29:02 -1000 Message-Id: <769290794fc23894211c56b1878a73634fd20283.1685068004.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:29:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181746 From: Khem Raj This is consistently seen with musl and grep from busybox Therefore backport a patch from upstream to fix it Signed-off-by: Khem Raj Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 511bcd965af658e6bb0c61d9f2adb1af75af773b) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/quilt/quilt.inc | 1 + ...t-Fix-a-race-condition-in-merge.test.patch | 48 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index fce81016d8..72deb24915 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc @@ -14,6 +14,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \ file://0001-tests-Allow-different-output-from-mv.patch \ file://fix-grep-3.8.patch \ file://faildiff-order.patch \ + file://0001-test-Fix-a-race-condition-in-merge.test.patch \ " SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch" diff --git a/meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch b/meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch new file mode 100644 index 0000000000..01d4c8befc --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch @@ -0,0 +1,48 @@ +From c1ce964f3e9312100a60f03c1e1fdd601e1911f2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= + +Date: Tue, 28 Feb 2023 18:45:15 +0100 +Subject: [PATCH] test: Fix a race condition in merge.test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Just like commit 4dfe7f9, (test: Fix a race condition, 2023-01-20), +this fix a test race when stdout and stderr in any order. + +Upstream-Status: Backport [https://git.savannah.nongnu.org/cgit/quilt.git/commit/?id=c1ce964f3e9312100a60f03c1e1fdd601e1911f2] +Signed-off-by: Đoàn Trần Công Danh +Signed-off-by: Jean Delvare +--- + test/merge.test | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/test/merge.test b/test/merge.test +index c64b33d..2e67d4f 100644 +--- a/test/merge.test ++++ b/test/merge.test +@@ -39,8 +39,9 @@ Test the patch merging functionality of `quilt diff'. + > Applying patch %{P}c.diff + > Now at patch %{P}c.diff + +- $ quilt diff -P b.diff | grep -v "^\\(---\\|+++\\)" ++ $ quilt diff -P b.diff >/dev/null + > Warning: more recent patches modify files in patch %{P}b.diff ++ $ quilt diff -P b.diff 2>/dev/null | grep -v "^\\(---\\|+++\\)" + >~ Index: [^/]+/abc\.txt + > =================================================================== + > @@ -1,3 +1,3 @@ +@@ -49,8 +50,9 @@ Test the patch merging functionality of `quilt diff'. + > +b+ + > c + +- $ quilt diff --combine a.diff -P b.diff | grep -v "^\\(---\\|+++\\)" ++ $ quilt diff --combine a.diff -P b.diff >/dev/null + > Warning: more recent patches modify files in patch %{P}b.diff ++ $ quilt diff --combine a.diff -P b.diff 2>/dev/null | grep -v "^\\(---\\|+++\\)" + >~ Index: [^/]+/abc\.txt + > =================================================================== + > @@ -1,3 +1,3 @@ +-- +2.40.0 + From patchwork Fri May 26 02:29:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24543 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 34915C77B7A for ; Fri, 26 May 2023 02:29:51 +0000 (UTC) Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by mx.groups.io with SMTP id smtpd.web11.110.1685068189632772545 for ; Thu, 25 May 2023 19:29:49 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=AYFgkkJ/; spf=softfail (domain: sakoman.com, ip: 209.85.215.181, mailfrom: steve@sakoman.com) Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-5346d150972so221354a12.3 for ; Thu, 25 May 2023 19:29:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068188; x=1687660188; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=N217YmqVIndH3L25f/FEbbz4MlkkOrbmNuPmHVSjulk=; b=AYFgkkJ/11GfzbZYDVavngleUd8VESv0VDiyWeJaACDZ4yt0UCOadLnLNKacJHlw8g oRcp8UtcU6hLZtjlykqcunfKGkb28MQGCcHJW4hgId45QWjVDkEFK9n91c3Y7qu5yfMr JY32DK0CeYrTCF5xy5Rx0mR9S4WN6Ocw7uulrubTd7wIU9/ilgnHHz8ovHIji5qfmfFW 6z7aXxPEYtttqDB3kFeCWBMoIUhidyJ30u+xV9bV5C+yprW5lRxTFSEPWj3IHq7nO/sb OjuuLVtP/+n0XCrAMQxI0D8/6rzPFtFAjwhUGPXqBla9nkTGG9ZGb0y8fLXB3jsfY3GU EvPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068188; x=1687660188; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N217YmqVIndH3L25f/FEbbz4MlkkOrbmNuPmHVSjulk=; b=eQcAVzuosDeYXUXablzK6LG8DxIlfhcB/7YzYqCfe5X148Hu72WMF+4gmUJG4JGNAq TzuRuP362IfjHOfMaF8kESX7aHPPmdaLFB6B5nm/Ili3SURAxRkO4JjsaxXa8h9jAW79 TPMFllOpWKk6Mi0XemDiYyJYQ34jmZHS0UHCjQjF/WrvkWyeT3BUidaIz9pLQwmOUdXU 4UZ8jgrbNDz2VkroNtFBIhjFq2CHWYZFl6MsLU8BdJN88MwX5nsePLYdLJmZJBvFkHhM 3k/tAoeDGibpFCT91cKEvxE/76CdfMre3uyEgEyAhrPyMoE0XgV+kRgivXa5NiHDr3Y5 44SA== X-Gm-Message-State: AC+VfDyfvHN8X3QS7YNtiKLaWwZGyTSZ1RZMQUqXfi9J/CLY6zrpX0I8 t/ld+VY/mCuLe0jSXgHwlCHvJaNQIhXP5agOXaU= X-Google-Smtp-Source: ACHHUZ6fdzfpzHAwXDd+q9N85/7L5B0i/nUA2uihoLMo62UgotxstfsjB/BRj/xfAgHd4uOaosNYJw== X-Received: by 2002:a17:902:7c89:b0:1ab:797:afbe with SMTP id y9-20020a1709027c8900b001ab0797afbemr940783pll.8.1685068188652; Thu, 25 May 2023 19:29:48 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:48 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 15/21] package_manager/ipk: fix config path generation in _create_custom_config() Date: Thu, 25 May 2023 16:29:03 -1000 Message-Id: <4766ba017b7562e42b33fde7f2e84c2a339e3f4c.1685068004.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:29:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181747 From: Enrico Jörns "sysconfdir" contains "/" by definition and thus using os.path.join() leads to self.target_rootfs being always ignored (and thus attempting to generate paths in host's /etc). Use oe.path.join() instead which was made for this purpose. Signed-off-by: Enrico Jorns Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 8414c504138f6de663f5130c6b4a6ede5605d88b) Signed-off-by: Steve Sakoman --- meta/lib/oe/package_manager/ipk/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/package_manager/ipk/__init__.py b/meta/lib/oe/package_manager/ipk/__init__.py index 9f60f3abcc..fd61340087 100644 --- a/meta/lib/oe/package_manager/ipk/__init__.py +++ b/meta/lib/oe/package_manager/ipk/__init__.py @@ -245,7 +245,7 @@ class OpkgPM(OpkgDpkgPM): """ if (self.d.getVar('FEED_DEPLOYDIR_BASE_URI') or "") != "": for arch in self.pkg_archs.split(): - cfg_file_name = os.path.join(self.target_rootfs, + cfg_file_name = oe.path.join(self.target_rootfs, self.d.getVar("sysconfdir"), "opkg", "local-%s-feed.conf" % arch) From patchwork Fri May 26 02:29:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24545 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 384FEC7EE2F for ; Fri, 26 May 2023 02:30:01 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web10.88.1685068191825157788 for ; Thu, 25 May 2023 19:29:51 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=WxZlozls; spf=softfail (domain: sakoman.com, ip: 209.85.214.172, mailfrom: steve@sakoman.com) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1ae852a5330so1475075ad.3 for ; Thu, 25 May 2023 19:29:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068190; x=1687660190; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=UXXUNBd2GngUgZxH44nfQTR8eLYkA/8zBrM6tS3KqaI=; b=WxZlozlsbMcArO3zPT1ewNnlL1OSxlCQS3VWy2/AOAPyLFTjEUF3XBojl3iSiMI7rL PdW1vk7HrxCXqSBX/2Q4e53NVhQlFEH3nrfKaJKQsvS0vgQxQnQMZ/yT+0KJD5XxgQkT ERtDAO9B2lQkohZFpxhPk70D7uSnMU6jlINA06DzxguLjtlpNv+crfOaM1PmAvard0fZ OfhYBxuqOEni5re0y5jv2qLx0UWKArwTYHkkHVPxcFjsmWItTqv070qtg4McI/GX4n3f ciJ6+u4LpOWqhA9SGgCH2U1pIJm5YCab0FVzK3jcwfTXs6I+qubQARJkO6aMZ2e6Qq/4 CGdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068190; x=1687660190; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UXXUNBd2GngUgZxH44nfQTR8eLYkA/8zBrM6tS3KqaI=; b=U5+Q8XpeLfbxr0YGJQArWdZwv/X/CxEDW3CmZZZvzqrkjdczKVit5RCT3OEY53He8R qP/6R/1IUXoF2doFP/XYrtaHoudPOXPt5YOUr9CjAA/xZnZhR1oa508X7sqFSJHU3qQd YktRIffxtfLu4JD3uhTddc+uFCdWkN73ZskkUEiGtqH5YXj5q9we4lq6rV049nKNUtWt 6txiH/JsgHx5s89Pszsu7oQWt6mtOPYD4FoE7UspKeNKir7jxlu0hI13PZxBs1kuz0n0 3tcWwnDzGFa1VQDEZnATyLxJfQmIt9+CZJbS8IU3TpIiz7U7VwqD1zlCYXSeTE0vSLf2 xVhw== X-Gm-Message-State: AC+VfDwApUXNtKXNOmDtu/ONeArmAF5m4Wb1qmn5XGKU+XOxvkjVv7Za E1+l+QhIWmPvhN4yvlYdjUJSLrfJuW2+8a0evhU= X-Google-Smtp-Source: ACHHUZ7DUSByrs/uGhcy5kWtrwRbxTnvdqXLJlhJA+kUsu/1BfAYPgBF3hWer71CifeOx0UNCCQ0Qw== X-Received: by 2002:a17:902:d2d0:b0:1ac:61ad:d6bd with SMTP id n16-20020a170902d2d000b001ac61add6bdmr1018881plc.65.1685068190497; Thu, 25 May 2023 19:29:50 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:50 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 16/21] dhcpcd: use git instead of tarballs Date: Thu, 25 May 2023 16:29:04 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:30:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181748 From: Alexander Kanavin As announced here: https://roy.marples.name/downloads/dhcpcd/ Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 6e317eaab45da2dea70d1485fdae93cfeea0db1d) Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb index 579fa95df7..21b2eebbd8 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb @@ -9,9 +9,7 @@ HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=d148485768fe85b9f1072b186a7e9b4d" -UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/" - -SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ +SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=dhcpcd-9 \ file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \ file://0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch \ file://0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch \ @@ -22,7 +20,8 @@ SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \ " -SRC_URI[sha256sum] = "819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c" +SRCREV = "3c458fc7fa4146029a1e4f9e98cd7e7adf03081a" +S = "${WORKDIR}/git" inherit pkgconfig autotools-brokensep systemd useradd From patchwork Fri May 26 02:29:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24549 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 55E11C7EE32 for ; Fri, 26 May 2023 02:30:01 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web11.112.1685068192901850013 for ; Thu, 25 May 2023 19:29:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=rnKCWk4X; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-528cdc9576cso159531a12.0 for ; Thu, 25 May 2023 19:29:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068192; x=1687660192; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Wpim3eOEUGnzdi1RPm+k6td6BedGmHR8k6Z/+nASxe8=; b=rnKCWk4X6tT08gs8JrnlpByNj+RI9tbHsy8FseZ0birPz83sKl97PKmdqYkVpFveM+ Bfl9bqW2o6I5PCwWnH+Yvq+LcM3UDXTKKtuOSco9LbdetqTCuMfOrEB3JlE22ZAct3GP zoA/DHIR6ScnhLck8Yu8pe3HMVVFzC0QipNfeREc0xQaBjkoJdcCF9wTKFuBt5iOilZ0 p1R09I8AtykCBwTxoRuRsKCv3pRabMOy1MOPw/VqxluBuD5if2+3F8whUrnzZXUEICRk d5rd088+u4bXJ3N8EuHnUL1c5YWnWqvcUrPPCd97uWV9sU1BKj7SXJnR8fdpLzhqdg3M 0owQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068192; x=1687660192; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Wpim3eOEUGnzdi1RPm+k6td6BedGmHR8k6Z/+nASxe8=; b=irq9ctiAQ/em8gPhHMeY9n4bw7omCreAKvWGnKylE4FW10Bnd65J8vIO+ILEaxwKE5 Jabsi0N+lmNMXUosbqyv5s6+jTH18CEZrDqvQANJpZ84jStk+R2mPuwFX0IjdV1vX+LZ CxjCJHfLKqakdaBJi1CC5wR5ZPbffLrYgg43iQN2WcfuJRDISzRH15DfLrjaf4Z8gEmI KEm95qsw2WVx5Si2BmV9r9+SCKlg3LNH5QKwGT+/HHH3zPakVQcQ+rCwC3zt59u/fLKt dbSRgXOlFT8AWH0+rY0xZMTtFXS6l2QYxvybzDtI+4DHYYIAP5hKCCEd73xlxUJ5DGg9 wIxw== X-Gm-Message-State: AC+VfDz1i/uXMbZeabSAW0wjSSVZ6mI3jlLUAzvfBbWgPULUCE9U1n2L JNJsaTHLxExUWUkC7VcJkh+cv+hHG3oeEyhVVQA= X-Google-Smtp-Source: ACHHUZ7y/DB5BO/iqOtVw/1UxbZ/G6ffP147XKPet63IIOLVhnXyTtgO3PmkYIeKk3cs/HfqBw70xA== X-Received: by 2002:a17:902:e541:b0:1af:cbb1:837 with SMTP id n1-20020a170902e54100b001afcbb10837mr1035776plf.65.1685068192097; Thu, 25 May 2023 19:29:52 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:51 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 17/21] license.bbclass: Include LICENSE in the output when it fails to parse Date: Thu, 25 May 2023 16:29:05 -1000 Message-Id: <1dd008511cc62bd32f85b529f8d6031bd57e4cd2.1685068004.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:30:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181749 From: Peter Kjellerstedt Signed-off-by: Peter Kjellerstedt Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 1a5197760da3890cc80ac7da8d589766612d9051) Signed-off-by: Steve Sakoman --- meta/classes/license.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 4ebfc4fb92..b92838c030 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -223,7 +223,7 @@ def find_license_files(d): bb.fatal('%s: %s' % (d.getVar('PF'), exc)) except SyntaxError: oe.qa.handle_error("license-syntax", - "%s: Failed to parse it's LICENSE field." % (d.getVar('PF')), d) + "%s: Failed to parse LICENSE: %s" % (d.getVar('PF'), d.getVar('LICENSE')), d) # Add files from LIC_FILES_CHKSUM to list of license files lic_chksum_paths = defaultdict(OrderedDict) for path, data in sorted(lic_chksums.items()): From patchwork Fri May 26 02:29:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24548 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 47631C7EE31 for ; Fri, 26 May 2023 02:30:01 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web10.89.1685068194552783066 for ; Thu, 25 May 2023 19:29:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=kEhLiYPO; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1ae4e49727eso2607725ad.1 for ; Thu, 25 May 2023 19:29:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068194; x=1687660194; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=r2Fd7dD0Cnq2V+d7ErnLRFl63IiuYcAmI+C/YDXdWk8=; b=kEhLiYPO0hoGGao1gBBG5aLLle9w+MGt+Cel/ZFYERkgcHiayQTLqb3Bun/AIgY/WR Wn2sdIdnctzIG75PPsWaBjihndW3WFvE0lf4TPfJYt9oOW4B556MdN5RvQABJkv1DAVn LLEh00eOgfLc+4eQowO3lmPSeLxy83n8T3um1MhyICocGh2YGORsckcRmmDI5XG/9OMQ QDe0uC6MEU+wPTPoJ4h4vBTL6YYYPa7KiRFE51kRVLSdssF9zrezhnkzHR22S7gREwVH ygH09wUQjNuE4QyCVyBJU2YEpo+dTCAVoinxZ+UmWJIkwPNUbBMUtOIQlyQr648BCvZT ujJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068194; x=1687660194; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r2Fd7dD0Cnq2V+d7ErnLRFl63IiuYcAmI+C/YDXdWk8=; b=N+2p2tMJbHlXfanTM8dbDCHKueMin5FQdxT/M58LBODdpOGrtOlet8C4DlZEn18V0v b9SMTWT/hWPkksy438vEXTXAQ3TUdeioZkIf6QLFmP6p5HgTgbYczuyw706Cb5r2etsU tl8MhP5PCRdTX2l69mtHWpD7eoaR56Jk1G2sQUCwANmeHlyj4hkJIb4xdt2/fQLEyCKk QQ4A86S5NWt0xP8s05ZpXTaUQUJZtLPS61TFzD1vp+WijqSb8ynCkz9AQL5FEtUNfppe iVtaFfszRAFsnbkoZfC99y1K2Ai8g4R8CcNncEQ/7g281b32UNdjAq5LiB+cvLq4L9qa lS0Q== X-Gm-Message-State: AC+VfDz+jVaZSdPFwA+VzQw+gjzxukJiKfuBRHbdXZ2ubx/bhF0KmN9r boQtaIs7Eyzq/+5HvdlTscMfKAFLTQ8+oHJ3jnI= X-Google-Smtp-Source: ACHHUZ7gnvSzf8WrQgpMjJI0W75JU5Gu8mRClhi+60ycCrGTrfGNHgjZGm92yvEqMOev5luwDD83iQ== X-Received: by 2002:a17:902:7c05:b0:1af:bb99:d590 with SMTP id x5-20020a1709027c0500b001afbb99d590mr796396pll.7.1685068193652; Thu, 25 May 2023 19:29:53 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:53 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 18/21] weston: add xwayland to DEPENDS for PACKAGECONFIG xwayland Date: Thu, 25 May 2023 16:29:06 -1000 Message-Id: <4e42196754b19926b2219c6ffda47bd389e9d9fb.1685068004.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:30:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181750 From: Ming Liu Otherwise xwayland.pc would not be present in sysroot, this leads to some xwayland configs missing like have_listenfd, have_glamor. Signed-off-by: Ming Liu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 7f1932cb5a408320a5b542e20ba2807718349e8f) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/wayland/weston_10.0.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/wayland/weston_10.0.2.bb b/meta/recipes-graphics/wayland/weston_10.0.2.bb index f81a33fd1e..e09f94d9bb 100644 --- a/meta/recipes-graphics/wayland/weston_10.0.2.bb +++ b/meta/recipes-graphics/wayland/weston_10.0.2.bb @@ -74,7 +74,7 @@ PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp" # Weston with systemd-login support PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus" # Weston with Xwayland support (requires X11 and Wayland) -PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false" +PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xwayland" # colord CMS support PACKAGECONFIG[colord] = "-Dcolor-management-colord=true,-Dcolor-management-colord=false,colord" # Clients support From patchwork Fri May 26 02:29:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24544 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 38428C77B7A for ; Fri, 26 May 2023 02:30:01 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web11.113.1685068196638744578 for ; Thu, 25 May 2023 19:29:56 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=kizKlYVS; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-530638a60e1so219258a12.2 for ; Thu, 25 May 2023 19:29:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068195; x=1687660195; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=VuvDc+fPuzohGk7V5JMvDwpodxp8jnUYcQShIqn8390=; b=kizKlYVSdvgnuyN7NKn/P8eEMnd/8NRFfRy5ldwlj7HtZ4z+VgmVdIYw6Hgg5ocBeP yS0F82Kn2Dms36vXXCrznqZOl5isG7L8T2f67gVEGglkVnLpC1E6qGKq0EieP+sDWMqg JgvEZ/bPoNozWvHlrwUtQSIqdZYNiX6I2nmOLK0Qehawhg+ZmvSZmQa0W6YRBb/1xFQk X8N7u8dltk1uaZrPzFGHk/vxGdhRep7x+dL/CGzg2ZIFY3usBV4RI2FdOEpj2OtB+4Ni TzsUOYO/7xeBFbnFcxevQxiJ7aO4op5vOhoO01Lwx8tajfqdF5EpJZhWpwzI+HGN7AiF Kgkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068195; x=1687660195; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VuvDc+fPuzohGk7V5JMvDwpodxp8jnUYcQShIqn8390=; b=E6cNHBGzQeGSyduoHFxy4hExeBkczKeUQmwwXsep6+UDjiI75km+iiO48S1GKRej47 ECYxSVn4Mf81kneG+wiycXCQssAFharUDKs1IAXUILx28RunR7t22OMnk4QCNSgrwbdI /F6cxmO5xEMIO33z/k0tYKX0zApbOYPUdeAXaL3HoZTW+p2WHaXYCz9CTU9T6GbrHNbJ dsc2FS5XKK9zwe2KJB6TJRaZkckHu05epSgo8I8oNiBE54TCDXOkVpgqpPu5DMRFAxfT +NWOROOMPkeYi5gSi7rpsrD/tgT87+x/moHjZkXXgx3zcjZwIh23+3lXh8fo0iuLM5iG H7/A== X-Gm-Message-State: AC+VfDwaljghA8IxejciDRyCbu4KhajVnbqynlryA8hW6c/ClrKWoz21 WJ+1j8zSnbTs1TU4CaEcRRW3im+hiqSPzdsB98s= X-Google-Smtp-Source: ACHHUZ5PW3FZ8sK1jo67u1obV7LCoAeDwcndLIj2lOhuSVkUGiZkTVoWS0QdWevceZ/hgluwmgqORg== X-Received: by 2002:a17:902:6bc4:b0:1aa:cddd:57d8 with SMTP id m4-20020a1709026bc400b001aacddd57d8mr772910plt.30.1685068195320; Thu, 25 May 2023 19:29:55 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:54 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 19/21] piglit: Add PACKAGECONFIG for glx and opencl Date: Thu, 25 May 2023 16:29:07 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:30:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181751 From: Tom Hochstein - Allow GLX tests to be disabled for systems that don't support it. - Allow OpenCL tests to be enabled. Signed-off-by: Tom Hochstein Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- ...roper-WAYLAND_INCLUDE_DIRS-variable.patch} | 0 ...-shader.c-do-not-hardcode-build-pat.patch} | 0 ...n-t-enable-GLX-if-tests-are-disabled.patch | 32 +++++++++++++++++++ meta/recipes-graphics/piglit/piglit_git.bb | 11 ++++--- 4 files changed, 39 insertions(+), 4 deletions(-) rename meta/recipes-graphics/piglit/piglit/{0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch => 0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch} (100%) rename meta/recipes-graphics/piglit/piglit/{0002-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch => 0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch} (100%) create mode 100644 meta/recipes-graphics/piglit/piglit/0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch diff --git a/meta/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch b/meta/recipes-graphics/piglit/piglit/0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch similarity index 100% rename from meta/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch rename to meta/recipes-graphics/piglit/piglit/0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch diff --git a/meta/recipes-graphics/piglit/piglit/0002-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch b/meta/recipes-graphics/piglit/piglit/0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch similarity index 100% rename from meta/recipes-graphics/piglit/piglit/0002-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch rename to meta/recipes-graphics/piglit/piglit/0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch diff --git a/meta/recipes-graphics/piglit/piglit/0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch b/meta/recipes-graphics/piglit/piglit/0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch new file mode 100644 index 0000000000..ef6fda0f4e --- /dev/null +++ b/meta/recipes-graphics/piglit/piglit/0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch @@ -0,0 +1,32 @@ +From 13ff43fe760ac343b33d8e8c84b89886aac07116 Mon Sep 17 00:00:00 2001 +From: Tom Hochstein +Date: Fri, 3 Jun 2022 10:44:29 -0500 +Subject: [PATCH] cmake: Don't enable GLX if tests are disabled + +Allow building for systems that don't support GLX. + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/720] +Signed-off-by: Tom Hochstein +--- + CMakeLists.txt | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e1aeb5ddf..85e171aba 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -134,10 +134,7 @@ if(PIGLIT_BUILD_CL_TESTS) + endif(PIGLIT_BUILD_CL_TESTS) + + IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") +- if(X11_FOUND AND OPENGL_gl_LIBRARY) +- # Assume the system has GLX. In the future, systems may exist +- # with libGL and libX11 but no GLX, but that world hasn't +- # arrived yet. ++ if(X11_FOUND AND OPENGL_gl_LIBRARY AND PIGLIT_BUILD_GLX_TESTS) + set(PIGLIT_HAS_GLX True) + add_definitions(-DPIGLIT_HAS_GLX) + endif() +-- +2.17.1 + diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index 3ae7a14e46..5b7a206247 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -8,10 +8,11 @@ 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://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \ file://0001-Add-a-missing-include-for-htobe32-definition.patch \ - file://0002-tests-util-piglit-shader.c-do-not-hardcode-build-pat.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://0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch" + UPSTREAM_CHECK_COMMITS = "1" SRCREV = "2f80c7cc9c02d37574dc8ba3140b7dd8eb3cbf82" @@ -36,8 +37,10 @@ REQUIRED_DISTRO_FEATURES += "opengl" export TEMP = "${B}/temp/" do_compile[dirs] =+ "${B}/temp/" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glx', '', d)}" PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut," +PACKAGECONFIG[glx] = "-DPIGLIT_BUILD_GLX_TESTS=ON,-DPIGLIT_BUILD_GLX_TESTS=OFF" +PACKAGECONFIG[opencl] = "-DPIGLIT_BUILD_CL_TESTS=ON,-DPIGLIT_BUILD_CL_TESTS=OFF,opencl-icd-loader" PACKAGECONFIG[x11] = "-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}" PACKAGECONFIG[vulkan] = "-DPIGLIT_BUILD_VK_TESTS=ON,-DPIGLIT_BUILD_VK_TESTS=OFF,vulkan-loader" From patchwork Fri May 26 02:29:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24546 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 424F7C7EE2E for ; Fri, 26 May 2023 02:30:01 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web11.114.1685068197718816885 for ; Thu, 25 May 2023 19:29:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=ifyIm+0a; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1ae4c5e1388so2548655ad.1 for ; Thu, 25 May 2023 19:29:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068197; x=1687660197; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=O8ZEZSSLUuMkAf2HhCUzdXn6FuoOLmaMepepeLv9F7I=; b=ifyIm+0azsFBWudEeDa5amQWEKd5Vp2PaoiEnTavlooavqqADPk67svR358vbuAOKG 01/zb7oUkN3+kKt55hamrTULLGQ5HPFUdqhpbhfCYcXFeKuIgH+M/5mg+xwT002Edl8x 7jZKptk9qOrMX4X6gTnQvV7gH4c3xrE0gEyqsriO3lDeQKY25M7VLsn4k763u5yVpX8c bjgkzmQx/A6khQzc+V8HMqJj+u1Xk6OVY+PJjqVuulSmwAKWWOh4DrmNz/9s5giaqO6K /9nL4rQDzALw9tGxLzyguVM7Az139ygnIZJ3TSKni0M3PZEpCR6FjOx33yJeG0RIQ2yE /cmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068197; x=1687660197; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O8ZEZSSLUuMkAf2HhCUzdXn6FuoOLmaMepepeLv9F7I=; b=QT4OcIxyqrQZSdWikKROW1mFP0d5RJfVUS9JGrqlZVSqjul7Bahbm0c76HLfYcnJuH 2fP4cCvjpuNOiROCvmxlnmUrH1slvbpqpUqw8BKUjoCNyQsMYsJy6oLJhmESQIOIbIn8 xpYb01HxEyLngNDMechawp6oThtiRVSHpenHfeV+smgaYX/x5s61QWUB7MR/xfqOZI92 GJ01YCg+pD0LG+NC4R4/+MYY+RnOQPkcGUf/Dc6hBXIu5jwi8ngEK/kHJlAD95Shyux2 NZM2z2aCPHgkKyRTvrddkLYVitN/DYIzYp84sc5cmlA/78MgZ1PYa2VkncC2wMll9oE7 5WRQ== X-Gm-Message-State: AC+VfDydCX0F3/QwV2Dr+tyZDDpjLDtGQp3bjtwAHnlNf4H6xG8cZk8f XQ5ZhE78uR6a7f7hhFzx0LpFa823oelOVEf3VCE= X-Google-Smtp-Source: ACHHUZ6fqFQbhlaCQz6nNM2oALfyankp7PIj40NJclPS8z3VGx5MevWCyG0uTBEQ/dToeyhlql8wcw== X-Received: by 2002:a17:903:230f:b0:1ad:bb42:7672 with SMTP id d15-20020a170903230f00b001adbb427672mr994793plh.29.1685068196909; Thu, 25 May 2023 19:29:56 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:56 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 20/21] piglit: Fix build time dependency Date: Thu, 25 May 2023 16:29:08 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:30:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181752 From: Zoltan Boszormenyi Replace explicit opencl-icd-loader with virtual/opencl-icd. Signed-off-by: Zoltán Böszörményi Signed-off-by: Alexandre Belloni Signed-off-by: Steve Sakoman --- meta/recipes-graphics/piglit/piglit_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index 5b7a206247..a3c9c5e2e0 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -40,7 +40,7 @@ do_compile[dirs] =+ "${B}/temp/" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glx', '', d)}" PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut," PACKAGECONFIG[glx] = "-DPIGLIT_BUILD_GLX_TESTS=ON,-DPIGLIT_BUILD_GLX_TESTS=OFF" -PACKAGECONFIG[opencl] = "-DPIGLIT_BUILD_CL_TESTS=ON,-DPIGLIT_BUILD_CL_TESTS=OFF,opencl-icd-loader" +PACKAGECONFIG[opencl] = "-DPIGLIT_BUILD_CL_TESTS=ON,-DPIGLIT_BUILD_CL_TESTS=OFF,virtual/opencl-icd" PACKAGECONFIG[x11] = "-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}" PACKAGECONFIG[vulkan] = "-DPIGLIT_BUILD_VK_TESTS=ON,-DPIGLIT_BUILD_VK_TESTS=OFF,vulkan-loader" From patchwork Fri May 26 02:29:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24547 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 47727C7EE33 for ; Fri, 26 May 2023 02:30:01 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web11.115.1685068200385630141 for ; Thu, 25 May 2023 19:30:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=yCtNt2Q1; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1ae87bdc452so1493405ad.2 for ; Thu, 25 May 2023 19:30:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1685068199; x=1687660199; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=uLeAkHfKixzfTHZmPtFMOUnO9s/yqoZxNgCuG8ChUzs=; b=yCtNt2Q1iWElucJHim/0O9gqSxxxvPEadY44Qu9bzYXHNR2+eebnI+AoruHTjdanFI uuAArMv9vnLw5OMmCVCu+7yXxQrVB4LJdVbaWamnD610jMcEWSIb+7/cGQjIOAHubz48 pwbLbaJr6KshsGDu94LFiVxg6kLkJ87RV1PtWVxCIt4TYNPqDxc55nnBhaX0sZ7HDhKZ Dr+8TETRJ2gTdc146ZRekEQi/UiKnBA7fW2ZgpndVWw55M/VEkd5cN3AXFM4RwgHgnU5 28ENobq/ovk4/WgD3vrArl8xkvn3CHWz5G2lMw0hmGESAhZi7UBWbMw31RNIrqPUU4fu CF+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685068199; x=1687660199; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uLeAkHfKixzfTHZmPtFMOUnO9s/yqoZxNgCuG8ChUzs=; b=h55j2g/rb3lTNH+8HlwjizD0MB4UdiVTjuNhUJMhPQgvLMzl9VzZRA1Cb8cOXr9hO0 in0HhZ4pGGMjHrRLBNorsG33ErxjUoACtGtG4AcAPBnzJEJB9s57S9VslJK77xIbwGll ETZl+FqLJsZYRtUD2tgLKRZ6orWdpTshUfeejvaN7Ei+4yGlgI13eTDwCz8AEMGGK8tO XlhtVKxk5jAw3IlBzU2zns4N6nTVwLzVHWB4h6L5Ma+RZzSgHE7slQ0ad30TlZKBdCUq LaDf+eby2gKWg1Q4zKRu4bA/LYXSIx3u7QlOosY+keCDzOzLwse6dbyNOZQUzWohJ1wr s1Uw== X-Gm-Message-State: AC+VfDy4XBMFLyBurYLF22d9YNznpvMvMF2TLFK1rm4mUZ/Gwtd0Z5Cm h9gHEod1GZGhvaWxnK8ZhXRns/4AK2FRW+4gKlk= X-Google-Smtp-Source: ACHHUZ7xctN3lC96NmeaS2rjT7qbQ3v927HyQVCFoAZ/7dCmparD9NC5jvNLv8EHOX/3F3G7m2kCcw== X-Received: by 2002:a17:903:2094:b0:1ae:3dcd:30fc with SMTP id d20-20020a170903209400b001ae3dcd30fcmr828045plc.11.1685068199533; Thu, 25 May 2023 19:29:59 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2023794plr.308.2023.05.25.19.29.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 19:29:59 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 21/21] piglit: Add missing glslang dependencies Date: Thu, 25 May 2023 16:29:09 -1000 Message-Id: <5e26ead1ca016d1691dccba1b58060ac853bf0d2.1685068004.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 26 May 2023 02:30:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181753 From: Tom Hochstein The vulkan configuration requires glslangValidator for build and runtime. Fixes configure error: ``` | CMake Error at CMakeLists.txt:191 (message): | glslangValidator required by vulkan tests not found ``` Fixes runtime error: ``` name: vulkan@shaders@fs-large-local-array result: fail returncode: 1 out: err: glslangValidator: No such file or directory glslangValidator failed ``` Signed-off-by: Tom Hochstein Signed-off-by: Alexandre Belloni Signed-off-by: Steve Sakoman --- meta/recipes-graphics/piglit/piglit_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index a3c9c5e2e0..78a5d6248a 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -42,7 +42,7 @@ PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut," PACKAGECONFIG[glx] = "-DPIGLIT_BUILD_GLX_TESTS=ON,-DPIGLIT_BUILD_GLX_TESTS=OFF" PACKAGECONFIG[opencl] = "-DPIGLIT_BUILD_CL_TESTS=ON,-DPIGLIT_BUILD_CL_TESTS=OFF,virtual/opencl-icd" PACKAGECONFIG[x11] = "-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}" -PACKAGECONFIG[vulkan] = "-DPIGLIT_BUILD_VK_TESTS=ON,-DPIGLIT_BUILD_VK_TESTS=OFF,vulkan-loader" +PACKAGECONFIG[vulkan] = "-DPIGLIT_BUILD_VK_TESTS=ON,-DPIGLIT_BUILD_VK_TESTS=OFF,glslang-native vulkan-loader,glslang" export PIGLIT_BUILD_DIR = "../../../../git"