diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2024-03-07 20:16:36 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2024-03-08 14:31:06 +0300 |
| commit | b58112e5af484d9314f6a4487b1bc8b292f952ef (patch) | |
| tree | d45e1f67b4c5a28e336b3cc9943934d41c902cd6 /poky/meta/recipes-core | |
| parent | 79cfa849badfe790acf152757b015db22c0e9800 (diff) | |
| download | openbmc-b58112e5af484d9314f6a4487b1bc8b292f952ef.tar.xz | |
subtree updates
meta-raspberrypi: 95a9103f91..92a9b7a012:
Michał Kluska (1):
rpi-base: Added missing HiFiBerry
meta-openembedded: 9f0e513211..a0237019f5:
Alexander Stein (1):
libkcapi: Update HOMEPAGE url
Changqing Li (4):
syslog-ng: upgrade 4.0.1 -> 4.6.0
multipath-tools: upgrade 0.9.3 -> 0.9.8
nodejs: upgrade 20.11.0 -> 20.11.1
postgresql: upgrade 15.5 -> 16.2
Joe Slater (1):
googletest: allow for shared libraries
Khem Raj (17):
python3-fastjsonschema: Add missing ptest deps
python3-gpiod: Tests rely on configfs support in kernel
python3-pyzmq: Add missing dep on python3-unixadmin for ptests
python3-betamax: Upgrade to 0.9.0
libgpiod: Tests rely on configfs support in kernel
keyutils: Add missing rdep for ptests
fuse3: Make kmod as a recommendation instead of rdep for ptests
drbd-utils: Disable warnings as errors
influxdb: Define GOPROXY
crucible: Define GOPROXY
syzkaller: Fix build with go 1.21
e2tools: Delete unneeded files from ptest package
ptest-packagelists-meta-oe: Move libgpiod out of PTESTS_PROBLEMS_META_OE
ptest-packagelists-meta-python: Move py3-libgpiod out of PTESTS_PROBLEMS_META_PYTHON
pgpool2: Upgrade to 4.5.1
pgpool2: Fix build with postgresql 16+
emacs: Add packageconfig for selinux support
Krupal Ka Patel (1):
python3-aiohappyeyeballs: Correct the typo of BBCLASSEXTEND
Markus Volk (3):
folks: update 0.15.6 -> 0.15.7
mozjs-115: update 115.6.0 -> 115.8.0
polkit: update 123 -> 124
Martin Jansa (3):
ristretto: use python3native and depend on glib-2.0-native, python3-packaging-native
xfce4-notifyd: use python3native and depend on python3-packaging-native
fuse3: use 4 spaces for indentation
Mingli Yu (1):
nlohmann-json: Upgrade to 3.11.3
Randolph Sapp (1):
glmark2: add upstream patch to not care about stencil config
Ulrich Ölmann (1):
signing.bbclass: fix typos
Xiangyu Chen (3):
iperf3: upgrade 3.15 -> 3.16
grpc: upgrade 1.60.0 -> 1.60.1
drbd-utils: upgrade 9.22.0 -> 9.27.0
Yi Zhao (7):
openipmi: fix do_configure error when using dash
cryptsetup: upgrade 2.6.1 -> 2.7.0
layer.conf: Add nativesdk-libdevmapper PREFERRED_RPROVIDER
krb5: upgrade 1.20.2 -> 1.21.2
postfix: upgrade 3.7.3 -> 3.8.5
openldap: upgrade 2.5.16 -> 2.6.7
openvpn: upgrade 2.6.7 -> 2.6.9
Yoann Congal (3):
drbd-utils: Drop a duplicated line in DESCRIPTION
drbd-utils: Fix a udev rule reproducibility
toybox-inittab: Fix serial getty reproducibility
alperak (9):
python3-google-auth: upgrade 2.28.0 -> 2.28.1
python3-netaddr: upgrade 0.10.1 -> 1.2.1 and add ptest
ptest-packagelists-meta-python: Move python3-xlrd from PTESTS_PROBLEMS_META_PYTHON to PTESTS_FAST_META_PYTHON
python3-wrapt: add ptest
python3-freezegun: add recipe and add ptest
python3-dateutil: upgrade 2.8.2 -> 2.9.0
python3-types-python-dateutil: add recipe
python3-arrow: add ptest, update backend and runtime dependencies
python3-marshmallow: upgrade 3.20.2 -> 3.21.1 and add ptest
poky: 25d60ac6f6..7165c23237:
Alexander Kanavin (48):
xz: correct upstream version check
python3-sphinxcontrib-jquery: add a recipe and make python3-sphinx-rtd-theme depend on it
acl: upgrade 2.3.1 -> 2.3.2
appstream: upgrade 1.0.0 -> 1.0.2
boost: upgrade 1.83.0 -> 1.84.0
btrfs-tools: upgrade 6.5.3 -> 6.7.1
dnf: upgrade 4.18.2 -> 4.19.0
diffoscope: upgrade 253 -> 259
ell: upgrade 0.62 -> 0.63
elfutils: upgrade 0.189 -> 0.191
epiphany: upgrade 45.1 -> 45.3
gettext: upgrade 0.22.4 -> 0.22.5
glib-2.0: upgrade 2.78.3 -> 2.78.4
glib-networking: upgrade 2.78.0 -> 2.78.1
kmscube: upgrade to latest revision
libbsd: upgrade 0.11.8 -> 0.12.1
libdnf: update 0.72.0 -> 0.73.0
libpciaccess: upgrade 0.17 -> 0.18
libpcre2: upgrade 10.42 -> 10.43
librepo: update 1.16.0 -> 1.17.0
libusb1: upgrade 1.0.26 -> 1.0.27
libxml2: upgrade 2.11.5 -> 2.12.5
linux-firmware: upgrade 20231211 -> 20240220
librsvg: upgrade 2.56.3 -> 2.57.1
lsof: upgrade 4.98.0 -> 4.99.3
man-pages: upgrade 6.05.01 -> 6.06
mc: upgrade 4.8.30 -> 4.8.31
mesa: upgrade 24.0.1 -> 24.0.2
minicom: upgrade 2.8 -> 2.9
nghttp2: upgrade 1.59.0 -> 1.60.0
orc: upgrade 0.4.37 -> 0.4.38
puzzles: upgrade to latest revision
piglit: upgrade to latest revision
python3-build: upgrade 1.0.3 -> 1.1.1
python3-dtschema: upgrade 2023.7 -> 2024.2
python3-jsonschema: upgrade 4.17.3 -> 4.21.1 and add new dependencies
python3-ruamel-yaml: upgrade 0.17.35 -> 0.18.6
python3-setuptools: upgrade 69.0.3 -> 69.1.1
python3-wcwidth: upgrade 0.2.12 -> 0.2.13
repo: upgrade 2.41 -> 2.42
shaderc: update 2023.7 -> 2023.8
systemd: upgrade 255.1 -> 255.4
ttyrun: upgrade 2.30.0 -> 2.31.0
taglib: upgrade 1.13.1 -> 2.0 and add utfcpp recipe to support that
update-rc.d: upgrade to latest revision
vala: upgrade 0.56.13 -> 0.56.15
vulkan: upgrade 1.3.268.0 -> 1.3.275.0
webkitgtk: upgrade 2.42.2 -> 2.42.5
Bruce Ashfield (3):
linux-yocto/cfg/6.6: drop CONFIG_DEBUG_CREDENTIALS
linux-yocto/6.6: update to v6.6.20
linux-yocto/6.6: update CVE exclusions
Changqing Li (3):
rxvt-unicode: Fix installing of terminfo
systemd: fix dead link /var/log/README
go: filter out build specific path from the linker flags
Chen Qi (2):
systemd: use RDEPENDS for systemd-vconsole-setup
systemd: remove systemd-bus-proxy settings
Christian Taedcke (1):
image_types.bbclass: fix vfat image names
Eilís 'pidge' Ní Fhlannagáin (6):
qemurunner.py: Fix error on calls to run_monitor
screenshot-tests: Add initial screenshot test png files for core-image-sato
oeqa/runtime/login: Proof of concept for screenshot testcases
oeqa/runtime/login: Exclude qemuriscv64
oeqa/runtime/login: Add screenshot sample logic/timeout/dbus-wait
sstatetests.py: Add testing for correct sstate permissions
Fabio Estevam (1):
u-boot: Move UBOOT_INITIAL_ENV back to u-boot.inc
Geoff Parker (1):
ref-manual: variables: adding multiple groups in GROUPADD_PARAM
Johan Bezem (1):
ref-manual: variables: correct sdk installation default path
Jose Quaresma (7):
go: rework patch to avoid identation
go: bump 1.21.0
goarch: disable dynamic linking globally
oeqa/gotoolchain: set GOPROXY
go: upgrade 1.21.0 -> 1.21.5
go: upgrade 1.21.5 -> 1.21.7
go: bump 1.22.0
Khem Raj (4):
mesa,mesa-gl: Fix build when dri3 is not enabled
linux-yocto: Enable gpio-sim with ptests
rust: Fix build failure re-appeared on riscv32
gdb: Upgrade 14.1 -> 14.2
Luca Ceresoli (2):
ref-manual: tasks: do_cleanall: recommend using '-f' instead
ref-manual: tasks: do_cleansstate: recommend using '-f' instead for a shared sstate
Markus Volk (1):
gtk+3: update 3.24.38 -> 3.24.41
Michael Opdenacker (4):
core-image-full-cmdline: add package-management
bitbake: utils: remove BB_ENV_PASSTHROUGH from preserved_envvars()
dev-manual: packages: fix capitalization
manuals: document VIRTUAL-RUNTIME variables
Randy MacLeod (1):
valgrind: skip intermittently failing ptests
Richard Purdie (9):
no-gplv3: Tweak for packagemangement in core-image-full-cmdline
qemu: Replace workaround with proper usermode fix for shmat
bitbake: fetch/git: Avoid clean upon failure
go: Further tweak indentation in patch
go: Drop linkmode with nativesdk/cross-canadian
libpng: Update SRC_URI to avoid redirects
oeqa/runtime/login: Various code improvements and fixes
oeqa/runtime/login: Mask out the mouse panel icon for now
oeqa/runtime/login: Fix dbus-wait timeout and loop conditional
Robert P. J. Day (1):
python3-cryptography_42.0.5.bb: delete redundant ptest packaging
Ross Burton (2):
Add genericarm64 MACHINE
rxvt: add rxvt to desktop entry name
Simone Weiß (4):
coreutils: backport patch to fix heap overflow in split
qemu: backport patch for ui/clipboard issue
ref-manual: classes: add cve status check for oe.qa
contributor-guide: add notes for tests
Tim Orling (1):
python3-hypothesis: upgrade 6.98.12 -> 6.98.15
Trevor Woerner (2):
bmaptool: now part of Yocto Project
dev-manual: bmaptool: rename
Yi Zhao (1):
expat: upgrdae 2.6.0 -> 2.6.1
Yoann Congal (1):
bitbake: prserv/serv: Fix a PID file removal race on prserv stop
Change-Id: Ie94e4df79e3d8f68aea3377f816d7106987a05f8
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'poky/meta/recipes-core')
39 files changed, 156 insertions, 103 deletions
diff --git a/poky/meta/recipes-core/coreutils/coreutils/CVE-2024-0684.patch b/poky/meta/recipes-core/coreutils/coreutils/CVE-2024-0684.patch new file mode 100644 index 0000000000..0c68e2dce0 --- /dev/null +++ b/poky/meta/recipes-core/coreutils/coreutils/CVE-2024-0684.patch @@ -0,0 +1,39 @@ +From c4c5ed8f4e9cd55a12966d4f520e3a13101637d9 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Tue, 16 Jan 2024 13:48:32 -0800 +Subject: [PATCH 1/1] split: do not shrink hold buffer +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +* src/split.c (line_bytes_split): Do not shrink hold buffer. +If it’s large for this batch it’s likely to be large for the next +batch, and for ‘split’ it’s not worth the complexity/CPU hassle to +shrink it. Do not assume hold_size can be bufsize. + +CVE: CVE-2024-0684 +Upstream-Status: Backport [https://github.com/coreutils/coreutils/commit/c4c5ed8f4e9cd55a12966d4f520e3a13101637d9] +Signed-off-by: Simone Weiß <simone.p.weiss@posteo.com> +--- + src/split.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/split.c b/src/split.c +index 64020c859..037960a59 100644 +--- a/src/split.c ++++ b/src/split.c +@@ -809,10 +809,7 @@ line_bytes_split (intmax_t n_bytes, char *buf, idx_t bufsize) + { + cwrite (n_out == 0, hold, n_hold); + n_out += n_hold; +- if (n_hold > bufsize) +- hold = xirealloc (hold, bufsize); + n_hold = 0; +- hold_size = bufsize; + } + + /* Output to eol if present. */ +-- +2.11.4.GIT + + diff --git a/poky/meta/recipes-core/coreutils/coreutils_9.4.bb b/poky/meta/recipes-core/coreutils/coreutils_9.4.bb index a79cabd3d2..fc51adcd5b 100644 --- a/poky/meta/recipes-core/coreutils/coreutils_9.4.bb +++ b/poky/meta/recipes-core/coreutils/coreutils_9.4.bb @@ -17,6 +17,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ file://remove-usr-local-lib-from-m4.patch \ file://0001-local.mk-fix-cross-compiling-problem.patch \ file://0001-posixtm-pacify-clang-18.patch \ + file://CVE-2024-0684.patch \ file://run-ptest \ " SRC_URI[sha256sum] = "ea613a4cf44612326e917201bbbcdfbd301de21ffc3b59b6e5c07e040b275e52" diff --git a/poky/meta/recipes-core/ell/ell_0.62.bb b/poky/meta/recipes-core/ell/ell_0.63.bb index c6ec91afb4..7ecb63a478 100644 --- a/poky/meta/recipes-core/ell/ell_0.62.bb +++ b/poky/meta/recipes-core/ell/ell_0.63.bb @@ -15,7 +15,7 @@ DEPENDS = "dbus" inherit autotools pkgconfig SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "f1efae12085610049714dc509c6fab3478925801609ad4232ce873b7daf1e03d" +SRC_URI[sha256sum] = "7397c76996d7646b9917ebf016cd67586b10166295af2e0e18cdb5b8f6659965" do_configure:prepend () { mkdir -p ${S}/build-aux diff --git a/poky/meta/recipes-core/expat/expat_2.6.0.bb b/poky/meta/recipes-core/expat/expat_2.6.1.bb index 1f9f7b269a..9bdc3b6206 100644 --- a/poky/meta/recipes-core/expat/expat_2.6.0.bb +++ b/poky/meta/recipes-core/expat/expat_2.6.1.bb @@ -15,7 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/R_${VERSION_TAG}/expat-${PV}.tar.bz2 \ GITHUB_BASE_URI = "https://github.com/libexpat/libexpat/releases/" UPSTREAM_CHECK_REGEX = "releases/tag/R_(?P<pver>.+)" -SRC_URI[sha256sum] = "ff60e6a6b6ce570ae012dc7b73169c7fdf4b6bf08c12ed0ec6f55736b78d85ba" +SRC_URI[sha256sum] = "4677d957c0c6cb2a3321101944574c24113b637c7ab1cf0659a27c5babc201fd" EXTRA_OECMAKE:class-native += "-DEXPAT_BUILD_DOCS=OFF" diff --git a/poky/meta/recipes-core/gettext/gettext-minimal-native_0.22.4.bb b/poky/meta/recipes-core/gettext/gettext-minimal-native_0.22.5.bb index db1bbb7e68..db1bbb7e68 100644 --- a/poky/meta/recipes-core/gettext/gettext-minimal-native_0.22.4.bb +++ b/poky/meta/recipes-core/gettext/gettext-minimal-native_0.22.5.bb diff --git a/poky/meta/recipes-core/gettext/gettext-sources.inc b/poky/meta/recipes-core/gettext/gettext-sources.inc index 8b4e240101..fd05837528 100644 --- a/poky/meta/recipes-core/gettext/gettext-sources.inc +++ b/poky/meta/recipes-core/gettext/gettext-sources.inc @@ -1,4 +1,4 @@ HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "c1e0bb2a4427a9024390c662cd532d664c4b36b8ff444ed5e54b115fdb7a1aea" +SRC_URI[sha256sum] = "ec1705b1e969b83a9f073144ec806151db88127f5e40fe5a94cb6c8fa48996a0" diff --git a/poky/meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch b/poky/meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch index d45b75869a..33d45a038c 100644 --- a/poky/meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch +++ b/poky/meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch @@ -1,4 +1,4 @@ -From 9b912a47f790a7b282ec0c2295a188c5d8fb6a7c Mon Sep 17 00:00:00 2001 +From c58c503c532d20883a93ef778327c86dd6de24f6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 6 Mar 2020 21:04:05 +0000 Subject: [PATCH] init-env.in: do not add C/CXX parameters diff --git a/poky/meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch b/poky/meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch index b0bc6b97a6..94afb255c3 100644 --- a/poky/meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch +++ b/poky/meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch @@ -1,4 +1,4 @@ -From 38b256e5aa7dfeb42acffd89565e53a2c0bab3e3 Mon Sep 17 00:00:00 2001 +From 7006142d199af13628edc687847a9a5bac48b45d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Tue, 7 Jan 2020 16:44:38 +0100 Subject: [PATCH] tests/autopoint-3: unset MAKEFLAGS @@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+) diff --git a/gettext-tools/tests/autopoint-3 b/gettext-tools/tests/autopoint-3 -index e13552b..55188df 100755 +index bd3fbf3..380eaac 100755 --- a/gettext-tools/tests/autopoint-3 +++ b/gettext-tools/tests/autopoint-3 -@@ -126,6 +126,7 @@ test $? = 0 || { cat autopoint.err; Exit 1; } +@@ -131,6 +131,7 @@ test $? = 0 || { cat autopoint.err; Exit 1; } ${CONFIG_SHELL} ./configure >/dev/null 2>autpoint.err test $? = 0 || { cat autopoint.err; Exit 1; } diff --git a/poky/meta/recipes-core/gettext/gettext/parallel.patch b/poky/meta/recipes-core/gettext/gettext/parallel.patch index d96a376b7d..8ecba46fd0 100644 --- a/poky/meta/recipes-core/gettext/gettext/parallel.patch +++ b/poky/meta/recipes-core/gettext/gettext/parallel.patch @@ -1,4 +1,4 @@ -From 4a2a0a93b469093b60ffd0bec55d33d1e03d4713 Mon Sep 17 00:00:00 2001 +From 83333bc873c2655ff1de161f6b7db930f22f1cea Mon Sep 17 00:00:00 2001 From: Joe Slater <jslater@windriver.com> Date: Thu, 7 Jun 2012 16:37:01 -0700 Subject: [PATCH] instal libgettextlib.a before removing it @@ -10,16 +10,15 @@ the operations. Upstream-Status: Pending Signed-off-by: Joe Slater <jslater@windriver.com> - --- gettext-tools/gnulib-lib/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gettext-tools/gnulib-lib/Makefile.am b/gettext-tools/gnulib-lib/Makefile.am -index 2126699..d2dd7e4 100644 +index ab729cd..a0d713e 100644 --- a/gettext-tools/gnulib-lib/Makefile.am +++ b/gettext-tools/gnulib-lib/Makefile.am -@@ -58,6 +58,10 @@ endif +@@ -58,6 +58,10 @@ AM_CFLAGS = @WARN_CFLAGS@ # Rules generated and collected by gnulib-tool. include Makefile.gnulib diff --git a/poky/meta/recipes-core/gettext/gettext/serial-tests-config.patch b/poky/meta/recipes-core/gettext/gettext/serial-tests-config.patch index 93f7c03334..7d39d6086a 100644 --- a/poky/meta/recipes-core/gettext/gettext/serial-tests-config.patch +++ b/poky/meta/recipes-core/gettext/gettext/serial-tests-config.patch @@ -1,4 +1,4 @@ -From ed64a5724ef7d6eb4e9a876f817ea266a536e195 Mon Sep 17 00:00:00 2001 +From aa8dfe0aafd0b53a6c5bac61b356ca92e1430a36 Mon Sep 17 00:00:00 2001 From: "Hongjun.Yang" <hongjun.yang@windriver.com> Date: Thu, 28 Jul 2016 12:36:15 +0800 Subject: [PATCH] fix for ptest @@ -8,7 +8,6 @@ Add serial-tests support, ptest need it Upstream-Status: Inappropriate [oe specific] Signed-off-by: Changqing Li <changqing.li@windriver.com> - --- configure.ac | 2 +- gettext-runtime/configure.ac | 2 +- @@ -16,7 +15,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 38db6fd..f019ae0 100644 +index f4e54ea..a47ff14 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_INIT([gettext], @@ -29,7 +28,7 @@ index 38db6fd..f019ae0 100644 dnl Override automake's tar command used for creating distributions. am__tar='${AMTAR} chf - --format=ustar --owner=root --group=root "$$tardir"' diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac -index de203e7..138a07f 100644 +index 126d069..aa23232 100644 --- a/gettext-runtime/configure.ac +++ b/gettext-runtime/configure.ac @@ -22,7 +22,7 @@ AC_INIT([gettext-runtime], @@ -42,7 +41,7 @@ index de203e7..138a07f 100644 dnl Installation directories. diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac -index cf1dd73..b544d6d 100644 +index 3610ee3..6f56a23 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -22,7 +22,7 @@ AC_INIT([gettext-tools], diff --git a/poky/meta/recipes-core/gettext/gettext/use-pkgconfig.patch b/poky/meta/recipes-core/gettext/gettext/use-pkgconfig.patch index f1fb61de4e..ceb1856118 100644 --- a/poky/meta/recipes-core/gettext/gettext/use-pkgconfig.patch +++ b/poky/meta/recipes-core/gettext/gettext/use-pkgconfig.patch @@ -1,4 +1,4 @@ -From 38c361e6860bfaefbefeccae621e698c301879f2 Mon Sep 17 00:00:00 2001 +From 6aa1338b916fe72c200b6f160b934be15b6ff590 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Tue, 23 Jan 2018 00:54:13 +0000 Subject: [PATCH] gettext: beat library detection into shape @@ -12,12 +12,11 @@ Simply delete all the crazy, and replace with a single call to pkg-config. Upstream-Status: Inappropriate [upstream still refuse to consider pkg-config] Signed-off-by: Ross Burton <ross.burton@intel.com> - --- - gettext-tools/gnulib-m4/libxml.m4 | 105 +---------------- - libtextstyle/gnulib-local/m4/libglib.m4 | 106 +++--------------- - libtextstyle/gnulib-m4/libglib.m4 | 106 +++--------------- - 3 files changed, 79 insertions(+), 470 deletions(-) + gettext-tools/gnulib-m4/libxml.m4 | 105 ++--------------------- + libtextstyle/gnulib-local/m4/libglib.m4 | 106 +++--------------------- + libtextstyle/gnulib-m4/libglib.m4 | 106 +++--------------------- + 3 files changed, 31 insertions(+), 286 deletions(-) diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4 index 0340490..0355388 100644 @@ -143,7 +142,7 @@ index 0340490..0355388 100644 ]) AC_SUBST([LIBXML]) diff --git a/libtextstyle/gnulib-local/m4/libglib.m4 b/libtextstyle/gnulib-local/m4/libglib.m4 -index 7ee5029..bb1e5e4 100644 +index dbc9eb8..136e512 100644 --- a/libtextstyle/gnulib-local/m4/libglib.m4 +++ b/libtextstyle/gnulib-local/m4/libglib.m4 @@ -6,106 +6,26 @@ dnl with or without modifications, as long as this notice is preserved. @@ -267,7 +266,7 @@ index 7ee5029..bb1e5e4 100644 AC_SUBST([LTLIBGLIB]) AC_SUBST([INCGLIB]) diff --git a/libtextstyle/gnulib-m4/libglib.m4 b/libtextstyle/gnulib-m4/libglib.m4 -index 7ee5029..bb1e5e4 100644 +index dbc9eb8..136e512 100644 --- a/libtextstyle/gnulib-m4/libglib.m4 +++ b/libtextstyle/gnulib-m4/libglib.m4 @@ -6,106 +6,26 @@ dnl with or without modifications, as long as this notice is preserved. diff --git a/poky/meta/recipes-core/gettext/gettext_0.22.4.bb b/poky/meta/recipes-core/gettext/gettext_0.22.5.bb index 75474c8c30..1a66d37916 100644 --- a/poky/meta/recipes-core/gettext/gettext_0.22.4.bb +++ b/poky/meta/recipes-core/gettext/gettext_0.22.5.bb @@ -175,7 +175,7 @@ do_install_ptest() { install ${B}/gettext-tools/misc/* ${D}${PTEST_PATH}/misc find ${D}${PTEST_PATH}/ -name "*.o" -exec rm {} \; chmod 0755 ${D}${PTEST_PATH}/tests/lang-vala ${D}${PTEST_PATH}/tests/plural-1 ${D}${PTEST_PATH}/tests/xgettext-tcl-4 \ - ${D}${PTEST_PATH}/tests/xgettext-vala-1 ${D}${PTEST_PATH}/tests/xgettext-po-2 + ${D}${PTEST_PATH}/tests/xgettext-vala-1 ${D}${PTEST_PATH}/tests/xgettext-po-2 ${D}${PTEST_PATH}/tests/xgettext-vala-6 sed -i -e 's|${DEBUG_PREFIX_MAP}||g' ${D}${PTEST_PATH}/tests/init-env fi } diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch index 0e5f371cb5..8e6598fbef 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch @@ -1,4 +1,4 @@ -From cf7df91cc8c3b4811235ef8aec144c5f0cf90bdb Mon Sep 17 00:00:00 2001 +From e7077aa23bfcd31a8e72e39dc93ce4f854678376 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 15 Feb 2019 11:17:27 +0100 Subject: [PATCH] Do not write $bindir into pkg-config files @@ -9,7 +9,6 @@ rather than use target paths). Upstream-Status: Inappropriate [upstream wants the paths in .pc files] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - --- gio/meson.build | 16 ++++++++-------- glib/meson.build | 6 +++--- diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch index 1254466063..eb9dfdbcf9 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch @@ -1,4 +1,4 @@ -From b907a6681c4c24e5d3745538d9fcd471cf1c4c4a Mon Sep 17 00:00:00 2001 +From 9a5d4bf65b658d744d610ee27ecd2ae65b14b158 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 15 Mar 2014 22:42:29 -0700 Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux @@ -8,7 +8,6 @@ based systems therefore lets set DATADIRNAME to "share". Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending - --- m4macros/glib-gettext.m4 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch index 50d369c24e..ad69f7ec65 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch @@ -1,4 +1,4 @@ -From 6e2ddcb5465d10618345b12e0b4471ead0f14304 Mon Sep 17 00:00:00 2001 +From 4933aef791857a5aac650b60af800778658b875b Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Tue, 22 Mar 2016 15:14:58 +0200 Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM @@ -8,7 +8,6 @@ renamer does not cope with library packages with files in ${bindir} Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Upstream-Status: Inappropriate [OE specific] - --- gio/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch index f810574d97..0e3a62af6a 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch @@ -1,4 +1,4 @@ -From c8c223045821cac97f798cfa63f19853621a8a2a Mon Sep 17 00:00:00 2001 +From 8ae2e9c2a04e089306693a021149dc6b7d1bd679 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 12 Jun 2015 17:08:46 +0300 Subject: [PATCH] Remove the warning about deprecated paths in schemas @@ -9,7 +9,6 @@ messages, and meta/lib/oe/rootfs.py complaints about them. Upstream-Status: Inappropriate Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - --- gio/glib-compile-schemas.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch index e1d2fb0e54..32b4cea409 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch @@ -1,11 +1,10 @@ -From bafde4eedc0a22b45e73ee6183b9a11393a1e400 Mon Sep 17 00:00:00 2001 +From c0733f7a91dfe13152abc60c5a3064456b3e9d63 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 13 Feb 2019 15:32:05 +0100 Subject: [PATCH] Set host_machine correctly when building with mingw32 Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - --- gio/tests/meson.build | 8 ++++---- glib/tests/meson.build | 2 +- @@ -66,7 +65,7 @@ index d80c86e..5329cda 100644 glib_tests += { 'gpoll' : { diff --git a/meson.build b/meson.build -index f7e936e..122f8b5 100644 +index 813c9b7..6ee775e 100644 --- a/meson.build +++ b/meson.build @@ -54,6 +54,9 @@ else diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch index 50368ed22c..b11c283e6d 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch @@ -1,4 +1,4 @@ -From 05f0674c93d94fe6b29c1b707980aac469ddcd72 Mon Sep 17 00:00:00 2001 +From a8eb944a10353403241608a084787f6efcbb2eb7 Mon Sep 17 00:00:00 2001 From: Jordan Williams <jordan@jwillikers.com> Date: Fri, 1 Dec 2023 09:53:50 -0600 Subject: [PATCH] Switch from the deprecated distutils module to the packaging diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch index e4c2f77459..aee2986033 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch @@ -1,4 +1,4 @@ -From 3f05b9418c88bbb83c08b57cc5529b006f26fff4 Mon Sep 17 00:00:00 2001 +From 878e51f82100c698236fda0e069e14ea9249350c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 8 Jan 2020 18:22:46 +0100 Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test @@ -8,7 +8,6 @@ not cross-compatible (hardcodes ld and objcopy). Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - --- gio/tests/resources.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch index 071e4a7c4d..0b10269114 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch @@ -1,4 +1,4 @@ -From 17d718640ae6f953e5eea714c1bd64eeb6e4799f Mon Sep 17 00:00:00 2001 +From b4b523160ef550a53705fcc45ac6e10d086ce491 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 12 Oct 2019 17:46:26 -0700 Subject: [PATCH] meson: Run atomics test on clang as well @@ -9,13 +9,12 @@ Fixes Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> - --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 122f8b5..f055079 100644 +index 6ee775e..8bc5fa7 100644 --- a/meson.build +++ b/meson.build @@ -1938,7 +1938,7 @@ atomicdefine = ''' diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch index e03f9a3c84..14dcb278e0 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch @@ -1,4 +1,4 @@ -From 7865d698b5d392aac3a3d32e9ebd5fea45017d15 Mon Sep 17 00:00:00 2001 +From 294f3e6e9a0a9f4733e85ed6810d1b743055370b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex@linutronix.de> Date: Sat, 16 Sep 2023 22:28:27 +0200 Subject: [PATCH] meson.build: do not enable pidfd features on native glib @@ -9,13 +9,12 @@ where these features are not implemented. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex@linutronix.de> - --- meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index f055079..77d78aa 100644 +index 8bc5fa7..df1fa60 100644 --- a/meson.build +++ b/meson.build @@ -981,7 +981,8 @@ if cc.links('''#include <sys/syscall.h> diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch index 4b75167da6..6dff5179c7 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch @@ -1,11 +1,10 @@ -From 53bcd4b6cd3fe3fe4246914462e6724761eecf51 Mon Sep 17 00:00:00 2001 +From 50636758c73e5e61212a8f801c6c602b8aab5ba7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Tue, 3 Oct 2017 10:45:55 +0300 Subject: [PATCH] Do not hardcode python path into various tools Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - --- gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +- gobject/glib-genmarshal.in | 2 +- diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/fix-regex.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/fix-regex.patch new file mode 100644 index 0000000000..bdfbd55899 --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/fix-regex.patch @@ -0,0 +1,54 @@ +From cce3ae98a2c1966719daabff5a4ec6cf94a846f6 Mon Sep 17 00:00:00 2001 +From: Philip Withnall <pwithnall@gnome.org> +Date: Mon, 26 Feb 2024 16:55:44 +0000 +Subject: [PATCH] tests: Remove variable-length lookbehind tests for GRegex +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +PCRE2 10.43 has now introduced support for variable-length lookbehind, +so these tests now fail if GLib is built against PCRE2 10.43 or higher. + +See +https://github.com/PCRE2Project/pcre2/blob/e8db6fa7137f4c6f66cb87e0a3c9467252ec1ef7/ChangeLog#L94. + +Rather than making the tests conditional on the version of PCRE2 in use, +just remove them. They are mostly testing the PCRE2 code rather than +any code in GLib, so don’t have much value. + +This should fix CI runs on msys2-mingw32, which updated to PCRE2 10.43 2 +days ago. + +Signed-off-by: Philip Withnall <pwithnall@gnome.org> + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/cce3ae98a2c1966719daabff5a4ec6cf94a846f6] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + glib/tests/regex.c | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/glib/tests/regex.c b/glib/tests/regex.c +index 1082526292..d7a698ec67 100644 +--- a/glib/tests/regex.c ++++ b/glib/tests/regex.c +@@ -1885,16 +1885,6 @@ test_lookbehind (void) + g_match_info_free (match); + g_regex_unref (regex); + +- regex = g_regex_new ("(?<!dogs?|cats?) x", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error); +- g_assert (regex == NULL); +- g_assert_error (error, G_REGEX_ERROR, G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND); +- g_clear_error (&error); +- +- regex = g_regex_new ("(?<=ab(c|de)) foo", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error); +- g_assert (regex == NULL); +- g_assert_error (error, G_REGEX_ERROR, G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND); +- g_clear_error (&error); +- + regex = g_regex_new ("(?<=abc|abde)foo", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error); + g_assert (regex); + g_assert_no_error (error); +-- +GitLab + + diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/memory-monitor.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/memory-monitor.patch index f9dfc5bb05..4f38509da6 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/memory-monitor.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/memory-monitor.patch @@ -1,4 +1,4 @@ -From df7506918efc8748dac8b8398021e1b79d694ba4 Mon Sep 17 00:00:00 2001 +From ce840b6b111e1e109e511f6833d6aa419e2b723a Mon Sep 17 00:00:00 2001 From: Philip Withnall <philip@tecnocode.co.uk> Date: Tue, 23 Jan 2024 11:16:52 +0000 Subject: [PATCH] Merge branch '2887-memory-monitor-tests' into 'main' @@ -22,7 +22,7 @@ Signed-off-by: Ross Burton <ross.burton@arm.com> 4 files changed, 113 insertions(+), 74 deletions(-) diff --git a/gio/tests/memory-monitor-dbus.py.in b/gio/tests/memory-monitor-dbus.py.in -index bf3291847..7aae01e70 100755 +index bf32918..7aae01e 100755 --- a/gio/tests/memory-monitor-dbus.py.in +++ b/gio/tests/memory-monitor-dbus.py.in @@ -16,7 +16,6 @@ import sys @@ -130,7 +130,7 @@ index bf3291847..7aae01e70 100755 except ImportError as e: @unittest.skip("Cannot import %s" % e.name) diff --git a/gio/tests/memory-monitor-portal.py.in b/gio/tests/memory-monitor-portal.py.in -index 748cee850..f570508f9 100755 +index 748cee8..f570508 100755 --- a/gio/tests/memory-monitor-portal.py.in +++ b/gio/tests/memory-monitor-portal.py.in @@ -16,7 +16,6 @@ import sys @@ -222,7 +222,7 @@ index 748cee850..f570508f9 100755 except ImportError as e: @unittest.skip("Cannot import %s" % e.name) diff --git a/gio/tests/power-profile-monitor-dbus.py.in b/gio/tests/power-profile-monitor-dbus.py.in -index 06e594f4a..f955afc80 100755 +index 06e594f..f955afc 100755 --- a/gio/tests/power-profile-monitor-dbus.py.in +++ b/gio/tests/power-profile-monitor-dbus.py.in @@ -16,7 +16,6 @@ import sys @@ -295,7 +295,7 @@ index 06e594f4a..f955afc80 100755 except ImportError as e: @unittest.skip("Cannot import %s" % e.name) diff --git a/gio/tests/power-profile-monitor-portal.py.in b/gio/tests/power-profile-monitor-portal.py.in -index 09e9a450d..ad2abf621 100755 +index 09e9a45..ad2abf6 100755 --- a/gio/tests/power-profile-monitor-portal.py.in +++ b/gio/tests/power-profile-monitor-portal.py.in @@ -16,7 +16,6 @@ import sys @@ -359,6 +359,3 @@ index 09e9a450d..ad2abf621 100755 def test_power_profile_power_saver_enabled_portal_default(self): '''power-saver-enabled property default value''' --- -2.34.1 - diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/native-gtkdoc.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/native-gtkdoc.patch deleted file mode 100644 index f56c2b8564..0000000000 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/native-gtkdoc.patch +++ /dev/null @@ -1,21 +0,0 @@ -docs/reference: depend on a native gtk-doc - -In a cross-compiled environment we don't need a target gtk-doc, but a -native gtk-doc. - -Upstream-Status: Backport [f3ff370d1b24f8afb51cd4e865593d5b678188a9] -Signed-off-by: Ross Burton <ross.burton@arm.com> - -diff --git a/docs/reference/meson.build b/docs/reference/meson.build -index c417ffecb..67c1dda56 100644 ---- a/docs/reference/meson.build -+++ b/docs/reference/meson.build -@@ -42,7 +42,7 @@ ignore_decorators = '|'.join(ignore_decorators) - if get_option('gtk_doc') - # Check we have the minimum gtk-doc version required. Older versions won't - # generate correct documentation. -- dependency('gtk-doc', version : '>=1.32.1', -+ dependency('gtk-doc', version : '>=1.32.1', native: true, - fallback : ['gtk-doc', 'dummy_dep'], - default_options : ['tests=false']) - diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index 95a73298d8..3e79bbf679 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch @@ -1,4 +1,4 @@ -From 03a069cb8066d3e8ef72a43f7b1db5c9625e9cc2 Mon Sep 17 00:00:00 2001 +From f40e89b3852df37959606ee13b1a14ade81fa886 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds @@ -13,7 +13,6 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> Port patch to 2.48 Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> - --- gio/giomodule.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb index 6c3e99c641..f0fd057be7 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb @@ -16,13 +16,13 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ file://0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch \ file://memory-monitor.patch \ - file://native-gtkdoc.patch \ + file://fix-regex.patch \ " SRC_URI:append:class-native = " file://relocate-modules.patch \ file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ " -SRC_URI[sha256sum] = "609801dd373796e515972bf95fc0b2daa44545481ee2f465c4f204d224b2bc21" +SRC_URI[sha256sum] = "24b8e0672dca120cc32d394bccb85844e732e04fe75d18bb0573b2dbc7548f63" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. diff --git a/poky/meta/recipes-core/glib-networking/glib-networking/eagain.patch b/poky/meta/recipes-core/glib-networking/glib-networking/eagain.patch index 062fc0191b..6c2e3c634b 100644 --- a/poky/meta/recipes-core/glib-networking/glib-networking/eagain.patch +++ b/poky/meta/recipes-core/glib-networking/glib-networking/eagain.patch @@ -1,4 +1,4 @@ -From 025bb39dfdb81dd2852deaefea228b197ef3cd8d Mon Sep 17 00:00:00 2001 +From 5604707bed4b4a4bc4658c7158a18c1774775775 Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Sat, 6 May 2023 12:18:50 +0100 Subject: [PATCH] In autobuilder testing we regularly see glib-networking ptest @@ -15,7 +15,6 @@ The test should probably retry in this situation so test a patch which does this Upstream-Status: Pending [testing to see if patch resolves the issue] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - --- tls/tests/connection.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/poky/meta/recipes-core/glib-networking/glib-networking_2.78.0.bb b/poky/meta/recipes-core/glib-networking/glib-networking_2.78.1.bb index 68f9a2ed78..5060d9fd7a 100644 --- a/poky/meta/recipes-core/glib-networking/glib-networking_2.78.0.bb +++ b/poky/meta/recipes-core/glib-networking/glib-networking_2.78.1.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SECTION = "libs" DEPENDS = "glib-2.0-native glib-2.0" -SRC_URI[archive.sha256sum] = "52fe4ce93f7dc51334b102894599858d23c8a65ac4a1110b30920565d68d3aba" +SRC_URI[archive.sha256sum] = "e48f2ddbb049832cbb09230529c5e45daca9f0df0eda325f832f7379859bf09f" # Upstream note that for the openssl backend, half the tests where this backend don't return # the expected error code or don't work as expected so default to gnutls diff --git a/poky/meta/recipes-core/libxml/libxml2/install-tests.patch b/poky/meta/recipes-core/libxml/libxml2/install-tests.patch index 14ccce5873..478eeea81b 100644 --- a/poky/meta/recipes-core/libxml/libxml2/install-tests.patch +++ b/poky/meta/recipes-core/libxml/libxml2/install-tests.patch @@ -1,4 +1,4 @@ -From 3fc716357ce1372d9418dc86f24315b34d9808de Mon Sep 17 00:00:00 2001 +From 0779511838a8cbd1e0f431c22f28f286a2a37b1b Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@arm.com> Date: Mon, 5 Dec 2022 17:02:32 +0000 Subject: [PATCH] add yocto-specific install-ptest target @@ -7,17 +7,16 @@ Add a target to install the test suite. Upstream-Status: Inappropriate Signed-off-by: Ross Burton <ross.burton@arm.com> - --- Makefile.am | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Makefile.am b/Makefile.am -index 5bc4018..57d27af 100644 +index 0a49d37..1097c63 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -26,6 +26,16 @@ check_PROGRAMS = \ - testlimits \ +@@ -27,6 +27,16 @@ check_PROGRAMS = \ + testparser \ testrecurse +ptestdir=$(libexecdir) diff --git a/poky/meta/recipes-core/libxml/libxml2_2.11.5.bb b/poky/meta/recipes-core/libxml/libxml2_2.12.5.bb index 44336c25e1..47c1a72e77 100644 --- a/poky/meta/recipes-core/libxml/libxml2_2.11.5.bb +++ b/poky/meta/recipes-core/libxml/libxml2_2.12.5.bb @@ -4,10 +4,11 @@ HOMEPAGE = "https://gitlab.gnome.org/GNOME/libxml2" BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml2" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://Copyright;md5=2044417e2e5006b65a8b9067b683fcf1 \ - file://hash.c;beginline=6;endline=15;md5=e77f77b12cb69e203d8b4090a0eee879 \ +LIC_FILES_CHKSUM = "file://Copyright;md5=fec7ecfe714722b2bb0aaff7d200c701 \ + file://dict.c;beginline=6;endline=15;md5=2b4b7b827d2d8b080372433c4c9c85b6 \ file://list.c;beginline=4;endline=13;md5=b9c25b021ccaf287e50060602d20f3a7 \ - file://trio.c;beginline=5;endline=14;md5=cd4f61e27f88c1d43df112966b1cd28f" + file://trio.c;beginline=5;endline=14;md5=cd4f61e27f88c1d43df112966b1cd28f \ + " DEPENDS = "zlib virtual/libiconv" @@ -19,7 +20,7 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt file://install-tests.patch \ " -SRC_URI[archive.sha256sum] = "3727b078c360ec69fa869de14bd6f75d7ee8d36987b071e6928d4720a28df3a6" +SRC_URI[archive.sha256sum] = "a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21" SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273" # Disputed as a security issue, but fixed in d39f780 diff --git a/poky/meta/recipes-core/meta/wic-tools.bb b/poky/meta/recipes-core/meta/wic-tools.bb index 9282d36a4d..76494e7fca 100644 --- a/poky/meta/recipes-core/meta/wic-tools.bb +++ b/poky/meta/recipes-core/meta/wic-tools.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" DEPENDS = "\ parted-native gptfdisk-native dosfstools-native \ - mtools-native bmap-tools-native grub-native cdrtools-native \ + mtools-native bmaptool-native grub-native cdrtools-native \ btrfs-tools-native squashfs-tools-native pseudo-native \ e2fsprogs-native util-linux-native tar-native erofs-utils-native \ virtual/${TARGET_PREFIX}binutils \ diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index ae34a8a90b..df71695a97 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -40,7 +40,7 @@ RDEPENDS:packagegroup-self-hosted-host-tools = "\ iptables \ lsb-release \ mc \ - mc-fish \ + mc-shell \ mc-helpers \ mc-helpers-perl \ parted \ diff --git a/poky/meta/recipes-core/systemd/systemd-boot-native_254.4.bb b/poky/meta/recipes-core/systemd/systemd-boot-native_255.4.bb index 73db59b14e..73db59b14e 100644 --- a/poky/meta/recipes-core/systemd/systemd-boot-native_254.4.bb +++ b/poky/meta/recipes-core/systemd/systemd-boot-native_255.4.bb diff --git a/poky/meta/recipes-core/systemd/systemd-boot_255.1.bb b/poky/meta/recipes-core/systemd/systemd-boot_255.4.bb index 4ee25ee72f..4ee25ee72f 100644 --- a/poky/meta/recipes-core/systemd/systemd-boot_255.1.bb +++ b/poky/meta/recipes-core/systemd/systemd-boot_255.4.bb diff --git a/poky/meta/recipes-core/systemd/systemd.inc b/poky/meta/recipes-core/systemd/systemd.inc index 1417e0150f..a35db5091e 100644 --- a/poky/meta/recipes-core/systemd/systemd.inc +++ b/poky/meta/recipes-core/systemd/systemd.inc @@ -15,7 +15,7 @@ LICENSE:libsystemd = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "2018ccef6645ce00c784369a22dc4e98f6d7061d" +SRCREV = "387a14a7b67b8b76adaed4175e14bb7e39b2f738" SRCBRANCH = "v255-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH}" diff --git a/poky/meta/recipes-core/systemd/systemd_255.1.bb b/poky/meta/recipes-core/systemd/systemd_255.4.bb index a907d60e84..d59ca30c12 100644 --- a/poky/meta/recipes-core/systemd/systemd_255.1.bb +++ b/poky/meta/recipes-core/systemd/systemd_255.4.bb @@ -247,6 +247,7 @@ EXTRA_OEMESON += "-Dnobody-user=nobody \ -Dsystem-uid-max=999 \ -Dsystem-alloc-gid-min=101 \ -Dsystem-gid-max=999 \ + -Dcreate-log-dirs=false \ " # Hardcode target binary paths to avoid using paths from sysroot or worse @@ -437,7 +438,7 @@ SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfm " SYSTEMD_SERVICE:${PN}-binfmt = "systemd-binfmt.service" -USERADD_PACKAGES = "${PN} ${PN}-extra-utils \ +USERADD_PACKAGES = "${PN} \ udev \ ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-gatewayd', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-remote', '', d)} \ @@ -452,7 +453,6 @@ USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit', '--syste USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'resolved', '--system -d / -M --shell /sbin/nologin systemd-resolve;', '', d)}" USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd', '--system -d / -M --shell /sbin/nologin systemd-timesync;', '', d)}" USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'oomd', '--system -d / -M --shell /sbin/nologin systemd-oom;', '', d)}" -USERADD_PARAM:${PN}-extra-utils = "--system -d / -M --shell /sbin/nologin systemd-bus-proxy" USERADD_PARAM:${PN}-journal-gatewayd = "--system -d / -M --shell /sbin/nologin systemd-journal-gateway" USERADD_PARAM:${PN}-journal-remote = "--system -d / -M --shell /sbin/nologin systemd-journal-remote" USERADD_PARAM:${PN}-journal-upload = "--system -d / -M --shell /sbin/nologin systemd-journal-upload" @@ -490,7 +490,7 @@ FILES:${PN}-binfmt = "${sysconfdir}/binfmt.d/ \ ${systemd_system_unitdir}/systemd-binfmt.service" RRECOMMENDS:${PN}-binfmt = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', 'kernel-module-binfmt-misc', '', d)}" -RRECOMMENDS:${PN}-vconsole-setup = "${@bb.utils.contains('PACKAGECONFIG', 'vconsole', 'kbd kbd-consolefonts kbd-keymaps', '', d)}" +RDEPENDS:${PN}-vconsole-setup = "${@bb.utils.contains('PACKAGECONFIG', 'vconsole', 'kbd kbd-consolefonts kbd-keymaps', '', d)}" FILES:${PN}-journal-gatewayd = "${rootlibexecdir}/systemd/systemd-journal-gatewayd \ @@ -591,9 +591,6 @@ FILES:${PN}-extra-utils = "\ ${rootlibexecdir}/systemd/systemd-resolve-host \ ${rootlibexecdir}/systemd/systemd-ac-power \ ${rootlibexecdir}/systemd/systemd-activate \ - ${rootlibexecdir}/systemd/systemd-bus-proxyd \ - ${systemd_system_unitdir}/systemd-bus-proxyd.service \ - ${systemd_system_unitdir}/systemd-bus-proxyd.socket \ ${rootlibexecdir}/systemd/systemd-measure \ ${rootlibexecdir}/systemd/systemd-pcrphase \ ${rootlibexecdir}/systemd/systemd-socket-proxyd \ diff --git a/poky/meta/recipes-core/ttyrun/ttyrun_2.30.0.bb b/poky/meta/recipes-core/ttyrun/ttyrun_2.31.0.bb index 73c6c58c9d..122dd9d8e7 100644 --- a/poky/meta/recipes-core/ttyrun/ttyrun_2.30.0.bb +++ b/poky/meta/recipes-core/ttyrun/ttyrun_2.31.0.bb @@ -7,7 +7,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=f5118f167b055bfd7c3450803f1847af" SRC_URI = "git://github.com/ibm-s390-linux/s390-tools;protocol=https;branch=master" -SRCREV = "c217f6be6addd4d008f110efa53fbec79681dbfd" +SRCREV = "6f15ed326491a17d83ca60cd2bda47fb5e8a0175" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb b/poky/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb index 043cb3f13e..ba622fe716 100644 --- a/poky/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb +++ b/poky/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb @@ -7,7 +7,7 @@ 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;protocol=https" -SRCREV = "8636cf478d426b568c1be11dbd9346f67e03adac" +SRCREV = "b8f950105010270a768aa12245d6abf166346015" UPSTREAM_CHECK_COMMITS = "1" |