Skip to contentSkip to conversation

Patch review

PATCH New Steve Sakoman 1 participant 14 messages May 17, 2023

lore
Share & tools
lore
#0 lore raw

cover Patch review

Please review this set of changes for mickledore and have comments back by end of day Thursday.

Passed a-full on autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/5305

The following changes since commit 2c5af07819b4a555737da9f07aa5236579300027:

machine/qemuarm*: don't explicitly set vmalloc (2023-05-12 05:31:11 -1000)

are available in the Git repository at:

https://git.openembedded.org/openembedded-core-contrib stable/mickledore-nut
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/mickledore-nut

Alexander Kanavin (3):
selftest/distrodata: clean up exception lists in recipe maintainers
test
dhcpcd: use git instead of tarballs
perl: patch out build paths from native binaries

Enrico Jörns (1):
package_manager/ipk: fix config path generation in
_create_custom_config()

Joe Slater (1):
ghostscript: fix CVE-2023-28879

Johannes Schrimpf (1):
python3targetconfig.bbclass: Extend PYTHONPATH instead of overwriting

Khem Raj (1):
quilt: Fix merge.test race condition

Markus Volk (1):
gtk4: update 4.10.0 -> 4.10.3

Ming Liu (1):
weston: add xwayland to DEPENDS for PACKAGECONFIG xwayland

Peter Kjellerstedt (1):
license.bbclass: Include LICENSE in the output when it fails to parse

Richard Purdie (1):
recipes: Default to https git protocol where possible

Virendra Thakur (1):
qemu: Whitelist CVE-2023-0664

hen Qi (1):
unfs3: fix symlink time setting issue

 meta/classes-global/license.bbclass           |  2 +-
 .../python3targetconfig.bbclass               |  2 +-
 meta/conf/distro/include/maintainers.inc      |  7 ++
 meta/lib/oe/package_manager/ipk/__init__.py   |  2 +-
 meta/lib/oeqa/selftest/cases/distrodata.py    |  6 +-
 meta/lib/oeqa/selftest/cases/fetch.py         |  2 +
 meta/lib/oeqa/selftest/cases/recipetool.py    |  8 +-
 .../dhcpcd/dhcpcd_9.4.1.bb                    |  7 +-
 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 +-
 .../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 +-
 .../update-rc.d/update-rc.d_0.8.bb            |  2 +-
 .../binutils/binutils-2.40.inc                |  2 +-
 .../btrfs-tools/btrfs-tools_6.1.3.bb          |  2 +-
 meta/recipes-devtools/e2fsprogs/e2fsprogs.inc |  2 +-
 .../erofs-utils/erofs-utils_1.5.bb            |  2 +-
 meta/recipes-devtools/mmc/mmc-utils_git.bb    |  2 +-
 meta/recipes-devtools/perl/perl_5.36.0.bb     |  4 +
 meta/recipes-devtools/pseudo/pseudo_git.bb    |  2 +-
 meta/recipes-devtools/qemu/qemu.inc           |  5 ++
 meta/recipes-devtools/quilt/quilt.inc         |  1 +
 ...t-Fix-a-race-condition-in-merge.test.patch | 48 ++++++++++
 .../0001-attr-fix-utime-for-symlink.patch     | 88 +++++++++++++++++++
 meta/recipes-devtools/unfs3/unfs3_git.bb      |  1 +
 meta/recipes-extended/bzip2/bzip2_1.0.8.bb    |  2 +-
 .../ghostscript/cve-2023-28879.patch          | 60 +++++++++++++
 .../ghostscript/ghostscript_10.0.0.bb         |  1 +
 .../gtk+/{gtk4_4.10.0.bb => gtk4_4.10.3.bb}   |  2 +-
 .../libfakekey/libfakekey_git.bb              |  2 +-
 .../libmatchbox/libmatchbox_1.12.bb           |  2 +-
 .../matchbox-wm/matchbox-wm_1.2.3.bb          |  2 +-
 .../recipes-graphics/wayland/weston_11.0.1.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 +-
 .../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 +-
 .../linux/linux-yocto-rt_5.15.bb              |  4 +-
 .../linux/linux-yocto-rt_6.1.bb               |  4 +-
 .../linux/linux-yocto-tiny_5.15.bb            |  4 +-
 .../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 +-
 .../recipes-kernel/lttng/babeltrace2_2.0.4.bb |  2 +-
 .../recipes-kernel/lttng/babeltrace_1.5.11.bb |  2 +-
 .../lttng/lttng-modules_2.13.9.bb             |  2 +-
 .../systemtap/systemtap_git.inc               |  2 +-
 meta/recipes-rt/rt-tests/rt-tests.inc         |  2 +-
 .../matchbox-config-gtk_0.2.bb                |  2 +-
 .../matchbox-desktop/matchbox-desktop_2.3.bb  |  2 +-
 .../matchbox-keyboard_0.1.1.bb                |  2 +-
 .../matchbox-panel-2/matchbox-panel-2_2.12.bb |  2 +-
 .../matchbox-terminal_0.2.bb                  |  2 +-
 .../matchbox-theme-sato_0.2.bb                |  2 +-
 meta/recipes-sato/puzzles/puzzles_git.bb      |  2 +-
 .../sato-screenshot/sato-screenshot_0.3.bb    |  2 +-
 .../settings-daemon/settings-daemon_0.0.2.bb  |  2 +-
 .../dos2unix/dos2unix_7.4.4.bb                |  2 +-
 .../gnome-desktop-testing_2021.1.bb           |  2 +-
 .../ptest-runner/ptest-runner_2.4.2.bb        |  2 +-
 65 files changed, 286 insertions(+), 70 deletions(-)
 create mode 100644 meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch
 create mode 100644 meta/recipes-devtools/unfs3/unfs3/0001-attr-fix-utime-for-symlink.patch
 create mode 100644 meta/recipes-extended/ghostscript/ghostscript/cve-2023-28879.patch
 rename meta/recipes-gnome/gtk+/{gtk4_4.10.0.bb => gtk4_4.10.3.bb} (98%)
Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/13 ghostscript: fix CVE-2023-28879

From: Joe Slater <[email protected]>

Backport from tag ghostpdl-10.01.1-gse-10174 which is after 10.01.1.

(cherry picked from commit 8a70d6935afa38173dbf012b8e1c3d59228504df)
---
 .../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
meta/recipes-extended/ghostscript/ghostscript/cve-2023-28879.patch new file +60 -0
new file mode 100644
index 0000000000..604b927521
@@ -0,0 +1,60 @@
+From 37ed5022cecd584de868933b5b60da2e995b3179 Mon Sep 17 00:00:00 2001
+From: Ken Sharp <[email protected]>
+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 <[email protected].
+
+---
+ base/sbcp.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/base/sbcp.c b/base/sbcp.c
+index 979ae0992..47fc233ec 100644
+--- a/base/sbcp.c
++++ b/base/sbcp.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2001-2021 Artifex Software, Inc.
++/* Copyright (C) 2001-2023 Artifex Software, Inc.
+    All Rights Reserved.
+ 
+    This software is provided AS-IS with no warranty, either express or
+@@ -50,6 +50,14 @@ s_xBCPE_process(stream_state * st, stream_cursor_read * pr,
+         byte ch = *++p;
+ 
+         if (ch <= 31 && escaped[ch]) {
++            /* Make sure we have space to store two characters in the write buffer,
++             * if we don't then exit without consuming the input character, we'll process
++             * that on the next time round.
++             */
++            if (pw->limit - q < 2) {
++                p--;
++                break;
++            }
+             if (p == rlimit) {
+                 p--;
+                 break;
+-- 
+2.25.1
+
meta/recipes-extended/ghostscript/ghostscript_10.0.0.bb +1 -0
index 56a93632e2..86ecdbe24a 100644
@@ -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} \
Signature · 1 line
2.34.1
#3 lore raw

PATCH 3/13 gtk4: update 4.10.0 -> 4.10.3

In reply to Steve Sakoman

From: Markus Volk <[email protected]>

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

(cherry picked from commit 0f07445de85c71926e0901d051d330f29a8486d6)
---
 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%)
meta/recipes-gnome/gtk+/gtk4_4.10.3.bb renamed from meta/recipes-gnome/gtk+/gtk4_4.10.0.bb +1 -1
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
@@ -37,7 +37,7 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 UPSTREAM_CHECK_REGEX = "gtk-(?P<pver>\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}"
 
Signature · 1 line
2.34.1
#4 lore raw

PATCH 4/13 recipes: Default to https git protocol where possible

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

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.

(cherry picked from commit 139102a73d4151f4748b4a861bd4ab28dda7dab7)
---
 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(-)
meta/lib/oeqa/selftest/cases/fetch.py +2 -0
index 3d01cf69f2..c9107022c8 100644
@@ -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
meta/lib/oeqa/selftest/cases/recipetool.py +4 -4
index b193f0f5c8..a5c0f7164a 100644
@@ -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):
meta/recipes-connectivity/neard/neard_0.18.bb +1 -1
index 23e999acc4..dbd6e3841a 100644
@@ -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 \
meta/recipes-core/dbus-wait/dbus-wait_git.bb +1 -1
index f2eb8b1874..bc846de216 100644
@@ -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"
meta/recipes-core/glibc/glibc-version.inc +1 -1
index 1b8665a9d8..37bb9fd34f 100644
@@ -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<pver>\d+\.\d+(\.(?!90)\d+)*)"
meta/recipes-core/images/build-appliance-image_15.0.0.bb +1 -1
index a5d7617cda..b73e5f1fb4 100644
@@ -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 \
meta/recipes-core/musl/libc-test_git.bb +1 -1
index b5bfc6e34c..6d64592f0c 100644
@@ -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 \
 "
 
meta/recipes-core/musl/musl_git.bb +1 -1
index 39f6dd8219..3b0dd53c73 100644
@@ -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 \
           "
meta/recipes-core/psplash/psplash_git.bb +1 -1
index 9532ed1534..aecbd2ce46 100644
@@ -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 \
meta/recipes-core/update-rc.d/update-rc.d_0.8.bb +1 -1
index ee49198429..043cb3f13e 100644
@@ -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"
meta/recipes-devtools/binutils/binutils-2.40.inc +1 -1
index 93631ca3d7..46de8e3ea9 100644
@@ -19,7 +19,7 @@ SRCBRANCH ?= "binutils-2_40-branch"
 UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\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 \
meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.3.bb +1 -1
index b4dfc5b3f3..05e84defba 100644
@@ -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 \
            "
meta/recipes-devtools/e2fsprogs/e2fsprogs.inc +1 -1
index f41a5d0b4e..d345b91472 100644
@@ -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
meta/recipes-devtools/erofs-utils/erofs-utils_1.5.bb +1 -1
index 6ce5843570..2b5861882d 100644
@@ -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 \
meta/recipes-devtools/mmc/mmc-utils_git.bb +1 -1
index 8c41b77fe1..1e2e17bfd3 100644
@@ -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"
meta/recipes-devtools/pseudo/pseudo_git.bb +1 -1
index 7c3231186c..c3c4bb0ed9 100644
@@ -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 \
meta/recipes-extended/bzip2/bzip2_1.0.8.bb +1 -1
index 78138d1543..4e3a06f240 100644
@@ -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 \
meta/recipes-graphics/libfakekey/libfakekey_git.bb +1 -1
index 5d94be52b4..c9c828a8c4 100644
@@ -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"
 
meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb +1 -1
index b01b332a55..bf3f5c005d 100644
@@ -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"
 
meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.3.bb +1 -1
index 8e9de0914e..880d4ed666 100644
@@ -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"
meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb +1 -1
index 09fbc9b798..b65a3bea56 100644
@@ -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"
meta/recipes-kernel/blktrace/blktrace_git.bb +1 -1
index bba5e04504..d0eeba3208 100644
@@ -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"
 
meta/recipes-kernel/dtc/dtc_1.7.0.bb +1 -1
index 4ab8451c60..1a78a0c079 100644
@@ -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<pver>\d+(\.\d+)+)"
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +1 -1
index 12f1cf516e..388d8feebc 100644
@@ -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() {
meta/recipes-kernel/kmod/kmod_30.bb +1 -1
index ff6e20554b..6fc9da9c82 100644
@@ -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 \
            "
meta/recipes-kernel/linux/linux-yocto-dev.bb +2 -2
index 52cd6f5f28..3a1595521e 100644
@@ -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
meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +2 -2
index 29379791f4..475fe34066 100644
@@ -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"
 
meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +2 -2
index 4aaa371d97..20d2729371 100644
@@ -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"
 
meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +2 -2
index c19c289b97..365d01db78 100644
@@ -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)$"
 
meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +2 -2
index 5046759061..47d77404d0 100644
@@ -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)$"
 
meta/recipes-kernel/linux/linux-yocto_5.15.bb +2 -2
index 785944c3cf..54c8e12644 100644
@@ -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"
meta/recipes-kernel/linux/linux-yocto_6.1.bb +2 -2
index c2b0e66fb8..36f7ed8791 100644
@@ -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"
meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb +1 -1
index 04c2a27904..16d8b945a4 100644
@@ -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 \
meta/recipes-kernel/lttng/babeltrace_1.5.11.bb +1 -1
index 194a773a24..f4d9b5e42a 100644
@@ -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"
meta/recipes-kernel/lttng/lttng-modules_2.13.9.bb +1 -1
index 5197bf578f..8500f168ff 100644
@@ -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"
meta/recipes-kernel/systemtap/systemtap_git.inc +1 -1
index d309a89496..afeb3ce2d2 100644
@@ -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 \
meta/recipes-rt/rt-tests/rt-tests.inc +1 -1
index 0481bf6028..527e14ad54 100644
@@ -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"
meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb +1 -1
index d870ab211b..490bd582b2 100644
@@ -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<pver>(\d+(\.\d+)+))"
 PV = "0.2+git${SRCPV}"
meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.3.bb +1 -1
index 9d3a2eca33..3777f05b5a 100644
@@ -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/ \
            "
 
meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb +1 -1
index b1724675ba..6b70948f16 100644
@@ -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"
 
meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb +1 -1
index 29a1a36e12..b71d1e5cd9 100644
@@ -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 \
            "
 
meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb +1 -1
index c45c2d170e..a1f236b40f 100644
@@ -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<pver>(\d+(\.\d+)+))"
 PV = "0.2+git${SRCPV}"
 
meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb +1 -1
index bc4024736f..c60a11c3c0 100644
@@ -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<pver>(\d+(\.\d+)+))"
 
 S = "${WORKDIR}/git"
meta/recipes-sato/puzzles/puzzles_git.bb +1 -1
index 87b6fac024..4b04588682 100644
@@ -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"
meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb +1 -1
index eea7025c8d..de4ab82484 100644
@@ -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<pver>(\d+(\.\d+)+))"
 
 S = "${WORKDIR}/git"
meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb +1 -1
index 4356930da0..4bdbefcb75 100644
@@ -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 \
            "
meta/recipes-support/dos2unix/dos2unix_7.4.4.bb +1 -1
index d8ebeb6402..506faf5a6d 100644
@@ -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<pver>(\d+(\.\d+)+))"
 
 SRCREV = "b56a58584d3fef0720425ae154c2a4d80e6af6c5"
meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb +1 -1
index 0cc7cd7b67..1173dd4af3 100644
@@ -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"
meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb +1 -1
index ee13e28c7d..ff5629c6f9 100644
@@ -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"
Signature · 1 line
2.34.1
#5 lore raw

PATCH 5/13 unfs3: fix symlink time setting issue

In reply to Steve Sakoman

From: hen Qi <[email protected]>

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.

(cherry picked from commit fe35a2c11ba6f87735bccae244817016f9c1b5db)
---
 .../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
meta/recipes-devtools/unfs3/unfs3/0001-attr-fix-utime-for-symlink.patch new file +88 -0
new file mode 100644
index 0000000000..a0f3740d6a
@@ -0,0 +1,88 @@
+From 7e789895919d57d573ebb8faa147d1286104cd01 Mon Sep 17 00:00:00 2001
+From: Rui Wang <[email protected]>
+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 <[email protected]>
+---
+ 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
+
meta/recipes-devtools/unfs3/unfs3_git.bb +1 -0
index 9913a503e8..c5b7898b3c 100644
@@ -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<pver>\d+(\.\d+)+)"
Signature · 1 line
2.34.1
#2 lore raw

PATCH 2/13 qemu: Whitelist CVE-2023-0664

In reply to Steve Sakoman

From: Virendra Thakur <[email protected]>

This CVE is related to Windows.

(cherry picked from commit d5ce88c15183c2bf887543c8c31e9c31aaa56a1a)
---
 meta/recipes-devtools/qemu/qemu.inc | 5 +++++
 1 file changed, 5 insertions(+)
meta/recipes-devtools/qemu/qemu.inc +5 -0
index 29bc34d743..4c9be91cb0 100644
@@ -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"
Signature · 1 line
2.34.1
#6 lore raw

PATCH 6/13 quilt: Fix merge.test race condition

In reply to Steve Sakoman

From: Khem Raj <[email protected]>

This is consistently seen with musl and grep from busybox Therefore backport a patch from upstream to fix it

(cherry picked from commit 511bcd965af658e6bb0c61d9f2adb1af75af773b)
---
 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
meta/recipes-devtools/quilt/quilt.inc +1 -0
index c93c38b83c..3374f4dfbf 100644
@@ -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"
meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch new file +48 -0

48 lines not on this page · raw message

Signature · 1 line
2.34.1
#8 lore raw

PATCH 8/13 package_manager/ipk: fix config path generation in _create_custom_config()

In reply to Steve Sakoman

From: Enrico Jörns <[email protected]>

"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.

(cherry picked from commit 8414c504138f6de663f5130c6b4a6ede5605d88b)
---
 meta/lib/oe/package_manager/ipk/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/package_manager/ipk/__init__.py +1 -1
index caca522fd6..e6f9c08e2b 100644
@@ -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)
Signature · 1 line
2.34.1
#9 lore raw

PATCH 9/13 selftest/distrodata: clean up exception lists in recipe maintainers test

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

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.

(cherry picked from commit e9158b191c1cfc16f97abed6c05891aa84fe9463)
---
 meta/conf/distro/include/maintainers.inc   | 7 +++++++
 meta/lib/oeqa/selftest/cases/distrodata.py | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)
meta/conf/distro/include/maintainers.inc +7 -0
index 94b0e8432e..b4ce618ca0 100644
@@ -129,6 +129,7 @@ RECIPE_MAINTAINER:pn-cryptodev-tests = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER:pn-cups = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER:pn-curl = "Robert Joslyn <[email protected]>"
 RECIPE_MAINTAINER:pn-cve-update-db-native = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER:pn-cve-update-nvd2-native = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER:pn-cwautomacros = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER:pn-db = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER:pn-dbus = "Chen Qi <[email protected]>"
@@ -278,6 +279,9 @@ RECIPE_MAINTAINER:pn-initramfs-live-install = "Anuj Mittal <[email protected]
 RECIPE_MAINTAINER:pn-initramfs-live-install-efi = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER:pn-initramfs-live-install-efi-testfs = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER:pn-initramfs-live-install-testfs = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-initramfs-module-install = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-initramfs-module-install-efi = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-initramfs-module-setup-live = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER:pn-initscripts = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER:pn-intltool = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER:pn-iproute2 = "Changhyeok Bae <[email protected]>"
@@ -419,6 +423,7 @@ RECIPE_MAINTAINER:pn-libvorbis = "Zang Ruochen <[email protected]>"
 RECIPE_MAINTAINER:pn-libwebp = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER:pn-libwpe = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER:pn-libx11 = "Unassigned <[email protected]>"
+RECIPE_MAINTAINER:pn-libx11-compose-data = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER:pn-libxau = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER:pn-libxcb = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER:pn-libxcvt = "Oleksandr Kravchuk <[email protected]>"
@@ -774,6 +779,7 @@ RECIPE_MAINTAINER:pn-systemd-bootchart = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER:pn-systemd-bootconf = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER:pn-systemd-conf = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER:pn-systemd-compat-units = "Chen Qi <[email protected]>"
+RECIPE_MAINTAINER:pn-systemd-machine-units = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER:pn-systemd-serialgetty = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER:pn-systemd-systemctl-native = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER:pn-systemtap = "Victor Kamensky <[email protected]>"
@@ -783,6 +789,7 @@ RECIPE_MAINTAINER:pn-sysvinit = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER:pn-sysvinit-inittab = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER:pn-taglib = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER:pn-tar = "Chen Qi <[email protected]>"
+RECIPE_MAINTAINER:pn-target-sdk-provides-dummy = "Richard Purdie <[email protected]>"
 RECIPE_MAINTAINER:pn-tcf-agent = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER:pn-tcl = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER:pn-tcp-wrappers = "Robert Yang <[email protected]>"
meta/lib/oeqa/selftest/cases/distrodata.py +3 -3
index b5554a6c3c..c83a3a7bd6 100644
@@ -84,15 +84,15 @@ The following recipes do not have a DESCRIPTION. Please add an entry for DESCRIP
         Author:      Alexander Kanavin <[email protected]>
         """
         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
Signature · 1 line
2.34.1
#10 lore raw

PATCH 10/13 dhcpcd: use git instead of tarballs

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

As announced here:
https://roy.marples.name/downloads/dhcpcd/

(cherry picked from commit 6e317eaab45da2dea70d1485fdae93cfeea0db1d)
---
 meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb +3 -4
index 579fa95df7..21b2eebbd8 100644
@@ -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
 
Signature · 1 line
2.34.1
#11 lore raw

PATCH 11/13 perl: patch out build paths from native binaries

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

(cherry picked from commit 9ea0f850928b3e7d7a2eb280b8b3ed0c9f977cd6)
---
 meta/recipes-devtools/perl/perl_5.36.0.bb | 4 ++++
 1 file changed, 4 insertions(+)
meta/recipes-devtools/perl/perl_5.36.0.bb +4 -0
index 4d8a919d1e..b8dba00f18 100644
@@ -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() {
Signature · 1 line
2.34.1
#7 lore raw

PATCH 7/13 python3targetconfig.bbclass: Extend PYTHONPATH instead of overwriting

In reply to Steve Sakoman

From: Johannes Schrimpf <[email protected]>

[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")
[Luca: add Fixes: tag]
(cherry picked from commit 2442ab92f8610784d28d8d83056b643bd95b0b4e)
---
 meta/classes-recipe/python3targetconfig.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes-recipe/python3targetconfig.bbclass +1 -1
index 22305fe176..08bc619398 100644
@@ -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
 }
 
Signature · 1 line
2.34.1
#12 lore raw

PATCH 12/13 license.bbclass: Include LICENSE in the output when it fails to parse

In reply to Steve Sakoman

From: Peter Kjellerstedt <[email protected]>

(cherry picked from commit 1a5197760da3890cc80ac7da8d589766612d9051)
---
 meta/classes-global/license.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes-global/license.bbclass +1 -1
index 560acb8b6f..23625f0104 100644
@@ -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()):
Signature · 1 line
2.34.1
#13 lore raw

PATCH 13/13 weston: add xwayland to DEPENDS for PACKAGECONFIG xwayland

In reply to Steve Sakoman

From: Ming Liu <[email protected]>

Otherwise xwayland.pc would not be present in sysroot, this leads to some xwayland configs missing like have_listenfd, have_glamor.

(cherry picked from commit 7f1932cb5a408320a5b542e20ba2807718349e8f)
---
 meta/recipes-graphics/wayland/weston_11.0.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/wayland/weston_11.0.1.bb +1 -1
index 2daecc9856..4f6ce19915 100644
@@ -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
Signature · 1 line
2.34.1