Patch review
PATCH 1/22 meta-oe-image: fix build depends
In reply to Armin Kusteradd only when various DISTRO_FEATURES are enabled
--- .../recipes-core/packagegroups/packagegroup-meta-oe.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +4 -4
@@ -96,7 +96,7 @@ RDEPENDS:packagegroup-meta-oe-bsp ="\ acpitool \ cpufrequtils \ edac-utils \ - firmwared \ + ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "firmwared", "", d)} \ flashrom \ fwupd \ fwupd-efi \
@@ -611,12 +611,12 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\ surf \ tesseract-lang \ tesseract \ - tigervnc \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "tigervnc", "", d)} \ tslib \ unclutter-xfixes \ libvdpau \ xcursorgen \ - xscreensaver \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "xscreensaver", "", d)} \ yad \ parallel-deqp-runner \ ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "opengl-es-cts", "", d)} \
@@ -729,7 +729,7 @@ RDEPENDS:packagegroup-meta-oe-support ="\ anthy \ atop \ ace-cloud-editor \ - driverctl \ + ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "driverctl", "", d)} \ frame \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geis", "", d)} \ grail \
Signature · 1 line
2.25.1
PATCH 2/22 frr: inherit autotools-brokensep instead of autotools
In reply to Armin KusterFrom: Yi Zhao <[email protected]>
There is a parallel build error in separate build directory:
| /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/frr/8.2.2-r0/recipe-sysroot-native/usr/lib/clippy ../git/python/clidef.py -o isisd/isis_cli_clippy.c ../git/isisd/isis_cli.c | Traceback (most recent call last): | File "../git/python/clidef.py", line 466, in <module> | clippy.wrdiff( | File "/home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/frr/8.2.2-r0/git/python/clippy/__init__.py", line 78, in wrdiff | with open(newname, "w") as out: | FileNotFoundError: [Errno 2] No such file or directory: 'isisd/isis_cli_clippy.c.new-372541' | make[1]: Leaving directory '/home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/frr/8.2.2-r0/build' | make[1]: *** [Makefile:17386: isisd/isis_cli_clippy.c] Error 1
This is beacuse clidef.py only creates new file but doesn't check if parent directory exists. Inherit autotools-brokensep can fix this issue as these parent directories always exist in source directory.
Also set ac_cv_path_PERL to '/usr/bin/env perl' to avoid path too long.
--- meta-networking/recipes-protocols/frr/frr_8.2.2.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
meta-networking/recipes-protocols/frr/frr_8.2.2.bb +4 -2
@@ -26,7 +26,7 @@ COMPATIBLE_HOST:armv5 = "null" # Error: PC-relative reference to a different section COMPATIBLE_HOST:mips64 = "null" -inherit autotools python3native pkgconfig useradd systemd +inherit autotools-brokensep python3native pkgconfig useradd systemd DEPENDS:class-native = "bison-native elfutils-native" DEPENDS:class-target = "bison-native json-c readline c-ares libyang frr-native"
@@ -63,6 +63,8 @@ EXTRA_OECONF:class-target = "--sbindir=${libdir}/frr \ --with-clippy=${RECIPE_SYSROOT_NATIVE}/usr/lib/clippy \ " +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" + LDFLAGS:append:mips = " -latomic" LDFLAGS:append:mipsel = " -latomic" LDFLAGS:append:powerpc = " -latomic"
@@ -77,7 +79,7 @@ do_compile:class-native () { do_install:class-native () { install -d ${D}${libdir} - install -m 755 ${WORKDIR}/build/lib/clippy ${D}${libdir}/clippy + install -m 755 ${S}/lib/clippy ${D}${libdir}/clippy } do_install:append:class-target () {
Signature · 1 line
2.25.1
cover Patch review
Please have comments back by Tuesday.
The following changes since commit 3b4da37a947c6ea244061929e7c457d02f34f748:
boinc-client: Make script install not depend on host install paths (2022-04-29 06:30:11 -0700)
are available in the Git repository at:
git://git.openembedded.org/meta-openembedded-contrib stable/kirkstone-nut
http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/kirkstone-nut
Armin Kuster (3):
meta-oe-image: fix build depends
meta-python-image: Fix build depends
meta-gnome: fix layer depends.
Bassem Boubaker (1):
conntrack-tools: Fix missing capability
Denys Dmytriyenko (2):
devmem2: reinstate previous patches, removed by mistake
devmem2: add support for different page sizes
Gianfranco Costamagna (1):
vboxguestdrivers: upgrade 6.1.32 -> 6.1.34
Jiaqing Zhao (2):
openldap: Remove libgcrypt dependency
openldap: Upgrade 2.5.9 -> 2.5.12
Khem Raj (7):
ufw: Fix packaging errors found with ppc64
libcereal: Enable for glibc/ppc
mimic: Use special rateconv.c license
makedumpfile: Use right TARGET for ppc32
evince: Add dbus to depnedencies on non-x11 builds
evolution-data-server: Do not pass --library-path to gir compiler
python3-wxgtk4: Needs x11 for sip module
Markus Volk (1):
minidlna: fix obsolete license warning
Michael Opdenacker (1):
devmem2: update SRC_URI according to redirect
Mingli Yu (1):
s-nail: Set VAL_MTA
Xu Huan (1):
python3-astroid: upgrade 2.11.2 -> 2.11.3
Yi Zhao (2):
frr: inherit autotools-brokensep instead of autotools
networkmanager: fix parallel build failure
meta-gnome/conf/layer.conf | 2 +-
.../recipes-gnome/evince/evince_42.2.bb | 2 +-
...e-Do-not-export-CC-into-gir-compiler.patch | 14 ++-
.../recipes-multimedia/mimic/mimic_1.3.0.1.bb | 2 +-
.../recipes-multimedia/minidlna/minidlna.inc | 2 +-
...t-add-dependency-libnm_client_public.patch | 34 +++++++
.../networkmanager/networkmanager_1.36.2.bb | 1 +
.../recipes-connectivity/ufw/ufw_0.36.1.bb | 2 +-
.../conntrack-tools/conntrack-tools_1.4.6.bb | 5 +
.../recipes-protocols/frr/frr_8.2.2.bb | 6 +-
meta-oe/licenses/rateconv | 27 ++++++
.../packagegroups/packagegroup-meta-oe.bb | 8 +-
.../files/0001-make.rc-set-VAL_MTA.patch | 48 ++++++++++
.../recipes-extended/s-nail/s-nail_14.9.24.bb | 3 +-
.../makedumpfile/makedumpfile_1.7.1.bb | 6 +-
meta-oe/recipes-support/devmem2/devmem2.bb | 7 +-
...word-is-32-bit-and-add-support-for-6.patch | 70 ++++++++++++++
...ort-different-page-sizes-at-run-time.patch | 35 +++++++
.../devmem2/devmem2/devmem2-fixups-2.patch | 91 +++++++++++++++++++
.../libcereal/libcereal_1.3.2.bb | 6 +-
.../openldap-2.4.28-gnutls-gcrypt.patch | 15 ---
.../{openldap_2.5.9.bb => openldap_2.5.12.bb} | 8 +-
...s_6.1.32.bb => vboxguestdrivers_6.1.34.bb} | 2 +-
.../packagegroups/packagegroup-meta-python.bb | 10 +-
...id_2.11.2.bb => python3-astroid_2.11.3.bb} | 2 +-
.../python3-wxgtk4/python3-wxgtk4_4.1.1.bb | 2 +-
26 files changed, 361 insertions(+), 49 deletions(-)
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-client-test-add-dependency-libnm_client_public.patch
create mode 100644 meta-oe/licenses/rateconv
create mode 100644 meta-oe/recipes-extended/s-nail/files/0001-make.rc-set-VAL_MTA.patch
create mode 100644 meta-oe/recipes-support/devmem2/devmem2/0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch
create mode 100644 meta-oe/recipes-support/devmem2/devmem2/0001-devmem2-support-different-page-sizes-at-run-time.patch
create mode 100644 meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch
delete mode 100644 meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch
rename meta-oe/recipes-support/openldap/{openldap_2.5.9.bb => openldap_2.5.12.bb} (96%)
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.32.bb => vboxguestdrivers_6.1.34.bb} (97%)
rename meta-python/recipes-devtools/python/{python3-astroid_2.11.2.bb => python3-astroid_2.11.3.bb} (89%)Signature · 1 line
2.25.1
PATCH 3/22 conntrack-tools: Fix missing capability
From: Bassem Boubaker <[email protected]>
The commit fix this error message: Do not forget that you need *root* or CAP_NET_ADMIN capabilities ;-)
--- .../recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb | 5 +++++ 1 file changed, 5 insertions(+)
meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb +5 -0
@@ -32,3 +32,8 @@ do_install:append() { sed -i 's!/var/!${localstatedir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample sed -i 's!^export PATH=.*!export PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}/${sysconfdir}/init.d/conntrackd } + +# fix error message: Do not forget that you need *root* or CAP_NET_ADMIN capabilities ;-) +pkg_postinst:${PN} () { + setcap cap_net_admin+ep $D/${sbindir}/conntrack" +}
Signature · 1 line
2.25.1
PATCH 4/22 ufw: Fix packaging errors found with ppc64
In reply to Armin KusterFrom: Khem Raj <[email protected]>
default baselib in ppc64 is lib64 which catches this latent issue
ERROR: ufw-0.36.1-r0 do_package: QA Issue: ufw: Files/directories were installed but not shipped in any package:
/usr/lib/ufw
/usr/lib/ufw/ufw-init
/usr/lib/ufw/ufw-init-functions
--- meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb +1 -1
@@ -63,7 +63,7 @@ INITSCRIPT_PARAMS = "defaults" FILES:${PN} += " \ ${sbindir}/* \ ${datadir}/ufw/* \ - /lib/ufw/* \ + ${nonarch_base_libdir}/ufw/* \ ${sysconfdir}/ufw/* \ ${sysconfdir}/default/ufw \ "
Signature · 1 line
2.25.1
PATCH 5/22 libcereal: Enable for glibc/ppc
In reply to Armin KusterFrom: Khem Raj <[email protected]>
The error is not observed with glibc latest clang 14
--- meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb +3 -3
@@ -45,6 +45,6 @@ RDEPENDS:${PN}-dev = "" BBCLASSEXTEND = "native nativesdk" -#it needs to work with CXXFLAGS += " -mlong-double-64" but ppc64 only supports 128bit long double -COMPATIBLE_HOST:powerpc64le = "null" -COMPATIBLE_HOST:powerpc = "null" +#it needs to work with CXXFLAGS += " -mlong-double-64" but ppc only supports 128bit long double +COMPATIBLE_HOST:powerpc:libc-musl = "null" +COMPATIBLE_HOST:powerpc64le:libc-musl = "null"
Signature · 1 line
2.25.1
PATCH 6/22 mimic: Use special rateconv.c license
In reply to Armin KusterFrom: Khem Raj <[email protected]>
rateconv.c looks like BSD-2 but it has second clause modified significantly, therefore be specific about it.
--- .../recipes-multimedia/mimic/mimic_1.3.0.1.bb | 2 +- meta-oe/licenses/rateconv | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 meta-oe/licenses/rateconv
meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb +1 -1
@@ -7,7 +7,7 @@ SECTION = "multimedia" LICENSE = "MIT & \ PD & \ CMU-Tex & \ - BSD & \ + rateconv & \ BSD-2-Clause & \ BSD-3-Clause & \ flite & \
meta-oe/licenses/rateconv new file +27 -0
@@ -0,0 +1,27 @@ +Authors: Markus Mummert + +Copyright (c) 1992, 1995 by Markus Mummert + +License: + Redistribution and use of this software, modifcation and inclusion + into other forms of software are permitted provided that the following + conditions are met: + + 1. Redistributions of this software must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. If this software is redistributed in a modified condition + it must reveal clearly that it has been modified. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + DAMAGE. +
Signature · 1 line
2.25.1
PATCH 7/22 makedumpfile: Use right TARGET for ppc32
In reply to Armin KusterFrom: Khem Raj <[email protected]>
--- meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.1.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.1.bb +5 -1
@@ -36,9 +36,13 @@ SECTION = "base" # If we do not specify TARGET, makedumpfile will build for the host but use the # target gcc. # + +MAKEDUMPFILE_TARGET ?= "${TARGET_ARCH}" +MAKEDUMPFILE_TARGET:powerpc = "ppc" + EXTRA_OEMAKE = "\ LINKTYPE=static \ - TARGET=${TARGET_ARCH} \ + TARGET=${MAKEDUMPFILE_TARGET} \ ${PACKAGECONFIG_CONFARGS} \ "
Signature · 1 line
2.25.1
PATCH 10/22 python3-astroid: upgrade 2.11.2 -> 2.11.3
In reply to Armin KusterFrom: Xu Huan <[email protected]>
Changelog:
==========
Fixed an error in the Qt brain when building instance_attrs. Fixed a crash in the gi brain.
---
.../{python3-astroid_2.11.2.bb => python3-astroid_2.11.3.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-astroid_2.11.2.bb => python3-astroid_2.11.3.bb} (89%)meta-python/recipes-devtools/python/python3-astroid_2.11.3.bb renamed from meta-python/recipes-devtools/python/python3-astroid_2.11.2.bb +1 -1
@@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1" -SRC_URI[sha256sum] = "8d0a30fe6481ce919f56690076eafbb2fb649142a89dc874f1ec0e7a011492d0" +SRC_URI[sha256sum] = "4e5ba10571e197785e312966ea5efb2f5783176d4c1a73fa922d474ae2be59f7" inherit pypi setuptools3
Signature · 1 line
2.25.1
PATCH 11/22 meta-python-image: Fix build depends
In reply to Armin Kuster--- .../packagegroups/packagegroup-meta-python.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +5 -5
@@ -12,9 +12,9 @@ PACKAGES = ' \ # FORTRAN:forcevariable = ",fortran" RDEPENDS:packagegroup-meta-python3 = "\ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "python3-systemd", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "python3-blivetgui", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11 systemd", "python3-blivetgui", "", d)} \ gyp \ - pamela \ + ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pamela", "", d)} \ pyrtm \ python3-absl \ python3-aenum \
@@ -52,7 +52,7 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-bitstring \ python3-bitstruct \ python3-blinker \ - python3-blivet \ + ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "python3-blivet", "", d)} \ python3-booleanpy \ python3-cachecontrol \ python3-cached-property \
@@ -84,7 +84,7 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-croniter \ python3-cson \ python3-custom-inherit \ - python3-cvxopt \ + ${@bb.utils.contains_any('FORTRAN', [',fortran',',f77'], 'python3-cvxopt', '', d)} \ python3-cycler \ python3-dateparser \ python3-dateutil \
@@ -327,7 +327,7 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-pyscaffold \ python3-pyserial \ python3-pysonos \ - python3-pystemd \ + ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "python3-pystemd", "", d)} \ python3-pytest-asyncio \ python3-pytest-benchmark \ python3-pytest-cache \
Signature · 1 line
2.25.1
PATCH 12/22 python3-wxgtk4: Needs x11 for sip module
In reply to Armin KusterFrom: Khem Raj <[email protected]>
sip/cpp/sip_corewxWindow.cpp requires gdk/gdkx.h which wont be built when gtk is built without x11, therefore require x11 when building this recipe, if gdkx.h is removed form includes then it fails
../../../../sip/cpp/sip_corewxWindow.cpp:56:16: error: unknown type name 'XID'
static XID GetXWindow(const wxWindow* wxwin) {
^
../../../../sip/cpp/sip_corewxWindow.cpp:59:28: error: use of undeclared identifier 'GDK_WINDOW_XID'
return GDK_WINDOW_XID(gtk_widget_get_window((wxwin)->m_wxwindow));
^
../../../../sip/cpp/sip_corewxWindow.cpp:64:28: error: use of undeclared identifier 'GDK_WINDOW_XID'
return GDK_WINDOW_XID(gtk_widget_get_window((wxwin)->m_widget));
^so it is using it and will need some work to get it going without x11 until then disable building it on non-x11 distros
--- .../recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb +1 -1
@@ -18,7 +18,7 @@ S = "${WORKDIR}/wxPython-${PV}" inherit pypi setuptools3 pkgconfig features_check -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "x11" export WX_CONFIG = "'${RECIPE_SYSROOT_NATIVE}${bindir}/wx-config --prefix=${STAGING_EXECPREFIXDIR} --baselib=${baselib}'"
Signature · 1 line
2.25.1
PATCH 13/22 meta-gnome: fix layer depends.
In reply to Armin Kustermeta-networking no longer depends on meta-python so add it separatily.
--- meta-gnome/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-gnome/conf/layer.conf +1 -1
@@ -15,7 +15,7 @@ IMAGE_LINGUAS_COMPLEMENTARY:append = " ${@bb.utils.contains('DISTRO_FEATURES','h # cause compatibility issues with other layers LAYERVERSION_gnome-layer = "1" -LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer" +LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer meta-python" LAYERSERIES_COMPAT_gnome-layer = "kirkstone"
Signature · 1 line
2.25.1
PATCH 14/22 networkmanager: fix parallel build failure
In reply to Armin KusterFrom: Yi Zhao <[email protected]>
Add dependency libnm_client_public_dep to libnm-client-test to fix parallel build error:
| In file included from ../NetworkManager-1.36.0/src/libnm-client-test/nm-test-utils-impl.c:10: | ../NetworkManager-1.36.0/src/libnm-client-public/NetworkManager.h:47:10: fatal error: nm-enum-types.h: No such file or directory | 47 | #include "nm-enum-types.h" | | ^~~~~~~~~~~~~~~~~
--- ...t-add-dependency-libnm_client_public.patch | 34 +++++++++++++++++++ .../networkmanager/networkmanager_1.36.2.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-client-test-add-dependency-libnm_client_public.patch
meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-client-test-add-dependency-libnm_client_public.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 7b5dc04e1fcc28dc653fb7bf0e9dda3700d93218 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <[email protected]> +Date: Tue, 3 May 2022 15:30:37 +0800 +Subject: [PATCH] libnm-client-test: add dependency libnm_client_public_dep + +Fix parallel build error: +| In file included from ../NetworkManager-1.36.0/src/libnm-client-test/nm-test-utils-impl.c:10: +| ../NetworkManager-1.36.0/src/libnm-client-public/NetworkManager.h:47:10: fatal error: nm-enum-types.h: No such file or directory +| 47 | #include "nm-enum-types.h" +| | ^~~~~~~~~~~~~~~~~ + +Upstream-Status: Submitted +[https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1206] + +Signed-off-by: Yi Zhao <[email protected]> +--- + src/libnm-client-test/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libnm-client-test/meson.build b/src/libnm-client-test/meson.build +index 8e2fba1130..bcac437702 100644 +--- a/src/libnm-client-test/meson.build ++++ b/src/libnm-client-test/meson.build +@@ -13,6 +13,7 @@ libnm_client_test = static_library( + ], + dependencies: [ + libnm_core_public_dep, ++ libnm_client_public_dep, + glib_dep, + ], + ) +-- +2.25.1 +
meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb +1 -0
@@ -29,6 +29,7 @@ SRC_URI = " \ file://enable-dhcpcd.conf \ file://enable-iwd.conf \ file://0001-do-not-ask-host-for-ifcfg-defaults.patch \ + file://0001-libnm-client-test-add-dependency-libnm_client_public.patch \ " SRC_URI[sha256sum] = "ab855cbe3b41832e9a3b003810e7c7313dfe19e630d29806d14d87fdd1470cab"
Signature · 1 line
2.25.1
PATCH 15/22 openldap: Remove libgcrypt dependency
In reply to Armin KusterFrom: Jiaqing Zhao <[email protected]>
Since OpenLDAP 2.5.0, it uses nettle instead of gcrypt.
--- .../openldap/openldap-2.4.28-gnutls-gcrypt.patch | 15 --------------- .../recipes-support/openldap/openldap_2.5.9.bb | 3 +-- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch
meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch deleted +0 -15
@@ -1,15 +0,0 @@ -From http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-nds/openldap/files/ - -Upstream-Status: Pending - ---- a/configure.ac -+++ b/configure.ac -@@ -1263,7 +1263,7 @@ if test $ol_link_tls = no ; then - ol_link_tls=yes - WITH_TLS_TYPE=gnutls - -- TLS_LIBS="-lgnutls" -+ TLS_LIBS="-lgnutls -lgcrypt" - - AC_DEFINE(HAVE_GNUTLS, 1, - [define if you have GNUtls])
meta-oe/recipes-support/openldap/openldap_2.5.9.bb +1 -2
@@ -15,7 +15,6 @@ SECTION = "libs" LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${BP}.tgz \ - file://openldap-2.4.28-gnutls-gcrypt.patch \ file://use-urandom.patch \ file://initscript \ file://slapd.service \
@@ -51,7 +50,7 @@ PACKAGECONFIG ??= "asyncmeta gnutls modules \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ " #--with-tls with TLS/SSL support auto|openssl|gnutls [auto] -PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls libgcrypt" +PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls" PACKAGECONFIG[openssl] = "--with-tls=openssl,,openssl" PACKAGECONFIG[sasl] = "--with-cyrus-sasl,--without-cyrus-sasl,cyrus-sasl"
Signature · 1 line
2.25.1
PATCH 16/22 openldap: Upgrade 2.5.9 -> 2.5.12
In reply to Armin KusterFrom: Jiaqing Zhao <[email protected]>
License-Update: Copyright year updated to 2022
---
.../openldap/{openldap_2.5.9.bb => openldap_2.5.12.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta-oe/recipes-support/openldap/{openldap_2.5.9.bb => openldap_2.5.12.bb} (97%)meta-oe/recipes-support/openldap/openldap_2.5.12.bb renamed from meta-oe/recipes-support/openldap/openldap_2.5.9.bb +2 -3
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html" # basically BSD. opensource.org does not record this license # at present (so it is apparently not OSI certified). LICENSE = "OpenLDAP" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=5cc6ef74da4ad25d707c4f5903d64975 \ +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=beceb5ac7100b6430640c61655b25c1f \ file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ " SECTION = "libs"
@@ -25,8 +25,7 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$ file://0001-librewrite-include-ldap_pvt_thread.h-before-redefini.patch \ " -SRC_URI[md5sum] = "237fc2d881c27f8dd5d9f396e2865c11" -SRC_URI[sha256sum] = "c08e12f4ca5803d5d9f9948c70ad3491282cda3c17ec8b655dcbcb2364e6fb9e" +SRC_URI[sha256sum] = "d5086cbfc49597fa7d0670a429a9054552d441b16ee8b2435412797ab0e37b96" DEPENDS = "util-linux groff-native"
Signature · 1 line
2.25.1
PATCH 17/22 s-nail: Set VAL_MTA
In reply to Armin KusterFrom: Mingli Yu <[email protected]>
Some build server may provide sendmail like /usr/lib/sendmail which may result the VAL_MTA to be /usr/lib/sendmail during do_configure, but the sendmail is actually /usr/sbin/sendmail on the target.
Fixes:
# echo "invalide address email" | s-nail -s "test mail" -r [email protected] [email protected] s-nail: Cannot start /usr/lib/sendmail: executable not found (adjust *mta* variable) /home/root/dead.letter 10/234 s-nail: ... message not sent
# which sendmail /usr/sbin/sendmail
--- .../files/0001-make.rc-set-VAL_MTA.patch | 48 +++++++++++++++++++ .../recipes-extended/s-nail/s-nail_14.9.24.bb | 3 +- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/s-nail/files/0001-make.rc-set-VAL_MTA.patch
meta-oe/recipes-extended/s-nail/files/0001-make.rc-set-VAL_MTA.patch new file +48 -0
@@ -0,0 +1,48 @@ +From da8c7a027390de7828d4272a3c8bcdbffbac25ad Mon Sep 17 00:00:00 2001 +From: Mingli Yu <[email protected]> +Date: Thu, 5 May 2022 16:57:48 +0800 +Subject: [PATCH] make.rc: set VAL_MTA + +Some build server may provide sendmail like /usr/lib/sendmail which +may result the VAL_MTA to be /usr/lib/sendmail, but the sendmail +is actually /usr/sbin/sendmail on the target. + +Fixes: + # echo "invalide address email" | s-nail -s "test mail" -r [email protected] [email protected] + s-nail: Cannot start /usr/lib/sendmail: executable not found (adjust *mta* variable) + /home/root/dead.letter 10/234 + s-nail: ... message not sent + + # which sendmail + /usr/sbin/sendmail + +Upstream-Status: Inappropriate[oe-specific] + +Signed-off-by: Mingli Yu <[email protected]> +--- + make.rc | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/make.rc b/make.rc +index 98bd968..45ac0d4 100644 +--- a/make.rc ++++ b/make.rc +@@ -96,14 +96,7 @@ VAL_MAIL=`\ + + # Path to the local MTA (Mail-Transfer-Agent). + # MTA aliases (aliases(5)) are optionally supported via OPT_MTA_ALIASES. +-VAL_MTA=`\ +- if [ -x /usr/bin/sendmail ]; then \ +- echo /usr/bin/sendmail;\ +- elif [ -x /usr/lib/sendmail ]; then \ +- echo /usr/lib/sendmail;\ +- else \ +- echo /usr/sbin/sendmail;\ +- fi` ++VAL_MTA=/usr/sbin/sendmail + + # Today a lot of systems no longer use sendmail(1), but a different MTA. + # To ensure compatibility with sendmail(1), a system called +-- +2.25.1 +
meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb +2 -1
@@ -6,7 +6,8 @@ LICENSE = "ISC & BSD-3-Clause & BSD-4-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=87266591c81260f10221f1f38872d023" SRC_URI = "https://ftp.sdaoden.eu/${BP}.tar.xz \ - file://make-errors.patch" + file://make-errors.patch \ + file://0001-make.rc-set-VAL_MTA.patch" SRC_URI[sha256sum] = "2714d6b8fb2af3b363fc7c79b76d058753716345d1b6ebcd8870ecd0e4f7ef8c" DEPENDS = "coreutils-native"
Signature · 1 line
2.25.1
PATCH 18/22 devmem2: reinstate previous patches, removed by mistake
In reply to Armin KusterFrom: Denys Dmytriyenko <[email protected]>
This reverts commit 5e8f4720aaa3da7350ead06959cae0492133cd61.
--- meta-oe/recipes-support/devmem2/devmem2.bb | 3 +- ...word-is-32-bit-and-add-support-for-6.patch | 70 ++++++++++++++ .../devmem2/devmem2/devmem2-fixups-2.patch | 91 +++++++++++++++++++ 3 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/devmem2/devmem2/0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch create mode 100644 meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch
meta-oe/recipes-support/devmem2/devmem2.bb +2 -1
@@ -4,7 +4,8 @@ LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf9862 PR = "r7" SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c;downloadfilename=devmem2-new.c \ - " + file://devmem2-fixups-2.patch;apply=yes;striplevel=0 \ + file://0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch" S = "${WORKDIR}"
meta-oe/recipes-support/devmem2/devmem2/0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch new file +70 -0
70 lines not on this page · raw message
meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch new file +91 -0
91 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 19/22 devmem2: add support for different page sizes
In reply to Armin KusterFrom: Denys Dmytriyenko <[email protected]>
Instead of hardcoding 4K page size, query the system and use the value for memory mapping.
--- meta-oe/recipes-support/devmem2/devmem2.bb | 4 ++- ...ort-different-page-sizes-at-run-time.patch | 35 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/devmem2/devmem2/0001-devmem2-support-different-page-sizes-at-run-time.patch
meta-oe/recipes-support/devmem2/devmem2.bb +3 -1
@@ -5,7 +5,9 @@ PR = "r7" SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c;downloadfilename=devmem2-new.c \ file://devmem2-fixups-2.patch;apply=yes;striplevel=0 \ - file://0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch" + file://0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch \ + file://0001-devmem2-support-different-page-sizes-at-run-time.patch \ +" S = "${WORKDIR}"
meta-oe/recipes-support/devmem2/devmem2/0001-devmem2-support-different-page-sizes-at-run-time.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 0f6af48b2fbc71ec8abe862d3e9eb6da7b03538b Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko <[email protected]> +Date: Wed, 8 Aug 2018 14:38:00 -0400 +Subject: [PATCH] devmem2: support different page sizes at run-time + +Signed-off-by: Denys Dmytriyenko <[email protected]> +--- + devmem2.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/devmem2.c b/devmem2.c +index 68131b2..76af2d6 100644 +--- a/devmem2.c ++++ b/devmem2.c +@@ -53,8 +53,6 @@ + #define FATAL do { fprintf(stderr, "Error at line %d, file %s (%d) [%s]\n", \ + __LINE__, __FILE__, errno, strerror(errno)); exit(1); } while(0) + +-#define MAP_SIZE 4096UL +-#define MAP_MASK (MAP_SIZE - 1) + + static inline void *fixup_addr(void *addr, size_t size); + +@@ -66,6 +64,8 @@ int main(int argc, char **argv) { + int access_type = 'w'; + char fmt_str[128]; + size_t data_size; ++ unsigned long MAP_SIZE = sysconf(_SC_PAGE_SIZE); ++ unsigned long MAP_MASK = (MAP_SIZE - 1); + + if(argc < 2) { + fprintf(stderr, "\nUsage:\t%s { address } [ type [ data ] ]\n" +-- +2.7.4 +
Signature · 1 line
2.25.1
PATCH 20/22 devmem2: update SRC_URI according to redirect
In reply to Armin KusterFrom: Michael Opdenacker <[email protected]>
http://www.free-electrons.com now redirects to https://bootlin.com
--- meta-oe/recipes-support/devmem2/devmem2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/devmem2/devmem2.bb +1 -1
@@ -3,7 +3,7 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf" PR = "r7" -SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c;downloadfilename=devmem2-new.c \ +SRC_URI = "https://bootlin.com/pub/mirror/devmem2.c;downloadfilename=devmem2-new.c \ file://devmem2-fixups-2.patch;apply=yes;striplevel=0 \ file://0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch \ file://0001-devmem2-support-different-page-sizes-at-run-time.patch \
Signature · 1 line
2.25.1
PATCH 21/22 vboxguestdrivers: upgrade 6.1.32 -> 6.1.34
In reply to Armin KusterFrom: Gianfranco Costamagna <[email protected]>
---
.../{vboxguestdrivers_6.1.32.bb => vboxguestdrivers_6.1.34.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.32.bb => vboxguestdrivers_6.1.34.bb} (97%)meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.34.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.32.bb +1 -1
@@ -16,7 +16,7 @@ SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 file://0001-utils-fix-build-against-5.15-libc-headers-headers.patch \ " -SRC_URI[sha256sum] = "5d11384200b4e943ad0056d2cf75980ae4bee852c89650e2914e1b34eedc2d2c" +SRC_URI[sha256sum] = "9c3ce1829432e5b8374f950698587038f45fb0492147dc200e59edb9bb75eb49" S ?= "${WORKDIR}/vbox_module" S:task-patch = "${WORKDIR}/${VBOX_NAME}"
Signature · 1 line
2.25.1
PATCH 22/22 minidlna: fix obsolete license warning
In reply to Armin KusterFrom: Markus Volk <[email protected]>
--- meta-multimedia/recipes-multimedia/minidlna/minidlna.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-multimedia/recipes-multimedia/minidlna/minidlna.inc +1 -1
@@ -1,6 +1,6 @@ DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with the aim of \ being fully compliant with DLNA/UPnP-AV clients." -LICENSE = "GPL-2.0|BSD-3-Clause" +LICENSE = "GPL-2.0-only|BSD-3-Clause" DEPENDS = "ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis" # because it depends on libav which has commercial flag
Signature · 1 line
2.25.1