diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-01-19 16:32:05 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-01-22 09:56:34 -0800 |
commit | 66454b26ff49c6cca3dd8d32832078cfa05cd5ef (patch) | |
tree | 62079bca2894e0e5045162292975f71d74ae3ab5 /meta-networking | |
parent | ff7839adcb9348733fab8ef7358d15e594afda07 (diff) | |
download | meta-openembedded-66454b26ff49c6cca3dd8d32832078cfa05cd5ef.tar.gz |
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 <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
12 files changed, 17 insertions, 17 deletions
diff --git a/meta-networking/recipes-connectivity/crda/crda_3.18.bb b/meta-networking/recipes-connectivity/crda/crda_3.18.bb index 7c925b252..d3c00424d 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 \ | |||
18 | SRC_URI[md5sum] = "0431fef3067bf503dfb464069f06163a" | 18 | SRC_URI[md5sum] = "0431fef3067bf503dfb464069f06163a" |
19 | SRC_URI[sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf" | 19 | SRC_URI[sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf" |
20 | 20 | ||
21 | inherit python-dir pythonnative siteinfo | 21 | inherit python3-dir python3native siteinfo |
22 | 22 | ||
23 | # Recursive make problem | 23 | # Recursive make problem |
24 | EXTRA_OEMAKE = "MAKEFLAGS= DESTDIR=${D} LIBDIR=${libdir}/crda LDLIBREG='-Wl,-rpath,${libdir}/crda -lreg' \ | 24 | 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 31e6978d6..888743306 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" | |||
96 | inherit useradd autotools-brokensep update-rc.d systemd | 96 | inherit useradd autotools-brokensep update-rc.d systemd |
97 | 97 | ||
98 | # This is not a cpan or python based package, but it needs some definitions | 98 | # This is not a cpan or python based package, but it needs some definitions |
99 | # from cpan-base and python-dir bbclasses for building rlm_perl and rlm_python | 99 | # from cpan-base and python3-dir bbclasses for building rlm_perl and rlm_python |
100 | # correctly. | 100 | # correctly. |
101 | inherit cpan-base python-dir | 101 | inherit cpan-base python3-dir |
102 | 102 | ||
103 | # The modules subdirs also need to be processed by autoreconf. Use autogen.sh | 103 | # The modules subdirs also need to be processed by autoreconf. Use autogen.sh |
104 | # in order to handle the subdirs correctly. | 104 | # 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 index 3aa41f1ad..91a6edd24 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" | |||
8 | SRC_URI[sha256sum] = "aef1e34d98d7bec7cc368e0ca0f2e97493f9b5ebe6d7103f8f6460cfca3dc6fc" | 8 | SRC_URI[sha256sum] = "aef1e34d98d7bec7cc368e0ca0f2e97493f9b5ebe6d7103f8f6460cfca3dc6fc" |
9 | 9 | ||
10 | PYPI_PACKAGE = "python-networkmanager" | 10 | PYPI_PACKAGE = "python-networkmanager" |
11 | inherit pypi setuptools | 11 | inherit pypi setuptools3 |
12 | 12 | ||
13 | RDEPENDS_${PN} = "networkmanager python-dbus python-six" | 13 | 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 6ff103c77..d620e88eb 100644 --- a/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb +++ b/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb | |||
@@ -20,12 +20,12 @@ SRC_URI = " \ | |||
20 | SRC_URI[md5sum] = "3747b453d76709e5a99da209fc0bb5f5" | 20 | SRC_URI[md5sum] = "3747b453d76709e5a99da209fc0bb5f5" |
21 | SRC_URI[sha256sum] = "5f85a8084ad3539b547bec097286948233188c971f498890316dec170bdd1da8" | 21 | SRC_URI[sha256sum] = "5f85a8084ad3539b547bec097286948233188c971f498890316dec170bdd1da8" |
22 | 22 | ||
23 | inherit setuptools features_check | 23 | inherit setuptools3 features_check |
24 | 24 | ||
25 | RDEPENDS_${PN} = " \ | 25 | RDEPENDS_${PN} = " \ |
26 | iptables \ | 26 | iptables \ |
27 | python \ | 27 | python3 \ |
28 | python-modules \ | 28 | python3-modules \ |
29 | " | 29 | " |
30 | 30 | ||
31 | RRECOMMENDS_${PN} = " \ | 31 | 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 9109b105f..da2d5a2af 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 = "\ | |||
36 | libdnet ufw civetweb freeradius kea daq \ | 36 | libdnet ufw civetweb freeradius kea daq \ |
37 | mbedtls relayd snort dhcpcd rdate vlan vpnc \ | 37 | mbedtls relayd snort dhcpcd rdate vlan vpnc \ |
38 | inetutils wolfssl lftp miniupnpd networkmanager \ | 38 | inetutils wolfssl lftp miniupnpd networkmanager \ |
39 | networkmanager-openvpn rdist nanomsg python-networkmanager \ | 39 | networkmanager-openvpn rdist nanomsg python3-networkmanager \ |
40 | ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth x11", "blueman", "", d)} \ | 40 | ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth x11", "blueman", "", d)} \ |
41 | ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \ | 41 | ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \ |
42 | ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \ | 42 | ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \ |
@@ -55,7 +55,7 @@ RDEPENDS_packagegroup-meta-networking-daemons = "\ | |||
55 | RDEPENDS_packagegroup-meta-networking-daemons_remove_libc-musl = "opensaf" | 55 | RDEPENDS_packagegroup-meta-networking-daemons_remove_libc-musl = "opensaf" |
56 | 56 | ||
57 | RDEPENDS_packagegroup-meta-networking-devtools = "\ | 57 | RDEPENDS_packagegroup-meta-networking-devtools = "\ |
58 | python-ldap grpc \ | 58 | python3-ldap grpc \ |
59 | " | 59 | " |
60 | 60 | ||
61 | RDEPENDS_packagegroup-meta-networking-extended = "\ | 61 | 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 index af8961e32..2ad70ace4 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/" | |||
12 | DEPENDS = "python openldap cyrus-sasl" | 12 | DEPENDS = "python openldap cyrus-sasl" |
13 | 13 | ||
14 | PYPI_PACKAGE = "python-ldap" | 14 | PYPI_PACKAGE = "python-ldap" |
15 | inherit pypi setuptools | 15 | inherit pypi setuptools3 |
16 | 16 | ||
17 | LIC_FILES_CHKSUM = "file://LICENCE;md5=36ce9d726d0321b73c1521704d07db1b" | 17 | LIC_FILES_CHKSUM = "file://LICENCE;md5=36ce9d726d0321b73c1521704d07db1b" |
18 | SRC_URI[md5sum] = "fe22522208dc9b06d16eb70f8553eaab" | 18 | 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 21caa918a..0faf19648 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 \ | |||
12 | SRC_URI[md5sum] = "c2b836a919cdd4ec53b06b70e0aa3e63" | 12 | SRC_URI[md5sum] = "c2b836a919cdd4ec53b06b70e0aa3e63" |
13 | SRC_URI[sha256sum] = "3f33f11dd08c3e8cc3e9d18eec686b1626d4818f4d5a72791507bbc4dce6a9a0" | 13 | SRC_URI[sha256sum] = "3f33f11dd08c3e8cc3e9d18eec686b1626d4818f4d5a72791507bbc4dce6a9a0" |
14 | 14 | ||
15 | inherit autotools gettext python-dir pythonnative | 15 | inherit autotools gettext python3-dir python3native |
16 | 16 | ||
17 | EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix}" | 17 | EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix}" |
18 | 18 | ||
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 585968f83..5917cfb3e 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" | |||
21 | 21 | ||
22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
23 | 23 | ||
24 | inherit autotools python-dir pkgconfig | 24 | inherit autotools python3-dir pkgconfig |
25 | 25 | ||
26 | CACHED_CONFIGUREVARS += "am_cv_python_pythondir=${PYTHON_SITEPACKAGES_DIR}/lowpan-tools" | 26 | CACHED_CONFIGUREVARS += "am_cv_python_pythondir=${PYTHON_SITEPACKAGES_DIR}/lowpan-tools" |
27 | 27 | ||
diff --git a/meta-networking/recipes-support/nghttp2/nghttp2_1.40.0.bb b/meta-networking/recipes-support/nghttp2/nghttp2_1.40.0.bb index f37e9b746..9ed8c5642 100644 --- a/meta-networking/recipes-support/nghttp2/nghttp2_1.40.0.bb +++ b/meta-networking/recipes-support/nghttp2/nghttp2_1.40.0.bb | |||
@@ -14,7 +14,7 @@ SRC_URI = "\ | |||
14 | SRC_URI[md5sum] = "8d1a6b96760254e4dd142d7176e8fb7c" | 14 | SRC_URI[md5sum] = "8d1a6b96760254e4dd142d7176e8fb7c" |
15 | SRC_URI[sha256sum] = "09fc43d428ff237138733c737b29fb1a7e49d49de06d2edbed3bc4cdcee69073" | 15 | SRC_URI[sha256sum] = "09fc43d428ff237138733c737b29fb1a7e49d49de06d2edbed3bc4cdcee69073" |
16 | 16 | ||
17 | inherit cmake manpages pythonnative | 17 | inherit cmake manpages python3native |
18 | PACKAGECONFIG[manpages] = "" | 18 | PACKAGECONFIG[manpages] = "" |
19 | 19 | ||
20 | # examples are never installed, and don't need to be built in the | 20 | # examples are never installed, and don't need to be built in the |
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 80f009b7c..6f09937ed 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 | |||
25 | 25 | ||
26 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/ntop/files/ntop/Stable" | 26 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/ntop/files/ntop/Stable" |
27 | 27 | ||
28 | inherit autotools-brokensep useradd pythonnative pkgconfig systemd | 28 | inherit autotools-brokensep useradd python3native pkgconfig systemd |
29 | 29 | ||
30 | DEPENDS = "geoip rrdtool python zlib libpcap gdbm" | 30 | DEPENDS = "geoip rrdtool python zlib libpcap gdbm" |
31 | 31 | ||
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 f09278039..3f3cc2073 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}" | |||
39 | SRC_URI[md5sum] = "d525ceaa07df5440674e7e68a6772fe7" | 39 | SRC_URI[md5sum] = "d525ceaa07df5440674e7e68a6772fe7" |
40 | SRC_URI[sha256sum] = "f3b1fafaaec2e2bac32fec5a86941ad8b8cb64543470bd6d819d7b166713d20b" | 40 | SRC_URI[sha256sum] = "f3b1fafaaec2e2bac32fec5a86941ad8b8cb64543470bd6d819d7b166713d20b" |
41 | 41 | ||
42 | inherit autotools-brokensep pkgconfig pythonnative perlnative update-rc.d systemd cpan-base | 42 | inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base |
43 | 43 | ||
44 | EXTRA_OECONF = "--disable-static \ | 44 | EXTRA_OECONF = "--disable-static \ |
45 | --with-perl='${STAGING_BINDIR_NATIVE}/perl-native/perl' \ | 45 | --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 06a79c500..ebf4d576e 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 = " \ | |||
29 | 29 | ||
30 | S = "${WORKDIR}/git" | 30 | S = "${WORKDIR}/git" |
31 | 31 | ||
32 | inherit autotools gettext pythonnative python-dir pkgconfig | 32 | inherit autotools gettext python3native python3-dir pkgconfig |
33 | 33 | ||
34 | DEPENDS += "spice-protocol jpeg pixman alsa-lib glib-2.0 python-pyparsing-native python-six-native glib-2.0-native" | 34 | DEPENDS += "spice-protocol jpeg pixman alsa-lib glib-2.0 python-pyparsing-native python-six-native glib-2.0-native" |
35 | DEPENDS_append_class-nativesdk = "nativesdk-openssl" | 35 | DEPENDS_append_class-nativesdk = "nativesdk-openssl" |