diff options
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-connectivity')
| -rw-r--r-- | meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.1.3.bb (renamed from meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.1.1.bb) | 3 | ||||
| -rw-r--r-- | meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.5.bb (renamed from meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.3.bb) | 11 | ||||
| -rw-r--r-- | meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.99.bb (renamed from meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.98.bb) | 20 | ||||
| -rw-r--r-- | meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch | 30 | ||||
| -rw-r--r-- | meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb (renamed from meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.10.bb) | 4 |
5 files changed, 51 insertions, 17 deletions
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.1.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.1.3.bb index 0ea7f6de9..9143a67ae 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.1.1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.1.3.bb @@ -11,8 +11,7 @@ SRC_URI = " \ file://0001-Search-for-cython3.patch \ file://0002-fix-fail-to-enable-bluetooth.patch \ " -SRC_URI[md5sum] = "9de89abb31be45bdbf11f7884764a2dc" -SRC_URI[sha256sum] = "f1eab2334e5a1587defa80900901048d14c2e8ffa8c0cff7240bc9937a61dbc3" +SRC_URI[sha256sum] = "3bd02e0cc9e2c1424df1fc2015da710a280ef4c657515727e47eafabf8c2cfde" EXTRA_OECONF = " \ --disable-appindicator \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.3.bb b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.5.bb index 4dea848f4..fbf586f76 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.3.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.5.bb @@ -8,16 +8,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ file://firewalld.init \ " -SRC_URI[md5sum] = "05ec772cbdc0a2b3df081e4beca5599d" -SRC_URI[sha256sum] = "414c46202c12334cd5c986214e5e2575d18e743c5531a97ace1c0cd94341c60d" +SRC_URI[md5sum] = "b1aeede85a72adcf4f79d98019811244" +SRC_URI[sha256sum] = "45a8a7dbc084ef56ce306154d3834922e7f1fc2bf11b6c821f579cad51313226" # glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 -DEPENDS = "intltool-native glib-2.0-native libxslt-native docbook-xsl-stylesheets-native" +DEPENDS = "intltool-native glib-2.0-native" inherit gettext autotools bash-completion python3native gsettings systemd update-rc.d PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd" +PACKAGECONFIG[docs] = "--with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog,--disable-docs,libxslt-native docbook-xsl-stylesheets-native" PACKAGES += "${PN}-zsh-completion" @@ -37,7 +38,6 @@ EXTRA_OECONF = "\ --without-ebtables \ --without-ebtables-restore \ --disable-sysconfig \ - --with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog \ " INITSCRIPT_NAME = "firewalld" @@ -62,6 +62,9 @@ do_install_append() { fi sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g \ ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml + + # This file contains Red Hat-isms. Modules get loaded without it. + rm -f ${D}${sysconfdir}/modprobe.d/firewalld-sysctls.conf } FILES_${PN} += "\ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.98.bb b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.99.bb index 9f123c70f..67ccddf6a 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.98.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.99.bb @@ -11,8 +11,8 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" S = "${WORKDIR}/git" -SRCREV = "5d22e9d22c4a3724d27b80b0cd9b898ae8f59d2b" -PV = "0.98+git${SRCPV}" +SRCREV = "1ccf7e0e3a7a91edbbe3f9f0669c8bbab8248cd1" +PV = "0.99+git${SRCPV}" SRC_URI = " \ git://github.com/CanonicalLtd/netplan.git \ @@ -20,17 +20,17 @@ SRC_URI = " \ DEPENDS = "glib-2.0 libyaml ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -RDEPENDS_${PN} = "python3 python3-core python3-pyyaml python3-netifaces python3-nose python3-coverage python3-pycodestyle python3-pyflakes util-linux-libuuid" +RDEPENDS_${PN} = "python3 python3-core python3-pyyaml python3-netifaces python3-nose python3-coverage python3-pycodestyle python3-pyflakes util-linux-libuuid libnetplan" inherit pkgconfig systemd TARGET_CC_ARCH += "${LDFLAGS}" -EXTRA_OEMAKE = "generate" +EXTRA_OEMAKE = "generate netplan/_features.py" EXTRA_OEMAKE =+ "${@bb.utils.contains('DISTRO_FEATURES','systemd','netplan-dbus dbus/io.netplan.Netplan.service','',d)}" do_install() { - install -d ${D}${sbindir} ${D}${base_libdir}/netplan ${D}${datadir}/netplan/netplan/cli/commands ${D}${sysconfdir}/netplan + install -d ${D}${sbindir} ${D}${libdir} ${D}${base_libdir}/netplan ${D}${datadir}/netplan/netplan/cli/commands ${D}${sysconfdir}/netplan install -m 755 ${S}/generate ${D}${base_libdir}/netplan/ install -m 644 ${S}/netplan/*.py ${D}${datadir}/netplan/netplan install -m 644 ${S}/netplan/cli/*.py ${D}${datadir}/netplan/netplan/cli @@ -39,7 +39,6 @@ do_install() { ln -srf ${D}${datadir}/netplan/netplan.script ${D}${sbindir}/netplan install -d ${D}/${systemd_unitdir}/system ${D}${systemd_unitdir}/system-generators - install -m 644 ${S}/src/netplan-wpa@.service ${D}${systemd_unitdir}/system/ ln -srf ${D}/${base_libdir}/netplan/generate ${D}${systemd_unitdir}/system-generators if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then @@ -48,12 +47,13 @@ do_install() { install -m 644 ${S}/dbus/io.netplan.Netplan.conf ${D}${datadir}/dbus-1/system.d install -m 644 ${S}/dbus/io.netplan.Netplan.service ${D}${datadir}/dbus-1/system-services fi -} -SYSTEMD_SERVICE_${PN} = "netplan-wpa@.service" -SYSTEMD_AUTO_ENABLE = "disable" + install -m 755 ${S}/libnetplan.so.0.0 ${D}${libdir} + ln -rfs ${D}${libdir}/libnetplan.so.0.0 ${D}${libdir}/libnetplan.so +} -PACKAGES += "${PN}-dbus" +PACKAGES += "${PN}-dbus libnetplan" +FILES_libnetplan = "${libdir}/libnetplan.so.0.0" FILES_${PN} = "${sbindir} ${base_libdir}/netplan/generate ${datadir}/netplan ${sysconfdir}/netplan ${systemd_unitdir}" FILES_${PN}-dbus = "${base_libdir}/netplan/netplan-dbus ${datadir}/dbus-1" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch new file mode 100644 index 000000000..11741897f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch @@ -0,0 +1,30 @@ +From 6388b16b93ba805f8877a94f47509f701250812f Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Mon, 6 Jul 2020 19:33:54 -0700 +Subject: [PATCH] install firewalld to var-libdir rather than hardcod lib + +The oe install firewalld (split packages) to ${libdir}/firewalld/zones + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 358b01a..5745339 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -4778,7 +4778,7 @@ data/server.conf: $(srcdir)/data/server.conf.in + $(AM_V_GEN) $(data_edit) $< >$@ + + if WITH_FIREWALLD_ZONE +-firewalldzonedir = $(prefix)/lib/firewalld/zones ++firewalldzonedir = $(libdir)/firewalld/zones + firewalldzone_DATA = data/nm-shared.xml + endif + +-- +2.21.0 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.10.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb index 33a2b7c0c..5eb2aefa7 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.10.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb @@ -26,6 +26,7 @@ SRC_URI = " \ file://${BPN}.initd \ file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ file://0002-Do-not-create-settings-settings-property-documentati.patch \ + file://0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch \ " SRC_URI_append_libc-musl = " \ file://musl/0001-Fix-build-with-musl-systemd-specific.patch \ @@ -33,7 +34,7 @@ SRC_URI_append_libc-musl = " \ file://musl/0003-Fix-build-with-musl-for-n-dhcp4.patch \ file://musl/0004-Fix-build-with-musl-systemd-specific.patch \ " -SRC_URI[sha256sum] = "2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77" +SRC_URI[sha256sum] = "c6893971936a1ce252ba4fdff830c972d2ae93fec6751b57dcfd3ad9f0c949dd" S = "${WORKDIR}/NetworkManager-${PV}" @@ -106,6 +107,7 @@ FILES_${PN} += " \ ${libexecdir} \ ${libdir}/NetworkManager/${PV}/*.so \ ${libdir}/NetworkManager \ + ${libdir}/firewalld/zones \ ${nonarch_libdir}/NetworkManager/conf.d \ ${nonarch_libdir}/NetworkManager/dispatcher.d \ ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-down.d \ |