mirror of
https://git.yoctoproject.org/poky
synced 2026-04-07 14:02:22 +02:00
meson: update 0.57.1 -> 0.57.2
(From OE-Core rev: 85345697c6e492598c882eb452b999b8a05f97a9) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
25fdd28161
commit
ec0e1d4fb9
@@ -14,20 +14,15 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
|
||||
file://disable-rpath-handling.patch \
|
||||
file://cross-prop-default.patch \
|
||||
file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
|
||||
file://0001-minstall-Correctly-set-uid-gid-of-installed-files.patch \
|
||||
file://gi-target-dep.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "72e1c782ba9bda204f4a1ed57f98d027d7b6eb9414c723eebbd6ec7f1955c8a6"
|
||||
SRC_URI[sha256sum] = "3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5"
|
||||
|
||||
SRC_URI_append_class-native = " \
|
||||
file://0001-Make-CPU-family-warnings-fatal.patch \
|
||||
file://0002-Support-building-allarch-recipes-again.patch \
|
||||
"
|
||||
|
||||
# remove at next version upgrade or when output changes
|
||||
PR = "r1"
|
||||
HASHEQUIV_HASH_VERSION .= ".1"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
|
||||
UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 76934bcbf2cfa7304e8864e28c51f58adda0392f Mon Sep 17 00:00:00 2001
|
||||
From 198e2de24adf5845e3ba389b533cf43440ee8acb Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Tue, 3 Jul 2018 13:59:09 +0100
|
||||
Subject: [PATCH] Make CPU family warnings fatal
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
From 3f6f4964dc79ae986f44afe1687922381f237edd Mon Sep 17 00:00:00 2001
|
||||
From: Peter Kjellerstedt <pkj@axis.com>
|
||||
Date: Wed, 3 Mar 2021 12:47:28 +0100
|
||||
Subject: [PATCH] minstall: Correctly set uid/gid of installed files
|
||||
|
||||
In commit caab4d3d, the uid and gid arguments passed to os.chown() by
|
||||
set_chown() were accidentally swapped, causing files to end up with
|
||||
incorrect owner/group if the owner and group are not the same.
|
||||
|
||||
Upstream-Status: Backport [https://github.com/mesonbuild/meson/commit/6226ac26ef63335bfb817db02b3f295c78214a82]
|
||||
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
|
||||
---
|
||||
mesonbuild/minstall.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
|
||||
index 785ff5869..07da408aa 100644
|
||||
--- a/mesonbuild/minstall.py
|
||||
+++ b/mesonbuild/minstall.py
|
||||
@@ -148,7 +148,7 @@ def set_chown(path: str, user: T.Optional[str] = None, group: T.Optional[str] =
|
||||
Use a real function rather than a lambda to help mypy out. Also real
|
||||
functions are faster.
|
||||
"""
|
||||
- real_os_chown(path, gid, uid, dir_fd=dir_fd, follow_symlinks=follow_symlinks)
|
||||
+ real_os_chown(path, uid, gid, dir_fd=dir_fd, follow_symlinks=follow_symlinks)
|
||||
|
||||
try:
|
||||
os.chown = chown
|
||||
@@ -1,4 +1,4 @@
|
||||
From 6efb6114836fd4a1e012aa03b37f3beeeb22b466 Mon Sep 17 00:00:00 2001
|
||||
From ac1021a3abf612e8be9b19eecb97062e0c314701 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Kjellerstedt <pkj@axis.com>
|
||||
Date: Thu, 26 Jul 2018 16:32:49 +0200
|
||||
Subject: [PATCH] Support building allarch recipes again
|
||||
|
||||
Reference in New Issue
Block a user