From eafcbb8a73edfad32d50070982300335b553e28e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 5 Jun 2020 17:59:17 -0500 Subject: meta-openembedded: subtree update:713e70bd25..5caca0f7bd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Andreas Müller (1): fluidsynth: upgrade 2.1.2 -> 2.1.3 Domarys Correa (6): python3-pytest: Update 5.3.5 -> 5.4.2 python3-pytest-html: Update 1.6 -> 2.1.1 python3-pytest-metadata: Update 1.8.0 -> 1.9.0 python3-pytest-asyncio: Update 0.10.0 -> 0.12.0 python3-pyudev: Update 0.21.0 -> 0.22.0 python3-pyyaml: Update 5.3 -> 5.3.1 Hongxu Jia (1): multipath-tools: fix compiling parallel issue Kai Kang (1): plymouth: disable systemd-integration for sysvinit Khem Raj (1): dfu-util-native: Remove DEPLOY_DIR_TOOLS from sstate-outputdirs Konrad Weihmann (14): pugixml: fix typo for homepage distuils-extra: fix typo for DESCRIPTION brotli: fix typo for DESCRIPTION wxwidgets: fix typo for DESCRIPTION passwdqc: remove double modify operation zbar: fix typo for DESCRIPTION sound-theme-freedesktop: remove double depends python3-cmd2: remove double colorama in RDEPENDS python3-smbus2: remove duplicate RDEPENDS settings python3-twisted: remove double var modification spawn-fcgi: fix typo in SUMMARY physfs: fix typo for HOMEPAGE rest: fix typo for HOMEPAGE proftpd: Fix typo for SRC_URI[md5sum] Leon Anavi (4): python3-click: Upgrade 7.0 -> 7.1.2 python3-dbussy: Upgrade 1.2.1 -> 1.3 python3-imageio: Upgrade 2.6.0 -> 2.8.0 python3-colorama: Upgrade 0.4.1 -> 0.4.3 Maciej Pijanowski (1): qpdf: fix typo in RDEPENDS Martin Jansa (1): irssi: package libirc_proxy.a in PN-staticdev Michael Haener (1): cockpit: 219 -> 220 Patrick Williams (1): net-snmp: refresh patches Pierre-Jean Texier (2): libuv: upgrade 1.36.0 -> 1.38.0 uftp: upgrade 4.10.2 -> 5.0 Robert P. J. Day (1): use weak assignments for PNBLACKLIST in recipe files Shlomi Vaknin (1): add python bitstring package Zang Ruochen (6): libgphoto2: upgrade 2.5.24 -> 2.5.25 rsyslog: upgrade 8.2002 -> 8.2004 mosquitto: upgrade 1.6.9 -> 1.6.10 snort: upgrade 2.9.15 -> 2.9.16 wireshark: upgrade 3.2.2 -> 3.2.4 cpuid: upgrade 20200211 -> 20200427 Zheng Ruoqin (5): nano: upgrade 4.9.2 -> 4.9.3 gsoap: upgrade 2.8.100 -> 2.8.103 logwatch: upgrade 7.5.1 -> 7.5.3 mcelog: upgrade 168 -> 170 libnet-dns-perl: upgrade 1.23 -> 1.24 Signed-off-by: Andrew Geissler Change-Id: I697f91df13d9e8d8cb15620aeccd644cdfe53a43 --- .../dfu-util/dfu-util-native_0.9.bb | 1 - .../meta-oe/recipes-support/gsoap/gsoap_2.8.100.bb | 42 ---------------------- .../meta-oe/recipes-support/gsoap/gsoap_2.8.103.bb | 42 ++++++++++++++++++++++ .../meta-oe/recipes-support/mcelog/mcelog_168.bb | 35 ------------------ .../meta-oe/recipes-support/mcelog/mcelog_170.bb | 35 ++++++++++++++++++ ...0001-add-explicit-dependency-on-libraries.patch | 40 +++++++++++++++++++++ .../multipath-tools/multipath-tools_0.8.4.bb | 1 + .../meta-oe/recipes-support/nano/nano_4.9.2.bb | 22 ------------ .../meta-oe/recipes-support/nano/nano_4.9.3.bb | 22 ++++++++++++ .../meta-oe/recipes-support/zbar/zbar_git.bb | 2 +- 10 files changed, 141 insertions(+), 101 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.100.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.103.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_168.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_170.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/nano/nano_4.9.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/nano/nano_4.9.3.bb (limited to 'meta-openembedded/meta-oe/recipes-support') diff --git a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb index feb16fa73..4305e3b40 100644 --- a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb @@ -16,7 +16,6 @@ do_deploy() { addtask deploy before do_package after do_install -do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" # cleandirs should possibly be in deploy.bbclass but we need it do_deploy[cleandirs] = "${DEPLOYDIR}" # clear stamp-extra-info since MACHINE_ARCH is normally put there by diff --git a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.100.bb b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.100.bb deleted file mode 100644 index 0b4eac889..000000000 --- a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.100.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "The gSOAP toolkit provides a unique SOAP-to-C/C++ language binding \ -for the development of SOAP Web Services and clients." -SECTION = "devel" -LICENSE = "GPL-2.0-with-OpenSSL-exception" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \ - file://GPLv2_license.txt;md5=a33672dbe491b6517750a0389063508b" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}2/${BPN}_${PV}.zip \ - " -SRC_URI[md5sum] = "f0fc5394286753eff657cf62b46d024b" -SRC_URI[sha256sum] = "11b4f99d28392e3e1aeb29bfd006a4f1f40e7fdd7a3f3444ee69014d415f09f2" - -inherit autotools - -BBCLASSEXTEND = "native" - -S = "${WORKDIR}/${BPN}-2.8" - -PARALLEL_MAKE = "" - -EXTRA_OEMAKE_class-target = "SOAP=${STAGING_BINDIR_NATIVE}/soapcpp2" - -DEPENDS = "openssl zlib flex bison bison-native" -DEPENDS_append_class-target = " gsoap-native" - -do_install_append() { - install -d ${D}${libdir} - for lib in libgsoapssl libgsoapssl++ libgsoap libgsoapck++ libgsoap++ libgsoapck - do - oe_libinstall -C gsoap $lib ${D}${libdir} - done -} - -do_install_class-native() { - oe_runmake DESTDIR=${D} BINDIR=${D}${bindir} install -} - -FILES_${PN} = "${bindir}/wsdl2h ${bindir}/soapcpp2" -FILES_${PN} += "${datadir}" -FILES_${PN}-staticdev = "${libdir}" -FILES_${PN}-dev = "${includedir}" -RRECOMMENDS_${PN}-dev = "${PN}-staticdev" diff --git a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.103.bb b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.103.bb new file mode 100644 index 000000000..8543c6f48 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.103.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "The gSOAP toolkit provides a unique SOAP-to-C/C++ language binding \ +for the development of SOAP Web Services and clients." +SECTION = "devel" +LICENSE = "GPL-2.0-with-OpenSSL-exception" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \ + file://GPLv2_license.txt;md5=a33672dbe491b6517750a0389063508b" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}2/${BPN}_${PV}.zip \ + " +SRC_URI[md5sum] = "3207ece9fc8ceb787091de93838f5952" +SRC_URI[sha256sum] = "afe2ba08d2fa56adc3c774b6741587203a72140a255346e9947b8d2ee6c7d4b6" + +inherit autotools + +BBCLASSEXTEND = "native" + +S = "${WORKDIR}/${BPN}-2.8" + +PARALLEL_MAKE = "" + +EXTRA_OEMAKE_class-target = "SOAP=${STAGING_BINDIR_NATIVE}/soapcpp2" + +DEPENDS = "openssl zlib flex bison bison-native" +DEPENDS_append_class-target = " gsoap-native" + +do_install_append() { + install -d ${D}${libdir} + for lib in libgsoapssl libgsoapssl++ libgsoap libgsoapck++ libgsoap++ libgsoapck + do + oe_libinstall -C gsoap $lib ${D}${libdir} + done +} + +do_install_class-native() { + oe_runmake DESTDIR=${D} BINDIR=${D}${bindir} install +} + +FILES_${PN} = "${bindir}/wsdl2h ${bindir}/soapcpp2" +FILES_${PN} += "${datadir}" +FILES_${PN}-staticdev = "${libdir}" +FILES_${PN}-dev = "${includedir}" +RRECOMMENDS_${PN}-dev = "${PN}-staticdev" diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_168.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_168.bb deleted file mode 100644 index e2ef6ea58..000000000 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_168.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "mcelog daemon accounts memory and some other errors in various ways." -DESCRIPTION = "mcelog is required by both 32bit x86 Linux kernels (since 2.6.30) \ -and 64bit Linux kernels (since early 2.6 kernel releases) to log machine checks \ -and should run on all Linux systems that need error handling." -HOMEPAGE = "http://mcelog.org/" -SECTION = "System Environment/Base" - -SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; \ - file://run-ptest \ -" - -SRCREV = "078d593b8b0c7d44afdd439aacfad6682913038f" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6" - -S = "${WORKDIR}/git" - -inherit autotools-brokensep ptest - -COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' - -do_install_append() { - install -d ${D}${sysconfdir}/cron.hourly - install -m 0755 ${S}/mcelog.cron ${D}${sysconfdir}/cron.hourly/ - sed -i 's/bash/sh/' ${D}${sysconfdir}/cron.hourly/mcelog.cron -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH} - cp -r ${S}/tests ${S}/input ${D}${PTEST_PATH} - sed -i 's#../../mcelog#mcelog#' ${D}${PTEST_PATH}/tests/test -} - -RDEPENDS_${PN}-ptest += "make bash mce-inject" diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_170.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_170.bb new file mode 100644 index 000000000..bdb080f41 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_170.bb @@ -0,0 +1,35 @@ +SUMMARY = "mcelog daemon accounts memory and some other errors in various ways." +DESCRIPTION = "mcelog is required by both 32bit x86 Linux kernels (since 2.6.30) \ +and 64bit Linux kernels (since early 2.6 kernel releases) to log machine checks \ +and should run on all Linux systems that need error handling." +HOMEPAGE = "http://mcelog.org/" +SECTION = "System Environment/Base" + +SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; \ + file://run-ptest \ +" + +SRCREV = "391abaac9bdff385934b18134789bcc98b0adeb7" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep ptest + +COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' + +do_install_append() { + install -d ${D}${sysconfdir}/cron.hourly + install -m 0755 ${S}/mcelog.cron ${D}${sysconfdir}/cron.hourly/ + sed -i 's/bash/sh/' ${D}${sysconfdir}/cron.hourly/mcelog.cron +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH} + cp -r ${S}/tests ${S}/input ${D}${PTEST_PATH} + sed -i 's#../../mcelog#mcelog#' ${D}${PTEST_PATH}/tests/test +} + +RDEPENDS_${PN}-ptest += "make bash mce-inject" diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch new file mode 100644 index 000000000..2827bb874 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch @@ -0,0 +1,40 @@ +From 04884263d1de8c427a7a15bd1cf6466ea65d3a0b Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Mon, 25 May 2020 23:22:55 -0700 +Subject: [PATCH] add explicit dependency on libraries + +[snip] +gcc/i686-overc-linux/10.1.0/ld: cannot find -lmpathpersist +collect2: error: ld returned 1 exit status +Makefile:36: recipe for target 'multipathd' failed +make[1]: *** [multipathd] Error 1 +make[1]: Leaving directory 'git/multipathd' +Makefile:29: recipe for target 'multipathd' failed +make: *** [multipathd] Error 2 +ln -sf libmpathpersist.so.0 libmpathpersist.so +[snip] + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia +--- + Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index bea0a0b2..37a77129 100644 +--- a/Makefile ++++ b/Makefile +@@ -29,7 +29,8 @@ $(BUILDDIRS): + $(MAKE) -C $@ + + multipath multipathd mpathpersist libmpathpersist : libmultipath +-mpathpersist: libmpathpersist ++mpathpersist multipathd: libmpathpersist ++libdmmp libmultipath mpathpersist multipath multipathd: libmpathcmd + + DEPS_ON_MULTIPATH := \ + multipath \ +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb index 2795a8d09..af34a4b39 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb @@ -44,6 +44,7 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ file://0030-Always-use-devmapper.patch \ file://0031-Always-use-devmapper-for-kpartx.patch \ file://0001-fix-bug-of-do_compile-and-do_install.patch \ + file://0001-add-explicit-dependency-on-libraries.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_4.9.2.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_4.9.2.bb deleted file mode 100644 index 2b236ba1e..000000000 --- a/meta-openembedded/meta-oe/recipes-support/nano/nano_4.9.2.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "GNU nano (Nano's ANOther editor, or \ -Not ANOther editor) is an enhanced clone of the \ -Pico text editor." -HOMEPAGE = "http://www.nano-editor.org/" -SECTION = "console/utils" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" - -DEPENDS = "ncurses file" -RDEPENDS_${PN} = "ncurses-terminfo-base" - -PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" - -SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -SRC_URI[md5sum] = "10df0100ebf4aa7bb4806428c11751eb" -SRC_URI[sha256sum] = "d8a25eea942ecee2d57b8e037eb4b28f030f818b78773b8fcb994ed5835d2ef6" - -UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" - -inherit autotools gettext pkgconfig - -PACKAGECONFIG[tiny] = "--enable-tiny," diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_4.9.3.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_4.9.3.bb new file mode 100644 index 000000000..645b07b4c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/nano/nano_4.9.3.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "GNU nano (Nano's ANOther editor, or \ +Not ANOther editor) is an enhanced clone of the \ +Pico text editor." +HOMEPAGE = "http://www.nano-editor.org/" +SECTION = "console/utils" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" + +DEPENDS = "ncurses file" +RDEPENDS_${PN} = "ncurses-terminfo-base" + +PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" + +SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" +SRC_URI[md5sum] = "52137a960ae8b3ca6d7dab6767fe6e5f" +SRC_URI[sha256sum] = "6e3438f033a0ed07d3d74c30d0803cbda3d2366ba1601b7bbf9b16ac371f51b4" + +UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" + +inherit autotools gettext pkgconfig + +PACKAGECONFIG[tiny] = "--enable-tiny," diff --git a/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb b/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb index 935e09cd5..181d7ae43 100644 --- a/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb @@ -1,4 +1,4 @@ -DESRIPTION = "2D barcode scanner toolkit." +DESCRIPTION = "2D barcode scanner toolkit." SECTION = "graphics" LICENSE = "LGPL-2.1" -- cgit v1.2.3