diff options
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-connectivity')
43 files changed, 544 insertions, 489 deletions
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb index 074292b43b..b9fefa8589 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb @@ -13,7 +13,7 @@ SRC_URI = "git://gitlab.freedesktop.org/realmd/adcli;branch=master \ S = "${WORKDIR}/git" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6" inherit autotools xmlcatalog diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch index 269174b2f6..913566dce9 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch @@ -1,31 +1,24 @@ -From 77db892cdee265e971270c06ca1ffbaeea6449a3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Tue, 26 Jun 2018 00:27:40 +0200 Subject: [PATCH] Search for cython3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstream-Status: Pending +Upstream-Status: Inappropriate -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +Signed-off-by: Markus Volk <f_l_k@gmx.net> --- - configure.ac | 2 +- + meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 727089d1..6b565cdc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,7 +58,7 @@ AC_SUBST([PYGOBJECT_LIBS]) +--- a/module/meson.build 2022-02-10 08:49:35.000000000 +0100 ++++ b/module/meson.build 2022-03-29 12:58:03.456193737 +0200 +@@ -1,4 +1,4 @@ +-cython = find_program('cython', required: true) ++cython = find_program('cython3', required: true) - AC_ARG_VAR([CYTHONEXEC], [Cython compiler]) - if test "x$CYTHONEXEC" = "x"; then -- AC_PATH_PROG([CYTHONEXEC],[cython]) -+ AC_PATH_PROG([CYTHONEXEC],[cython3]) - fi - AC_SUBST([CYTHONEXEC]) - AC_MSG_CHECKING([for cython executable]) + blueman_c = custom_target( + 'blueman_c', + -- 2.14.3 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.3.bb b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb index df496c3683..ea06ee67f7 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.3.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb @@ -1,23 +1,19 @@ DESCRIPTION = "Blueman is a GTK+ Bluetooth Manager" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "bluez5 python3-pygobject python3-cython-native python3-setuptools-native intltool-native" +DEPENDS = "gtk+3 glib-2.0 bluez5 python3-pygobject python3-cython-native" -inherit autotools gettext systemd gsettings pkgconfig python3native gtk-icon-cache +inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache SRC_URI = " \ https://github.com/blueman-project/blueman/releases/download/${PV}/blueman-${PV}.tar.xz \ file://0001-Search-for-cython3.patch \ file://0002-fix-fail-to-enable-bluetooth.patch \ " -SRC_URI[sha256sum] = "6edd791da6afd8f610ffb08d5138cfcf50e6257ad30efad686287f3a2be106e9" +SRC_URI[sha256sum] = "55d639feeda0b43b18a659e65985213a54b47dcb1348f3b4effb5238db242602" -EXTRA_OECONF = " \ - --disable-appindicator \ - --disable-runtime-deps-check \ - --disable-schemas-compile \ -" +EXTRA_OEMESON = "-Druntime_deps_check=false -Dappindicator=false" SYSTEMD_SERVICE:${PN} = "${BPN}-mechanism.service" SYSTEMD_AUTO_ENABLE:${PN} = "disable" @@ -26,22 +22,25 @@ RRECOMENDS_${PN} += "adwaita-icon-theme" RDEPENDS:${PN} += " \ python3-core \ python3-dbus \ + python3-pygobject \ + python3-terminal \ packagegroup-tools-bluetooth \ " -PACKAGECONFIG ??= "thunar" -PACKAGECONFIG[thunar] = "--enable-thunar-sendto,--disable-thunar-sendto" +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'polkit pulseaudio ', d)} \ + thunar \ +" +PACKAGECONFIG[thunar] = "-Dthunar-sendto=true,-Dthunar-sendto=false" +PACKAGECONFIG[pulseaudio] = "-Dpulseaudio=true,-Dpulseaudio=false" +PACKAGECONFIG[polkit] = "-Dpolicykit=true,-Dpolicykit=false" FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/Thunar \ + ${datadir} \ ${systemd_user_unitdir} \ - ${exec_prefix}${systemd_system_unitdir} \ ${PYTHON_SITEPACKAGES_DIR} \ " -FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_blueman.a" - # In code, path to python is a variable that is replaced with path to native version of it # during the configure stage, e.g ../recipe-sysroot-native/usr/bin/python3-native/python3. # Replace it with #!/usr/bin/env python3 @@ -55,3 +54,4 @@ do_install:append() { ${D}${bindir}/blueman-services \ ${D}${bindir}/blueman-tray } + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb index a3b734c2ec..8e164708ed 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Python interface to Bluetooth LE on Linux" HOMEPAGE = "https://github.com/IanHarvey/bluepy" SECTION = "devel/python" -LICENSE = "GPLv2 & PD" +LICENSE = "GPL-2.0-only & PD" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=59e0d45ea684dda215889aa1b5acd001" DEPENDS = "glib-2.0" SRCREV = "7ad565231a97c304c0eff45f2649cd005e69db09" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.0.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.0.0.bb index 86b6577721..f34c73c173 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.0.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.0.0.bb @@ -1,6 +1,6 @@ SUMMARY = "a SocketCAN over Ethernet tunnel" HOMEPAGE = "https://github.com/mguentner/cannelloni" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" SRC_URI = "git://github.com/mguentner/cannelloni.git;protocol=https;branch=master" SRCREV = "0bd7e27db35bdef361226882ae04205504f7b2f4" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb b/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb index 8e5ee66a2a..14d809f518 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb @@ -1,7 +1,7 @@ SUMMARY = "The dump DAQ test the various inline mode features " HOMEPAGE = "http://www.snort.org" SECTION = "libs" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f9ce51a65dd738dc1ae631d8b21c40e0" PARALLEL_MAKE = "" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb deleted file mode 100644 index 8d4be95cfe..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb +++ /dev/null @@ -1,83 +0,0 @@ -SECTION = "console/network" -SUMMARY = "Internet Software Consortium DHCP Relay Agent" -DESCRIPTION = "A DHCP relay agent passes DHCP requests from one \ -LAN to another, so that a DHCP server is not needed on every LAN." - -HOMEPAGE = "http://www.isc.org/" - -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747c01" - -DEPENDS = "openssl libcap zlib chrpath-replacement-native" -EXTRANATIVEPATH += "chrpath-native" - -SRC_URI = "https://ftp.isc.org/isc/dhcp/4.4.2-P1/dhcp-4.4.2-P1.tar.gz \ - https://ftp.isc.org/isc/bind9/9.11.32/bind-9.11.32.tar.gz;name=bind;unpack=0 \ - file://default-relay \ - file://init-relay \ - file://dhcrelay.service \ - file://0001-Makefile.am-only-build-dhcrelay.patch \ - file://0002-bind-version-update-to-latest-version.patch \ - file://0003-bind-Makefile.in-disable-backtrace.patch \ - " - -SRC_URI[md5sum] = "3089a1ebd20a802ec0870ae337d43907" -SRC_URI[sha256sum] = "b05e04337539545a8faa0d6ac518defc61a07e5aec66a857f455e7f218c85a1a" -SRC_URI[bind.md5sum] = "0d029dd06ca60c6739c3189c999ef757" -SRC_URI[bind.sha256sum] = "cbf8cb4b74dd1452d97c3a2a8c625ea346df8516b4b3508ef07443121a591342" - -UPSTREAM_CHECK_URI = "http://ftp.isc.org/isc/dhcp/" -UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/" - -S = "${WORKDIR}/dhcp-4.4.2-P1" - -inherit autotools-brokensep systemd - -SYSTEMD_SERVICE:${PN} = "dhcrelay.service" -SYSTEMD_AUTO_ENABLE:${PN} = "disable" - -CFLAGS += "-D_GNU_SOURCE -fcommon" -LDFLAGS:append = " -pthread" - -EXTRA_OECONF = "--enable-paranoia \ - --disable-static \ - --enable-libtool \ - --with-randomdev=/dev/random \ - " - -# Enable shared libs per dhcp README -do_configure:prepend () { - cp configure.ac+lt configure.ac - cp ${WORKDIR}/bind-9.11.32.tar.gz ${S}/bind/bind.tar.gz -} - -do_compile:prepend() { - # Need to unpack this now instead of earlier as do_configure will delete the configure script - rm -rf ${S}/bind/bind-9.11.32/ - tar xf ${S}/bind/bind.tar.gz -C ${S}/bind - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/bind/bind-9.11.32/ - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/bind/bind-9.11.32/ - cp -fpR ${S}/m4/*.m4 ${S}/bind/bind-9.11.32/libtool.m4/ - rm -rf ${S}/bind/bind-9.11.32/libtool - install -m 0755 ${S}/libtool ${S}/bind/bind-9.11.32/ -} - -do_install:append () { - install -Dm 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay - install -Dm 0755 ${B}/bind/bind-9.11.32/lib/isccfg/.libs/libisccfg.so.163 ${D}${libdir}/libisccfg.so.163 - install -Dm 0755 ${B}/bind/bind-9.11.32/lib/dns/.libs/libdns.so.1115 ${D}${libdir}/libdns.so.1115 - chrpath --delete ${D}${libdir}/libisccfg.so.163 - chrpath --delete ${D}${libdir}/libdns.so.1115 - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/dhcrelay.service - sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcrelay.service - else - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay - fi -} - -PARALLEL_MAKE = "" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3.bb b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3.bb new file mode 100644 index 0000000000..92c648708e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3.bb @@ -0,0 +1,62 @@ +SECTION = "console/network" +SUMMARY = "Internet Software Consortium DHCP Relay Agent" +DESCRIPTION = "A DHCP relay agent passes DHCP requests from one \ +LAN to another, so that a DHCP server is not needed on every LAN." + +HOMEPAGE = "http://www.isc.org/" + +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c463f4afde26d9eb60f14f50aeb85f8f" + +DEPENDS = "openssl libcap zlib" + +SRC_URI = "https://downloads.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \ + file://default-relay \ + file://init-relay \ + file://dhcrelay.service \ + file://0001-Makefile.am-only-build-dhcrelay.patch \ + file://0002-bind-Makefile.in-disable-backtrace.patch \ + file://0003-bind-Makefile.in-regenerate-configure.patch \ + " + +SRC_URI[sha256sum] = "0e3ec6b4c2a05ec0148874bcd999a66d05518378d77421f607fb0bc9d0135818" + +UPSTREAM_CHECK_URI = "http://ftp.isc.org/isc/dhcp/" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/" + +S = "${WORKDIR}/dhcp-${PV}" + +inherit autotools-brokensep systemd pkgconfig + +SYSTEMD_SERVICE:${PN} = "dhcrelay.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" + +CFLAGS += "-D_GNU_SOURCE -fcommon" +LDFLAGS:append = " -pthread" + +EXTRA_OECONF = "--enable-paranoia \ + --disable-static \ + --enable-libtool \ + --with-randomdev=/dev/random \ + " + +# Enable shared libs per dhcp README +do_configure:prepend () { + cp configure.ac+lt configure.ac +} + +do_install:append () { + install -Dm 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/dhcrelay.service + sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcrelay.service + else + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay + fi +} + +PARALLEL_MAKE = "" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0001-Makefile.am-only-build-dhcrelay.patch b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0001-Makefile.am-only-build-dhcrelay.patch index fed85d2a8c..5320d7c9e9 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0001-Makefile.am-only-build-dhcrelay.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0001-Makefile.am-only-build-dhcrelay.patch @@ -1,4 +1,4 @@ -From 17cc080e58894644dd18664ac6f3451096d5f065 Mon Sep 17 00:00:00 2001 +From 4fd67b6adb7c1d8524ba17d1a0b3894f901555a9 Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Thu, 13 May 2021 15:23:16 +0800 Subject: [PATCH] Makefile.am: only build dhcrelay @@ -26,5 +26,5 @@ index ed692a5..34f9772 100644 DIST_SUBDIRS = $(SUBDIRS) keama -- -2.17.1 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-disable-backtrace.patch b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0002-bind-Makefile.in-disable-backtrace.patch index 51520bc621..631a640ecc 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-disable-backtrace.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0002-bind-Makefile.in-disable-backtrace.patch @@ -1,4 +1,4 @@ -From bc9c5d64ad4829c7830ef70fcaff94470974247c Mon Sep 17 00:00:00 2001 +From 6c6bbfe6b33e5c7e46a4260d656593dbe610fd8a Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Tue, 8 Jun 2021 10:13:57 +0800 Subject: [PATCH] bind/Makefile.in: disable backtrace @@ -14,7 +14,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bind/Makefile.in b/bind/Makefile.in -index 8fe8883..1058160 100644 +index 2e60091..533d55c 100644 --- a/bind/Makefile.in +++ b/bind/Makefile.in @@ -22,7 +22,7 @@ prefix = @prefix@ @@ -27,5 +27,5 @@ index 8fe8883..1058160 100644 @BINDLT@ @BINDIOMUX@ @BINDCONFIG@ --enable-full-report -- -2.17.1 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0002-bind-version-update-to-latest-version.patch b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0002-bind-version-update-to-latest-version.patch deleted file mode 100644 index 5c7a5f058f..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0002-bind-version-update-to-latest-version.patch +++ /dev/null @@ -1,30 +0,0 @@ -From edb68972f8dc636e6208e78f02dec6f9805e4c0b Mon Sep 17 00:00:00 2001 -From: Yi Zhao <yi.zhao@windriver.com> -Date: Wed, 26 May 2021 11:39:00 +0800 -Subject: [PATCH] bind/version: update to latest version - -Update the bundled bind from 9.11.14 to 9.11.32. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - bind/version.tmp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bind/version.tmp b/bind/version.tmp -index cf52f1b..4cc538e 100644 ---- a/bind/version.tmp -+++ b/bind/version.tmp -@@ -5,7 +5,7 @@ PRODUCT=BIND - DESCRIPTION="(Extended Support Version)" - MAJORVER=9 - MINORVER=11 --PATCHVER=14 -+PATCHVER=32 - RELEASETYPE= - RELEASEVER= - EXTENSIONS= --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-regenerate-configure.patch b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-regenerate-configure.patch new file mode 100644 index 0000000000..71be0276a3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-regenerate-configure.patch @@ -0,0 +1,30 @@ +From 6ca1b224032355521b35471d222d0b09c08369a0 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Thu, 27 May 2021 11:38:36 +0800 +Subject: [PATCH] bind/Makefile.in: regenerate configure + +Run autogen.sh to regenerate configure. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + bind/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bind/Makefile.in b/bind/Makefile.in +index 533d55c..fdffe15 100644 +--- a/bind/Makefile.in ++++ b/bind/Makefile.in +@@ -55,7 +55,7 @@ bind1: + else \ + echo Configuring BIND libraries for DHCP. ; \ + rm -rf ${cleandirs} ${cleanfiles} ; \ +- (cd ${bindsrcdir} && \ ++ (cd ${bindsrcdir} && ./autogen.sh && \ + ./configure ${bindconfig} > ${binddir}/configure.log); \ + fi + +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb index 8c74c3954e..bdda35a24b 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Dibbler DHCPv6 client" DESCRIPTION = "Dibbler is a portable DHCPv6 implementation. It supports stateful as well as stateless autoconfiguration for IPv6." HOMEPAGE = "http://klub.com.pl/dhcpv6" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=7236695bb6d4461c105d685a8b61c4e3" SRCREV = "a7c6cf58a88a510cb00841351e75030ce78d36bf" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb b/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb index 51e220c9e7..8648f2e0e6 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb @@ -1,7 +1,7 @@ SUMMARY = "daemon that sends updates when your IP changes" HOMEPAGE = "http://sourceforge.net/projects/ez-ipupdate/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=7783169b4be06b54e86730eb01bc3a31" SRC_URI = "http://sourceforge.net/projects/ez-ipupdate/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.4.bb b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.4.bb index 7d29bf1ed0..1dea339535 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.4.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.4.bb @@ -2,7 +2,7 @@ SUMMARY = "Dynamic firewall daemon with a D-Bus interface" HOMEPAGE = "https://firewalld.org/" BUGTRACKER = "https://github.com/firewalld/firewalld/issues" UPSTREAM_CHECK_URI = "https://github.com/firewalld/firewalld/releases" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb index 3e5cca6405..da7e60419e 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb @@ -9,7 +9,7 @@ done when adding or deleting new users." SUMMARY = "High-performance and highly configurable RADIUS server" HOMEPAGE = "http://www.freeradius.org/" SECTION = "System/Servers" -LICENSE = "GPLv2 & LGPLv2+" +LICENSE = "GPL-2.0-only & LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" DEPENDS = "openssl-native openssl libidn libtool libpcap libtalloc" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb index 9b64388a0f..bf3e18dce7 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb @@ -3,7 +3,7 @@ DESCRIPTION = "LFTP is a sophisticated file transfer program with \ FISH, SFTP, HTTPS and FTPS protocols" HOMEPAGE = "http://lftp.yar.ru/" SECTION = "console/network" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "http://lftp.yar.ru/ftp/lftp-${PV}.tar.bz2" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch new file mode 100644 index 0000000000..e778e8158b --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch @@ -0,0 +1,29 @@ +From 16d07a82242c3263ec0038c9b4c97355795d2dd9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 19 Mar 2022 23:16:51 -0700 +Subject: [PATCH] pyiec61850: Use CMAKE_INSTALL_LIBDIR from GNUInstallDirs in + cmake + +This ensures that it gets installed in platform specified system libdir +all platforms do not use /usr/lib as assumed here e.g. ppc64 uses lib64 + +Upstream-Status: Submitted [https://github.com/mz-automation/libiec61850/pull/376] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + pyiec61850/CMakeLists.txt | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/pyiec61850/CMakeLists.txt ++++ b/pyiec61850/CMakeLists.txt +@@ -31,7 +31,9 @@ endif() + + swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS}) + +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) +-install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) ++include(GNUInstallDirs) ++ ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) ++install(TARGETS _iec61850 LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}//python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) + + add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) diff --git a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.1.bb index fa42be62a2..3e5fc91dad 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.1.bb @@ -10,13 +10,14 @@ library for the IEC 61850/MMS, IEC 61850/GOOSE and IEC \ written in C. It is available under the GPLv3 license." HOMEPAGE = "http://libiec61850.com" SECTION = "console/network" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "swig-native python3" -SRCREV = "fcefc746fea286aeaa40d2f62240216da81c85e5" +SRCREV = "210cf30897631fe2006ac50483caf8fd616622a2" SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.5;protocol=https \ file://0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \ + file://0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.1.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.1.5.bb index 3c2ab980e5..005ad726f3 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.1.5.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.1.5.bb @@ -4,7 +4,7 @@ communication patterns. It aims to make the networking layer fast, scalable, \ and easy to use. Implemented in C, it works on a wide range of operating \ systems with no further dependencies." HOMEPAGE = "https://nanomsg.org/" -LICENSE = "MIT-X" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=587b3fd7fd291e418ff4d2b8f3904755" SECTION = "libs/networking" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-Makefile-fix-parallel-build-failure.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-Makefile-fix-parallel-build-failure.patch new file mode 100644 index 0000000000..2149ee30cd --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-Makefile-fix-parallel-build-failure.patch @@ -0,0 +1,44 @@ +From 2e84550b47b475d830622f41576992a1d45d6af0 Mon Sep 17 00:00:00 2001 +From: Zhao Yi <38274519+yizhao1@users.noreply.github.com> +Date: Tue, 15 Mar 2022 19:28:26 +0800 +Subject: [PATCH] Makefile: fix parallel build failure (#267) + +* Makefile: fix parallel build failure + +Add src/_features.h as dependency for dbus.o to fix the parallel build +failure: +src/dbus.c:17:10: fatal error: _features.h: No such file or directory + +Upstream-Status: Backport +[https://github.com/canonical/netplan/commit/2e84550b47b475d830622f41576992a1d45d6af0] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 0368e41..8ac7432 100644 +--- a/Makefile ++++ b/Makefile +@@ -52,7 +52,7 @@ NOSETESTS3 ?= $(shell command -v nosetests-3 || command -v nosetests3 || echo tr + + default: netplan/_features.py generate netplan-dbus dbus/io.netplan.Netplan.service doc/netplan.html doc/netplan.5 doc/netplan-generate.8 doc/netplan-apply.8 doc/netplan-try.8 doc/netplan-dbus.8 doc/netplan-get.8 doc/netplan-set.8 + +-%.o: src/%.c ++%.o: src/%.c src/_features.h + $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -c $^ `pkg-config --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid` + + libnetplan.so.$(NETPLAN_SOVER): $(SRCS) abicompat.lds +@@ -62,7 +62,7 @@ libnetplan.so.$(NETPLAN_SOVER): $(SRCS) abicompat.lds + generate: libnetplan.so.$(NETPLAN_SOVER) generate.o + $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(filter-out $<,$^) -L. -lnetplan `pkg-config --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid` + +-netplan-dbus: libnetplan.so.$(NETPLAN_SOVER) src/_features.h dbus.o ++netplan-dbus: libnetplan.so.$(NETPLAN_SOVER) dbus.o + $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(filter-out $<,$(patsubst %.h,,$^)) -L. -lnetplan `pkg-config --cflags --libs libsystemd glib-2.0 gio-2.0 yaml-0.1 uuid` + + src/_features.h: src/[^_]*.[hc] +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.104.bb b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.104.bb index e26649744c..ea944fa9db 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.104.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.104.bb @@ -7,7 +7,7 @@ tool." HOMEPAGE = "https://netplan.io" SECTION = "net/misc" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" S = "${WORKDIR}/git" @@ -16,6 +16,7 @@ PV = "0.104" SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https \ file://0001-Makefile-do-not-use-Werror.patch \ + file://0001-Makefile-fix-parallel-build-failure.patch \ " SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.16.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.18.bb index 19cac13458..1d0c38e035 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.16.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.18.bb @@ -1,7 +1,7 @@ SUMMARY = "NetworkManager-openvpn-plugin" SECTION = "net/misc" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=100d5a599bead70ddcd70dcd73f2e29c" DEPENDS = "dbus dbus-glib networkmanager openvpn intltool-native glib-2.0-native" @@ -10,7 +10,7 @@ inherit gnomebase useradd gettext systemd SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/NetworkManager-openvpn-${PV}.tar.xz" -SRC_URI[sha256sum] = "8920de09c7ae5f1f520c83f844455db8faec31427350268fe2dd95b860f91fb5" +SRC_URI[sha256sum] = "53dfb0acf64478adc728074f162f62e60bff62a605bd897eb88b267e7057927a" S = "${WORKDIR}/NetworkManager-openvpn-${PV}" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch deleted file mode 100644 index 19c8c74811..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 9bcf4c81a559d1e7deac47b2e510d7f1e5837a02 Mon Sep 17 00:00:00 2001 -From: Pablo Saavedra <psaavedra@igalia.com> -Date: Tue, 13 Mar 2018 17:36:20 +0100 -Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 65ceffb..ad4b0fc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -561,7 +561,7 @@ if test "$have_jansson" = "yes"; then - AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled]) - - AC_CHECK_TOOLS(READELF, [eu-readelf readelf]) -- JANSSON_LIBDIR=`$PKG_CONFIG --variable=libdir jansson` -+ JANSSON_LIBDIR=${PKG_CONFIG_SYSROOT_DIR}`$PKG_CONFIG --variable=libdir jansson` - JANSSON_SONAME=`$READELF -d $JANSSON_LIBDIR/libjansson.so |sed -n 's/.*SONAME.*\[[\([^]]*\)]]/\1/p'` - - if test "$JANSSON_SONAME" = ""; then diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-do-not-ask-host-for-ifcfg-defaults.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-do-not-ask-host-for-ifcfg-defaults.patch new file mode 100644 index 0000000000..92b129320c --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-do-not-ask-host-for-ifcfg-defaults.patch @@ -0,0 +1,24 @@ +From 37559b659e22886d5f55837d4f167ba5fda73e85 Mon Sep 17 00:00:00 2001 +From: Adrian Freihofer <adrian.freihofer@siemens.com> +Date: Sun, 29 Aug 2021 15:50:35 +0200 +Subject: [PATCH] do-not-ask-host-for-ifcfg-defaults + +--- + meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index d0cec83..289aa1b 100644 +--- a/meson.build ++++ b/meson.build +@@ -304,8 +304,8 @@ else + distro = 'unknown' + endif + +-enable_ifcfg_rh = get_option('ifcfg_rh') or (distro == 'redhat') +-enable_ifupdown = get_option('ifupdown') or (distro == 'debian') ++enable_ifcfg_rh = get_option('ifcfg_rh') ++enable_ifupdown = get_option('ifupdown') + + config_plugins_default = get_option('config_plugins_default') + config_h.set_quoted('NM_CONFIG_DEFAULT_MAIN_PLUGINS', config_plugins_default) diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch deleted file mode 100644 index 86e8eaafc5..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch +++ /dev/null @@ -1,60 +0,0 @@ -From d0dead0478a070b96f37bd3b310443eaa8c93a25 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Mon, 5 Jul 2021 00:42:23 +0200 -Subject: [PATCH] Do not create settings settings/property documentation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It was tried to get this work by adding python3-pygobject-native to DEPENDS but -compile could not find (configure passed) python module gi. -Anyway it is not necessary for us to have the settings/property docs. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> -Signed-off-by: Vinicius Aquino <voa.aquino@gmail.com> ---- - Makefile.am | 5 ----- - configure.ac | 5 ----- - 2 files changed, 10 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 5a62070..3d0ebcd 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1860,15 +1860,10 @@ src/libnm-client-impl/libnm.typelib: src/libnm-client-impl/libnm.gir - INTROSPECTION_GIRS += src/libnm-client-impl/NM-1.0.gir - - libnm_noinst_data = \ -- src/nmcli/generate-docs-nm-settings-nmcli.xml \ -- man/nm-settings-docs-dbus.xml \ -- man/nm-settings-docs-nmcli.xml \ - src/libnm-client-impl/nm-property-infos-dbus.xml \ - src/libnm-client-impl/nm-property-infos-ifcfg-rh.xml \ - src/libnm-client-impl/nm-property-infos-keyfile.xml \ - src/libnm-client-impl/nm-property-infos-nmcli.xml \ -- src/libnm-client-impl/nm-settings-docs-gir.xml \ -- src/libnmc-setting/settings-docs-input.xml \ - $(NULL) - - noinst_DATA += $(libnm_noinst_data) -diff --git a/configure.ac b/configure.ac -index 8fe23de..dc24850 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1258,11 +1258,6 @@ GTK_DOC_CHECK(1.0) - # check if we can build setting property documentation - build_docs=no - if test -n "$INTROSPECTION_MAKEFILE"; then -- # If g-i is installed we know we have python, but we might not have pygobject -- if ! "$PYTHON" -c 'from gi.repository import GObject' > /dev/null 2>&1; then -- AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)]) -- fi -- - AC_PATH_PROG(PERL, perl) - if test -z "$PERL"; then - AC_MSG_ERROR([--enable-introspection requires perl]) --- -2.31.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch deleted file mode 100644 index 11741897f6..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch +++ /dev/null @@ -1,30 +0,0 @@ -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/enable-dhcpcd.conf b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/enable-dhcpcd.conf new file mode 100644 index 0000000000..8da4fe0487 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/enable-dhcpcd.conf @@ -0,0 +1,2 @@ +[main] +dhcp=dhcpcd diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/enable-iwd.conf b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/enable-iwd.conf new file mode 100644 index 0000000000..abb5937341 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/enable-iwd.conf @@ -0,0 +1,3 @@ +[device] +wifi.iwd.autoconnect=yes +wifi.backend=iwd diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.34.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.34.0.bb deleted file mode 100644 index ec15aea070..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.34.0.bb +++ /dev/null @@ -1,180 +0,0 @@ -SUMMARY = "NetworkManager" -HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" -SECTION = "net/misc" - -LICENSE = "GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ -" - -DEPENDS = " \ - intltool-native \ - libxslt-native \ - libnl \ - udev \ - util-linux \ - libndp \ - libnewt \ - curl \ -" - -inherit gnomebase gettext update-rc.d systemd vala gobject-introspection gtk-doc update-alternatives upstream-version-is-even - -SRC_URI = " \ - ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ - file://${BPN}.initd \ - file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ - file://0002-Do-not-create-settings-settings-property-documentati.patch \ - file://0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch \ -" -SRC_URI[sha256sum] = "819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd" - -S = "${WORKDIR}/NetworkManager-${PV}" - -EXTRA_OECONF = " \ - --disable-ifcfg-rh \ - --disable-more-warnings \ - --with-iptables=${sbindir}/iptables \ - --with-tests \ - --with-nmtui=yes \ - --with-udev-dir=${nonarch_base_libdir}/udev \ - --with-dhclient=no \ - --with-dhcpcd=no \ - --with-dhcpcanon=no \ - --with-netconfig=no \ -" - -# stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template -# avoids: -# | ../NetworkManager-1.16.0/libnm-core/nm-json.c:106:50: error: 'RTLD_DEEPBIND' undeclared (first use in this function); did you mean 'RTLD_DEFAULT'? -CFLAGS:append:libc-musl = " \ - -DRTLD_DEEPBIND=0 \ -" - -do_compile:prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/src/libnm-client-impl/.libs" -} - -PACKAGECONFIG ??= "nss ifupdown dnsmasq nmcli \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)} \ -" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'nmcli', 'bash-completion', '', d)} - -PACKAGECONFIG[systemd] = " \ - --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \ - --without-systemdsystemunitdir, \ -" -PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit" -PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" -# consolekit is not picked by shlibs, so add it to RDEPENDS too -PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" -PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" -PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" -PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" -PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" -PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf,,,resolvconf" -PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls" -PACKAGECONFIG[wifi] = "--with-wext=yes --enable-wifi=yes,--with-wext=no --enable-wifi=no,,wpa-supplicant" -PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" -PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" -PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-cloud-setup=no" -PACKAGECONFIG[nmcli] = "--with-nmcli=yes,--with-nmcli=no,readline" -PACKAGECONFIG[ovs] = "--enable-ovs,--disable-ovs,jansson" -PACKAGECONFIG[audit] = "--with-libaudit,--without-libaudit,audit" -PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" - -PACKAGES =+ " \ - ${PN}-nmcli ${PN}-nmcli-doc \ - ${PN}-nmtui ${PN}-nmtui-doc \ - ${PN}-adsl ${PN}-cloud-setup \ -" - -SYSTEMD_PACKAGES = "${PN} ${PN}-cloud-setup" - -FILES:${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-plugin-adsl.so" - -FILES:${PN}-cloud-setup = " \ - ${libexecdir}/nm-cloud-setup \ - ${systemd_system_unitdir}/nm-cloud-setup.service \ - ${systemd_system_unitdir}/nm-cloud-setup.timer \ - ${libdir}/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh \ - ${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh \ -" -ALLOW_EMPTY:${PN}-cloud-setup = "1" -SYSTEMD_SERVICE:${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONFIG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '', d)}" - -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 \ - ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-up.d \ - ${nonarch_libdir}/NetworkManager/dispatcher.d/no-wait.d \ - ${nonarch_libdir}/NetworkManager/VPN \ - ${nonarch_libdir}/NetworkManager/system-connections \ - ${datadir}/polkit-1 \ - ${datadir}/dbus-1 \ - ${nonarch_base_libdir}/udev/* \ - ${systemd_system_unitdir} \ - ${libdir}/pppd \ -" - -RRECOMMENDS:${PN} += "iptables \ - ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \ -" -RCONFLICTS:${PN} = "connman" - -FILES:${PN}-dev += " \ - ${datadir}/NetworkManager/gdb-cmd \ - ${libdir}/pppd/*/*.la \ - ${libdir}/NetworkManager/*.la \ - ${libdir}/NetworkManager/${PV}/*.la \ -" - -FILES:${PN}-nmcli = " \ - ${bindir}/nmcli \ -" - -FILES:${PN}-nmcli-doc = " \ - ${mandir}/man1/nmcli* \ -" - -FILES:${PN}-nmtui = " \ - ${bindir}/nmtui \ - ${bindir}/nmtui-edit \ - ${bindir}/nmtui-connect \ - ${bindir}/nmtui-hostname \ -" - -FILES:${PN}-nmtui-doc = " \ - ${mandir}/man1/nmtui* \ -" - -INITSCRIPT_NAME = "network-manager" -SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'NetworkManager.service NetworkManager-dispatcher.service', '', d)}" - -ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE:${PN} = "${@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)}" - -do_install:append() { - install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/network-manager - - rm -rf ${D}/run ${D}${localstatedir}/run - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','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 - - # systemd v210 and newer do not need this rule file - rm ${D}/${nonarch_base_libdir}/udev/rules.d/84-nm-drivers.rules - fi -} diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb new file mode 100644 index 0000000000..b09ff18bf7 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb @@ -0,0 +1,248 @@ +SUMMARY = "NetworkManager" +HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" +SECTION = "net/misc" + +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ +" + +DEPENDS = " \ + coreutils-native \ + intltool-native \ + libxslt-native \ + libnl \ + udev \ + util-linux \ + libndp \ + libnewt \ + curl \ + dbus \ +" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gettext update-rc.d systemd gobject-introspection gtk-doc update-alternatives upstream-version-is-even + +SRC_URI = " \ + ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ + file://${BPN}.initd \ + file://enable-dhcpcd.conf \ + file://enable-iwd.conf \ + file://0001-do-not-ask-host-for-ifcfg-defaults.patch \ +" +SRC_URI[sha256sum] = "ab855cbe3b41832e9a3b003810e7c7313dfe19e630d29806d14d87fdd1470cab" + +S = "${WORKDIR}/NetworkManager-${PV}" + +# ['auto', 'symlink', 'file', 'netconfig', 'resolvconf'] +NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT ??= "auto" + +# ['dhcpcanon', 'dhclient', 'dhcpcd', 'internal', 'nettools'] +NETWORKMANAGER_DHCP_DEFAULT ??= "internal" + +EXTRA_OEMESON = "\ + -Difcfg_rh=false \ + -Dtests=yes \ + -Dnmtui=true \ + -Dudev_dir=${nonarch_base_libdir}/udev \ + -Dlibpsl=false \ + -Dqt=false \ + -Dconfig_dns_rc_manager_default=${NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT} \ + -Dconfig_dhcp_default=${NETWORKMANAGER_DHCP_DEFAULT} \ + -Ddhcpcanon=false \ +" + +# stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template +# avoids: +# | ../NetworkManager-1.16.0/libnm-core/nm-json.c:106:50: error: 'RTLD_DEEPBIND' undeclared (first use in this function); did you mean 'RTLD_DEFAULT'? +CFLAGS:append:libc-musl = " \ + -DRTLD_DEEPBIND=0 \ +" + +do_compile:prepend() { + export GI_TYPELIB_PATH="${B}}/src/libnm-client-impl${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" +} + +PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli vala \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)} \ +" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'nmcli', 'bash-completion', '', d)} +inherit ${@bb.utils.contains('PACKAGECONFIG', 'vala', 'vala', '', d)} + +PACKAGECONFIG[systemd] = "\ + -Dsystemdsystemunitdir=${systemd_unitdir}/system -Dsession_tracking=systemd,\ + -Dsystemdsystemunitdir=no -Dsystemd_journal=false -Dsession_tracking=no\ +" +PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false,polkit" +PACKAGECONFIG[bluez5] = "-Dbluez5_dun=true,-Dbluez5_dun=false,bluez5" +# consolekit is not picked by shlibs, so add it to RDEPENDS too +PACKAGECONFIG[consolekit] = "-Dsession_tracking_consolekit=true,-Dsession_tracking_consolekit=false,consolekit,consolekit" +PACKAGECONFIG[modemmanager] = "-Dmodem_manager=true,-Dmodem_manager=false,modemmanager mobile-broadband-provider-info" +PACKAGECONFIG[ppp] = "-Dppp=true,-Dppp=false,ppp,ppp" +PACKAGECONFIG[dnsmasq] = "-Ddnsmasq=${bindir}/dnsmasq" +PACKAGECONFIG[nss] = "-Dcrypto=nss,,nss" +PACKAGECONFIG[resolvconf] = "-Dresolvconf=${base_sbindir}/resolvconf,-Dresolvconf=no,,resolvconf" +PACKAGECONFIG[gnutls] = "-Dcrypto=gnutls,,gnutls" +PACKAGECONFIG[wifi] = "-Dwext=true -Dwifi=true,-Dwext=false -Dwifi=false" +PACKAGECONFIG[iwd] = "-Diwd=true,-Diwd=false" +PACKAGECONFIG[ifupdown] = "-Difupdown=true,-Difupdown=false" +PACKAGECONFIG[cloud-setup] = "-Dnm_cloud_setup=true,-Dnm_cloud_setup=false" +PACKAGECONFIG[nmcli] = "-Dnmcli=true,-Dnmcli=false" +PACKAGECONFIG[readline] = "-Dreadline=libreadline,,readline" +PACKAGECONFIG[libedit] = "-Dreadline=libedit,,libedit" +PACKAGECONFIG[ovs] = "-Dovs=true,-Dovs=false,jansson" +PACKAGECONFIG[audit] = "-Dlibaudit=yes,-Dlibaudit=no" +PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux" +PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" +PACKAGECONFIG[dhcpcd] = "-Ddhcpcd=yes,-Ddhcpcd=no,,dhcpcd" +PACKAGECONFIG[dhclient] = "-Ddhclient=yes,-Ddhclient=no,,dhcp" +PACKAGECONFIG[concheck] = "-Dconcheck=true,-Dconcheck=false" + + +PACKAGES =+ " \ + ${PN}-adsl \ + ${PN}-bluetooth \ + ${PN}-cloud-setup \ + ${PN}-nmcli ${PN}-nmcli-doc \ + ${PN}-nmtui ${PN}-nmtui-doc \ + ${PN}-wifi \ + ${PN}-wwan \ + ${PN}-ovs ${PN}-ovs-doc \ + ${PN}-ppp \ +" + +SYSTEMD_PACKAGES = "${PN} ${PN}-cloud-setup" + +NETWORKMANAGER_PLUGINDIR = "${libdir}/NetworkManager/${PV}" + +FILES:${PN}-adsl = "${NETWORKMANAGER_PLUGINDIR}/libnm-device-plugin-adsl.so" + +FILES:${PN}-bluetooth = "${NETWORKMANAGER_PLUGINDIR}/libnm-device-plugin-bluetooth.so" + +FILES:${PN}-cloud-setup = " \ + ${libexecdir}/nm-cloud-setup \ + ${systemd_system_unitdir}/nm-cloud-setup.service \ + ${systemd_system_unitdir}/nm-cloud-setup.timer \ + ${libdir}/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh \ + ${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh \ +" +ALLOW_EMPTY:${PN}-cloud-setup = "1" +SYSTEMD_SERVICE:${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONFIG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '', d)}" + +FILES:${PN}-nmcli = " \ + ${bindir}/nmcli \ +" + +FILES:${PN}-nmcli-doc = " \ + ${mandir}/man1/nmcli* \ +" + +FILES:${PN}-nmtui = " \ + ${bindir}/nmtui \ + ${bindir}/nmtui-edit \ + ${bindir}/nmtui-connect \ + ${bindir}/nmtui-hostname \ +" + +FILES:${PN}-nmtui-doc = " \ + ${mandir}/man1/nmtui* \ +" + +FILES:${PN}-wifi = "${NETWORKMANAGER_PLUGINDIR}/libnm-device-plugin-wifi.so" + +FILES:${PN}-wwan = "\ + ${NETWORKMANAGER_PLUGINDIR}/libnm-device-plugin-wwan.so \ + ${NETWORKMANAGER_PLUGINDIR}/libnm-wwan.so \ +" + +FILES:${PN}-ovs = "\ + ${NETWORKMANAGER_PLUGINDIR}/libnm-device-plugin-ovs.so \ + ${systemd_system_unitdir}/NetworkManager.service.d/NetworkManager-ovs.conf \ +" + +FILES:${PN}-ovs-doc = "\ + ${mandir}/man7/nm-openvswitch.7* \ +" + +FILES:${PN}-ppp = "\ + ${NETWORKMANAGER_PLUGINDIR}/libnm-ppp-plugin.so \ + ${libdir}/pppd/*/nm-pppd-plugin.so \ +" + +FILES:${PN}-dev += " \ + ${libdir}/pppd/*/*.la \ + ${libdir}/NetworkManager/*.la \ + ${NETWORKMANAGER_PLUGINDIR}/*.la \ +" + +FILES:${PN} += " \ + ${libexecdir} \ + ${libdir}/NetworkManager \ + ${nonarch_libdir}/firewalld/zones \ + ${nonarch_libdir}/NetworkManager/conf.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-down.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-up.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/no-wait.d \ + ${nonarch_libdir}/NetworkManager/VPN \ + ${nonarch_libdir}/NetworkManager/system-connections \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${nonarch_base_libdir}/udev/* \ + ${systemd_system_unitdir} \ +" + +RRECOMMENDS:${PN} += "\ + iptables \ + ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \ + ${@bb.utils.contains('PACKAGECONFIG','adsl','${PN}-adsl','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','bluez5','${PN}-bluetooth','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','cloud-setup','${PN}-cloud-setup','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','nmcli','${PN}-nmcli','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','nmtui','${PN}-nmtui','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','wifi','${PN}-wifi','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','wwan','${PN}-wwan','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','ovs','${PN}-ovs','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','ppp','${PN}-ppp','',d)} \ +" +RCONFLICTS:${PN} = "connman" + + +INITSCRIPT_NAME = "network-manager" +SYSTEMD_SERVICE:${PN} = "\ + NetworkManager.service \ + NetworkManager-dispatcher.service \ +" + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE:${PN} = "${@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)}" + +do_install:append() { + install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/network-manager + + rm -rf ${D}/run ${D}${localstatedir}/run + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','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 + + # systemd v210 and newer do not need this rule file + rm ${D}/${nonarch_base_libdir}/udev/rules.d/84-nm-drivers.rules + fi + + # Enable iwd if compiled + if ${@bb.utils.contains('PACKAGECONFIG','iwd','true','false',d)}; then + install -Dm 0644 ${WORKDIR}/enable-iwd.conf ${D}${libdir}/NetworkManager/conf.d/enable-iwd.conf + fi + + # Enable dhcpd if compiled + if ${@bb.utils.contains('PACKAGECONFIG','dhcpcd','true','false',d)}; then + install -Dm 0644 ${WORKDIR}/enable-dhcpcd.conf ${D}${libdir}/NetworkManager/conf.d/enable-dhcpcd.conf + fi +} diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.10.bb b/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.20.bb index 7a61f74e31..022ba85a26 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.10.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.20.bb @@ -1,11 +1,11 @@ SUMMARY = "Open client for Cisco AnyConnect VPN" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=243b725d71bb5df4a1e5920b344b86ad" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=8c2e1ec1540fb3e0beb68361344cba7e" SRC_URI = " \ git://git.infradead.org/users/dwmw2/openconnect.git;branch=master \ " -SRCREV = "9d287e40c57233190a51b6434ba7345370e36f38" +SRCREV = "03a3b9c76a9b6d0a65073b6bebbc1192e3445507" DEPENDS = "vpnc libxml2 krb5 gettext-native" RDEPENDS:${PN} = "bash python3-core vpnc-script" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb index cd4db12c08..67e7c1c615 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb @@ -8,7 +8,7 @@ DESCRIPTION = "The rdate utility retrieves the date and time from \ HOMEPAGE= "https://www.aelius.com/njh/rdate/" SECTION = "Applications/System" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "https://www.aelius.com/njh/${BPN}/${BP}.tar.gz \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb index 1dd50f6e12..1da18d7ca0 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Layer 3 relay daemon" SECTION = "console/network" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://main.c;endline=17;md5=86aad799085683e0a2e1c2684a20bab2" DEPENDS = "libubox" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb index 84eee44195..dc6e4b5e16 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb @@ -1,7 +1,7 @@ HOMEPAGE = "https://www.samba.org/" SECTION = "console/network" -LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+" +LICENSE = "GPL-3.0-or-later & LGPL-3.0-or-later & GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://${COREBASE}/meta/files/common-licenses/LGPL-3.0-or-later;md5=c51d3eef3be114124d11349ca0d7e117 \ file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/sethdlc/sethdlc_1.18.bb b/meta-openembedded/meta-networking/recipes-connectivity/sethdlc/sethdlc_1.18.bb index 744e782064..4e3c157713 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/sethdlc/sethdlc_1.18.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/sethdlc/sethdlc_1.18.bb @@ -1,7 +1,7 @@ DESCRIPTION = "set Linux HDLC packet radio modem driver port information" HOMEPAGE = "https://www.kernel.org/pub/linux/utils/net/hdlc" SECTION = "comm" -LICENSE = "GPLv2 & GPLv2+ " +LICENSE = "GPL-2.0-only & GPL-2.0-or-later " LIC_FILES_CHKSUM = "file://sethdlc.c;endline=10;md5=90f936879e9f8b755a138aeb348782eb" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.19.bb b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.19.bb index 9c479d2200..26b335dbd5 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.19.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.19.bb @@ -1,7 +1,7 @@ DESCRIPTION = "snort - a free lightweight network intrusion detection system for UNIX and Windows." HOMEPAGE = "http://www.snort.org/" SECTION = "net" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" DEPENDS = "xz libpcap libpcre daq libdnet util-linux daq-native libtirpc bison-native" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch index 884fa1647e..ee935eb615 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch @@ -23,11 +23,9 @@ Signed-off-by: Silcet <camorga1@gmail.com> setup.py | 65 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 28 deletions(-) -diff --git a/setup.py b/setup.py -index 09204d3..2343bc9 100644 --- a/setup.py +++ b/setup.py -@@ -246,41 +246,50 @@ shutil.copytree('src', 'staging') +@@ -245,45 +245,50 @@ shutil.copytree('src', 'staging') os.unlink(os.path.join('staging', 'ufw-init')) os.unlink(os.path.join('staging', 'ufw-init-functions')) @@ -36,7 +34,11 @@ index 09204d3..2343bc9 100644 iptables_dir = '' -for e in ['iptables']: -- for dir in ['/sbin', '/bin', '/usr/sbin', '/usr/bin', '/usr/local/sbin', \ +- # Historically iptables was in /sbin, then later also symlinked from +- # /usr/sbin/iptables to /sbin/iptables. Debian bullseye moves iptables +- # to /usr/sbin with no symlink in /sbin except on upgrades. To accomodate +- # buildds that may still have the old iptables, search /usr/sbin first +- for dir in ['/usr/sbin', '/sbin', '/usr/bin', '/bin', '/usr/local/sbin', \ - '/usr/local/bin']: - if e == "iptables": - if os.path.exists(os.path.join(dir, e)): @@ -49,6 +51,14 @@ index 09204d3..2343bc9 100644 - if iptables_exe != "": - break - +- +-if iptables_exe == '': +- print("ERROR: could not find required binary 'iptables'", file=sys.stderr) +- sys.exit(1) +- +-for e in ['ip6tables', 'iptables-restore', 'ip6tables-restore']: +- if not os.path.exists(os.path.join(iptables_dir, e)): +- print("ERROR: could not find required binary '%s'" % (e), file=sys.stderr) +if "--iptables-dir" in sys.argv: + iptables_dir = sys.argv[sys.argv.index("--iptables-dir") + 1] + iptables_exe = os.path.join(iptables_dir, "iptables") @@ -59,7 +69,7 @@ index 09204d3..2343bc9 100644 + +if not iptables_set: + for e in ['iptables']: -+ for dir in ['/sbin', '/bin', '/usr/sbin', '/usr/bin', '/usr/local/sbin', \ ++ for dir in ['/usr/sbin', '/sbin', '/usr/bin', '/bin', '/usr/local/sbin', \ + '/usr/local/bin']: + if e == "iptables": + if os.path.exists(os.path.join(dir, e)): @@ -68,16 +78,10 @@ index 09204d3..2343bc9 100644 + print("Found '%s'" % iptables_exe) + else: + continue - --if iptables_exe == '': -- print("ERROR: could not find required binary 'iptables'", file=sys.stderr) -- sys.exit(1) ++ + if iptables_exe != "": + break - --for e in ['ip6tables', 'iptables-restore', 'ip6tables-restore']: -- if not os.path.exists(os.path.join(iptables_dir, e)): -- print("ERROR: could not find required binary '%s'" % (e), file=sys.stderr) ++ + if iptables_exe == '': + print("ERROR: could not find required binary 'iptables'", file=sys.stderr) sys.exit(1) diff --git a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/setuptools.patch b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/setuptools.patch new file mode 100644 index 0000000000..ad5391cb98 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/setuptools.patch @@ -0,0 +1,20 @@ +Move to setuptools as distutils is now deprecated. + +Upstream-Status: Submitted [https://code.launchpad.net/~tgamblin/ufw/distutils-to-setuptools] +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/setup.py b/setup.py +index cb67a6a..de648d3 100644 +--- a/setup.py ++++ b/setup.py +@@ -25,8 +25,8 @@ + # + + from __future__ import print_function +-from distutils.command.install import install as _install +-from distutils.core import setup ++from setuptools.command.install import install as _install ++from setuptools import setup + import errno + import os + import re diff --git a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.36.bb b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb index 40188cea21..70216a85e3 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.36.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb @@ -5,21 +5,20 @@ managing a netfilter firewall. It provides a command line interface and aims \ to be uncomplicated and easy to use." HOMEPAGE = "https://launchpad.net/ufw" SECTION = "net" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" -SRC_URI = "https://launchpad.net/ufw/0.36/0.36/+download/ufw-0.36.tar.gz \ +SRC_URI = "https://launchpad.net/ufw/0.36/0.36.1/+download/ufw-0.36.1.tar.gz \ file://0001-optimize-boot.patch \ file://0002-add-an-option-to-specify-iptables-location.patch \ file://0003-only-make-one-reference-to-env.patch \ + file://setuptools.patch \ " +SRC_URI[sha256sum] = "1c57e78fbf2970f0cc9c56ea87a231e6d83d825e55b9e31e2c88b91b0ea03c8c" UPSTREAM_CHECK_URI = "https://launchpad.net/ufw" -SRC_URI[md5sum] = "6d8ab1506da21ae003f4628f93d05781" -SRC_URI[sha256sum] = "754b22ae5edff0273460ac9f57509c3938187e0cf4fb9692c6a02833fff33cfc" - -inherit setuptools3 features_check systemd update-rc.d +inherit setuptools3_legacy features_check systemd update-rc.d RDEPENDS:${PN} = " \ iptables \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb b/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb index 8f899e62de..035d4946f1 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb @@ -1,7 +1,7 @@ SUMMARY = "VLAN provides vconfig utility" HOMEPAGE = "http://www.candelatech.com/~greear/vlan.html" SECTION = "misc" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://vconfig.c;beginline=1;endline=19;md5=094ca47de36c20c598b15b32c270ce0a" SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/vlan/1.9-3ubuntu10.6/${BPN}_${PV}.orig.tar.gz \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb b/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb index 421ebaa969..adc2a72eeb 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb @@ -2,7 +2,7 @@ SUMMARY = "A client for the Cisco3000 VPN Concentrator" HOMEPAGE = "http://www.unix-ag.uni-kl.de/~massar/vpnc/" AUTHOR = "Maurice Massar vpnc@unix-ag.uni-kl.de" SECTION = "net" -LICENSE = "GPL-2.0+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=173b74cb8ac640a9992c03f3bce22a33" DEPENDS += "libgcrypt" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.2.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.2.0.bb index a597fb3ccd..78a24bcddd 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.2.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.2.0.bb @@ -6,7 +6,7 @@ DESCRIPTION = "wolfSSL, formerly CyaSSL, is a lightweight SSL library written \ HOMEPAGE = "https://www.wolfssl.com/products/wolfssl" BUGTRACKER = "https://github.com/wolfssl/wolfssl/issues" SECTION = "libs" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" PROVIDES += "cyassl" |