From f3f8ef6d2c19eb775e7fe0a66594268f70a34eca Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 19 Jan 2020 16:32:05 -0800 Subject: [PATCH 1/3] meta-networking: Remove using python2 This change makes the parsing go though, we still might have build issues, which will be reported in world builds seprately Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/crda/crda_3.18.bb | 2 +- .../recipes-connectivity/freeradius/freeradius_3.0.19.bb | 4 ++-- ...on-networkmanager_2.1.bb => python3-networkmanager_2.1.bb} | 4 ++-- meta-networking/recipes-connectivity/ufw/ufw_0.33.bb | 4 ++-- .../packagegroups/packagegroup-meta-networking.bb | 4 ++-- .../python/{python-ldap_3.2.0.bb => python3-ldap_3.2.0.bb} | 2 +- meta-networking/recipes-support/fetchmail/fetchmail_6.4.1.bb | 2 +- .../recipes-support/lowpan-tools/lowpan-tools_git.bb | 2 +- meta-networking/recipes-support/ntop/ntop_5.0.1.bb | 2 +- meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb | 2 +- meta-networking/recipes-support/spice/spice_git.bb | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) rename meta-networking/recipes-connectivity/python-networkmanager/{python-networkmanager_2.1.bb => python3-networkmanager_2.1.bb} (82%) rename meta-networking/recipes-devtools/python/{python-ldap_3.2.0.bb => python3-ldap_3.2.0.bb} (97%) diff --git a/meta-networking/recipes-connectivity/crda/crda_3.18.bb b/meta-networking/recipes-connectivity/crda/crda_3.18.bb index c93905ea7c2..4f975e11ead 100644 --- a/meta-networking/recipes-connectivity/crda/crda_3.18.bb +++ b/meta-networking/recipes-connectivity/crda/crda_3.18.bb @@ -18,7 +18,7 @@ SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \ SRC_URI[md5sum] = "0431fef3067bf503dfb464069f06163a" SRC_URI[sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf" -inherit python-dir pythonnative siteinfo +inherit python3-dir python3native siteinfo # Recursive make problem EXTRA_OEMAKE = "MAKEFLAGS= DESTDIR=${D} LIBDIR=${libdir}/crda LDLIBREG='-Wl,-rpath,${libdir}/crda -lreg' \ diff --git a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb b/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb index 8c95bbae3dc..1e4d3a57f36 100644 --- a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb +++ b/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb @@ -96,9 +96,9 @@ PACKAGECONFIG[rlm-eap-pwd] = "--with-rlm_eap_pwd, --without-rlm_eap_pwd" inherit useradd autotools-brokensep update-rc.d systemd # This is not a cpan or python based package, but it needs some definitions -# from cpan-base and python-dir bbclasses for building rlm_perl and rlm_python +# from cpan-base and python3-dir bbclasses for building rlm_perl and rlm_python # correctly. -inherit cpan-base python-dir +inherit cpan-base python3-dir # The modules subdirs also need to be processed by autoreconf. Use autogen.sh # in order to handle the subdirs correctly. diff --git a/meta-networking/recipes-connectivity/python-networkmanager/python-networkmanager_2.1.bb b/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.1.bb similarity index 82% rename from meta-networking/recipes-connectivity/python-networkmanager/python-networkmanager_2.1.bb rename to meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.1.bb index 3aa41f1add0..91a6edd2417 100644 --- a/meta-networking/recipes-connectivity/python-networkmanager/python-networkmanager_2.1.bb +++ b/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.1.bb @@ -8,6 +8,6 @@ SRC_URI[md5sum] = "f638d854a3639fb37c0e06d1092a771e" SRC_URI[sha256sum] = "aef1e34d98d7bec7cc368e0ca0f2e97493f9b5ebe6d7103f8f6460cfca3dc6fc" PYPI_PACKAGE = "python-networkmanager" -inherit pypi setuptools +inherit pypi setuptools3 -RDEPENDS_${PN} = "networkmanager python-dbus python-six" +RDEPENDS_${PN} = "networkmanager python3-dbus python3-six" diff --git a/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb b/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb index 19cfe46b7ba..c65b1c9b0eb 100644 --- a/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb +++ b/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb @@ -24,8 +24,8 @@ inherit setuptools distro_features_check RDEPENDS_${PN} = " \ iptables \ - python \ - python-modules \ + python3 \ + python3-modules \ " RRECOMMENDS_${PN} = " \ diff --git a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index f511d729e34..584ee708246 100644 --- a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -36,7 +36,7 @@ RDEPENDS_packagegroup-meta-networking-connectivity = "\ libdnet ufw civetweb freeradius kea daq \ mbedtls relayd snort dhcpcd rdate vlan vpnc \ inetutils wolfssl lftp miniupnpd networkmanager \ - networkmanager-openvpn rdist nanomsg python-networkmanager \ + networkmanager-openvpn rdist nanomsg python3-networkmanager \ ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth x11", "blueman", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \ @@ -51,7 +51,7 @@ RDEPENDS_packagegroup-meta-networking-daemons = "\ " RDEPENDS_packagegroup-meta-networking-devtools = "\ - python-ldap grpc \ + python3-ldap grpc \ " RDEPENDS_packagegroup-meta-networking-extended = "\ diff --git a/meta-networking/recipes-devtools/python/python-ldap_3.2.0.bb b/meta-networking/recipes-devtools/python/python3-ldap_3.2.0.bb similarity index 97% rename from meta-networking/recipes-devtools/python/python-ldap_3.2.0.bb rename to meta-networking/recipes-devtools/python/python3-ldap_3.2.0.bb index af8961e3228..2ad70ace4a7 100644 --- a/meta-networking/recipes-devtools/python/python-ldap_3.2.0.bb +++ b/meta-networking/recipes-devtools/python/python3-ldap_3.2.0.bb @@ -12,7 +12,7 @@ HOMEPAGE = "http://www.python-ldap.org/" DEPENDS = "python openldap cyrus-sasl" PYPI_PACKAGE = "python-ldap" -inherit pypi setuptools +inherit pypi setuptools3 LIC_FILES_CHKSUM = "file://LICENCE;md5=36ce9d726d0321b73c1521704d07db1b" SRC_URI[md5sum] = "fe22522208dc9b06d16eb70f8553eaab" diff --git a/meta-networking/recipes-support/fetchmail/fetchmail_6.4.1.bb b/meta-networking/recipes-support/fetchmail/fetchmail_6.4.1.bb index 21caa918a6a..0faf1964826 100644 --- a/meta-networking/recipes-support/fetchmail/fetchmail_6.4.1.bb +++ b/meta-networking/recipes-support/fetchmail/fetchmail_6.4.1.bb @@ -12,7 +12,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz \ SRC_URI[md5sum] = "c2b836a919cdd4ec53b06b70e0aa3e63" SRC_URI[sha256sum] = "3f33f11dd08c3e8cc3e9d18eec686b1626d4818f4d5a72791507bbc4dce6a9a0" -inherit autotools gettext python-dir pythonnative +inherit autotools gettext python3-dir python3native EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix}" diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb index b70c43f1562..5bd8bdcb5e6 100644 --- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb @@ -21,7 +21,7 @@ SRCREV = "1c2d8674cc6f4b1166a066e8822e295c105ae7a2" S = "${WORKDIR}/git" -inherit autotools python-dir pkgconfig +inherit autotools python3-dir pkgconfig CACHED_CONFIGUREVARS += "am_cv_python_pythondir=${PYTHON_SITEPACKAGES_DIR}/lowpan-tools" diff --git a/meta-networking/recipes-support/ntop/ntop_5.0.1.bb b/meta-networking/recipes-support/ntop/ntop_5.0.1.bb index 80f009b7c3a..6f09937ed0b 100644 --- a/meta-networking/recipes-support/ntop/ntop_5.0.1.bb +++ b/meta-networking/recipes-support/ntop/ntop_5.0.1.bb @@ -25,7 +25,7 @@ SRC_URI[sha256sum] = "7e8e84cb14d2173beaca4d4cb991a14d84a4bef84ec37b2276bc363f45 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/ntop/files/ntop/Stable" -inherit autotools-brokensep useradd pythonnative pkgconfig systemd +inherit autotools-brokensep useradd python3native pkgconfig systemd DEPENDS = "geoip rrdtool python zlib libpcap gdbm" diff --git a/meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb b/meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb index f0927803997..3f3cc207346 100644 --- a/meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb +++ b/meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb @@ -39,7 +39,7 @@ S = "${WORKDIR}/OpenIPMI-${PV}" SRC_URI[md5sum] = "d525ceaa07df5440674e7e68a6772fe7" SRC_URI[sha256sum] = "f3b1fafaaec2e2bac32fec5a86941ad8b8cb64543470bd6d819d7b166713d20b" -inherit autotools-brokensep pkgconfig pythonnative perlnative update-rc.d systemd cpan-base +inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base EXTRA_OECONF = "--disable-static \ --with-perl='${STAGING_BINDIR_NATIVE}/perl-native/perl' \ diff --git a/meta-networking/recipes-support/spice/spice_git.bb b/meta-networking/recipes-support/spice/spice_git.bb index 06a79c5001d..ebf4d576e51 100644 --- a/meta-networking/recipes-support/spice/spice_git.bb +++ b/meta-networking/recipes-support/spice/spice_git.bb @@ -29,7 +29,7 @@ SRC_URI = " \ S = "${WORKDIR}/git" -inherit autotools gettext pythonnative python-dir pkgconfig +inherit autotools gettext python3native python3-dir pkgconfig DEPENDS += "spice-protocol jpeg pixman alsa-lib glib-2.0 python-pyparsing-native python-six-native glib-2.0-native" DEPENDS_append_class-nativesdk = "nativesdk-openssl" From 53fe0b642efdfa96ef1cab2aaa2b13b24cb60433 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Mon, 23 Mar 2020 22:42:26 +0100 Subject: [PATCH 2/3] ufw: fix upstream check URL Fixes: $: devtool check-upgrade-status ufw <...> INFO: ufw 0.33 UNKNOWN_BROKEN None Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/ufw/ufw_0.33.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb b/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb index c65b1c9b0eb..dd319d1f9f8 100644 --- a/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb +++ b/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb @@ -17,6 +17,9 @@ SRC_URI = " \ file://0004-lp1039729.patch \ file://0005-lp1191197.patch \ " + +UPSTREAM_CHECK_URI = "https://launchpad.net/ufw" + SRC_URI[md5sum] = "3747b453d76709e5a99da209fc0bb5f5" SRC_URI[sha256sum] = "5f85a8084ad3539b547bec097286948233188c971f498890316dec170bdd1da8" From 80e52dc045cff9623d2f7ab9c9aa6e04bba8561a Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Thu, 7 Mar 2024 13:51:14 -0800 Subject: [PATCH 3/3] ufw: Install for Python 3 --- .../ufw/0006-Change-ufw-to-use-Python-3.patch | 22 +++++++++++++++++++ .../recipes-connectivity/ufw/ufw_0.33.bb | 3 ++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-connectivity/ufw/ufw/0006-Change-ufw-to-use-Python-3.patch diff --git a/meta-networking/recipes-connectivity/ufw/ufw/0006-Change-ufw-to-use-Python-3.patch b/meta-networking/recipes-connectivity/ufw/ufw/0006-Change-ufw-to-use-Python-3.patch new file mode 100644 index 00000000000..7fd60713d09 --- /dev/null +++ b/meta-networking/recipes-connectivity/ufw/ufw/0006-Change-ufw-to-use-Python-3.patch @@ -0,0 +1,22 @@ +From cc07a44f717bb7bdd71c07a7ad84caf6d8ed5c8c Mon Sep 17 00:00:00 2001 +From: Garrett Brown +Date: Tue, 2 Apr 2024 14:12:46 -0700 +Subject: [PATCH] Change ufw to use Python 3 + +--- + src/ufw | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ufw b/src/ufw +index c9e80e9..6ae28fa 100755 +--- a/src/ufw ++++ b/src/ufw +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # + # ufw: front-end for Linux firewalling (cli) + # +-- +2.34.1 + diff --git a/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb b/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb index dd319d1f9f8..493f25b9807 100644 --- a/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb +++ b/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb @@ -16,6 +16,7 @@ SRC_URI = " \ file://0003-fix-typeerror-on-error.patch \ file://0004-lp1039729.patch \ file://0005-lp1191197.patch \ + file://0006-Change-ufw-to-use-Python-3.patch \ " UPSTREAM_CHECK_URI = "https://launchpad.net/ufw" @@ -23,7 +24,7 @@ UPSTREAM_CHECK_URI = "https://launchpad.net/ufw" SRC_URI[md5sum] = "3747b453d76709e5a99da209fc0bb5f5" SRC_URI[sha256sum] = "5f85a8084ad3539b547bec097286948233188c971f498890316dec170bdd1da8" -inherit setuptools distro_features_check +inherit setuptools3 distro_features_check RDEPENDS_${PN} = " \ iptables \