From ba6de43c25453413491a8bac2d6f7f7011c9b326 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 21 May 2019 08:07:33 -0400 Subject: meta-openembedded: subtree update:1ecd8b4364..f3018013ff Adrian Bunk (1): Add irda-utils Khem Raj (1): openocd: Upgrade to latest git version Martin Jansa (8): gtkwave: add distro_features_check ndctl: make MACHINE_ARCH and ignore from libblockdev oprofile: make MACHINE_ARCH umip: make MACHINE_ARCH mscgen: fix SRC_URI for multilib python-cassandra-driver.inc: fix DEPENDS triggerhappy: fix issues opencv: use the same package name in PACKAGES and RDEPENDS Oleksandr Kravchuk (4): znc: update to 1.7.3 pure-ftpd: update to 1.0.47 xl2tpd: update to 1.3.14 ell: remove recipe Scott Ellis (1): wireguard: Upgrade 20190123 -> 20190406 Tom Rini (1): toybox: Re-order inherit location so we can override do_configure Zang Ruochen (8): python-pyparsing: upgrade 2.2.0 -> 2.4.0 python-six: upgrade 1.11.0 -> 1.12.0 python-typing: upgrade 3.6.4 -> 3.6.6 python-urllib3: upgrade 1.23 -> 1.25.2 python-wrapt: upgrade 1.10.11 -> 1.11.1 python-mako:upgrade 1.0.9 -> 1.0.10 python-pip: upgrade 19.1 -> 19.1.1 python-pysocks: upgrade 1.6.8 -> 1.7.0 Change-Id: I9a4d8fb60195b1cfd0f39cebf8b113b3bb63808d Signed-off-by: Brad Bishop --- .../recipes-connectivity/umip/umip_1.0.bb | 3 + ...coded-usr-local-includes-from-configure.a.patch | 14 ++-- .../pure-ftpd/pure-ftpd/nostrip.patch | 13 ++-- .../recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb | 22 ------ .../recipes-daemons/pure-ftpd/pure-ftpd_1.0.47.bb | 21 ++++++ .../meta-networking/recipes-irc/znc/znc_1.7.3.bb | 32 ++++++++ .../meta-networking/recipes-irc/znc/znc_git.bb | 34 --------- .../wireguard/wireguard-module_0.0.20190123.bb | 31 -------- .../wireguard/wireguard-module_0.0.20190406.bb | 31 ++++++++ .../wireguard/wireguard-tools_0.0.20190123.bb | 27 ------- .../wireguard/wireguard-tools_0.0.20190406.bb | 27 +++++++ .../recipes-kernel/wireguard/wireguard.inc | 4 +- .../recipes-protocols/xl2tpd/xl2tpd.inc | 4 +- .../recipes-protocols/xl2tpd/xl2tpd_1.3.14.bb | 5 ++ .../recipes-protocols/xl2tpd/xl2tpd_git.bb | 8 -- meta-openembedded/meta-oe/conf/layer.conf | 6 ++ .../recipes-bsp/irda-utils/irda-utils-0.9.18/init | 78 +++++++++++++++++++ .../irda-utils/irda-utils-0.9.18/ldflags.patch | 87 ++++++++++++++++++++++ .../irda-utils/irda-utils-0.9.18/musl.patch | 29 ++++++++ .../recipes-bsp/irda-utils/irda-utils_0.9.18.bb | 64 ++++++++++++++++ .../meta-oe/recipes-core/ell/ell_0.17.bb | 17 ----- .../meta-oe/recipes-core/ndctl/ndctl_v63.bb | 3 + .../meta-oe/recipes-core/toybox/toybox_0.7.5.bb | 4 +- ...1.0.22-deprecated-libusb_set_debug-with-l.patch | 39 ---------- .../recipes-devtools/openocd/openocd_git.bb | 3 +- .../triggerhappy/triggerhappy_0.5.0.bb | 47 ------------ .../triggerhappy/triggerhappy_git.bb | 47 ++++++++++++ .../recipes-graphics/gtkwave/gtkwave_3.3.98.bb | 4 + .../recipes-kernel/oprofile/oprofile_1.3.0.bb | 3 + .../meta-oe/recipes-support/mscgen/mscgen_0.20.bb | 2 +- .../meta-oe/recipes-support/opencv/opencv_3.4.5.bb | 2 +- .../python/python-cassandra-driver.inc | 2 +- .../recipes-devtools/python/python-mako.inc | 4 +- .../recipes-devtools/python/python-mako_1.0.10.bb | 2 + .../recipes-devtools/python/python-mako_1.0.9.bb | 2 - .../recipes-devtools/python/python-pip_19.1.1.bb | 14 ++++ .../recipes-devtools/python/python-pip_19.1.bb | 14 ---- .../recipes-devtools/python/python-pyparsing.inc | 6 +- .../python/python-pyparsing_2.2.0.bb | 2 - .../python/python-pyparsing_2.4.0.bb | 2 + .../recipes-devtools/python/python-pysocks.inc | 4 +- .../python/python-pysocks_1.6.8.bb | 2 - .../python/python-pysocks_1.7.0.bb | 2 + .../recipes-devtools/python/python-six.inc | 6 +- .../recipes-devtools/python/python-six_1.11.0.bb | 2 - .../recipes-devtools/python/python-six_1.12.0.bb | 2 + .../recipes-devtools/python/python-typing.inc | 4 +- .../recipes-devtools/python/python-typing_3.6.4.bb | 2 - .../recipes-devtools/python/python-typing_3.6.6.bb | 2 + .../recipes-devtools/python/python-urllib3.inc | 6 +- .../recipes-devtools/python/python-urllib3_1.23.bb | 2 - .../python/python-urllib3_1.25.2.bb | 2 + .../recipes-devtools/python/python-wrapt.inc | 6 +- .../python/python-wrapt_1.10.11.bb | 2 - .../recipes-devtools/python/python-wrapt_1.11.1.bb | 2 + .../python/python3-pyparsing_2.2.0.bb | 2 - .../python/python3-pyparsing_2.4.0.bb | 2 + .../python/python3-pysocks_1.6.8.bb | 6 -- .../python/python3-pysocks_1.7.0.bb | 6 ++ .../python/python3-urllib3_1.23.bb | 2 - .../python/python3-urllib3_1.25.2.bb | 2 + .../python/python3-wrapt_1.10.11.bb | 2 - .../python/python3-wrapt_1.11.1.bb | 2 + 63 files changed, 519 insertions(+), 310 deletions(-) delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.47.bb create mode 100644 meta-openembedded/meta-networking/recipes-irc/znc/znc_1.7.3.bb delete mode 100644 meta-openembedded/meta-networking/recipes-irc/znc/znc_git.bb delete mode 100644 meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190123.bb create mode 100644 meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190406.bb delete mode 100644 meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190123.bb create mode 100644 meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190406.bb create mode 100644 meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.14.bb delete mode 100644 meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb create mode 100755 meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/init create mode 100644 meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/ldflags.patch create mode 100644 meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/musl.patch create mode 100644 meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb delete mode 100644 meta-openembedded/meta-oe/recipes-core/ell/ell_0.17.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_0.5.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-mako_1.0.10.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-mako_1.0.9.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing_2.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing_2.4.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.6.8.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.7.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-six_1.11.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-six_1.12.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.6.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.6.6.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.23.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.25.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-wrapt_1.10.11.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-wrapt_1.11.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyparsing_2.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyparsing_2.4.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.6.8.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.7.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.23.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.10.11.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.11.1.bb (limited to 'meta-openembedded') diff --git a/meta-openembedded/meta-networking/recipes-connectivity/umip/umip_1.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/umip/umip_1.0.bb index e2abc02ce..43367b550 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/umip/umip_1.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/umip/umip_1.0.bb @@ -20,6 +20,9 @@ SRC_URI = "git://git.umip.org/umip/umip.git \ " SRCREV = "cbd441c5db719db554ff2b4fcb02fef88ae2f791" +# Depends on ipsec-tools which is already MACHINE_ARCH (and also RRECOMMENDS kernel modules) +PACKAGE_ARCH = "${MACHINE_ARCH}" + S = "${WORKDIR}/git" EXTRA_OECONF = "--enable-vt" diff --git a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch index 76523fb99..16a611e3c 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch @@ -1,4 +1,4 @@ -From 1bafadf2502334a3e972ff667061469316d0d2ca Mon Sep 17 00:00:00 2001 +From a45e086661a3eed29193546c525998d7525ef6d9 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Tue, 4 Aug 2015 02:46:39 +0200 Subject: [PATCH] Remove hardcoded /usr/local includes from configure.ac @@ -7,17 +7,18 @@ Upstream-Status: Inappropriate [config] Signed-off-by: Yauhen Kharuzhy Signed-off-by: Tudor Florea + --- configure.ac | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/configure.ac b/configure.ac -index 6c78e8c..851d45d 100644 +index 3a4209b..695ce68 100644 --- a/configure.ac +++ b/configure.ac -@@ -100,18 +100,6 @@ AC_ARG_VAR(PYTHON,local path to the python interpreter) - python_possible_path="/usr/bin:/usr/local/bin:/bin:/opt/python/bin:/opt/python/usr/bin:/opt/python/usr/local/bin" - AC_PATH_PROG(PYTHON,python,/usr/bin/env python,$python_possible_path) +@@ -91,18 +91,6 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"]) + AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS="$LDFLAGS -Wl,-z,now"]) + AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"]) -if test -d /usr/local/include; then - CPPFLAGS="$CPPFLAGS -I/usr/local/include" @@ -34,6 +35,3 @@ index 6c78e8c..851d45d 100644 CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" dnl Checks for header files --- -1.9.1 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch index 4cb33bc5c..32d714f6f 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch @@ -1,7 +1,8 @@ -From 0290bd6f4ceddff2c52dff833c9d31d24de7d0e1 Mon Sep 17 00:00:00 2001 +From 79fd22c0def26eba130db98e312bb00fec32ac0a Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Tue, 4 Aug 2015 03:07:01 +0200 -Subject: [PATCH] Don't mess with CFLAGS and LDFLAGS when --with-minimal is specified +Subject: [PATCH] Don't mess with CFLAGS and LDFLAGS when --with-minimal is + specified We especially don't want stripping enabled. @@ -9,15 +10,16 @@ Upstream-Status: Inappropriate [config] Signed-off-by: Paul Eggleton Signed-off-by: Tudor Florea + --- configure.ac | 2 -- 1 file changed, 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 851d45d..dc410a1 100644 +index 695ce68..0f28b55 100644 --- a/configure.ac +++ b/configure.ac -@@ -423,8 +423,6 @@ AC_ARG_WITH(minimal, +@@ -414,8 +414,6 @@ AC_ARG_WITH(minimal, AC_DEFINE(NO_FTP_USERS) AC_DEFINE(WITHOUT_ASCII) AC_DEFINE(BORING_MODE) @@ -26,6 +28,3 @@ index 851d45d..dc410a1 100644 fi ]) AC_ARG_WITH(paranoidmsg, --- -1.9.1 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb deleted file mode 100644 index e5c561646..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "FTP Server with a strong focus on software security" -DESCRIPTION = "Pure-FTPd is a free (BSD license), secure, production-quality and standard-conformant FTP server." -HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd" -SECTION = "net" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=90352fb2bfe17f4261687a0d6e09f489" - -DEPENDS = "libcap virtual/crypt" - - -SRC_URI = "http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${PV}.tar.gz \ - file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \ - file://nostrip.patch \ -" -SRC_URI[md5sum] = "4195af8f0e5ee2a798b1014071dae3a3" -SRC_URI[sha256sum] = "7be73a8e58b190a7054d2ae00c5e650cb9e091980420082d02ec3c3b68d8e7f9" - -inherit autotools - -EXTRA_OECONF = "--with-minimal" -PACKAGECONFIG[libsodium] ="ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=yes, \ - ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no, libsodium" diff --git a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.47.bb b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.47.bb new file mode 100644 index 000000000..43be44ea3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.47.bb @@ -0,0 +1,21 @@ +SUMMARY = "FTP Server with a strong focus on software security" +DESCRIPTION = "Pure-FTPd is a free (BSD license), secure, production-quality and standard-conformant FTP server." +HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd" +SECTION = "net" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=0595b4261a04bc2d27f30b9c90796c1f" + +DEPENDS = "libcap virtual/crypt" + +SRC_URI = "http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${PV}.tar.gz \ + file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \ + file://nostrip.patch \ +" +SRC_URI[md5sum] = "f000e519918682ee6b65090352177d4a" +SRC_URI[sha256sum] = "4740c316f5df879a2d68464489fb9b8b90113fe7dce58e2cdd2054a4768f27ad" + +inherit autotools + +EXTRA_OECONF = "--with-minimal" +PACKAGECONFIG[libsodium] ="ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=yes, \ + ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no, libsodium" diff --git a/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.7.3.bb b/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.7.3.bb new file mode 100644 index 000000000..b7d46af6f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.7.3.bb @@ -0,0 +1,32 @@ +SUMMARY = "ZNC, an advanced IRC bouncer" +SECTION = "net" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +DEPENDS = "openssl zlib icu" + +SRC_URI = "git://github.com/znc/znc.git;name=znc \ + git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;name=Csocket \ + " +SRCREV_znc = "be1b6bcd4cafbc57ebc298d89a5402ae7df55a8a" +SRCREV_Csocket = "e8d9e0bb248c521c2c7fa01e1c6a116d929c41b4" + +# This constructs a composite revision based on multiple SRCREV's. +# +SRCREV_FORMAT = "znc_Csocket" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +# ZNC has a custom autogen.sh that states that this command is needed *and* expected to fail +do_configure_prepend() { + automake --add-missing || true +} + +do_install_append() { + sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc +} diff --git a/meta-openembedded/meta-networking/recipes-irc/znc/znc_git.bb b/meta-openembedded/meta-networking/recipes-irc/znc/znc_git.bb deleted file mode 100644 index 728ef8746..000000000 --- a/meta-openembedded/meta-networking/recipes-irc/znc/znc_git.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "ZNC, an advanced IRC bouncer" -SECTION = "net" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -DEPENDS = "openssl zlib icu" - -PV = "1.7.1" - -SRC_URI = "git://github.com/znc/znc.git;name=znc \ - git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;name=Csocket \ - " -SRCREV_znc = "c426898b3a1b899dfe8a8b2a3eeb4b18d8be1bf2" -SRCREV_Csocket = "e8d9e0bb248c521c2c7fa01e1c6a116d929c41b4" - -# This constructs a composite revision based on multiple SRCREV's. -# -SRCREV_FORMAT = "znc_Csocket" - -S = "${WORKDIR}/git" - -inherit autotools-brokensep pkgconfig - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -# ZNC has a custom autogen.sh that states that this command is needed *and* expected to fail -do_configure_prepend() { - automake --add-missing || true -} - -do_install_append() { - sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc -} diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190123.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190123.bb deleted file mode 100644 index badc97a97..000000000 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190123.bb +++ /dev/null @@ -1,31 +0,0 @@ -require wireguard.inc - -inherit module kernel-module-split - -DEPENDS = "virtual/kernel libmnl" - -# This module requires Linux 3.10 higher and several networking related -# configuration options. For exact kernel requirements visit: -# https://www.wireguard.io/install/#kernel-requirements - -EXTRA_OEMAKE_append = " \ - KERNELDIR=${STAGING_KERNEL_DIR} \ - " - -MAKE_TARGETS = "module" - -RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit" -MODULE_NAME = "wireguard" - -# Kernel module packages MUST begin with 'kernel-module-', otherwise -# multilib image generation can fail. -# -# The following line is only necessary if the recipe name does not begin -# with kernel-module-. -PKG_${PN} = "kernel-module-${MODULE_NAME}" - -module_do_install() { - install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME} - install -m 0644 ${MODULE_NAME}.ko \ - ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}/${MODULE_NAME}.ko -} diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190406.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190406.bb new file mode 100644 index 000000000..badc97a97 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190406.bb @@ -0,0 +1,31 @@ +require wireguard.inc + +inherit module kernel-module-split + +DEPENDS = "virtual/kernel libmnl" + +# This module requires Linux 3.10 higher and several networking related +# configuration options. For exact kernel requirements visit: +# https://www.wireguard.io/install/#kernel-requirements + +EXTRA_OEMAKE_append = " \ + KERNELDIR=${STAGING_KERNEL_DIR} \ + " + +MAKE_TARGETS = "module" + +RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit" +MODULE_NAME = "wireguard" + +# Kernel module packages MUST begin with 'kernel-module-', otherwise +# multilib image generation can fail. +# +# The following line is only necessary if the recipe name does not begin +# with kernel-module-. +PKG_${PN} = "kernel-module-${MODULE_NAME}" + +module_do_install() { + install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME} + install -m 0644 ${MODULE_NAME}.ko \ + ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}/${MODULE_NAME}.ko +} diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190123.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190123.bb deleted file mode 100644 index c4ddbcb0e..000000000 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190123.bb +++ /dev/null @@ -1,27 +0,0 @@ -require wireguard.inc - -inherit bash-completion systemd pkgconfig - -DEPENDS = "wireguard-module libmnl" - -do_compile_prepend () { - cd ${S}/tools -} - -do_install () { - cd ${S}/tools - oe_runmake DESTDIR="${D}" PREFIX="${prefix}" SYSCONFDIR="${sysconfdir}" \ - SYSTEMDUNITDIR="${systemd_unitdir}" \ - WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', '', d)} \ - WITH_BASHCOMPLETION=yes \ - WITH_WGQUICK=yes \ - install -} - -FILES_${PN} = " \ - ${sysconfdir} \ - ${systemd_unitdir} \ - ${bindir} \ -" - -RDEPENDS_${PN} = "wireguard-module bash" diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190406.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190406.bb new file mode 100644 index 000000000..c4ddbcb0e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190406.bb @@ -0,0 +1,27 @@ +require wireguard.inc + +inherit bash-completion systemd pkgconfig + +DEPENDS = "wireguard-module libmnl" + +do_compile_prepend () { + cd ${S}/tools +} + +do_install () { + cd ${S}/tools + oe_runmake DESTDIR="${D}" PREFIX="${prefix}" SYSCONFDIR="${sysconfdir}" \ + SYSTEMDUNITDIR="${systemd_unitdir}" \ + WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', '', d)} \ + WITH_BASHCOMPLETION=yes \ + WITH_WGQUICK=yes \ + install +} + +FILES_${PN} = " \ + ${sysconfdir} \ + ${systemd_unitdir} \ + ${bindir} \ +" + +RDEPENDS_${PN} = "wireguard-module bash" diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc index 8314e79b9..5cf745e9a 100644 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc @@ -11,7 +11,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz" -SRC_URI[md5sum] = "8a0a232f65d5d86dd408efd9ac30bcf9" -SRC_URI[sha256sum] = "edd13c7631af169e3838621b1a1bff3ef73cf7bc778eec2bd55f7c1089ffdf9b" +SRC_URI[md5sum] = "c11254fe48695e61c145a7e82756ecba" +SRC_URI[sha256sum] = "2f06f3adf70b95e74a7736a22dcf6e9ef623b311a15b7d55b5474e57c3d0415b" S = "${WORKDIR}/WireGuard-${PV}/src/" diff --git a/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc index d037c7cfc..43942bcae 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc +++ b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc @@ -8,8 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "git://github.com/xelerance/xl2tpd.git \ -" +SRC_URI = "git://github.com/xelerance/xl2tpd.git" S = "${WORKDIR}/git" @@ -38,4 +37,3 @@ CONFFILES_${PN} += "${sysconfdir}/xl2tpd.conf ${sysconfdir}/default/xl2tpd" INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_NAME_${PN} = "xl2tpd" - diff --git a/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.14.bb b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.14.bb new file mode 100644 index 000000000..f03b537d9 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.14.bb @@ -0,0 +1,5 @@ +require xl2tpd.inc + +# This is v1.3.6 plus some commits. There is no tag for this commit. +# +SRCREV = "ba619c79c4790c78c033df0abde4a9a5de744a08" diff --git a/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb deleted file mode 100644 index 88ae5d6f8..000000000 --- a/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xl2tpd.inc - -# This is v1.3.6 plus some commits. There is no tag for this commit. -# -PV = "1.3.9+git${SRCPV}" - -SRCREV = "f114c10ac532051badeca0132b144a2f1596f047" - diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf index 31f2f17fc..507ac50ec 100644 --- a/meta-openembedded/meta-oe/conf/layer.conf +++ b/meta-openembedded/meta-oe/conf/layer.conf @@ -51,6 +51,12 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ phoronix-test-suite->php \ " +# Depends on ndctl (through nvdimm PACKAGECONFIG) which depends on MACHINE_ARCH kernel +# and making libblockdev MACHINE_ARCH is not an option as python3-blivet, udisks2, gvfs +# would be MACHINE_ARCH as well +SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ + libblockdev->ndctl \ +" # ttf.inc inherits fontcache which adds fontconfig-utils to RDEPENDS SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ terminus-font->fontconfig \ diff --git a/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/init b/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/init new file mode 100755 index 000000000..6f29e9c6e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/init @@ -0,0 +1,78 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: irda +# Required-Start: $network $remote_fs +# Required-Stop: $network $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Infrared port support +### END INIT INFO + +NAME="irattach" +test -x "$IRDA_DAEMON" || IRDA_DAEMON=/usr/sbin/irattach +test -z "$IRATTACH_PID" && IRATTACH_PID=/var/run/irattach.pid + +# Source function library. +. /etc/init.d/functions + +module_id() { + awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' &2 + exit 1 + ;; +esac diff --git a/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/ldflags.patch b/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/ldflags.patch new file mode 100644 index 000000000..b246de8f5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/ldflags.patch @@ -0,0 +1,87 @@ +Obey LDFLAGS + +Signed-off-by: Christopher Larson +Upstream-Status: Pending + +Index: irda-utils-0.9.18/findchip/Makefile +=================================================================== +--- irda-utils-0.9.18.orig/findchip/Makefile ++++ irda-utils-0.9.18/findchip/Makefile +@@ -65,5 +65,5 @@ install: findchip + + gfindchip: gfindchip.c + $(prn_cc) +- $(ECMD))$(CC) $(CFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs` ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs` + +Index: irda-utils-0.9.18/irattach/Makefile +=================================================================== +--- irda-utils-0.9.18.orig/irattach/Makefile ++++ irda-utils-0.9.18/irattach/Makefile +@@ -49,13 +49,13 @@ all: $(TARGETS) + + irattach: irattach.o util.o + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@ ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) irattach.o util.o -o $@ + + + + dongle_attach: dongle_attach.o + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@ ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) dongle_attach.o -o $@ + + + install: $(TARGETS) +Index: irda-utils-0.9.18/irdadump/Makefile +=================================================================== +--- irda-utils-0.9.18.orig/irdadump/Makefile ++++ irda-utils-0.9.18/irdadump/Makefile +@@ -40,7 +40,7 @@ lib_irdadump.a: $(LIBIRDADUMP_OBJS) + + irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET) + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) + + + .c.o: +Index: irda-utils-0.9.18/irdaping/Makefile +=================================================================== +--- irda-utils-0.9.18.orig/irdaping/Makefile ++++ irda-utils-0.9.18/irdaping/Makefile +@@ -56,7 +56,7 @@ all: $(TARGETS) + + irdaping: $(OBJS) + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@ ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ + + + .c.o: +Index: irda-utils-0.9.18/irnetd/Makefile +=================================================================== +--- irda-utils-0.9.18.orig/irnetd/Makefile ++++ irda-utils-0.9.18/irnetd/Makefile +@@ -50,7 +50,7 @@ all: $(TARGETS) + + irnetd: $(OBJS) + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@ ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ + + + install: irnetd +Index: irda-utils-0.9.18/psion/Makefile +=================================================================== +--- irda-utils-0.9.18.orig/psion/Makefile ++++ irda-utils-0.9.18/psion/Makefile +@@ -25,4 +25,4 @@ install: $(PSION_TARGETS) + CFLAGS += -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) + irpsion5: + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@ +\ No newline at end of file ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(PSION_SRC) -o $@ +\ No newline at end of file diff --git a/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/musl.patch b/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/musl.patch new file mode 100644 index 000000000..97eb97502 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/musl.patch @@ -0,0 +1,29 @@ +Replace use of with . + +kernel headers already provides the +needed definitions, moreover not all libc implementations +provide if_packet.h e.g. musl + +Signed-off-by: Khem Raj +Upstream-Status: Pending + +Index: irda-utils-0.9.18/irdaping/irdaping.c +=================================================================== +--- irda-utils-0.9.18.orig/irdaping/irdaping.c ++++ irda-utils-0.9.18/irdaping/irdaping.c +@@ -33,7 +33,6 @@ + #include + #include + #include /* For struct ifreq */ +-#include /* For struct sockaddr_pkt */ + #include /* For ARPHRD_IRDA */ + #include /* For ETH_P_ALL */ + #include /* For htons */ +@@ -46,6 +45,7 @@ + #include /* __cpu_to_le32 and co. */ + + #include /* For __u8 and co. */ ++#include /* For struct sockaddr_pkt */ + #include + + #ifndef AF_IRDA diff --git a/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb b/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb new file mode 100644 index 000000000..caffcb696 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb @@ -0,0 +1,64 @@ +SUMMARY = "Common files for IrDA" +DESCRIPTION = "Provides common files needed to use IrDA. \ +IrDA allows communication over Infrared with other devices \ +such as phones and laptops." +HOMEPAGE = "http://irda.sourceforge.net/" +BUGTRACKER = "http://sourceforge.net/p/irda/bugs/" +SECTION = "base" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://irdadump/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://smcinit/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ + file://man/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://irdadump/irdadump.c;beginline=1;endline=24;md5=d78b9dce3cd78c2220250c9c7a2be178" + +SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \ + file://ldflags.patch \ + file://musl.patch \ + file://init" + +SRC_URI[md5sum] = "84dc12aa4c3f61fccb8d8919bf4079bb" +SRC_URI[sha256sum] = "61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67a9fdc6" + +inherit update-rc.d + +RRECOMMENDS_${PN} = "\ + kernel-module-pxaficp-ir \ + kernel-module-irda \ + kernel-module-ircomm \ + kernel-module-ircomm-tty \ + kernel-module-irlan \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ppp', 'kernel-module-irnet', '',d)} \ + kernel-module-irport \ + kernel-module-irtty \ + kernel-module-irtty-sir \ + kernel-module-sir-dev \ + ${@bb.utils.contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-ir-usb', '',d)} " + +EXTRA_OEMAKE = "\ + 'CC=${CC}' \ + 'LD=${LD}' \ + 'CFLAGS=${CFLAGS}' \ + 'LDFLAGS=${LDFLAGS}' \ + 'SYS_INCLUDES=' \ + 'V=1' \ +" + +INITSCRIPT_NAME = "irattach" +INITSCRIPT_PARAMS = "defaults 20" + +TARGETS ??= "irattach irdaping" +do_compile () { + for t in ${TARGETS}; do + oe_runmake -C $t + done +} + +do_install () { + install -d ${D}${sbindir} + for t in ${TARGETS}; do + oe_runmake -C $t ROOT="${D}" install + done + + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME} +} diff --git a/meta-openembedded/meta-oe/recipes-core/ell/ell_0.17.bb b/meta-openembedded/meta-oe/recipes-core/ell/ell_0.17.bb deleted file mode 100644 index 27f11cfbe..000000000 --- a/meta-openembedded/meta-oe/recipes-core/ell/ell_0.17.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Embedded Linux Library" -DESCRIPTION = "ELL is a DBUS library which provides DBUS bindings." -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" -SECTION = "libs" - -inherit autotools pkgconfig - -S = "${WORKDIR}/git" -SRCREV = "ebc021cee3b2d20ca2af5e3ed02495da616b2fd3" -SRC_URI = "git://git.kernel.org/pub/scm/libs/ell/ell.git" - -do_configure_prepend () { - mkdir -p ${S}/build-aux -} - -DEPENDS = "dbus" diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb index 1f3abf514..61e53029b 100644 --- a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb +++ b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb @@ -19,6 +19,9 @@ S = "${WORKDIR}/git" EXTRA_OECONF += "--enable-test --enable-destructive --disable-docs" +# Depends on MACHINE_ARCH kernel +PACKAGE_ARCH = "${MACHINE_ARCH}" + PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd, systemd" diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb index 614136e27..069f0471c 100644 --- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb @@ -5,6 +5,8 @@ DEPENDS = "attr virtual/crypt" LICENSE = "BSD-0-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f0b8b3dd6431bcaa245da0a08bd0d511" +inherit cml1 update-alternatives + SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \ file://OE-path-changes.patch \ " @@ -48,8 +50,6 @@ do_install() { install -m 0644 ${B}/toybox.links ${D}${sysconfdir} } -inherit cml1 update-alternatives - # If you've chosen to install toybox you probably want it to take precedence # over busybox where possible but not over other packages ALTERNATIVE_PRIORITY = "60" diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch deleted file mode 100644 index c5b9083dc..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b95a996bfb281104b68ec66f32ebb79db519a4a8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 31 May 2018 21:06:46 -0700 -Subject: [PATCH] Fix libusb-1.0.22 deprecated libusb_set_debug with - libusb_set_option - -libusb_set_debug is deprecated in libusb >= 1.0.22 therefore replace -with equivalent libusb_set_option() API - -see libusb commit for more details - -https://github.com/libusb/libusb/commit/539f22e2fd916558d11ab9a66f10f461c5593168 - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted [http://openocd.zylin.com/#/c/4540/] - src/jtag/drivers/xds110.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/jtag/drivers/xds110.c b/src/jtag/drivers/xds110.c -index 90b699027..9bfe02ea8 100644 ---- a/src/jtag/drivers/xds110.c -+++ b/src/jtag/drivers/xds110.c -@@ -367,8 +367,11 @@ static bool usb_connect(void) - - /* Set libusb to auto detach kernel and disable debug messages */ - (void)libusb_set_auto_detach_kernel_driver(dev, 1); -+#if LIBUSB_API_VERSION >= 0x01000106 -+ libusb_set_option(ctx, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_NONE); -+#else - libusb_set_debug(ctx, LIBUSB_LOG_LEVEL_NONE); -- -+#endif - /* Claim the debug interface on the XDS110 */ - result = libusb_claim_interface(dev, INTERFACE_DEBUG); - } else { --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb index 4377e88e4..9a8a09a91 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -9,11 +9,10 @@ SRC_URI = " \ git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl \ git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl \ git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink \ - file://0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch \ " SRCREV_FORMAT = "openocd" -SRCREV_openocd = "cdf1e826eb23c29de1019ce64125f644f01b0afe" +SRCREV_openocd = "7ee618692f56b0efea864890da45d73d28e393d9" SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba" SRCREV_jimtcl = "a9bf5975fd0f89974d689a2d9ebd0873c8d64787" SRCREV_libjaylink = "8645845c1abebd004e991ba9a7f808f4fd0c608b" diff --git a/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_0.5.0.bb b/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_0.5.0.bb deleted file mode 100644 index 037ce063e..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_0.5.0.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "A lightweight hotkey daemon" -HOMEPAGE = "https://github.com/wertarbyte/triggerhappy" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "https://github.com/wertarbyte/triggerhappy/archive/debian/0.5.0-1.tar.gz" - -SRC_URI[md5sum] = "77f90a18c775e47c4c5e9e08987ca32f" -SRC_URI[sha256sum] = "9150bafbf7f2de7d57e6cc154676c33da98dc11ac6442e1ca57e5dce82bd4292" - -S = "${WORKDIR}/${PN}-debian-${PV}-1" - -inherit autotools-brokensep pkgconfig update-rc.d systemd - -PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" -PACKAGECONFIG[systemd] = ",,systemd" - -INITSCRIPT_NAME = "triggerhappy" -INITSCRIPT_PARAMS = "defaults" -SYSTEMD_SERVICE_${PN} = "triggerhappy.service triggerhappy.socket" - -FILES_${PN} = "\ -${sbindir}/thd \ -${sbindir}/th-cmd \ -${sysconfdir}/triggerhappy/triggers.d \ -${nonarch_base_libdir}/udev/rules.d/80-triggerhappy.rules \ -${sysconfdir}/init.d/triggerhappy \ -${systemd_unitdir}/system \ -" -CONFFILES_${PN} = "${sysconfdir}/udev/rules.d/80-triggerhappy.rules" - -do_install_append() { - install -d ${D}${sysconfdir}/triggerhappy/triggers.d - - install -d ${D}${nonarch_base_libdir}/udev/rules.d - install -m 0644 ${S}/udev/triggerhappy-udev.rules ${D}${nonarch_base_libdir}/udev/rules.d/80-triggerhappy.rules - - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${S}/debian/init.d ${D}${sysconfdir}/init.d/triggerhappy - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}/${systemd_unitdir}/system - install -m 0644 ${S}/systemd/triggerhappy.socket ${D}${systemd_unitdir}/system - install -m 0644 ${S}/systemd/triggerhappy.service ${D}${systemd_unitdir}/system - fi -} diff --git a/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb b/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb new file mode 100644 index 000000000..24df750e0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb @@ -0,0 +1,47 @@ +SUMMARY = "A lightweight hotkey daemon" +HOMEPAGE = "https://github.com/wertarbyte/triggerhappy" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +# matches debian/0.5.0-1 tag +SRCREV = "44a173195986d0d853316cb02a58785ded66c12b" +PV = "0.5.0+git${SRCPV}" +SRC_URI = "git://github.com/wertarbyte/${BPN}.git;branch=debian" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig update-rc.d systemd + +PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" +PACKAGECONFIG[systemd] = ",,systemd" + +INITSCRIPT_NAME = "triggerhappy" +INITSCRIPT_PARAMS = "defaults" +SYSTEMD_SERVICE_${PN} = "triggerhappy.service triggerhappy.socket" + +FILES_${PN} = "\ + ${sbindir}/thd \ + ${sbindir}/th-cmd \ + ${sysconfdir}/triggerhappy/triggers.d \ + ${nonarch_base_libdir}/udev/rules.d/80-triggerhappy.rules \ + ${sysconfdir}/init.d/triggerhappy \ + ${systemd_unitdir}/system \ +" +CONFFILES_${PN} = "${sysconfdir}/udev/rules.d/80-triggerhappy.rules" + +do_install_append() { + install -d ${D}${sysconfdir}/triggerhappy/triggers.d + + install -d ${D}${nonarch_base_libdir}/udev/rules.d + install -m 0644 ${S}/udev/triggerhappy-udev.rules ${D}${nonarch_base_libdir}/udev/rules.d/80-triggerhappy.rules + + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${S}/debian/init.d ${D}${sysconfdir}/init.d/triggerhappy + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}/${systemd_unitdir}/system + install -m 0644 ${S}/systemd/triggerhappy.socket ${D}${systemd_unitdir}/system + install -m 0644 ${S}/systemd/triggerhappy.service ${D}${systemd_unitdir}/system + fi +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb index 60df6f773..b9aae0f6c 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb @@ -14,6 +14,10 @@ inherit pkgconfig autotools gettext texinfo DEPENDS = "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0" RDEPENDS_${PN} = "tk-lib" +# depends on gtk+ which has this restriction +inherit distro_features_check +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" + EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS} --with-tk=${STAGING_BINDIR_CROSS}" FILES_${PN} = "${bindir} ${datadir}" diff --git a/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb b/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb index 1dc535ed8..8d706e4a5 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb @@ -3,6 +3,9 @@ require oprofile.inc DEPENDS += "virtual/kernel" DEPENDS_append_powerpc64 = " libpfm4" +# Depends on MACHINE_ARCH kernel +PACKAGE_ARCH = "${MACHINE_ARCH}" + SRC_URI[md5sum] = "bd998df5521ebedae31e71cd3fb6200b" SRC_URI[sha256sum] = "95ded8bde1ec39922f0af015981a67aec63e025a501e4dc04cd65d38f73647e6" diff --git a/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb b/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb index 6ead015f8..276ad201f 100644 --- a/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb +++ b/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.mcternan.me.uk/mscgen/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b1e6a340187c1cf716513439d07c1d79" -SRC_URI = "http://www.mcternan.me.uk/mscgen/software/${PN}-src-${PV}.tar.gz" +SRC_URI = "http://www.mcternan.me.uk/mscgen/software/${BPN}-src-${PV}.tar.gz" SRC_URI[md5sum] = "65c90fb5150d7176b65b793f0faa7377" SRC_URI[sha256sum] = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23" diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.4.5.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.4.5.bb index fa6e06a25..ce60698b2 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.4.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.4.5.bb @@ -176,7 +176,7 @@ SUMMARY_python3-opencv = "Python bindings to opencv" FILES_python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" RDEPENDS_python3-opencv = "python3-core python3-numpy" -RDEPENDS_opencv-apps = "bash" +RDEPENDS_${PN}-apps = "bash" do_install_append() { cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cassandra-driver.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-cassandra-driver.inc index 1cc1f4c49..53ebfec33 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cassandra-driver.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cassandra-driver.inc @@ -28,6 +28,6 @@ RDEPENDS_${PN} += "\ libevent \ " -DEPENDS_${PN} += "\ +DEPENDS += "\ ${PYTHON_PN}-cython \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-mako.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-mako.inc index 724d0ce5c..d86ad33cd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-mako.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-mako.inc @@ -8,8 +8,8 @@ PYPI_PACKAGE = "Mako" inherit pypi -SRC_URI[md5sum] = "d739720f3f0d6a1cb6a96ea7a4760c3e" -SRC_URI[sha256sum] = "0728c404877cd4ca72c409c0ea372dc5f3b53fa1ad2bb434e1d216c0444ff1fd" +SRC_URI[md5sum] = "a94d376078dda65f834ea5049a81ebb5" +SRC_URI[sha256sum] = "7165919e78e1feb68b4dbe829871ea9941398178fa58e6beedb9ba14acf63965" RDEPENDS_${PN} = " \ ${PYTHON_PN}-html \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-mako_1.0.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-mako_1.0.10.bb new file mode 100644 index 000000000..3372eeb28 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-mako_1.0.10.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-mako.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-mako_1.0.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-mako_1.0.9.bb deleted file mode 100644 index 3372eeb28..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-mako_1.0.9.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-mako.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.1.1.bb new file mode 100644 index 000000000..f78265030 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.1.1.bb @@ -0,0 +1,14 @@ +SUMMARY = "PIP is a tool for installing and managing Python packages" +HOMEPAGE = "https://pip.pypa.io/" +LICENSE = "MIT & LGPL-2.1" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" + +SRC_URI[md5sum] = "4fb98a060f21c731d6743b90a714fc73" +SRC_URI[sha256sum] = "44d3d7d3d30a1eb65c7e5ff1173cdf8f7467850605ac7cc3707b6064bddd0958" + +inherit pypi setuptools + +# Since PIP is like CPAN for PERL we need to drag in all python modules to ensure everything works +RDEPENDS_${PN}_class-target = "python-modules python-distribute python-misc" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.1.bb deleted file mode 100644 index f451a8729..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "PIP is a tool for installing and managing Python packages" -HOMEPAGE = "https://pip.pypa.io/" -LICENSE = "MIT & LGPL-2.1" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" - -SRC_URI[md5sum] = "22e3726252b492ce24312c2b43d0127f" -SRC_URI[sha256sum] = "d9137cb543d8a4d73140a3282f6d777b2e786bb6abb8add3ac5b6539c82cd624" - -inherit pypi setuptools - -# Since PIP is like CPAN for PERL we need to drag in all python modules to ensure everything works -RDEPENDS_${PN}_class-target = "python-modules python-distribute python-misc" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing.inc index e30839f87..e0df4e9b8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing.inc @@ -1,10 +1,10 @@ SUMMARY = "Python parsing module" HOMEPAGE = "http://pyparsing.wikispaces.com/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fb46329938e6bc829b256e37d5c1e31a" +LIC_FILES_CHKSUM = "file://LICENSE;md5=657a566233888513e1f07ba13e2f47f1" -SRC_URI[md5sum] = "0214e42d63af850256962b6744c948d9" -SRC_URI[sha256sum] = "0832bcf47acd283788593e7a0f542407bd9550a55a8a8435214a1960e04bcb04" +SRC_URI[md5sum] = "e534c0ca755155823bf45fdd8d084922" +SRC_URI[sha256sum] = "1873c03321fc118f4e9746baf201ff990ceb915f433f23b395f5580d1840cb2a" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing_2.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing_2.2.0.bb deleted file mode 100644 index 90217f3c3..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing_2.2.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-pyparsing.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing_2.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing_2.4.0.bb new file mode 100644 index 000000000..90217f3c3 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing_2.4.0.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-pyparsing.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks.inc index 53ec1b7d8..32cb50ce1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://python-requests.org" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=1d457bcffb9661b45f799d4efee72f16" -SRC_URI[md5sum] = "441c4e3bf5b042f7e70613cd871df26c" -SRC_URI[sha256sum] = "3fe52c55890a248676fd69dc9e3c4e811718b777834bcaab7a8125cf9deac672" +SRC_URI[md5sum] = "ffea8bdc4eee054df2f9f6a9c3752567" +SRC_URI[sha256sum] = "d9031ea45fdfacbe59a99273e9f0448ddb33c1580fe3831c1b09557c5718977c" PYPI_PACKAGE = "PySocks" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.6.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.6.8.bb deleted file mode 100644 index 8a24e4c49..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.6.8.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-pysocks.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.7.0.bb new file mode 100644 index 000000000..8a24e4c49 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.7.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-pysocks.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-six.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-six.inc index a5915c116..47129258e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-six.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-six.inc @@ -1,10 +1,10 @@ SUMMARY = "Python 2 and 3 compatibility library" HOMEPAGE = "http://pypi.python.org/pypi/six/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=35cec5bf04dd0820d0a18533ea7c774a" +LIC_FILES_CHKSUM = "file://LICENSE;md5=83e0f622bd5ac7d575dbd83d094d69b5" -SRC_URI[md5sum] = "d12789f9baf7e9fb2524c0c64f1773f8" -SRC_URI[sha256sum] = "70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9" +SRC_URI[md5sum] = "9ae5d1feed8c0215f4ae4adcd9207fcb" +SRC_URI[sha256sum] = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73" do_compile_append() { ${PYTHON} setup.py -q bdist_egg --dist-dir ./ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-six_1.11.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-six_1.11.0.bb deleted file mode 100644 index 9075745d7..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-six_1.11.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-six.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-six_1.12.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-six_1.12.0.bb new file mode 100644 index 000000000..9075745d7 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-six_1.12.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-six.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-typing.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-typing.inc index a0ee6b24b..82c2ab74f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-typing.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-typing.inc @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/python/typing" LICENSE = "PSF" LIC_FILES_CHKSUM = "file://LICENSE;md5=64fc2b30b67d0a8423c250e0386ed72f" -SRC_URI[md5sum] = "5b2ade08d83be488f17b5fe587c27c74" -SRC_URI[sha256sum] = "d400a9344254803a2368533e4533a4200d21eb7b6b729c173bc38201a74db3f2" +SRC_URI[md5sum] = "64614206b4bdc0864fc0e0bccd69efc9" +SRC_URI[sha256sum] = "4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.6.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.6.4.bb deleted file mode 100644 index 04ce063c9..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.6.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-typing.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.6.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.6.6.bb new file mode 100644 index 000000000..04ce063c9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.6.6.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-typing.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3.inc index 34f147877..2ce6d1050 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3.inc @@ -1,10 +1,10 @@ SUMMARY = "Python HTTP library with thread-safe connection pooling, file post support, sanity friendly, and more" HOMEPAGE = "https://github.com/shazow/urllib3" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ea114851ad9a8c311aac8728a681a067" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=65715c2eb961313d71b297dd5a04f85e" -SRC_URI[md5sum] = "1ad43e4b5ab7a0794c89dc057e1d7179" -SRC_URI[sha256sum] = "a68ac5e15e76e7e5dd2b8f94007233e01effe3e50e8daddf69acfd81cb686baf" +SRC_URI[md5sum] = "1ebfbbec8bee21dbb686c009b37f4963" +SRC_URI[sha256sum] = "a53063d8b9210a7bdec15e7b272776b9d42b2fd6816401a0d43006ad2f9902db" RDEPENDS_${PN} += "\ ${PYTHON_PN}-certifi \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.23.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.23.bb deleted file mode 100644 index 6c81f1db9..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.23.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-urllib3.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.25.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.25.2.bb new file mode 100644 index 000000000..6c81f1db9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.25.2.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-urllib3.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt.inc index c85548fb4..4de09d2fd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt.inc @@ -2,10 +2,10 @@ SUMMARY = "A Python module for decorators, wrappers and monkey patching." HOMEPAGE = "http://wrapt.readthedocs.org/" LICENSE = "BSD" SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://LICENSE;md5=61c27930012e86b3dc7e36f92e83c4d8" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fdfc019b57affbe1d7a32e3d34e83db4" -SRC_URI[md5sum] = "e1346f31782d50401f81c2345b037076" -SRC_URI[sha256sum] = "d4d560d479f2c21e1b5443bbd15fe7ec4b37fe7e53d335d3b9b0a7b1226fe3c6" +SRC_URI[md5sum] = "9f21acd7c0a57bf3057715c4665db3c7" +SRC_URI[sha256sum] = "4aea003270831cceb8a90ff27c4031da6ead7ec1886023b80ce0dfe0adf61533" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt_1.10.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt_1.10.11.bb deleted file mode 100644 index bb4247657..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt_1.10.11.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-wrapt.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt_1.11.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt_1.11.1.bb new file mode 100644 index 000000000..bb4247657 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt_1.11.1.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-wrapt.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyparsing_2.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyparsing_2.2.0.bb deleted file mode 100644 index 0805fee3e..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyparsing_2.2.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-pyparsing.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyparsing_2.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyparsing_2.4.0.bb new file mode 100644 index 000000000..0805fee3e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyparsing_2.4.0.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-pyparsing.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.6.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.6.8.bb deleted file mode 100644 index bbda05a51..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.6.8.bb +++ /dev/null @@ -1,6 +0,0 @@ -inherit pypi setuptools3 -require python-pysocks.inc - -RDEPENDS_${PN}_class-target += "\ - ${PYTHON_PN}-netclient \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.7.0.bb new file mode 100644 index 000000000..bbda05a51 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.7.0.bb @@ -0,0 +1,6 @@ +inherit pypi setuptools3 +require python-pysocks.inc + +RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-netclient \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.23.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.23.bb deleted file mode 100644 index 19eb7025b..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.23.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-urllib3.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.2.bb new file mode 100644 index 000000000..19eb7025b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.2.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-urllib3.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.10.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.10.11.bb deleted file mode 100644 index 85f446ef9..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.10.11.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-wrapt.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.11.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.11.1.bb new file mode 100644 index 000000000..85f446ef9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.11.1.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-wrapt.inc -- cgit v1.2.3