From patchwork Wed May 17 02:44:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24045 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 E1D2DC7EE25 for ; Wed, 17 May 2023 02:44:56 +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.40946.1684291488041952612 for ; Tue, 16 May 2023 19:44:48 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=G3D99y0t; 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-1ae408f4d1aso2931485ad.0 for ; Tue, 16 May 2023 19:44:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684291487; x=1686883487; 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=LTkfMAJ5N7DMoLAaaDOr18BBIgXWaQ7NoJSYP3b71/s=; b=G3D99y0tV0JMpuzbUpWmkJOJ4Z1IZ//Q9Qin7HQLkkPrhSUrWHrqasRbQ4oFvfXB8R /wutQd4Mbd71r65M/HQgnW3XmXa6KIZ6ZKqrt8sQd2uMi+jLs9ZD5BIt9Z0QODuXKiUJ 3VQdVVVSYsNhdH0QtevdDUuJYHEl+7wv+IQDiSjmwLK5FVnMwo8Yy9BldLREdSchcXK1 ObJMdTcrVtZSnXVSRMQ8+Sf9RNzRinfH5z4uw8Bn7xUvcLBKer81xuBQ+PndvVoxNlbV lVppR1ieNBpMeZDKa+Sk7bIk83MHEz7iiI/kDtCa0437c+kS2C0dNYt9mgiP4vcoIQCr w4YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684291487; x=1686883487; 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=LTkfMAJ5N7DMoLAaaDOr18BBIgXWaQ7NoJSYP3b71/s=; b=cYeLtp5/Er6YDZgumJJoavu0wRJHCsXRbfn27EoI/KMlMIIjHHr/D1PuA0zN8c5lcT kriNC5zXjmiWX1rMXSCbTnEB3q8zJL7+eatZO7iXCuO3+HafoUr8ASOmN9OlpiC4AH/e vo6kyU82blxZSoAAXb3HMWw0O5KdI3ViCJZcYWT5cwPm9oF0SDB8jRUmxFbFUEmdBqhF c/ySsMYRP90/LsJLPT76GkIKhV6TiBLfiGU+TGitVXJvnN0iwbhibrFIoszmsEjw02Bx UfYdVlIAJxhmpORVN94s0U3Mf2T2aJOYum+hW9DBfMqX/L6Lv68jZKVD7A/aMOE6yS9x S6eQ== X-Gm-Message-State: AC+VfDy4BNEwY9W9SZpkuJKDFmXhlS0YDBcntsVoFnwS9HphebpCDDcb RCbO5SRc2eutvyq0yIpHsWG0F2uW+lmiSfaQiJI= X-Google-Smtp-Source: ACHHUZ4DUCwP7u4hmaKOIyPNHnUP+iEnzp86q6foSlqAGDsm45bKqHh+fhei6LgIrywZntjYuuyYAA== X-Received: by 2002:a17:903:32cb:b0:1ab:7c4:eb24 with SMTP id i11-20020a17090332cb00b001ab07c4eb24mr48400143plr.22.1684291487020; Tue, 16 May 2023 19:44:47 -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 bj11-20020a170902850b00b001a2135e7eabsm16282767plb.16.2023.05.16.19.44.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 19:44:46 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 01/13] ghostscript: fix CVE-2023-28879 Date: Tue, 16 May 2023 16:44:24 -1000 Message-Id: <5046578b09b0a83a961768824e47f34fb3de9eb1.1684291329.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 17 May 2023 02:44:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181430 From: Joe Slater Backport from tag ghostpdl-10.01.1-gse-10174 which is after 10.01.1. Signed-off-by: Joe Slater Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 8a70d6935afa38173dbf012b8e1c3d59228504df) Signed-off-by: Steve Sakoman --- .../ghostscript/cve-2023-28879.patch | 60 +++++++++++++++++++ .../ghostscript/ghostscript_10.0.0.bb | 1 + 2 files changed, 61 insertions(+) create mode 100644 meta/recipes-extended/ghostscript/ghostscript/cve-2023-28879.patch diff --git a/meta/recipes-extended/ghostscript/ghostscript/cve-2023-28879.patch b/meta/recipes-extended/ghostscript/ghostscript/cve-2023-28879.patch new file mode 100644 index 0000000000..604b927521 --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/cve-2023-28879.patch @@ -0,0 +1,60 @@ +From 37ed5022cecd584de868933b5b60da2e995b3179 Mon Sep 17 00:00:00 2001 +From: Ken Sharp +Date: Fri, 24 Mar 2023 13:19:57 +0000 +Subject: [PATCH] Graphics library - prevent buffer overrun in (T)BCP encoding + +Bug #706494 "Buffer Overflow in s_xBCPE_process" + +As described in detail in the bug report, if the write buffer is filled +to one byte less than full, and we then try to write an escaped +character, we overrun the buffer because we don't check before +writing two bytes to it. + +This just checks if we have two bytes before starting to write an +escaped character and exits if we don't (replacing the consumed byte +of the input). + +Up for further discussion; why do we even permit a BCP encoding filter +anyway ? I think we should remove this, at least when SAFER is true. +--- +CVE: CVE-2023-28879 + +Upstream-Status: Backport [see text] + +git://git.ghostscript.com/ghostpdl +cherry-pick + +Signed-off-by: Joe Slater limit - q < 2) { ++ p--; ++ break; ++ } + if (p == rlimit) { + p--; + break; +-- +2.25.1 + diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.0.0.bb b/meta/recipes-extended/ghostscript/ghostscript_10.0.0.bb index 56a93632e2..86ecdbe24a 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_10.0.0.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_10.0.0.bb @@ -34,6 +34,7 @@ SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/d file://avoid-host-contamination.patch \ file://mkdir-p.patch \ file://cross-compile.patch \ + file://cve-2023-28879.patch \ " SRC_URI = "${SRC_URI_BASE} \ From patchwork Wed May 17 02:44:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24046 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 05FA6C7EE2D for ; Wed, 17 May 2023 02:44:57 +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.40819.1684291489720972678 for ; Tue, 16 May 2023 19:44:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=0D35dpGc; 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-52160f75920so98935a12.2 for ; Tue, 16 May 2023 19:44:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684291489; x=1686883489; 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=1vFhBnYMxnIBCxY+342PrfnnuaGtOsNOYF0Bn2Ps59w=; b=0D35dpGc+BjvrCMrv1v95R3MyLag958nfaPbilAe0EvOFnXLTiOMBSEUnvI8FrpPXd TwUlBzkzIMnDSepQjdCLiNDpuf3Z3zRg6M5xPRV2dbA9JYHi5JLIlQQvI2w2dRIRf73T 50TBtZpukgf3BxJ48y0r/t16KbSdGgDsjcYKs2tzNuRN5W7wWKrES1euCsVBVkZHWOtA 9JZTsD5eZc1NDFJF+xwthT9DUYfwZYTdaMf9S2vjr/G95WZBcF1qav5IksnxXIc1LsKe vhnLB0HCqLdg0nkPOxJoQR0fAorOkkSyZVp4P3a9/w4wxHe9kRuz+TaWWcV439fYrIlr voPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684291489; x=1686883489; 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=1vFhBnYMxnIBCxY+342PrfnnuaGtOsNOYF0Bn2Ps59w=; b=HNXOBnqXM4Kvk+9ZDi4gMM4D4G+htxX4A4CJVbHSEM56glB9L579BC+vPJjsT1Mopx Nr/e71dCCLg5njld4wGh2ywHMwYICYZ/BZbVGSb3IJR7JXmBwk87Tfi/uzsYjUFGAPrY lIlyzb2ViN6B+TENK9XKQlLNtpi+zZT8Hc1vdAgfKNvhr9CycSVeNtASFL22TMMpNU90 +wrThJgOU7zYc6yeQuX/FfcK08VWraPldm59BsGeW5eBMYRq5igzEwrY9VQnfhpWVLtq qKcfP84k/80Q9keyQhju92R6Zg4cSPWVA8QMyrq9vWxnKQ8WjHetsbpbJIpWbg/FWRe/ 2Y/Q== X-Gm-Message-State: AC+VfDztyNWd4gDrZJK/o8wu+cOX2812vWUwnSL+lCwiLz9tKcwOHSw5 aSf52AQzpJxvO6JiewdtS63KWuVkNpf2Qm9SSHU= X-Google-Smtp-Source: ACHHUZ5OOH+N//VXlvJ5B1X+C/3hR+qe3yBybfM2XYtwOifQvDLyvmBwQN5ZCLHujSYVZMT+y7sRRQ== X-Received: by 2002:a17:902:e845:b0:1ac:63ac:109d with SMTP id t5-20020a170902e84500b001ac63ac109dmr45653727plg.15.1684291488786; Tue, 16 May 2023 19:44: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 bj11-20020a170902850b00b001a2135e7eabsm16282767plb.16.2023.05.16.19.44.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 19:44:48 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 02/13] qemu: Whitelist CVE-2023-0664 Date: Tue, 16 May 2023 16:44:25 -1000 Message-Id: <5474b4d8c5df31abb69e1a5be01cd089405d1cce.1684291329.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 17 May 2023 02:44:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181431 From: Virendra Thakur This CVE is related to Windows. Link: https://nvd.nist.gov/vuln/detail/CVE-2023-0664 Signed-off-by: Virendra Thakur Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit d5ce88c15183c2bf887543c8c31e9c31aaa56a1a) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/qemu/qemu.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 29bc34d743..4c9be91cb0 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -55,6 +55,11 @@ CVE_CHECK_IGNORE += "CVE-2007-0998" # https://bugzilla.redhat.com/show_bug.cgi?id=1609015#c11 CVE_CHECK_IGNORE += "CVE-2018-18438" +# As per https://nvd.nist.gov/vuln/detail/CVE-2023-0664 +# https://bugzilla.redhat.com/show_bug.cgi?id=2167423 +# this bug related to windows specific. +CVE_CHECK_IGNORE += "CVE-2023-0664" + COMPATIBLE_HOST:mipsarchn32 = "null" COMPATIBLE_HOST:mipsarchn64 = "null" COMPATIBLE_HOST:riscv32 = "null" From patchwork Wed May 17 02:44:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24047 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 F3399C7EE24 for ; Wed, 17 May 2023 02:44:56 +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.web10.40948.1684291491504038217 for ; Tue, 16 May 2023 19:44: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=uKliPzGl; 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-52079a12451so101763a12.3 for ; Tue, 16 May 2023 19:44:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684291490; x=1686883490; 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=JcbpRlJaf76Tv7+sQeYiQ7L+XsqQNba6fhPiEgfiFV4=; b=uKliPzGlvzNBnoQaeDNn1Wm1PJ9/SBa+e3sk2DYb+4vv1Mko8vFbxm+vkBJEy0c533 PNKSciGQzTuDkCnLdR2xF3vl43hW5hqrdYZY1DbdD/QErDLCpT92kT47Kj6rjvDFtdnX GIswTpXylDSrW0QzQCGIVRxodUeQk+Eqt7M0IkDvfLmPK6sigDk1oRfveribXkehSDye 8L5QhJg16a1VepWDCddhqq1kH13K7nv/4r2pQ21oPQXqATkcHioqXnDv634RpBlonJt5 W67jxvyOCXokkmM6ucxu1Q2JyLUD1k/jXm2A/oHYqbFd1dzpuGlt07LNWInYvlrZ+JDr xVdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684291490; x=1686883490; 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=JcbpRlJaf76Tv7+sQeYiQ7L+XsqQNba6fhPiEgfiFV4=; b=NT5laHd0hWcyo9OcSzML5jVmZzwOag4+0qAg1qpni3pxykGEWTSzi11G/y6Ipvrv5J 4pvCPaeqO55QpSW+MZTaamQ6NwCyU42lZWW7+kcgq2mIsZHRr7xEy0Z1QzgmXz3rnR4K CZqTvqFkEkOkoOIU5y2Zud4egoLIHjnMnb9gKy1hQlu0BbxP9eD6CXQ0TiFrP9L31eQL 8lQMAzQd3b+vppU+1Ro+dI4jQwQQ4hGTwMTTtJbMfIypBINC3yBo56udETGdakjaeYWU sIN/0a87143kyA/o2vaAdQFDRr3FHOcm6JwAKr1TWbCJvyUnFw6ejVuJKhaiQXH3Wuee wrpQ== X-Gm-Message-State: AC+VfDz5Xbblg7oajV34lYyVXTLhG12ifN90HEoPlUv51rcdvvtaLF9i KP4bKT24hYFeqpnJTVbFaxNn6os345khRXMDAhk= X-Google-Smtp-Source: ACHHUZ4IxWFxtVU1C+XhCDv+zLcIDiOUZ5NvtEIfNeQyNAGl96v06qcL8jB1Jy9B2AUcw8AuAk88Hw== X-Received: by 2002:a17:903:552:b0:1ae:2013:4bc8 with SMTP id jo18-20020a170903055200b001ae20134bc8mr7280934plb.18.1684291490570; Tue, 16 May 2023 19:44: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 bj11-20020a170902850b00b001a2135e7eabsm16282767plb.16.2023.05.16.19.44.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 19:44:50 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 03/13] gtk4: update 4.10.0 -> 4.10.3 Date: Tue, 16 May 2023 16:44:26 -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 ; Wed, 17 May 2023 02:44:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181432 From: Markus Volk Overview of Changes in 4.10.3, 22-04-2023 ========================================= * Fix a popover positioning regression in 4.10.2 * Fix issues with slow loading files in the file chooser Overview of Changes in 4.10.2, 21-04-2023 ========================================= * Fixed issues: - Holding control to select multiple files broken in filechooser (#5669) - Inspector crash (#5681) - Listbase doesn't account for bottom padding in size_allocate_child (#5380) - Leaking AT contexts (#5690) - OpenGL / Windows: Crash when closing gtk4-widget-factory (#5685) - GTK apps crash on startup when setting cursor-size to 0 on Wayland (#5700) - Segmentation fault: gdk_wayland_toplevel_set_startup_id() needs to null-check display->xdg_activation before using it (#5701) - Possible use-after-free under gtk_scrolled_window_update_use_indicators() (#5684) - Wrong error message in `gtk_init` (#5704) - Segfault when scrolling after changing ListView model (#5763) - Bluetooth panel from the Settings app: clicking in the "Downloads" link no longer opens Nautilus (#5671) - Broadway docs or code is broken (#5662) - Disabled GtkPicture's are not properly themed (#5683) - Setting CSS padding to a GtkTextView gives the context menu an offset (#5695) - A11y: the Showing state is used only for windows (#5194) - Gtk4 expander: CSS nodes mismatch code vs. documentation (#5723) - Invoking gtk inspector on a folder results in a crash (#5729) - Double tap requires very precise touch input (#5580) - Name autocompletion dropdown in the GTK4 FileChooser's Save dialog gets stuck, creates artifacts, jumps around (#5743) - Links are not opened when xdg-desktop-portal OpenURI is not available (#5733) - GtkSnapshot generates no nodes appending whitespace-only layouts (#5747) * Translation updates British English Bulgarian Chinese (China) French Indonesian Korean Russian Serbian Slovenian Turkish Overview of Changes in 4.10.1, 14-03-2023 ========================================= * GtkFileChooser - Improve search performance - Be safe against pathless files - Fix memory leaks - Only show local files in recent files - Show most recent files first - Make files non-selectable in selet_folder mode * GtkListView / GtkColumnView / GtkGridView - Fix scrolling problems - Support CSS border-spacing * GtkComboBox - Fix a size allocation problem * gtk - Size allocation fixes * Accessibility - Miscellaneous property fixes and improvements * Wayland - Fix an ordering problem in surface disposal * Windows - Fix Visual Studio build with older GLib * Translation updates Basque Bulgarian Catalan Czech Danish Finnish Friulian Galician Georgian Hungarian Lithuanian Polish Portuguese Swedish Turkish Ukrainian Signed-off-by: Markus Volk Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 0f07445de85c71926e0901d051d330f29a8486d6) Signed-off-by: Steve Sakoman --- meta/recipes-gnome/gtk+/{gtk4_4.10.0.bb => gtk4_4.10.3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-gnome/gtk+/{gtk4_4.10.0.bb => gtk4_4.10.3.bb} (98%) diff --git a/meta/recipes-gnome/gtk+/gtk4_4.10.0.bb b/meta/recipes-gnome/gtk+/gtk4_4.10.3.bb similarity index 98% rename from meta/recipes-gnome/gtk+/gtk4_4.10.0.bb rename to meta/recipes-gnome/gtk+/gtk4_4.10.3.bb index d58fe149ec..9aa33e6851 100644 --- a/meta/recipes-gnome/gtk+/gtk4_4.10.0.bb +++ b/meta/recipes-gnome/gtk+/gtk4_4.10.3.bb @@ -37,7 +37,7 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" UPSTREAM_CHECK_REGEX = "gtk-(?P\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz" -SRC_URI[sha256sum] = "8dc1e7c3b3a46772f0fa416a8ca3fd21d0d0b3b03fb307d2e7327ebee69626e4" +SRC_URI[sha256sum] = "4545441ad79e377eb6e0a705026dc7a46886e46a1b034db40912909da801cea9" S = "${WORKDIR}/gtk-${PV}" From patchwork Wed May 17 02:44:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24049 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 E98F8C7EE2C for ; Wed, 17 May 2023 02:44:56 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web10.40949.1684291493995687349 for ; Tue, 16 May 2023 19:44:54 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=Iz5rifKI; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-64389a44895so150291b3a.1 for ; Tue, 16 May 2023 19:44:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684291493; x=1686883493; 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=ftaWl2hCSW0cbnq+bod/myDG05mhtCKVENFJ484epts=; b=Iz5rifKIb4ds1FMd93mu4VGjxvwVO8LMwW+q1ayCxwb8fIGEzb2tBZ+uBE3t7yEPth vHWCUnZy9Zxi2EhvPIV0WTTD2WacfaQv7ANVCs96W8kOM2vvYGgnrUDnInzXOG+aLiSi 94w98axx272BRmO8BnIqaN0fqlHzbMlvIJAjzlfrt4jwXlrRPbvseGG9bmeqm5sf7iv+ lhmsS2tmyCLaoEA8pWB80c0fT0FOsET+gZow8XV3jUK+OAOqO/oNKmujBKPCSWfdjXpn Aj2rrYF2ZLcxSV6KOE85zg0VkRkC2oRn+CxX24oqM5tiQ71FaE4FIS9UfuGT/JeM2faY fOMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684291493; x=1686883493; 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=ftaWl2hCSW0cbnq+bod/myDG05mhtCKVENFJ484epts=; b=YlyFSPeauuROhOCssxQ20lbCoyZP9JXp+Ll6HVcyfRjqFiy/84T6UdBxsNWC2yfbyE gdnUrZDUZt7yLRnvQCz9EjjCU0DptKSfoVewwX1zrEZcJjffTOluQ2Z0JjjCYGceSAjW IQpmXZa5zQxAUvuEyyarEyDWDbxujfPrkQL/2ZpvAKELyuY3oOfCgpSSN08r+tPYAFtM bfCtsw5zk+pL4a7L2hydkHjZcLKm39RveGO/4HrG4rkObTMG/0wUWNUAD00jqifctjRR U2lStJpDoErFVrMi3GXtxwFGHJBeHqmw2Tlj+YG3wB0UodJ0ukkydg6iC2Fw8bLIQXH/ S3RA== X-Gm-Message-State: AC+VfDwxxiQ1ejENwxtbGhD36ncbU238QAcIbBwLEOOHC7+ie5xtXYgr HAsxO4B2l06iJhbwAWFNkISzDujuhSxw6behjDw= X-Google-Smtp-Source: ACHHUZ7JOnvkmYLaQ7hY3dTS43Z+bU13VjxsMl8eau0RblbGOcjhGHKpLRbO+YERaAVwG5m39cvAHA== X-Received: by 2002:a05:6a20:3c91:b0:104:1439:d244 with SMTP id b17-20020a056a203c9100b001041439d244mr26825575pzj.21.1684291492515; Tue, 16 May 2023 19:44: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 bj11-20020a170902850b00b001a2135e7eabsm16282767plb.16.2023.05.16.19.44.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 19:44:52 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 04/13] recipes: Default to https git protocol where possible Date: Tue, 16 May 2023 16:44:27 -1000 Message-Id: <8f3669f81db8a58f8ed2faef76acab3499f59619.1684291329.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 17 May 2023 02:44:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181433 From: Richard Purdie The recommendation from server maintainers is that the https protocol is both faster and more reliable than the dedicated git protocol at this point. Switch to it where possible. Signed-off-by: Richard Purdie (cherry picked from commit 139102a73d4151f4748b4a861bd4ab28dda7dab7) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/fetch.py | 2 ++ meta/lib/oeqa/selftest/cases/recipetool.py | 8 ++++---- meta/recipes-connectivity/neard/neard_0.18.bb | 2 +- meta/recipes-core/dbus-wait/dbus-wait_git.bb | 2 +- meta/recipes-core/glibc/glibc-version.inc | 2 +- meta/recipes-core/images/build-appliance-image_15.0.0.bb | 2 +- meta/recipes-core/musl/libc-test_git.bb | 2 +- meta/recipes-core/musl/musl_git.bb | 2 +- meta/recipes-core/psplash/psplash_git.bb | 2 +- meta/recipes-core/update-rc.d/update-rc.d_0.8.bb | 2 +- meta/recipes-devtools/binutils/binutils-2.40.inc | 2 +- meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.3.bb | 2 +- meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 2 +- meta/recipes-devtools/erofs-utils/erofs-utils_1.5.bb | 2 +- meta/recipes-devtools/mmc/mmc-utils_git.bb | 2 +- meta/recipes-devtools/pseudo/pseudo_git.bb | 2 +- meta/recipes-extended/bzip2/bzip2_1.0.8.bb | 2 +- meta/recipes-graphics/libfakekey/libfakekey_git.bb | 2 +- meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb | 2 +- meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.3.bb | 2 +- .../xcursor-transparent-theme_git.bb | 2 +- meta/recipes-kernel/blktrace/blktrace_git.bb | 2 +- meta/recipes-kernel/dtc/dtc_1.7.0.bb | 2 +- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- meta/recipes-kernel/kmod/kmod_30.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-dev.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 4 ++-- meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb | 2 +- meta/recipes-kernel/lttng/babeltrace_1.5.11.bb | 2 +- meta/recipes-kernel/lttng/lttng-modules_2.13.9.bb | 2 +- meta/recipes-kernel/systemtap/systemtap_git.inc | 2 +- meta/recipes-rt/rt-tests/rt-tests.inc | 2 +- .../matchbox-config-gtk/matchbox-config-gtk_0.2.bb | 2 +- .../recipes-sato/matchbox-desktop/matchbox-desktop_2.3.bb | 2 +- .../matchbox-keyboard/matchbox-keyboard_0.1.1.bb | 2 +- .../matchbox-panel-2/matchbox-panel-2_2.12.bb | 2 +- .../matchbox-terminal/matchbox-terminal_0.2.bb | 2 +- .../matchbox-theme-sato/matchbox-theme-sato_0.2.bb | 2 +- meta/recipes-sato/puzzles/puzzles_git.bb | 2 +- meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb | 2 +- .../recipes-sato/settings-daemon/settings-daemon_0.0.2.bb | 2 +- meta/recipes-support/dos2unix/dos2unix_7.4.4.bb | 2 +- .../gnome-desktop-testing/gnome-desktop-testing_2021.1.bb | 2 +- meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb | 2 +- 49 files changed, 60 insertions(+), 58 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/fetch.py b/meta/lib/oeqa/selftest/cases/fetch.py index 3d01cf69f2..c9107022c8 100644 --- a/meta/lib/oeqa/selftest/cases/fetch.py +++ b/meta/lib/oeqa/selftest/cases/fetch.py @@ -36,6 +36,7 @@ PREMIRRORS:forcevariable = "" # No mirrors and broken git, should fail features = """ DL_DIR = "%s" +SRC_URI:pn-dbus-wait = "git://git.yoctoproject.org/dbus-wait;branch=master;protocol=git" GIT_PROXY_COMMAND = "false" MIRRORS:forcevariable = "" PREMIRRORS:forcevariable = "" @@ -48,6 +49,7 @@ PREMIRRORS:forcevariable = "" # Broken git but a specific mirror features = """ DL_DIR = "%s" +SRC_URI:pn-dbus-wait = "git://git.yoctoproject.org/dbus-wait;branch=master;protocol=git" GIT_PROXY_COMMAND = "false" MIRRORS:forcevariable = "git://.*/.* http://downloads.yoctoproject.org/mirror/sources/" """ % dldir diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py index b193f0f5c8..a5c0f7164a 100644 --- a/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/meta/lib/oeqa/selftest/cases/recipetool.py @@ -361,7 +361,7 @@ class RecipetoolCreateTests(RecipetoolBase): tempsrc = os.path.join(self.tempdir, 'srctree') os.makedirs(tempsrc) recipefile = os.path.join(self.tempdir, 'libmatchbox.bb') - srcuri = 'git://git.yoctoproject.org/libmatchbox' + srcuri = 'git://git.yoctoproject.org/libmatchbox;protocol=https' result = runCmd(['recipetool', 'create', '-o', recipefile, srcuri + ";rev=9f7cf8895ae2d39c465c04cc78e918c157420269", '-x', tempsrc]) self.assertTrue(os.path.isfile(recipefile), 'recipetool did not create recipe file; output:\n%s' % result.output) checkvars = {} @@ -511,13 +511,13 @@ class RecipetoolCreateTests(RecipetoolBase): self._test_recipetool_create_git('http://git.yoctoproject.org/git/matchbox-keyboard') def test_recipetool_create_git_srcuri_master(self): - self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;branch=master') + self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;branch=master;protocol=https') def test_recipetool_create_git_srcuri_branch(self): - self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;branch=matchbox-keyboard-0-1') + self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;branch=matchbox-keyboard-0-1;protocol=https') def test_recipetool_create_git_srcbranch(self): - self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard', 'matchbox-keyboard-0-1') + self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;protocol=https', 'matchbox-keyboard-0-1') class RecipetoolTests(RecipetoolBase): diff --git a/meta/recipes-connectivity/neard/neard_0.18.bb b/meta/recipes-connectivity/neard/neard_0.18.bb index 23e999acc4..dbd6e3841a 100644 --- a/meta/recipes-connectivity/neard/neard_0.18.bb +++ b/meta/recipes-connectivity/neard/neard_0.18.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ DEPENDS = "dbus glib-2.0 libnl" -SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=git;branch=master \ +SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=https;branch=master \ file://neard.in \ file://Makefile.am-fix-parallel-issue.patch \ file://Makefile.am-do-not-ship-version.h.patch \ diff --git a/meta/recipes-core/dbus-wait/dbus-wait_git.bb b/meta/recipes-core/dbus-wait/dbus-wait_git.bb index f2eb8b1874..bc846de216 100644 --- a/meta/recipes-core/dbus-wait/dbus-wait_git.bb +++ b/meta/recipes-core/dbus-wait/dbus-wait_git.bb @@ -11,7 +11,7 @@ SRCREV = "6cc6077a36fe2648a5f993fe7c16c9632f946517" PV = "0.1+git${SRCPV}" PR = "r2" -SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master" +SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https" UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index 1b8665a9d8..37bb9fd34f 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc @@ -3,6 +3,6 @@ PV = "2.37" SRCREV_glibc ?= "d8e1a7590d375159fb5aac07ad8111ab4699e994" SRCREV_localedef ?= "794da69788cbf9bf57b59a852f9f11307663fa87" -GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" +GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git;protocol=https" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+(\.(?!90)\d+)*)" diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb index a5d7617cda..b73e5f1fb4 100644 --- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -27,7 +27,7 @@ inherit core-image setuptools3 features_check REQUIRED_DISTRO_FEATURES += "xattr" SRCREV ?= "b8007d3c22d8062bc257e3b29c4561ef7758aa28" -SRC_URI = "git://git.yoctoproject.org/poky;branch=mickledore \ +SRC_URI = "git://git.yoctoproject.org/poky;branch=mickledore;protocol=https \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ file://README_VirtualBox_Guest_Additions.txt \ diff --git a/meta/recipes-core/musl/libc-test_git.bb b/meta/recipes-core/musl/libc-test_git.bb index b5bfc6e34c..6d64592f0c 100644 --- a/meta/recipes-core/musl/libc-test_git.bb +++ b/meta/recipes-core/musl/libc-test_git.bb @@ -11,7 +11,7 @@ inherit ptest SRCREV = "18e28496adee3d84fefdda6efcb9c5b8996a2398" SRC_URI = " \ - git://repo.or.cz/libc-test;branch=master \ + git://repo.or.cz/libc-test;branch=master;protocol=https \ file://run-ptest \ " diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 39f6dd8219..3b0dd53c73 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -12,7 +12,7 @@ PV = "${BASEVER}+git${SRCPV}" # mirror is at git://github.com/kraj/musl.git -SRC_URI = "git://git.musl-libc.org/musl;branch=master \ +SRC_URI = "git://git.musl-libc.org/musl;branch=master;protocol=https \ file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \ " diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 9532ed1534..aecbd2ce46 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb @@ -9,7 +9,7 @@ DEPENDS = "gdk-pixbuf-native" SRCREV = "44afb7506d43cca15582b4c5b90ba5580344d75d" PV = "0.1+git${SRCPV}" -SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \ +SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https \ file://psplash-init \ file://psplash-start.service \ file://psplash-systemd.service \ diff --git a/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb b/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb index ee49198429..043cb3f13e 100644 --- a/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb +++ b/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb @@ -6,7 +6,7 @@ SECTION = "base" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://update-rc.d;beginline=5;endline=15;md5=d40a07c27f535425934bb5001f2037d9" -SRC_URI = "git://git.yoctoproject.org/update-rc.d;branch=master" +SRC_URI = "git://git.yoctoproject.org/update-rc.d;branch=master;protocol=https" SRCREV = "8636cf478d426b568c1be11dbd9346f67e03adac" UPSTREAM_CHECK_COMMITS = "1" diff --git a/meta/recipes-devtools/binutils/binutils-2.40.inc b/meta/recipes-devtools/binutils/binutils-2.40.inc index 93631ca3d7..46de8e3ea9 100644 --- a/meta/recipes-devtools/binutils/binutils-2.40.inc +++ b/meta/recipes-devtools/binutils/binutils-2.40.inc @@ -19,7 +19,7 @@ SRCBRANCH ?= "binutils-2_40-branch" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P\d+_(\d_?)*)" SRCREV ?= "ffb83e32fc11f36b7b82b876c14888f82cd983b3" -BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=git" +BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=https" SRC_URI = "\ ${BINUTILS_GIT_URI} \ file://0004-Point-scripts-location-to-libdir.patch \ diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.3.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.3.bb index b4dfc5b3f3..05e84defba 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.3.bb +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.3.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = " \ SECTION = "base" DEPENDS = "util-linux zlib" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master \ +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master;protocol=https \ file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ file://0001-Use-pread-pwrite-ftruncate-stat-instead-of-64bit-equ.patch \ " diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc index f41a5d0b4e..d345b91472 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc @@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \ SECTION = "base" DEPENDS = "util-linux attr autoconf-archive" -SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git;branch=master" +SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git;branch=master;protocol=https" S = "${WORKDIR}/git" inherit autotools gettext texinfo pkgconfig multilib_header update-alternatives ptest diff --git a/meta/recipes-devtools/erofs-utils/erofs-utils_1.5.bb b/meta/recipes-devtools/erofs-utils/erofs-utils_1.5.bb index 6ce5843570..2b5861882d 100644 --- a/meta/recipes-devtools/erofs-utils/erofs-utils_1.5.bb +++ b/meta/recipes-devtools/erofs-utils/erofs-utils_1.5.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73001d804ea1e3d84365f652242cca20" HOMEPAGE = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/README" SRCREV = "a2821a66b42aee5430bccee82c280e38d1e9ab29" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git;branch=master \ +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git;branch=master;protocol=https \ file://0001-configure-use-AC_SYS_LARGEFILE.patch \ file://0002-erofs-replace-l-stat64-by-equivalent-l-stat.patch \ file://0003-internal.h-Make-LFS-mandatory-for-all-usecases.patch \ diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/meta/recipes-devtools/mmc/mmc-utils_git.bb index 8c41b77fe1..1e2e17bfd3 100644 --- a/meta/recipes-devtools/mmc/mmc-utils_git.bb +++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb @@ -9,7 +9,7 @@ SRCREV = "d4c2910981ff99b983734426dfa99632fb81ac6b" PV = "0.1+git${SRCPV}" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${SRCBRANCH}" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${SRCBRANCH};protocol=https" UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index 7c3231186c..c3c4bb0ed9 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -1,6 +1,6 @@ require pseudo.inc -SRC_URI = "git://git.yoctoproject.org/pseudo;branch=master \ +SRC_URI = "git://git.yoctoproject.org/pseudo;branch=master;protocol=https \ file://0001-configure-Prune-PIE-flags.patch \ file://fallback-passwd \ file://fallback-group \ diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.8.bb b/meta/recipes-extended/bzip2/bzip2_1.0.8.bb index 78138d1543..4e3a06f240 100644 --- a/meta/recipes-extended/bzip2/bzip2_1.0.8.bb +++ b/meta/recipes-extended/bzip2/bzip2_1.0.8.bb @@ -22,7 +22,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;endline=37;md5=600af43c50f1fcb82e " SRC_URI = "https://sourceware.org/pub/${BPN}/${BPN}-${PV}.tar.gz \ - git://sourceware.org/git/bzip2-tests.git;name=bzip2-tests;branch=master \ + git://sourceware.org/git/bzip2-tests.git;name=bzip2-tests;branch=master;protocol=https \ file://configure.ac;subdir=${BP} \ file://Makefile.am;subdir=${BP} \ file://run-ptest \ diff --git a/meta/recipes-graphics/libfakekey/libfakekey_git.bb b/meta/recipes-graphics/libfakekey/libfakekey_git.bb index 5d94be52b4..c9c828a8c4 100644 --- a/meta/recipes-graphics/libfakekey/libfakekey_git.bb +++ b/meta/recipes-graphics/libfakekey/libfakekey_git.bb @@ -13,7 +13,7 @@ SECTION = "x11/wm" SRCREV = "7ad885912efb2131e80914e964d5e635b0d07b40" PV = "0.3+git${SRCPV}" -SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master" +SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb index b01b332a55..bf3f5c005d 100644 --- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb +++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb @@ -17,7 +17,7 @@ DEPENDS = "virtual/libx11 libxext" #SRCREV for 1.12 SRCREV = "e846ee434f8e23d9db38af13c523f791495e0e87" -SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master" +SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.3.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.3.bb index 8e9de0914e..880d4ed666 100644 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.3.bb +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.3.bb @@ -11,7 +11,7 @@ SECTION = "x11/wm" DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf libxcursor libxfixes" SRCREV = "ce8c1053270d960a7235ab5c3435f707541810a4" -SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;branch=master \ +SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;branch=master;protocol=https \ file://kbdconfig" S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb index 09fbc9b798..b65a3bea56 100644 --- a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb +++ b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb @@ -10,7 +10,7 @@ SECTION = "x11/base" SRCREV = "23c8af5ba4a1b7efbaf0bbca59a65ff7e10a1a06" PV = "0.1.1+git${SRCPV}" -SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master" +SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https" UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/meta/recipes-kernel/blktrace/blktrace_git.bb index bba5e04504..d0eeba3208 100644 --- a/meta/recipes-kernel/blktrace/blktrace_git.bb +++ b/meta/recipes-kernel/blktrace/blktrace_git.bb @@ -14,7 +14,7 @@ SRCREV = "366d30b9cdb20345c5d064af850d686da79b89eb" PV = "1.3.0+git${SRCPV}" -SRC_URI = "git://git.kernel.dk/blktrace.git;branch=master" +SRC_URI = "git://git.kernel.dk/blktrace.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta/recipes-kernel/dtc/dtc_1.7.0.bb b/meta/recipes-kernel/dtc/dtc_1.7.0.bb index 4ab8451c60..1a78a0c079 100644 --- a/meta/recipes-kernel/dtc/dtc_1.7.0.bb +++ b/meta/recipes-kernel/dtc/dtc_1.7.0.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://BSD-2-Clause;md5=5d6306d1b08f8df623178dfd81880927 \ file://README.license;md5=a1eb22e37f09df5b5511b8a278992d0e" -SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=main" +SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=main;protocol=https" SRCREV = "039a99414e778332d8f9c04cbd3072e1dcc62798" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 12f1cf516e..388d8feebc 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -16,7 +16,7 @@ PV = "0.3+git${SRCPV}" inherit native -SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git;branch=master" +SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git;branch=master;protocol=https" S = "${WORKDIR}/git" do_configure() { diff --git a/meta/recipes-kernel/kmod/kmod_30.bb b/meta/recipes-kernel/kmod/kmod_30.bb index ff6e20554b..6fc9da9c82 100644 --- a/meta/recipes-kernel/kmod/kmod_30.bb +++ b/meta/recipes-kernel/kmod/kmod_30.bb @@ -17,7 +17,7 @@ inherit autotools bash-completion gtk-doc pkgconfig manpages update-alternatives SRCREV = "5d46434a63ae0160150a0efdde1914873697e273" -SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;branch=master \ +SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;branch=master;protocol=https \ file://depmod-search.conf \ file://avoid_parallel_tests.patch \ " diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb index 52cd6f5f28..3a1595521e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -17,8 +17,8 @@ include recipes-kernel/linux/linux-yocto-dev-revisions.inc KBRANCH = "v6.3/standard/base" KMETA = "kernel-meta" -SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=master;destsuffix=${KMETA}" +SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine;protocol=https \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=master;destsuffix=${KMETA};protocol=https" # Set default SRCREVs. Both the machine and meta SRCREVs are statically set # to the korg v3.7 tag, and hence prevent network access during parsing. If diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index 29379791f4..475fe34066 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -14,8 +14,8 @@ python () { SRCREV_machine ?= "8e0611e36c848a07f9cdd778903c9e51bb90b319" SRCREV_meta ?= "e4b95ec17228274acb38bf10061448224df3a312" -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA};protocol=https" LINUX_VERSION ?= "5.15.108" diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb index 4aaa371d97..20d2729371 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb @@ -17,8 +17,8 @@ python () { SRCREV_machine ?= "f974a72071f8b481fc4e38517219bc5c503e14f6" SRCREV_meta ?= "36901b5b298e601fe73dd79aaff8b615a7762013" -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA}" +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" LINUX_VERSION ?= "6.1.25" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index c19c289b97..365d01db78 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -19,8 +19,8 @@ SRCREV_meta ?= "e4b95ec17228274acb38bf10061448224df3a312" PV = "${LINUX_VERSION}+git${SRCPV}" -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA};protocol=https" COMPATIBLE_MACHINE = "^(qemux86|qemux86-64|qemuarm64|qemuarm|qemuarmv5)$" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb index 5046759061..47d77404d0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb @@ -22,8 +22,8 @@ SRCREV_meta ?= "36901b5b298e601fe73dd79aaff8b615a7762013" PV = "${LINUX_VERSION}+git${SRCPV}" -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA}" +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" COMPATIBLE_MACHINE = "^(qemux86|qemux86-64|qemuarm64|qemuarm|qemuarmv5)$" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 785944c3cf..54c8e12644 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -34,8 +34,8 @@ SRCREV_machine:class-devupstream ?= "3299fb36854fdc288bddc2c4d265f8a2e5105944" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH};protocol=https \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA};protocol=https" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" LINUX_VERSION ?= "5.15.108" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index c2b0e66fb8..36f7ed8791 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb @@ -39,8 +39,8 @@ SRCREV_machine:class-devupstream ?= "f17b0ab65d17988d5e6d6fe22f708ef3721080bf" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v6.1/base" -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA}" +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH};protocol=https \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" LINUX_VERSION ?= "6.1.25" diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb index 04c2a27904..16d8b945a4 100644 --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a458c13f18385b7bc5069a6d7b176e" DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" -SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.0 \ +SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.0;protocol=https \ file://run-ptest \ file://0001-tests-do-not-run-test-applications-from-.libs.patch \ file://0001-Make-manpages-multilib-identical.patch \ diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.11.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.11.bb index 194a773a24..f4d9b5e42a 100644 --- a/meta/recipes-kernel/lttng/babeltrace_1.5.11.bb +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.11.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" -SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.5 \ +SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.5;protocol=https \ file://run-ptest \ " SRCREV = "91c00f70884887ff5c4849a8e3d47e311a22ba9d" diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.9.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.9.bb index 5197bf578f..8500f168ff 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.13.9.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.9.bb @@ -41,6 +41,6 @@ python do_package:prepend() { } BBCLASSEXTEND = "devupstream:target" -SRC_URI:class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.13" +SRC_URI:class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.13;protocol=https" SRCREV:class-devupstream = "7584cfc04914cb0842a986e9808686858b9c8630" SRCREV_FORMAT ?= "lttng_git" diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index d309a89496..afeb3ce2d2 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -3,7 +3,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRCREV = "b176afb2e49119ef844d193d27b0752a6d84fe8f" PV = "4.8" -SRC_URI = "git://sourceware.org/git/systemtap.git;branch=master \ +SRC_URI = "git://sourceware.org/git/systemtap.git;branch=master;protocol=https \ file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ file://0001-Install-python-modules-to-correct-library-dir.patch \ file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc index 0481bf6028..527e14ad54 100644 --- a/meta/recipes-rt/rt-tests/rt-tests.inc +++ b/meta/recipes-rt/rt-tests/rt-tests.inc @@ -2,6 +2,6 @@ SRCREV = "4579b9a6d85ae528f76e92421eb5e7b33cd26b17" PV = "2.5" PE = "1" -SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=main" +SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=main;protocol=https" S = "${WORKDIR}/git" diff --git a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb index d870ab211b..490bd582b2 100644 --- a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb +++ b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb @@ -10,7 +10,7 @@ DEPENDS = "gconf gtk+3" RDEPENDS:${PN} = "settings-daemon" SRCREV = "7182e603357250952aa24d90f6d89345f93da7ce" -SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \ +SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https \ file://no-handed.patch" UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))" PV = "0.2+git${SRCPV}" diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.3.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.3.bb index 9d3a2eca33..3777f05b5a 100644 --- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.3.bb +++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.3.bb @@ -12,7 +12,7 @@ DEPENDS = "gtk+3 startup-notification dbus" SECTION = "x11/wm" SRCREV = "0fd6a0c3f3b7bbf4f4b46190d71f7aef35d6bbfd" -SRC_URI = "git://git.yoctoproject.org/${BPN}-2;branch=master \ +SRC_URI = "git://git.yoctoproject.org/${BPN}-2;branch=master;protocol=https \ file://vfolders/ \ " diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb index b1724675ba..6b70948f16 100644 --- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb +++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb @@ -13,7 +13,7 @@ DEPENDS = "libfakekey expat libxft" #SRCREV for 0.1.1 SRCREV = "630d89068dc0a1e9199306d405cb32f892dfa4d3" -SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \ +SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1;protocol=https \ file://0001-desktop-file-Hide-the-keyboard-from-app-list.patch \ file://80matchboxkeyboard.sh" diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb index 29a1a36e12..b71d1e5cd9 100644 --- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb +++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb @@ -22,7 +22,7 @@ RPROVIDES:${PN} = "matchbox-panel" RREPLACES:${PN} = "matchbox-panel" RCONFLICTS:${PN} = "matchbox-panel" -SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \ +SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=https;branch=master \ file://0001-applets-systray-Allow-icons-to-be-smaller.patch \ " diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb index c45c2d170e..a1f236b40f 100644 --- a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb +++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb @@ -10,7 +10,7 @@ DEPENDS = "gtk+3 vte" SECTION = "x11/utils" SRCREV = "99e6eb7db1b5fef110973d96194eec992a2515a2" -SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master" +SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https" UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))" PV = "0.2+git${SRCPV}" diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb index bc4024736f..c60a11c3c0 100644 --- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb +++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb @@ -2,7 +2,7 @@ require matchbox-theme-sato.inc # SRCREV tagged 0.2 SRCREV = "df085ba9cdaeaf2956890b0e29d7ea1779bf6c78" -SRC_URI = "git://git.yoctoproject.org/matchbox-sato;branch=master" +SRC_URI = "git://git.yoctoproject.org/matchbox-sato;branch=master;protocol=https" UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))" S = "${WORKDIR}/git" diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb index 87b6fac024..4b04588682 100644 --- a/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/meta/recipes-sato/puzzles/puzzles_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=92d2b7a2fc96b5f7f17101df7db1fefa" # gtk support includes a bunch of x11 headers REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "git://git.tartarus.org/simon/puzzles.git;branch=main" +SRC_URI = "git://git.tartarus.org/simon/puzzles.git;branch=main;protocol=https" UPSTREAM_CHECK_COMMITS = "1" SRCREV = "5a491c5ad333ef34c1e7713f920f51cbb205af60" diff --git a/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb b/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb index eea7025c8d..de4ab82484 100644 --- a/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb +++ b/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb @@ -11,7 +11,7 @@ DEPENDS = "matchbox-panel-2 gtk+3" # SRCREV tagged 0.3 SRCREV = "9250fa5a012d84ff45984e8c4345ee7635227756" -SRC_URI = "git://git.yoctoproject.org/screenshot;branch=master" +SRC_URI = "git://git.yoctoproject.org/screenshot;branch=master;protocol=https" UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))" S = "${WORKDIR}/git" diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb index 4356930da0..4bdbefcb75 100644 --- a/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb +++ b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb @@ -9,7 +9,7 @@ SECTION = "x11" # SRCREV tagged 0.0.2 SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2" -SRC_URI = "git://git.yoctoproject.org/xsettings-daemon;branch=master \ +SRC_URI = "git://git.yoctoproject.org/xsettings-daemon;branch=master;protocol=https \ file://addsoundkeys.patch \ file://70settings-daemon.sh \ " diff --git a/meta/recipes-support/dos2unix/dos2unix_7.4.4.bb b/meta/recipes-support/dos2unix/dos2unix_7.4.4.bb index d8ebeb6402..506faf5a6d 100644 --- a/meta/recipes-support/dos2unix/dos2unix_7.4.4.bb +++ b/meta/recipes-support/dos2unix/dos2unix_7.4.4.bb @@ -8,7 +8,7 @@ SECTION = "support" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=37f72246ce2aa2fce9482c10b1f2b502" -SRC_URI = "git://git.code.sf.net/p/dos2unix/dos2unix;branch=master" +SRC_URI = "git://git.code.sf.net/p/dos2unix/dos2unix;branch=master;protocol=https" UPSTREAM_CHECK_GITTAGREGEX = "dos2unix-(?P(\d+(\.\d+)+))" SRCREV = "b56a58584d3fef0720425ae154c2a4d80e6af6c5" diff --git a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb index 0cc7cd7b67..1173dd4af3 100644 --- a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb +++ b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb @@ -9,7 +9,7 @@ LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://src/gnome-desktop-testing-runner.c;beginline=1;endline=20;md5=7ef3ad9da2ffcf7707dc11151fe007f4" -SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;protocol=http;branch=master \ +SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;protocol=https;branch=master \ file://0001-fix-non-literal-format-string-issue-with-clang.patch \ " SRCREV = "e346cd4ed2e2102c9b195b614f3c642d23f5f6e7" diff --git a/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb b/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb index ee13e28c7d..ff5629c6f9 100644 --- a/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb +++ b/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" SRCREV = "bcb82804daa8f725b6add259dcef2067e61a75aa" PV .= "+git${SRCPV}" -SRC_URI = "git://git.yoctoproject.org/ptest-runner2;branch=master \ +SRC_URI = "git://git.yoctoproject.org/ptest-runner2;branch=master;protocol=https \ " S = "${WORKDIR}/git" From patchwork Wed May 17 02:44:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24048 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 E6E2FC7EE2A for ; Wed, 17 May 2023 02:44:56 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web10.40950.1684291495323129481 for ; Tue, 16 May 2023 19:44:55 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=48gjhDVg; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-24dec03ad8fso295320a91.1 for ; Tue, 16 May 2023 19:44:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684291494; x=1686883494; 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=Ne04COgMAhX13WtvBSZI5A3LjNY4NBrAKTn+HmT6krY=; b=48gjhDVgoH0sCkdonnuHh+kgnpdNuKbiTzjxdOgvKxRFsbQ3gHRXTINjdpSVECYbMk PJxRomJruOE5BuolB0SIbWA02DtLSLv+jeTdyalZgyNL+5YsGEG0WPEziucFoe0O+3I1 kwwJSTkupH3KCfAav6MnlzHZnV00f0l+qWSjS8AF5DWtJMvXCztdXKCkjHDbebgJDSxo lWaYOnFL+Na0lcqWrfQ+cZC4s/wHmq6NMIV13OYsDc1KRQ9zEhbuHDuyiZSMtWKCS9G8 K8Qh7mJVSSlqCzLtL6iligCNQVxDQKdSv+FgVxWBxXun8WWr6jJomTlMbok2JaWi7s0G MH8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684291494; x=1686883494; 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=Ne04COgMAhX13WtvBSZI5A3LjNY4NBrAKTn+HmT6krY=; b=DyhVJgp93eJKo3Jt7/dWb9MAU5Uhvv1VcM6oNA80MeXEacjBLfJITcGHLt7vyA/x8z rkHZrhvDlNKKl7p2IyByAZ/gXu0Ej0HNHt7h11tf9ZhLjCcyOqYdnEeLtIH803iTyByJ rn4mdR6Lf7liAkDZZk6OJNzr0ARrLz0+GlHWRtaDqzzctEeDKllbmUkaoWpgTLZKnVhe GP3GUpVosM5j92Pm6wP76zFXlzX//psLtXwcEczD4TWm1JDkFk2hMu6Trv31S+pVPAP4 jSlDZ7UcrcurHew1cN2jGJ0PBCnASIuNaPiXjHv/4esQWQpS7fqgzBcg2cE+vSpatIoL VvUg== X-Gm-Message-State: AC+VfDyo49eLZ7odfTxWASve6vGPjF7dd7Ypt4dW4fCJE8WbH/+idNY5 o8unLiMr71p4uFnNZzLNvcO/aiUrJ1LSvTrlhD4= X-Google-Smtp-Source: ACHHUZ6bH7QG1hrCD/YC/UpsfPf2HZI7sU6Fx+CCkJ5i3DtEg96Wf45o7Ru3Vitbv+6GNZj/kneLJQ== X-Received: by 2002:a17:902:d505:b0:1a6:dd9a:62c5 with SMTP id b5-20020a170902d50500b001a6dd9a62c5mr49942537plg.10.1684291494330; Tue, 16 May 2023 19:44:54 -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 bj11-20020a170902850b00b001a2135e7eabsm16282767plb.16.2023.05.16.19.44.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 19:44:53 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 05/13] unfs3: fix symlink time setting issue Date: Tue, 16 May 2023 16:44:28 -1000 Message-Id: <221b509b31a44a16ccc0f66293e51b86322c0b5b.1684291329.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 17 May 2023 02:44:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181434 From: hen Qi Add back the dropped 0001-attr-fix-utime-for-symlink.patch to fix symlink time setting issue on NFS. The problem could be reproduced by runing the following command on nfs booted qemu: ln -s dest src && touch -h src Apart from the rpm operations mentioned in the original patch, 'docker pull' also fails with a 'stale file' error. The common pattern here is extracting files from a bundle and setting times for them. Signed-off-by: Chen Qi Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit fe35a2c11ba6f87735bccae244817016f9c1b5db) Signed-off-by: Steve Sakoman --- .../0001-attr-fix-utime-for-symlink.patch | 88 +++++++++++++++++++ meta/recipes-devtools/unfs3/unfs3_git.bb | 1 + 2 files changed, 89 insertions(+) create mode 100644 meta/recipes-devtools/unfs3/unfs3/0001-attr-fix-utime-for-symlink.patch diff --git a/meta/recipes-devtools/unfs3/unfs3/0001-attr-fix-utime-for-symlink.patch b/meta/recipes-devtools/unfs3/unfs3/0001-attr-fix-utime-for-symlink.patch new file mode 100644 index 0000000000..a0f3740d6a --- /dev/null +++ b/meta/recipes-devtools/unfs3/unfs3/0001-attr-fix-utime-for-symlink.patch @@ -0,0 +1,88 @@ +From 7e789895919d57d573ebb8faa147d1286104cd01 Mon Sep 17 00:00:00 2001 +From: Rui Wang +Date: Mon, 24 Apr 2023 02:57:57 -0700 +Subject: [PATCH] attr: fix utime for symlink + +unfs3 has an old defect that it can not change the timestamps of a +symlink file because it only uses utime(), which will follow the +symlink. This will not cause an error if the symlink points to an +existent file. But under some special situation, such as installing +a rpm package, rpm tool will create the symlink first and try to +modify the timestamps of it, when the target file is non-existent. +This will cause an ESTALE error. Making rpm tool ignore this error +is a solution, but not the best one. An acceptable approach is +Making unfs3 support lutimes(), which can modify the symlink file +itself. Considering not every system support this function, so a +function checking is necessary. + +Upstream-Status: Submitted [https://github.com/unfs3/unfs3/pull/35] + +Signed-off-by: Chen Qi +--- + attr.c | 15 +++++++++++---- + backend_unix.h | 2 ++ + configure.ac | 1 + + 3 files changed, 14 insertions(+), 4 deletions(-) + +diff --git a/attr.c b/attr.c +index 0ce9375..930ce6e 100644 +--- a/attr.c ++++ b/attr.c +@@ -285,7 +285,7 @@ post_op_attr get_post_cached(struct svc_req * req) + static nfsstat3 set_time(const char *path, backend_statstruct buf, sattr3 new) + { + time_t new_atime, new_mtime; +- struct utimbuf utim; ++ struct timeval stamps[2]; + int res; + + /* set atime and mtime */ +@@ -307,10 +307,17 @@ static nfsstat3 set_time(const char *path, backend_statstruct buf, sattr3 new) + else /* DONT_CHANGE */ + new_mtime = buf.st_mtime; + +- utim.actime = new_atime; +- utim.modtime = new_mtime; ++ stamps[0].tv_sec = new_atime; ++ stamps[0].tv_usec = 0; ++ stamps[1].tv_sec = new_mtime; ++ stamps[1].tv_usec = 0; ++ ++#if HAVE_LUTIMES ++ res = backend_lutimes(path, stamps); ++#else ++ res = backend_utimes(path, stamps); ++#endif + +- res = backend_utime(path, &utim); + if (res == -1) + return setattr_err(); + } +diff --git a/backend_unix.h b/backend_unix.h +index 4db72ae..9cce9ab 100644 +--- a/backend_unix.h ++++ b/backend_unix.h +@@ -61,6 +61,8 @@ + #define backend_symlink symlink + #define backend_truncate truncate + #define backend_utime utime ++#define backend_utimes utimes ++#define backend_lutimes lutimes + #define backend_statstruct struct stat + #define backend_dirstream DIR + #define backend_statvfsstruct struct statvfs +diff --git a/configure.ac b/configure.ac +index d46c905..c21afe3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -32,6 +32,7 @@ AC_CHECK_FUNCS(setresuid setresgid) + AC_CHECK_FUNCS(vsyslog) + AC_CHECK_FUNCS(lchown) + AC_CHECK_FUNCS(setgroups) ++AC_CHECK_FUNCS(lutimes) + UNFS3_COMPILE_WARNINGS + + PKG_CHECK_MODULES([TIRPC], [libtirpc]) +-- +2.40.0 + diff --git a/meta/recipes-devtools/unfs3/unfs3_git.bb b/meta/recipes-devtools/unfs3/unfs3_git.bb index 9913a503e8..c5b7898b3c 100644 --- a/meta/recipes-devtools/unfs3/unfs3_git.bb +++ b/meta/recipes-devtools/unfs3/unfs3_git.bb @@ -17,6 +17,7 @@ SRC_URI = "git://github.com/unfs3/unfs3.git;protocol=https;branch=master \ file://0001-Alias-off64_t-to-off_t-on-linux-if-not-defined.patch \ file://0001-locate.c-Include-attr.h.patch \ file://0001-fix-building-on-macOS.patch \ + file://0001-attr-fix-utime-for-symlink.patch \ " SRCREV = "c8f2d2cd4529955419bad0e163f88d47ff176b8d" UPSTREAM_CHECK_GITTAGREGEX = "unfs3\-(?P\d+(\.\d+)+)" From patchwork Wed May 17 02:44:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24050 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 EFC74C7EE2C for ; Wed, 17 May 2023 02:45:06 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web10.40950.1684291495323129481 for ; Tue, 16 May 2023 19:44:57 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=d7dmy/vx; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-24dec03ad8fso295337a91.1 for ; Tue, 16 May 2023 19:44:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684291496; x=1686883496; 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=5SGoQa6rJWN6+6RvCZmBAyYbous7H9ogVxg7AKlUlss=; b=d7dmy/vxnWXjP8Da2mK3KsAfYwz2qdVTtwBKzQglgxUgPKOxI7y1xyxduU2fXp1Taw YU2ne7NvLrvRg61ihNSFhZfN3/XcSFGwsG6mHxKPYMxCwgnRuf3Bcwhw6+LYDOS6bjUo yw4IXmJUGVkAWnAYQoQLE3jBn5g3/Y/oBFtxJUgM/y89LqSxQ6SVBkIZ3NZQOhj1RhHe gaz0cAY/KQ6Ar9NGkiknLB9ac9ieziibegqhPgshQhvoPX8eaX6uTCWPARNpybBZ2z0d YrCwmo1mAkZgZ7WVdU+0Dcm6QZajksfbuLyjsv+q3CGJaR5X4pr2EDWj9XeCzj1nZvlP Bq8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684291496; x=1686883496; 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=5SGoQa6rJWN6+6RvCZmBAyYbous7H9ogVxg7AKlUlss=; b=ag877j8PudQ9r9JqdNecn9wmAA/FKSEn+QF0GSn2KMPLtdIvf7zU7042o1iiNbvH1O WX4D6Ha5KOIAixNKgHnmhNQxmU1MSDhUuEiz5zVvEsIvEXAQdG2rJuY9zTxTUXMsB9Za W5SBRtGNLlL7POWvHu6ZCPgeFXwiMIEagBOegIHO+OcdiS3oqNTnGijREs9MeSi7goTj 8DwX1M2+VN8O6xYJJxfKWMIPT/b+onlKeXXZT/8zqN+ClBFIyRido0zmCr3VBOa62VEE IPXkjo5cIijXWG3QZcIR8/htfSAMIWgac8mWb9bUfAGMWAGm21wYMdCkoCR90q+dmIcu B4Yw== X-Gm-Message-State: AC+VfDyJg3Efo0h0dJZFdzMXE4aw4GjtpEz7ryFMO5o2CGpAOK2v4jD/ 4R2itB5jdcZGNZcN2xsgO5a5TAL1QXf6FIk2Xys= X-Google-Smtp-Source: ACHHUZ5B8uFf7rTFTZ8aFwhaQZrXk73vE+xpZ36VJfoH17lW2x1enO9kfiZlnw99n/nY6CEMP7bdvA== X-Received: by 2002:a17:903:1248:b0:1ab:224b:d1fc with SMTP id u8-20020a170903124800b001ab224bd1fcmr53659964plh.41.1684291496162; Tue, 16 May 2023 19:44: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 bj11-20020a170902850b00b001a2135e7eabsm16282767plb.16.2023.05.16.19.44.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 19:44:55 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 06/13] quilt: Fix merge.test race condition Date: Tue, 16 May 2023 16:44:29 -1000 Message-Id: <3be4c38b370fec42a569cb2cd22315efc860227b.1684291329.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 17 May 2023 02:45:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181435 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 c93c38b83c..3374f4dfbf 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc @@ -13,6 +13,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 Wed May 17 02:44:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24054 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 0D164C7EE2A for ; Wed, 17 May 2023 02:45:07 +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.web10.40952.1684291498820218794 for ; Tue, 16 May 2023 19:44:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=SV8mJ/wz; 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-1ae4e49727eso3831565ad.1 for ; Tue, 16 May 2023 19:44:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684291498; x=1686883498; 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=7t/Ch7tnJjB3lb1+DwlvX2xLzPzzO4Vh4D8+qEIF2DM=; b=SV8mJ/wzVqHvhOLHsIHZFbtyCxzt0c/AU5ALjZCQf9wSQFaKjogh7she2JQ8eGhqBT iFhog8YI9istMrfPwuD7eOPzYU6Ot7u00rWotnYhpOyv4/Sf0InG1y8LYBp2Da4J4vC9 AXIX/CO2BmERUf1vaToyiBdoXQLHdJnm98drClNsLdQNAHsw/W7rW8vnowcHnc9g5sW8 81hNWDiEhTBbCsADSR7qHHczMGRXXM1CVK9A+4zhP+L8dKyNTZISgFUIV+fYBs2OFogs 8hqc6Pj2Gtp8FZtMoRBvUuNrS+sbgPhiczfXkGuWSn7S6EsZx+b9mgeYfCl7pX41vj6g 4+pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684291498; x=1686883498; 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=7t/Ch7tnJjB3lb1+DwlvX2xLzPzzO4Vh4D8+qEIF2DM=; b=iw6da6VLtoREsunylwknaRIMm6IkQ9PTql/rpTPISOArPXBuZVitdN5VjqshGskEgH lf0icMr+i0evzKQ6B1Cl4hyPD6Y/dZqi4e3iWX/z2mcDD1JMmvl2//2KAeil6Nkr4AK0 l9SsVqPmt+Ogu25X8bhZaElxnKggOFCGVN8TkQ64ptTrlkgX29eA/TyCpVChHqTYgyeO n3gzsRdvcXMzjF2mRt373pguCATo1hEyd/v0kedhRI/PZ3g4wSr2dmgOQTp5m3FD119o lkLhq5voEWYrK/deuMcmHRC6WM6c4GYpd+I987PEt0nhvNauyjN0GydEy2Y/6b6ft0lW SYTQ== X-Gm-Message-State: AC+VfDw5LqPyKiYQlApzwuGoXM+0AfYP6gbJY1ZPA6FQTdWe+oHm9K4g 7qug5Qn+q/hhnQkPPJLJF6bRN7Ub2yWOrf80qjo= X-Google-Smtp-Source: ACHHUZ7vrO5nxDUP/Ml7bTaIUrp8wAyDK3vLe+WJep23CddceSHlQRFuOz9V4QwXmvKuI0R5UC/33A== X-Received: by 2002:a17:903:2804:b0:1a6:d2af:5a3f with SMTP id kp4-20020a170903280400b001a6d2af5a3fmr34094686plb.3.1684291497932; Tue, 16 May 2023 19:44:57 -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 bj11-20020a170902850b00b001a2135e7eabsm16282767plb.16.2023.05.16.19.44.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 19:44:57 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 07/13] python3targetconfig.bbclass: Extend PYTHONPATH instead of overwriting Date: Tue, 16 May 2023 16:44:30 -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 ; Wed, 17 May 2023 02:45:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181436 From: Johannes Schrimpf [YOCTO #15108] -- https://bugzilla.yoctoproject.org/show_bug.cgi?id=15108 Since the latest change, the PYTHONPATH is overwritten instead of extended. This leads to changed behavior and build errors of recipes where the PYTHONPATH is set before setup_target_config is run. Fixes: c9617c03bcee ("python3targetconfig.bbclass: use PYTHONPATH to point to the target config") Signed-off-by: Johannes Schrimpf [Luca: add Fixes: tag] Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 2442ab92f8610784d28d8d83056b643bd95b0b4e) Signed-off-by: Steve Sakoman --- meta/classes-recipe/python3targetconfig.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/python3targetconfig.bbclass b/meta/classes-recipe/python3targetconfig.bbclass index 22305fe176..08bc619398 100644 --- a/meta/classes-recipe/python3targetconfig.bbclass +++ b/meta/classes-recipe/python3targetconfig.bbclass @@ -12,7 +12,7 @@ DEPENDS:append = " ${EXTRA_PYTHON_DEPENDS}" setup_target_config() { export _PYTHON_SYSCONFIGDATA_NAME="_sysconfigdata" - export PYTHONPATH=${STAGING_LIBDIR}/python-sysconfigdata + export PYTHONPATH=${STAGING_LIBDIR}/python-sysconfigdata:$PYTHONPATH export PATH=${STAGING_EXECPREFIXDIR}/python-target-config/:$PATH } From patchwork Wed May 17 02:44:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24055 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 EFC40C7EE25 for ; Wed, 17 May 2023 02:45:06 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web10.40954.1684291500572848002 for ; Tue, 16 May 2023 19:45:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=gUJCNr1C; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-64ab2a37812so9921986b3a.1 for ; Tue, 16 May 2023 19:45:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684291500; x=1686883500; 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=podTh9mNjp3UKonfc6kQQvILP9/dqzLmxRLflnHqnL4=; b=gUJCNr1CrCiXNff0ixUB+rHrI5LW+xTauAjHWekn/l3lcxR0ro7WrXg58uNZlZvSUD 1U6HFaipjpLrqe8cBNYf4ActMwYoiTaGEmtzBG8xG8XKlSqirr3QW2GhZ3fTclSu3brK /IbwX+qAXWcMUfiu6giwLYe018uKzsgv6R4zjvMwI+B+QhJJHYxMTWsd3rz4200vvKiQ HvKnLB3XlwpwGsAb1qv6+fSw+jN6gwpjLydXjTWD8Q4dnixZw7Xo4L4xPJnkXgChsVC6 rWwkNvAVJ4UbLnEECV7oG2/iyp6cnXSNHzN+AoBgPId0PfvKtGDRFsj1z8Ixbs5UdMyj K7mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684291500; x=1686883500; 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=podTh9mNjp3UKonfc6kQQvILP9/dqzLmxRLflnHqnL4=; b=ZywEbqOZkMre+RyIkZT0+5lIOiPd+lHBBZU6U2AzGBilIppFpNTaOfrYgdwStC+W1j R439/BQRjcDMwbkakvstfaFOL7P8AVisQ3gc+QcHtc80Tyq/wkBgkxwa49yTHhcerAdT rJkJ3akTAZFXRuouE75cRg19eI0sx8XWG6S37p3HPWxbAylgRKB+oVgEIMCFzNZMf+8r PByXvSK9itONiTh8jUk7BH0anYBb2GBaeAkS6O7edxFGxprLrJuR0c/k7xDCg6T/W6xG BIucZA7WYlMHpMIvS2VV4DQdxm9x53gC3ACsiR9gD8vCLvotps5cV4E2ArgromYE2w2a THeQ== X-Gm-Message-State: AC+VfDyBlkyH0+GFYHMENaKupAsblGWMKJ8EvW56imSpHAVgf+JtVeM+ 0e6jSfI599awwZaeNUF/KKp6BRSD1V+vcpWNZzk= X-Google-Smtp-Source: ACHHUZ6m/HOJo0/A1zaVdwt0GG5GYDktJLq2JjCQNiMoloklPACNjFdtdVDUZJ76kLKbJGu7VoQ6jA== X-Received: by 2002:a17:902:b210:b0:1ac:5d9b:d971 with SMTP id t16-20020a170902b21000b001ac5d9bd971mr662371plr.34.1684291499699; Tue, 16 May 2023 19:44: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 bj11-20020a170902850b00b001a2135e7eabsm16282767plb.16.2023.05.16.19.44.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 19:44:59 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 08/13] package_manager/ipk: fix config path generation in _create_custom_config() Date: Tue, 16 May 2023 16:44:31 -1000 Message-Id: <116e2b1d0c75c6be333339812468550145915774.1684291329.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 17 May 2023 02:45:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181437 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 caca522fd6..e6f9c08e2b 100644 --- a/meta/lib/oe/package_manager/ipk/__init__.py +++ b/meta/lib/oe/package_manager/ipk/__init__.py @@ -247,7 +247,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 Wed May 17 02:44:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24053 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 DDDF9C77B75 for ; Wed, 17 May 2023 02:45:06 +0000 (UTC) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mx.groups.io with SMTP id smtpd.web11.40826.1684291502436156124 for ; Tue, 16 May 2023 19:45:02 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=hAeXiT2Q; spf=softfail (domain: sakoman.com, ip: 209.85.215.176, mailfrom: steve@sakoman.com) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-53202149ae2so106143a12.3 for ; Tue, 16 May 2023 19:45:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684291501; x=1686883501; 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=kokcE84cMNQ7/oMXsAHE8yZ01v/f/AZ6vON5RrtBkLw=; b=hAeXiT2QhwmU66E7rztS50AIg5KSptBCC9z2hmXMZjyHUbUkOONJdkGBAI4F4ekDg6 P6ISjJBY22XZxdzc3CRugc7WYF99OeCPgjU7TecZGHvEQYtApL7O3L5gyVN/qT6LpXel ruwuwHJMpeR2SsbZu7hfO4GLcHE68SZfjiM7BKRLZQixOtni6U/pSKTK1vTV1cOV0UW0 dMaDjtosswdosaVf7N7CUqxdNQLfkWIXYOrHfAicxZ3aCqESu1Dez1BKUt+AIzqyuPoP xQnzHY/DNdP8Mrc0ol3AvWOxu9ZdPiBMKZ3my+svADEb5H5fjUKh+Y3JU8KYYHh50i+o F79Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684291501; x=1686883501; 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=kokcE84cMNQ7/oMXsAHE8yZ01v/f/AZ6vON5RrtBkLw=; b=i01Wbd6ZVlRElhPIAhpadpmw7usj2TWg4Qid0JyR2hlscPTh+ihD3lkTeo6cYb3rBZ 9oaLkWQaonErSaGQk3ypUJHm864/dgpNGtfCCrWJRb/Qfzv7UvG9gewENmeNQTprm3Lh MSxREZGzW+vOYWiomDU+lG8Dpj+7UiTBY3ttbytJaUJosbeil7odyQeqPndfPPBA37vO wsw4jtyOCmh4hV+ZPJrGAec/yqP8hpg23PwyTSewx7yUEcASYXEu2eYdfIEJY6CleZ95 dpaFYHeeIHKYyJ1uN7XcC7iabtIyVFDWZr2yLjVi0czPVxn4hyV7o7rMaDQXtxzBVKbs xt+A== X-Gm-Message-State: AC+VfDyRum6bkRcSRCQTB89kLcyPkLWAZ/UNWjXxbklEFuOk81nVhAap 3md75S/Q96P8W5pucskrw4WBASUl9q3p2FWSVsY= X-Google-Smtp-Source: ACHHUZ6L6I8l1zn3E5pCucSJ2gDa2HHebQYAebBvIJmDjfqntYAYLqlR1IPgO5qsS0ba4d95fOdVdw== X-Received: by 2002:a17:902:bc45:b0:1ad:b857:148a with SMTP id t5-20020a170902bc4500b001adb857148amr23685171plz.15.1684291501363; Tue, 16 May 2023 19:45:01 -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 bj11-20020a170902850b00b001a2135e7eabsm16282767plb.16.2023.05.16.19.45.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 19:45:01 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 09/13] selftest/distrodata: clean up exception lists in recipe maintainers test Date: Tue, 16 May 2023 16:44:32 -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 ; Wed, 17 May 2023 02:45:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181438 From: Alexander Kanavin Specifically: - add missing maintainer.inc entries for initramfs-module-*, systemd-machine-units and target-sdk-provides-dummy and drop them from exception list. - remove rust from exception list for unbuildable-by-default recipes as it is now buildable. - add missing maintainer.inc entry for libx11-compose-data and cve-update-nvd2-native; as they are also unbuildable by default, they needs to be in exception list as well. Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit e9158b191c1cfc16f97abed6c05891aa84fe9463) Signed-off-by: Steve Sakoman --- meta/conf/distro/include/maintainers.inc | 7 +++++++ meta/lib/oeqa/selftest/cases/distrodata.py | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 94b0e8432e..b4ce618ca0 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -129,6 +129,7 @@ RECIPE_MAINTAINER:pn-cryptodev-tests = "Robert Yang " RECIPE_MAINTAINER:pn-cups = "Chen Qi " RECIPE_MAINTAINER:pn-curl = "Robert Joslyn " RECIPE_MAINTAINER:pn-cve-update-db-native = "Ross Burton " +RECIPE_MAINTAINER:pn-cve-update-nvd2-native = "Ross Burton " RECIPE_MAINTAINER:pn-cwautomacros = "Ross Burton " RECIPE_MAINTAINER:pn-db = "Unassigned " RECIPE_MAINTAINER:pn-dbus = "Chen Qi " @@ -278,6 +279,9 @@ RECIPE_MAINTAINER:pn-initramfs-live-install = "Anuj Mittal """ def is_exception(pkg): - exceptions = ["packagegroup-", "initramfs-", "systemd-machine-units", "target-sdk-provides-dummy"] + exceptions = ["packagegroup-",] for i in exceptions: if i in pkg: return True return False def is_maintainer_exception(entry): - exceptions = ["musl", "newlib", "linux-yocto", "linux-dummy", "mesa-gl", "libgfortran", - "cve-update-db-native", "rust"] + exceptions = ["musl", "newlib", "linux-yocto", "linux-dummy", "mesa-gl", "libgfortran", "libx11-compose-data", + "cve-update-db-native","cve-update-nvd2-native",] for i in exceptions: if i in entry: return True From patchwork Wed May 17 02:44:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24051 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 DBD82C7EE24 for ; Wed, 17 May 2023 02:45:06 +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.40828.1684291504042460661 for ; Tue, 16 May 2023 19:45:04 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=Qh1yRUwk; 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-1aaebed5bd6so2618825ad.1 for ; Tue, 16 May 2023 19:45:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684291503; x=1686883503; 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=Qh1yRUwkhaQs14L99Z0j73t7oVfbtydrzbPssstdOvReYamO4Sra200TVn0ohx0ku5 AvMa+7nPAxb5GwRAQuoKEk/H27obPDGSXd2dPDvSfsZqZ48zIweW2dZDwViHrf5J9o5r /JDdOaZdsvI2tjYRgYdt/YYNlbl1dBCEHeGkwnFwamaHwJsZvgHfnMxrLkk3bYaszjAU 2RIh9VPRoVcuaCQb3WRwSClJX4gIuAdjwPmVJ6X03pO9glbgy5keu2XvqWnyB0oT/KLX vfLOOclqQqCMAtP8UqBvgQcAQ1WmogAw+urIOsgHnUM62eo9F6AZPaOC/EiZY/E6jIVP 1Z+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684291503; x=1686883503; 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=AayEdE34Jlfv1rWEpLWJuP9gpuFC/GYvxCpuv89+xrE8qZIRUC0eOS5PsDJ0a66JzE PgL7NRXIPz4nfO82bJSxafyUEa02dnwvNyHUTs2iqy0irkB93aUL8oy3xpde5soNggfL KaPo0vrnBBehET03NmPra8k/ARDmOiPPtfBt1Dl5kk3LrrEYelMNMPsa56VoByLsUEgP q/Tkh4yCdkuUztdgCMK6QNTv6NThYEd2WxL46CzAmluSs/8LeeeQqpgpDMHWqI1VN139 D21p3nLoAAnxavqNF8aWq8tRRtjyioJc/PrxfTbPdXfM0Di4DMkuCHAUHw0vlDDf1xyc tU1Q== X-Gm-Message-State: AC+VfDw35f13zTks284Z1X92/B/9HbemohHQDY9s79PQhKMarXkcQ+mF H9HcZutxwey6slIvWNwS6hDDG7QLjgjDJh0KpPE= X-Google-Smtp-Source: ACHHUZ60uVSFgWkaAKbCvEJLYDoGqRG/MJ2cGfDjfoVeJIcabdzunv9GhE4yQet+55KhTByECXUnwQ== X-Received: by 2002:a17:903:246:b0:1ae:40ed:4b8 with SMTP id j6-20020a170903024600b001ae40ed04b8mr3318670plh.22.1684291503114; Tue, 16 May 2023 19:45:03 -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 bj11-20020a170902850b00b001a2135e7eabsm16282767plb.16.2023.05.16.19.45.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 19:45:02 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 10/13] dhcpcd: use git instead of tarballs Date: Tue, 16 May 2023 16:44:33 -1000 Message-Id: <6578d20898f68c0cc88eda7e0f56e6f5a557f17e.1684291329.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 17 May 2023 02:45:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181439 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 Wed May 17 02:44:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24052 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 F0E9AC7EE2D for ; Wed, 17 May 2023 02:45:06 +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.40945.1684291486106506245 for ; Tue, 16 May 2023 19:45:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=ZPgPgMLA; 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-1ae454844edso2757745ad.1 for ; Tue, 16 May 2023 19:45:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684291505; x=1686883505; 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=G3el6UnkDBDZ5Cw7CiAFOv+rg35Ycr+g9j2gv/CWbVc=; b=ZPgPgMLAQ7Y6uy3LRwk+MznvSQjRQj5yEqR10LB/tLCie9K+2gAqwRtJz93rrxuchG qUv2WUlJMvwZRY3PWTnGJzaItckDUWzknAZu78k3Ol3NF7LQga5I2X6eyJr+7FAF3h6j jLaLTpQCaFm2qwAL9O4LFSyfFJGDf6nVGvzD22DPp4Y4tmT+tcWQKq4SpTXjRDC9BGfq yQUAl9JBGNx7/b9A7beOl1blvkG9hRZxEyTx6MfmUtITo0a0WmaQLN58ElwDBswiKcDi TPNGEFKZak4HaqCdsBuWHJIfA7d3TepSECuzlOj767E0neLhSSHDwZspn9w5cB5vI7Ff Okbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684291505; x=1686883505; 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=G3el6UnkDBDZ5Cw7CiAFOv+rg35Ycr+g9j2gv/CWbVc=; b=EoY8rlFd4cJqsUVGNXKKO5LCseAB0gQD2cjMjtQNLM5xxKfwIezvCo1FzF+LBjZGyd XEGu8YU8sh+UUzt2l2t/hrytLxOD6qDrSKf9adX8/9Vx2y3l1Yy5Lb61izPkonIFKHWh 6mwisl+TUIJrA7TEPW9cDDDYmW/AHo8IdMKASWCx5OgryViAvpT2Dqr0HGqgetVBD2+5 fccWwclzdZPVSaueTOWj7luBi+AMMvuZTDhS3CEci9Y86ZhZY9h1Q9mCaVf29eviteh/ LaWcpJalquM7Blh01VKnoThOYxdsXma/G/RIEXhMPJZneCx4mx9v1hOPxBkswKnMHFhc TEqA== X-Gm-Message-State: AC+VfDwnwHnc5c3zyWAfH+Mr8xGUFL8zhCbtQqHRgkk3Pw0iB5Ofvktt XUeSWN1IycxVcSI+YFQMp64+cRZLCYqnSb87mrg= X-Google-Smtp-Source: ACHHUZ7/o9+BdMG949m2l4JsUkymhmlEMJWQ8xZ8KdFEQNoUmrgNtPULc9wftUTWEADCMrRcxTsBZg== X-Received: by 2002:a17:902:e802:b0:19d:297:f30b with SMTP id u2-20020a170902e80200b0019d0297f30bmr51084974plg.19.1684291504809; Tue, 16 May 2023 19:45:04 -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 bj11-20020a170902850b00b001a2135e7eabsm16282767plb.16.2023.05.16.19.45.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 19:45:04 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 11/13] perl: patch out build paths from native binaries Date: Tue, 16 May 2023 16:44:34 -1000 Message-Id: <8f47d5cb79758d5b2a296759bd4806f85f739b90.1684291329.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 17 May 2023 02:45:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181440 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 9ea0f850928b3e7d7a2eb280b8b3ed0c9f977cd6) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/perl/perl_5.36.0.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-devtools/perl/perl_5.36.0.bb b/meta/recipes-devtools/perl/perl_5.36.0.bb index 4d8a919d1e..b8dba00f18 100644 --- a/meta/recipes-devtools/perl/perl_5.36.0.bb +++ b/meta/recipes-devtools/perl/perl_5.36.0.bb @@ -109,6 +109,10 @@ do_configure:class-native() { -Ui_xlocale \ -Alddlflags=' ${LDFLAGS}' \ ${PACKAGECONFIG_CONFARGS} + + # This prevents leakage of build paths into perl-native binaries, which + # causes non-deterministic troubles when those paths no longer exist or aren't accessible. + sed -i -e "s,${STAGING_LIBDIR},/completelyboguspath,g" config.h } do_configure:append() { From patchwork Wed May 17 02:44:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24056 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 DAD55C77B75 for ; Wed, 17 May 2023 02:45:16 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web10.40954.1684291500572848002 for ; Tue, 16 May 2023 19:45:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=m7/2O/MX; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-64ab2a37812so9922401b3a.1 for ; Tue, 16 May 2023 19:45:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684291507; x=1686883507; 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=4rhjtlNH9mwgqABc/rI61JtERMdL3sxBIX00DnpQojE=; b=m7/2O/MX3aErZBHdiAEUTYWqwfx7miMpeGYkVY4YOCpLFG3t8G4x4o4xGTNe3z/rzr Z9neVAb1SdbOuCjVojDPuIsYDR8m1YsjBGX50z9ikhQ5AvJjCFK/ozBwoBhAhMlQciM5 1nHkVfeihRCSyZgL+E5l1zRm/Y6PI2iEBe5EZYMI1bx1XIrArz+C1EJt4zyHwCnWC5R5 yMJi1Xe3xRpbvFfgYO0UBWTwaxfKzi6Pg/ui0tpt/7tLnSn+vHMaAsW+z+Ya7FksO6ir 6x0dYsmMac2Q0YDvdSv0EyGJ2kFMrprox9IRdZY902NXKSMHvC2WPAD88wvcestceynb IX5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684291507; x=1686883507; 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=4rhjtlNH9mwgqABc/rI61JtERMdL3sxBIX00DnpQojE=; b=OeF9rGAEZesu48jifzAgv1diPDoX+tpvjKfbJlxHDlucpmsKZnorTb1zVUnY8z0Mtw 7H6XE6QbwIuSkfGXTUk4MR1AF7nwvJGip87RtC5MsgtyYvaD1gseK9gQpa2Ky8zdy4Br CfweFsQswpSQ5Cizb4CdZTVhay0la5K0CElUKOmhnVpwLr+Ew+t2DAP/m6jkUF/1V455 ID4YpL2TDbfwkTsov03GN9bmyYpTvjTGW2wiGa1lfJegGhmcasuRPfLkBdQm8QYNVF+A IjrRsY8wfa9YgL5E3kwJ85AHyDYRGDCTkpzl+QsLPKP1ZfQJsIsK5pc3eKqm/g9KwOzy 7hbg== X-Gm-Message-State: AC+VfDx7PEmve2TosHNQje/PIfjkFmflszuqDfpzRngPML1hK2509Rmu GSDpRlp75kCOwR5hN66mBZw9SgV2fNmiGaSV684= X-Google-Smtp-Source: ACHHUZ73v/3zQM9EzwrT2IPUEg0k16qAm6n7OHLjNaHJpmPaxLPzSdmdSJ+bHO7f2dp5nZvsHQb+Qg== X-Received: by 2002:a17:902:b210:b0:1ac:5d9b:d971 with SMTP id t16-20020a170902b21000b001ac5d9bd971mr662599plr.34.1684291506640; Tue, 16 May 2023 19:45:06 -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 bj11-20020a170902850b00b001a2135e7eabsm16282767plb.16.2023.05.16.19.45.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 19:45:06 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 12/13] license.bbclass: Include LICENSE in the output when it fails to parse Date: Tue, 16 May 2023 16:44:35 -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 ; Wed, 17 May 2023 02:45:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181441 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-global/license.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-global/license.bbclass b/meta/classes-global/license.bbclass index 560acb8b6f..23625f0104 100644 --- a/meta/classes-global/license.bbclass +++ b/meta/classes-global/license.bbclass @@ -229,7 +229,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 Wed May 17 02:44:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24057 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 DB476C7EE24 for ; Wed, 17 May 2023 02:45:16 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web10.40958.1684291509409601980 for ; Tue, 16 May 2023 19:45:09 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=tY2iSqLh; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-24decf5cc03so279725a91.0 for ; Tue, 16 May 2023 19:45:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684291508; x=1686883508; 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=8QMIDGLvMHCY8vKbt7t6rvYRbt7NpfQWZ+e7VBGBcnQ=; b=tY2iSqLhX/fWEErXMxbMNo7BkeYQMhPIY77+vDCDTJBi4NW4iWhw9nIPKnpXJev6B0 oI7ouDnOhKl7JUuxaeTQ4RPLDIpPFhaOwcd0qqOEie/tQFlJZhpRSrkSfNyL180J/zyI SJ9g1Vv+Gi/gdeDzVYa3qc68KrIeT4bMsEiLRJ8no6Dz9R+HQv27pYsqRNyh5pm+SlMH vXqUOw8PoJ4ERO/KvU8u7RLpVhxcCf7C2X2zWctYrVPCpnkd+LZDGsmK5ZhSFHD6JTdo tOfdm61ZF+7ATf57J11p98rm+RctDtm2izupW0GQCOUqTZR4KV06Iq92Yn3QgRbTe1vs npmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684291508; x=1686883508; 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=8QMIDGLvMHCY8vKbt7t6rvYRbt7NpfQWZ+e7VBGBcnQ=; b=RlFhJdxT4HFBlJYkKg9HiFSeJ+g/cT+MCSik9AIvT79JmEMwmD+P0ddhkGrhPYNIrX vs+bQVEzQa1cdx9gxHHbPMLobNliBgIN0nhErUrMnbH/st/92EIhH2qDRE9uVCejLjDE K0brgla6fB6ozMUhGl1xAGwbli2NBHTQLf2xK/I5LSGFWqvgFGlRjDjK1OARmYC8t9qY 9al2UuNmbTHdIgk0SCFvFE67dzweHKvnLVoYJKw6usHPuZC2K6HcnD+mqj4Jnm9nM1gX FhwP2O7228ga89LxwqHbeOYXx4owi1Fx3ABxu8fcvW/VzqGgaRORqlJ1cdeohz1HbWkR O6dQ== X-Gm-Message-State: AC+VfDwcVMNuX9XHBdAt4r5kqKq2rYPy6WYmlxzzIuXj6nuiLrvZHr7p R/ilOccxJPOFcVMoXgfUNo7JI3NgR0Fh1pRWzhc= X-Google-Smtp-Source: ACHHUZ4KRJIDr3kDrrQb/RL0pMhpehrZaBz3q6BMiJUO4heTw9nJmVBFEhvu2TL3P5s6xQk//QfLhQ== X-Received: by 2002:a17:902:a612:b0:1ae:4a0b:5957 with SMTP id u18-20020a170902a61200b001ae4a0b5957mr2482155plq.54.1684291508560; Tue, 16 May 2023 19:45:08 -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 bj11-20020a170902850b00b001a2135e7eabsm16282767plb.16.2023.05.16.19.45.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 19:45:08 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 13/13] weston: add xwayland to DEPENDS for PACKAGECONFIG xwayland Date: Tue, 16 May 2023 16:44:36 -1000 Message-Id: <20cd64812d286c920bd766145ab1cd968e72667e.1684291329.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 17 May 2023 02:45:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181442 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_11.0.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/wayland/weston_11.0.1.bb b/meta/recipes-graphics/wayland/weston_11.0.1.bb index 2daecc9856..4f6ce19915 100644 --- a/meta/recipes-graphics/wayland/weston_11.0.1.bb +++ b/meta/recipes-graphics/wayland/weston_11.0.1.bb @@ -73,7 +73,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] = "-Ddeprecated-color-management-colord=true,-Ddeprecated-color-management-colord=false,colord" # Clients support