Revert "waf-samba.bbclass: point PYTHON_CONFIG to target python3-config"
PATCH 1/6 Revert "waf-samba.bbclass: point PYTHON_CONFIG to target python3-config"
This reverts commit 4b063f93a731cd6cc486dfcbc2c2f403fd29e7f3.
This is breaking builds.
--- meta-networking/classes/waf-samba.bbclass | 1 - 1 file changed, 1 deletion(-)
meta-networking/classes/waf-samba.bbclass +0 -1
@@ -95,7 +95,6 @@ do_configure() { export STAGING_LIBDIR=${STAGING_LIBDIR} export STAGING_INCDIR=${STAGING_INCDIR} export PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} - export PYTHON_CONFIG=${STAGING_EXECPREFIXDIR}/python-target-config/python3-config CONFIG_CMD="./configure ${CONFIGUREOPTS} ${EXTRA_OECONF} --cross-compile" if [ "${CROSS_METHOD}" = "answer" ]; then
Signature · 1 line
2.25.1
PATCH 2/6 networkmanager: fix /etc/resolv.conf handling
From: Chen Qi <[email protected]>
The current handling of /etc/resolv.conf by NM has some problems. When networkd is not configuring network, and there's 'ip=dhcp' in kernel command line, the /run/NetworkManager/resolv.conf file is not created, resulting in /etc/resolv.conf being a dead symlink. This is because NM is treating the network interface as externally configured and will not try to reconfigure it again.
This means if we want NM to work properly with /etc/resolv.conf, we've got to either ensure there's no 'ip=dhcp' in kernel command line, or we've got to ensure networkd is configuring network. This is weird because normally we should not enable two network managers at the same time. Note that NM syncs part of its codes with networkd, which is the reason I think it happens to work when these two network configuration tools are configuring the same interface at the same time.
In fact, NM now works well with resolved. It sends the DNS info it gets to resolved unconditionally by default (the behavior could be disabled in configuration file).
Looking at the original commit that sets up the update-alternatives mechanism, it says:
"""
This brings the networkmanager in sync with how systemd-resolved and connman work. Additionally this allows it to function with a read-only rootFS.
"""
I guess the author was using systemd but disabling resolved, and the author wanted to use read-only rootFS. In order to keep such combination still works, change to use PACKAGECONFIG to handle things, and when 'man-resolv-conf' is enabled, the above combination could still work.
--- .../networkmanager/networkmanager_1.40.0.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
meta-networking/recipes-connectivity/networkmanager/networkmanager_1.40.0.bb +6 -4
@@ -107,6 +107,8 @@ PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" PACKAGECONFIG[dhcpcd] = "-Ddhcpcd=${base_sbindir}/dhcpcd,-Ddhcpcd=no,,dhcpcd" PACKAGECONFIG[dhclient] = "-Ddhclient=yes,-Ddhclient=no,,dhcp" PACKAGECONFIG[concheck] = "-Dconcheck=true,-Dconcheck=false" +# The following PACKAGECONFIG is used to determine whether NM is managing /etc/resolv.conf itself or not +PACKAGECONFIG[man-resolv-conf] = ",," PACKAGES =+ " \
@@ -258,9 +260,9 @@ SYSTEMD_SERVICE:${PN}-daemon = "\ " RCONFLICTS:${PN}-daemon += "connman" ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE:${PN}-daemon = "${@bb.utils.contains('DISTRO_FEATURES','systemd','resolv-conf','',d)}" -ALTERNATIVE_TARGET[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv-conf.NetworkManager','',d)}" -ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv.conf','',d)}" +ALTERNATIVE:${PN}-daemon = "${@bb.utils.contains('PACKAGECONFIG','man-resolv-conf','resolv-conf','',d)}" +ALTERNATIVE_TARGET[resolv-conf] = "${@bb.utils.contains('PACKAGECONFIG','man-resolv-conf','${sysconfdir}/resolv-conf.NetworkManager','',d)}" +ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('PACKAGECONFIG','man-resolv-conf','${sysconfdir}/resolv.conf','',d)}" # The networkmanager package is an empty meta package which weakly depends on all the compiled features.
@@ -285,7 +287,7 @@ do_install:append() { rm -rf ${D}/run ${D}${localstatedir}/run - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + if ${@bb.utils.contains('PACKAGECONFIG','man-resolv-conf','true','false',d)}; then # For read-only filesystem, do not create links during bootup ln -sf ../run/NetworkManager/resolv.conf ${D}${sysconfdir}/resolv-conf.NetworkManager
Signature · 1 line
2.25.1
PATCH 3/6 fluidsynth: update SRC_URI to remove non-existing 2.2.x branch
In reply to Armin KusterFrom: Preeti Sachan <[email protected]>
Remove branch 2.2.x from SRC_URI as fluidsynth github removed the branch. The SRCREV is on master branch.
--- meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc +1 -1
@@ -4,7 +4,7 @@ SECTION = "libs/multimedia" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" -SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=2.2.x;protocol=https" +SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=master;protocol=https" SRCREV = "8b00644751578ba67b709a827cbe5133d849d339" S = "${WORKDIR}/git" PV = "2.2.6"
Signature · 1 line
2.25.1
PATCH 4/6 openwsman: upgrade 2.7.1 -> 2.7.2
In reply to Armin KusterFrom: Wang Mingyu <[email protected]>
Changelog:
==========
- Security
- call setgroups before setuid or setgid
- harden systemd service (https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort)
- Bugfixes
- wsman-win-client-transport: initialize certificate pointer
- iniparser: fix buffer size
- wsman-win-client-transport: plug leak in error path
- memory.c: fix memory cleanup
- Improve handling of HTTP 401 Unauthorized
- Fix serialization tests
- Fix Ruby bindings warnings
- Fix Ruby plugin loading test
- Fix rpm packaging
- Allow to run tests from 'build' directory
- Add Python XML test
- Enable CUNIT tests
---
.../openwsman/{openwsman_2.7.1.bb => openwsman_2.7.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-extended/openwsman/{openwsman_2.7.1.bb => openwsman_2.7.2.bb} (98%)meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb renamed from meta-oe/recipes-extended/openwsman/openwsman_2.7.1.bb +1 -1
@@ -15,7 +15,7 @@ DEPENDS = "curl libxml2 openssl libpam" inherit features_check REQUIRED_DISTRO_FEATURES = "pam" -SRCREV = "6cdf3bee50388d8e5f70850322a4df57fd685a5e" +SRCREV = "0120e256faa255d997d9a49d5207662c0b73d430" SRC_URI = "git://github.com/Openwsman/openwsman.git;branch=master;protocol=https \ file://libssl-is-required-if-eventint-supported.patch \
Signature · 1 line
2.25.1
PATCH 5/6 sshpass: Use SPDX identified string for GPLv2
In reply to Armin KusterFrom: Khem Raj <[email protected]>
Fixes
QA Issue: Recipe LICENSE includes obsolete licenses GPLv2 [obsolete-license]
--- meta-networking/recipes-connectivity/sshpass/sshpass_1.09.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-connectivity/sshpass/sshpass_1.09.bb +1 -1
@@ -1,7 +1,7 @@ DESCRIPTION = "Non-interactive ssh password auth" HOMEPAGE = "http://sshpass.sourceforge.net/" SECTION = "console/network" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz"
Signature · 1 line
2.25.1
PATCH 6/6 strongswan: upgrade 5.9.8 -> 5.9.9
In reply to Armin KusterFrom: Yi Zhao <[email protected]>
Changelog:
https://github.com/strongswan/strongswan/releases/tag/5.9.9
---
.../strongswan/{strongswan_5.9.8.bb => strongswan_5.9.9.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-networking/recipes-support/strongswan/{strongswan_5.9.8.bb => strongswan_5.9.9.bb} (99%)meta-networking/recipes-support/strongswan/strongswan_5.9.9.bb renamed from meta-networking/recipes-support/strongswan/strongswan_5.9.8.bb +1 -1
@@ -11,7 +11,7 @@ DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' tpm2-tss', SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ " -SRC_URI[sha256sum] = "d3303a43c0bd7b75a12b64855e8edcb53696f06190364f26d1533bde1f2e453c" +SRC_URI[sha256sum] = "5e16580998834658c17cebfb31dd637e728669cf2fdd325460234a4643b8d81d" UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar"
Signature · 1 line
2.25.1