diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-18 13:27:43 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-18 13:36:02 +0300 |
commit | b809eb9d31058aad51fb82ff321a6bef45b23e58 (patch) | |
tree | 79e830e2b140780b96250c595592e1172bf31869 /meta-openembedded | |
parent | 85521d71312d95503e78e3470267cbd4d7a6ecfa (diff) | |
download | openbmc-b809eb9d31058aad51fb82ff321a6bef45b23e58.tar.xz |
meta-openembedded: subtree update:19528ba2a6..ef1b17f4ef
Callaghan, Dan (1):
lmsensors: add a PACKAGECONFIG for sensord
Changqing Li (1):
ntp: fix package split wrongly when enabled usrmerge
Khem Raj (1):
remove spurious file
Nathan Rossi (3):
libeigen: Add native and nativesdk to BBCLASSEXTEND
python*-pyusb: Add native and nativesdk to BBCLASSEXTEND
python*-pyserial: Add native and nativesdk to BBCLASSEXTEND
Oleksandr Kravchuk (23):
babl: update to 0.1.62
znc: update to 1.7.4
zlog: update to 1.2.14
wipe: update to 0.24
upower: update to 0.99.11
python-pyobject: update to 3.34.0
python-pytoml: update to 0.1.21
python-cpuset: update to 1.6
libwebsockets: update to 3.2.0
libvpx: update to 1.8.1
libvdpau: update to 1.3
libmicrohttpd: update to 0.9.66
lcms: update to 2.9
libblockdev: update to 2.23
libbytesize: update to 2.1
iwd: update to 0.20
gsl: update to 2.6
gflags: update to 2.2.2
digitemp: update to 3.7.2
catch2: update to 2.9.2
botan: update to 2.11.0
agent-proxy: update to 1.97
ceres-solver: fix package version
Paul Eggleton (1):
mosquitto: update to 1.6.5
Scott Ellis (1):
wireguard: Upgrade 20190905 to 20190913
Trevor Gamblin (1):
openjpeg: upgrade 2.3.0 -> 2.3.1
Yi Zhao (1):
samba: upgrade 4.10.7 -> 4.10.8
Zang Ruochen (2):
python-dbus: upgrade 1.2.10 -> 1.2.12
python-pluggy: upgrade 0.12.0 -> 0.13.0
Zheng Ruoqin (1):
xrdp: 0.9.4 -> 0.9.11
Change-Id: I3152060569cc5af7f7950c7037f25f54191d20a9
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded')
49 files changed, 119 insertions, 474 deletions
diff --git a/meta-openembedded/file b/meta-openembedded/file deleted file mode 100644 index e69de29bb2..0000000000 --- a/meta-openembedded/file +++ /dev/null diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.8.bb b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.5.bb index 768b5930fb..4bb0720ca5 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.8.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.5.bb @@ -1,5 +1,9 @@ -SUMMARY = "Open source MQTT v3.1/3.1.1 implemention" -DESCRIPTION = "Mosquitto is an open source (Eclipse licensed) message broker that implements the MQ Telemetry Transport protocol version 3.1 and 3.1.1. MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. " +SUMMARY = "Open source MQTT implementation" +DESCRIPTION = "Mosquitto is an open source (Eclipse licensed) message broker \ +that implements the MQ Telemetry Transport protocol version 3.1, 3.1.1 and \ +5, providing both an MQTT broker and several command-line clients. MQTT \ +provides a lightweight method of carrying out messaging using a \ +publish/subscribe model. " HOMEPAGE = "http://mosquitto.org/" SECTION = "console/network" LICENSE = "EPL-1.0 | EDL-1.0" @@ -14,8 +18,8 @@ SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ file://mosquitto.init \ " -SRC_URI[md5sum] = "bbbcceb32db3657d9d436a8440a9db1c" -SRC_URI[sha256sum] = "78d7e70c3794dc3a1d484b4f2f8d3addebe9c2da3f5a1cebe557f7d13beb0da4" +SRC_URI[md5sum] = "12a1bd274d5ec454649a06c1bf65d802" +SRC_URI[sha256sum] = "bc71b38b5a26fc7cc772853e5607c657868db9f9a6d2b15e2b677649a0f85d20" inherit systemd update-rc.d useradd @@ -79,6 +83,7 @@ FILES_libmosquittopp1 = "${libdir}/libmosquittopp.so.1" FILES_${PN}-clients = "${bindir}/mosquitto_pub \ ${bindir}/mosquitto_sub \ + ${bindir}/mosquitto_rr \ " FILES_${PN}-examples = "${sysconfdir}/mosquitto/*.example" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.7.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.8.bb index 1b2bc087d5..d824eacf9e 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.7.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.8.bb @@ -34,8 +34,8 @@ SRC_URI_append_libc-musl = " \ file://0001-samba-fix-musl-lib-without-innetgr.patch \ " -SRC_URI[md5sum] = "05472d0dd943b3ccbc3be5032a9eb563" -SRC_URI[sha256sum] = "34f30494b6b63700f54be22be636e8a6e0430577166a76a017075e11c02a1ebb" +SRC_URI[md5sum] = "f3c722bbcd903479008fa1b529f56365" +SRC_URI[sha256sum] = "c41f05fb567f7359998b451543501c7690a2bf6551d658a76bd6916316a410f4" UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.10(\.\d+)+).tar.gz" 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.4.bb index b7d46af6f6..75860073a9 100644 --- a/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.7.3.bb +++ b/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.7.4.bb @@ -8,7 +8,7 @@ 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_znc = "e661cdf9a394e2afd1b97517efa21fa2fa757e22" SRCREV_Csocket = "e8d9e0bb248c521c2c7fa01e1c6a116d929c41b4" # This constructs a composite revision based on multiple SRCREV's. diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190905.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190913.bb index badc97a973..badc97a973 100644 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190905.bb +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190913.bb diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190905.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190913.bb index c4ddbcb0e9..c4ddbcb0e9 100644 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190905.bb +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190913.bb diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc index 48487405b2..b0b48d0dd0 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] = "97a8f781cb683f3a23ffa2f0cdb008cc" -SRC_URI[sha256sum] = "78767ceeb5286beaa851145f072d920a340a9f1b771a2943b8efd638cee1a8f6" +SRC_URI[md5sum] = "ec2345dfc8ffc61ccd7529d5d19b2602" +SRC_URI[sha256sum] = "997327185d2d1b597dc118f737c0c165e2a2c21453387ea02659f1159d148518" S = "${WORKDIR}/WireGuard-${PV}/src/" diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb index dc18a602ab..9b327ba2fa 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb @@ -136,9 +136,9 @@ RCONFLICTS_ntpdate += "ntpdate-systemd" RSUGGESTS_${PN} = "iana-etc" -FILES_${PN} = "${sbindir}/ntpd.ntp ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd ${libdir} \ +FILES_${PN} = "${sbindir}/ntpd.ntp ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd \ ${NTP_USER_HOME} \ - ${systemd_unitdir}/ntp-units.d/60-ntpd.list ${libexecdir}\ + ${systemd_unitdir}/ntp-units.d/60-ntpd.list \ " FILES_${PN}-tickadj = "${sbindir}/tickadj" FILES_${PN}-utils = "${sbindir} ${datadir}/ntp/lib" diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb index b0091d6574..b55bd51619 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb @@ -14,6 +14,9 @@ SRC_URI = "file://fancontrol \ " S = "${WORKDIR}" +PACKAGECONFIG ??= "sensord" +PACKAGECONFIG[sensord] = ",," + RDEPENDS_${PN}-dev = "" do_install() { @@ -25,27 +28,29 @@ do_install() { install -d ${D}${sysconfdir}/sensors.d install -m 0644 ${WORKDIR}/sensors.conf ${D}${sysconfdir}/sensors.d - # Install sensord configuration file - install -m 0644 ${WORKDIR}/sensord.conf ${D}${sysconfdir} + if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then + # Install sensord configuration file + install -m 0644 ${WORKDIR}/sensord.conf ${D}${sysconfdir} - # Install sensord.cgi script and create world-writable - # web-accessible sensord directory - install -d ${D}/www/pages/cgi-bin - install -m 0755 ${WORKDIR}/sensord.cgi ${D}/www/pages/cgi-bin - install -d -m a=rwxs ${D}/www/pages/sensord + # Install sensord.cgi script and create world-writable + # web-accessible sensord directory + install -d ${D}/www/pages/cgi-bin + install -m 0755 ${WORKDIR}/sensord.cgi ${D}/www/pages/cgi-bin + install -d -m a=rwxs ${D}/www/pages/sensord + fi } # libsensors configuration PACKAGES =+ "${PN}-libsensors" # sensord logging daemon configuration -PACKAGES =+ "${PN}-sensord" +PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)}" # fancontrol script configuration PACKAGES =+ "${PN}-fancontrol" # sensord web cgi support -PACKAGES =+ "${PN}-cgi" +PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-cgi', '', d)}" RRECOMMENDS_${PN}-cgi = "lighttpd lighttpd-module-cgi" RDEPENDS_${PN}-cgi = "${PN}-sensord rrdtool" FILES_${PN}-cgi = "/www/*" diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb index 585dc94810..ffafd17f82 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb @@ -23,14 +23,26 @@ inherit update-rc.d systemd RDEPENDS_${PN}-dev = "" -INITSCRIPT_PACKAGES = "${PN}-fancontrol ${PN}-sensord" +PACKAGECONFIG ??= "sensord" +PACKAGECONFIG[sensord] = "sensord,,rrdtool" + +INITSCRIPT_PACKAGES = "\ + ${PN}-fancontrol \ + ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \ + " INITSCRIPT_NAME_${PN}-fancontrol = "fancontrol" INITSCRIPT_NAME_${PN}-sensord = "sensord" INITSCRIPT_PARAMS_${PN}-fancontrol = "defaults 66" INITSCRIPT_PARAMS_${PN}-sensord = "defaults 67" -SYSTEMD_PACKAGES = "${PN}-sensord" -SYSTEMD_SERVICE_${PN}-sensord = "sensord.service lm_sensors.service fancontrol.service" +SYSTEMD_PACKAGES = "\ + ${PN} \ + ${PN}-fancontrol \ + ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \ + " +SYSTEMD_SERVICE_${PN} = "lm_sensors.service" +SYSTEMD_SERVICE_${PN}-fancontrol = "fancontrol.service" +SYSTEMD_SERVICE_${PN}-sensord = "sensord.service" SYSTEMD_AUTO_ENABLE = "disable" S = "${WORKDIR}/git" @@ -46,13 +58,15 @@ do_compile() { sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' ${S}/Makefile sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' \ ${S}/lib/Module.mk - oe_runmake user PROG_EXTRA="sensors sensord" + oe_runmake user PROG_EXTRA="sensors ${PACKAGECONFIG_CONFARGS}" } do_install() { oe_runmake user_install DESTDIR=${D} - install -m 0755 ${S}/prog/sensord/sensord ${D}${sbindir} - install -m 0644 ${S}/prog/sensord/sensord.8 ${D}${mandir}/man8 + if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then + install -m 0755 ${S}/prog/sensord/sensord ${D}${sbindir} + install -m 0644 ${S}/prog/sensord/sensord.8 ${D}${mandir}/man8 + fi # Install directory install -d ${D}${INIT_D_DIR} @@ -60,12 +74,17 @@ do_install() { # Install fancontrol init script install -m 0755 ${WORKDIR}/fancontrol.init ${D}${INIT_D_DIR}/fancontrol - # Install sensord init script - install -m 0755 ${WORKDIR}/sensord.init ${D}${INIT_D_DIR}/sensord + if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then + # Install sensord init script + install -m 0755 ${WORKDIR}/sensord.init ${D}${INIT_D_DIR}/sensord + fi # Insall sensord service script - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${S}/prog/init/*.service ${D}${systemd_system_unitdir} + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${S}/prog/init/*.service ${D}${systemd_unitdir}/system + if ! ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then + rm ${D}${systemd_system_unitdir}/sensord.service + fi } RPROVIDES_${PN}-dbg += "${PN}-libsensors-dbg ${PN}-sensors-dbg ${PN}-sensord-dbg ${PN}-isatools-dbg" @@ -89,7 +108,7 @@ PACKAGES =+ "${PN}-libsensors ${PN}-libsensors-dev ${PN}-libsensors-staticdev ${ PACKAGES =+ "${PN}-sensors ${PN}-sensors-doc" # sensord logging daemon -PACKAGES =+ "${PN}-sensord ${PN}-sensord-doc" +PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord ${PN}-sensord-doc', '', d)}" # fancontrol script PACKAGES =+ "${PN}-fancontrol ${PN}-fancontrol-doc" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.19.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.20.bb index 2b4530e3c5..42205034c5 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.19.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.20.bb @@ -7,7 +7,7 @@ inherit autotools pkgconfig systemd DEPENDS = "ell readline dbus" SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git" -SRCREV = "899d802744b7e12409e259f546ba5594ab90262c" +SRCREV = "00f0039232cc73bbcf7a1875f8f9aae464d90a8f" S = "${WORKDIR}/git" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.1.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.2.0.bb index fcabeb9022..9c5503357f 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.2.0.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4ce87f3facb6f911c142c8bef9bfb380" DEPENDS = "zlib" S = "${WORKDIR}/git" -SRCREV = "89eedcaa94e1c8a97ea3af10642fd224bcea068f" -SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;" +SRCREV = "94931cad003faf9d316e698b557bbb6d245f1f91" +SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v3.2-stable" inherit cmake pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.9.0.bb b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.11.0.bb index a7d25d5674..c2d644b417 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.11.0.bb @@ -1,15 +1,12 @@ -# Copyright (C) 2018 Khem Raj <raj.khem@gmail.com> -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "Crypto and TLS for C++11" +SUMMARY = "Crypto and TLS for C++11" HOMEPAGE = "https://botan.randombit.net" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://license.txt;md5=f4c145d4d70a3244a053c9f90d4841fc" SECTION = "libs" -SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tgz" -SRC_URI[md5sum] = "db8403d6a2f10c20fde3f3c76be9a045" -SRC_URI[sha256sum] = "305564352334dd63ae63db039077d96ae52dfa57a3248871081719b6a9f2d119" +SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tar.xz" +SRC_URI[md5sum] = "2dba13b0d25d0e9d2a6f9867c62c9f2e" +SRC_URI[sha256sum] = "f7874da2aeb8c018fd77df40b2137879bf90b66f5589490c991e83fb3e8094be" S = "${WORKDIR}/Botan-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-cpuset_1.5.7.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-cpuset_1.6.bb index 156e52a3a5..1255a51f75 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-cpuset_1.5.7.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/python/python-cpuset_1.6.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" S = "${WORKDIR}/git" -SRCREV = "ae629aa1dc959342745ad97406adddf63bb6dbdd" +SRCREV = "6c46d71a1c6ee711063153b9f7787280128f7252" SRC_URI = "git://github.com/lpechacek/cpuset.git;protocol=https;" inherit distutils diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.32.2.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.34.0.bb index 0ea70b23b5..0cbd07f666 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.32.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.34.0.bb @@ -15,8 +15,8 @@ SRC_URI = " \ file://0001-python-pyobject-fix-install-dir.patch \ " -SRC_URI[md5sum] = "92ffa25351782feb96362f0dace2089f" -SRC_URI[sha256sum] = "c39ca2a28364b57fa00549c6e836346031e6b886c3ceabfd8ab4b4fed0a83611" +SRC_URI[md5sum] = "ca1dc4f31c1d6d283758e8f315a88ab6" +SRC_URI[sha256sum] = "87e2c9aa785f352ef111dcc5f63df9b85cf6e05e52ff04f803ffbebdacf5271a" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-pytoml.inc b/meta-openembedded/meta-oe/recipes-devtools/python/python-pytoml.inc index 1019c09d03..180531d750 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-pytoml.inc +++ b/meta-openembedded/meta-oe/recipes-devtools/python/python-pytoml.inc @@ -4,8 +4,8 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=cfff423699bdaef24331933ac4f56078" -SRC_URI[md5sum] = "a11d8a4859b53f6ebe2f782314428911" -SRC_URI[sha256sum] = "ca2d0cb127c938b8b76a9a0d0f855cf930c1d50cc3a0af6d3595b566519a1013" +SRC_URI[md5sum] = "e59dd36a559dd2a876e4c149c69e947b" +SRC_URI[sha256sum] = "8eecf7c8d0adcff3b375b09fe403407aa9b645c499e5ab8cac670ac4a35f61e7" inherit pypi diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-pytoml_0.1.20.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-pytoml_0.1.21.bb index 88fa95317f..88fa95317f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-pytoml_0.1.20.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/python/python-pytoml_0.1.21.bb diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.22.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.23.bb index 985bd03e46..761619d9af 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.22.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.23.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" inherit autotools gobject-introspection -SRCREV = "f6e4538485d0442b3674e182c01ffe5a0f258ad4" +SRCREV = "f5d2458e9e52d8c55b609ae8cf46ef0673b4a02a" SRC_URI = " \ git://github.com/rhinstaller/libblockdev;branch=master \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/wipe/wipe_git.bb b/meta-openembedded/meta-oe/recipes-extended/wipe/wipe_0.24.bb index 9a8101621b..831d514a4e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/wipe/wipe_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/wipe/wipe_0.24.bb @@ -13,8 +13,7 @@ SRC_URI = "git://github.com/berke/wipe.git;branch=master \ file://support-cross-compile-for-linux.patch \ file://makefile-add-ldflags.patch \ " -SRCREV = "d9c100c9cd0b1cbbe4359e4d6c9a035d11e7597c" -PV = "0.23+git${SRCPV}" +SRCREV = "796b62293e007546e051619bd03f5ba338ef28e5" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch b/meta-openembedded/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch deleted file mode 100644 index 71a989103e..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b97f62fdf3b78eb5cfcb3a1b12c6fd62f735717b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 15 Jul 2017 09:29:33 -0700 -Subject: [PATCH] event.c: Cast pthread_t to unsigned long instead of unsigned - int - -On 64bit machines it ends up in errors - -event.c:85:67: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] - a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%x", (unsigned int)a_event->tid); - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/event.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/event.c b/src/event.c -index 8f988b5..c632c33 100644 ---- a/src/event.c -+++ b/src/event.c -@@ -82,7 +82,7 @@ zlog_event_t *zlog_event_new(int time_cache_count) - a_event->tid = pthread_self(); - - a_event->tid_str_len = sprintf(a_event->tid_str, "%lu", (unsigned long)a_event->tid); -- a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%x", (unsigned int)a_event->tid); -+ a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%lu", (unsigned long)a_event->tid); - - //zlog_event_profile(a_event, ZC_DEBUG); - return a_event; --- -2.13.3 - diff --git a/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_git.bb b/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.14.bb index de7516457f..b94664c33c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.14.bb @@ -3,12 +3,8 @@ HOMEPAGE = "https://github.com/HardySimpson/zlog" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -PV = "1.2.12+git${SRCPV}" - -SRCREV = "13904dab2878aa2654d0c20fb8600a3dc5f2dd68" -SRC_URI = "git://github.com/HardySimpson/zlog \ - file://0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch \ - " +SRCREV = "8fc78c3c65cb705953a2f3f9a813c3ef3c8b2270" +SRC_URI = "git://github.com/HardySimpson/zlog" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/babl/babl_0.1.28.bb b/meta-openembedded/meta-oe/recipes-graphics/babl/babl_0.1.62.bb index 9d8c90fdbb..4a7dbcab3b 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/babl/babl_0.1.28.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/babl/babl_0.1.62.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" inherit gnomebase SRC_URI = "http://ftp.gimp.org/pub/${BPN}/0.1/${BP}.tar.bz2" -SRC_URI[md5sum] = "cc53d8474a43aafb7cdaccea56cfde44" -SRC_URI[sha256sum] = "63f3ed23e72a857a0e6df53d9d968a325024177b01edbe314a0c98b499eb8603" +SRC_URI[md5sum] = "28fa9d43549378ceebe2871d7721dd46" +SRC_URI[sha256sum] = "dc279f174edbcb08821cf37e4ab0bc02e6949369b00b150c759a6c24bfd3f510" FILES_${PN} += "${libdir}/babl-*/*.so" FILES_${PN}-dev += "${libdir}/babl-*/*.la" diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch deleted file mode 100644 index 5c5fe64f2d..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch +++ /dev/null @@ -1,48 +0,0 @@ -From fe491c0919f5adc8d626cb98c5ec19d0b99dfe20 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Thu, 27 Sep 2018 23:45:04 +0200 -Subject: [PATCH] Ensure cmake files are installed at common location -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* Otherwise recent poppler is not able to find them -* Include path needs adjustment with this change - -Upstream-Status: Inappropriate [Configuration] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - CMakeLists.txt | 2 +- - cmake/OpenJPEGConfig.cmake.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ff70a06f..23d2fac4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -150,7 +150,7 @@ if(NOT OPENJPEG_INSTALL_PACKAGE_DIR) - # We could install *.cmake files in share/ however those files contains - # hardcoded path to libraries on a multi-arch system (fedora/debian) those - # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu) -- set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}") -+ set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}") - endif() - - if (APPLE) -diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in -index b20294ca..6a2f4baf 100644 ---- a/cmake/OpenJPEGConfig.cmake.in -+++ b/cmake/OpenJPEGConfig.cmake.in -@@ -26,7 +26,7 @@ get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) - if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) - # This is an install tree - include(${SELF_DIR}/OpenJPEGTargets.cmake) -- get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) -+ get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) - set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT}) - - else() --- -2.14.4 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb index d30ff4825c..b19f9109d5 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb @@ -7,13 +7,14 @@ DEPENDS = "libpng tiff lcms zlib" SRC_URI = " \ git://github.com/uclouvain/openjpeg.git \ - file://0001-Ensure-cmake-files-are-installed-at-common-location.patch \ file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ " -SRCREV = "081de4b15f54cb4482035b7bf5e3fb443e4bc84b" +SRCREV = "57096325457f96d8cd07bd3af04fe81d7a2ba788" S = "${WORKDIR}/git" inherit cmake # for multilib EXTRA_OECMAKE += "-DOPENJPEG_INSTALL_LIB_DIR=${@d.getVar('baselib').replace('/', '')}" + +FILES_${PN} += "${libdir}/openjpeg*" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_git.bb b/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb index b79a562c8e..d96b50186a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb @@ -5,14 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=83af8811a28727a13f04132cc33b7f58" DEPENDS = "virtual/libx11 libxext xorgproto" -PV = "1.1.1+git${SRCPV}" - -SRCREV = "a21bf7aa438f5dd40d0a300a3167aa3d6f26dccc" +SRCREV = "f57a9904c43ef5d726320c77baa91d0c38361ed4" SRC_URI = "git://anongit.freedesktop.org/vdpau/libvdpau" S = "${WORKDIR}/git" -inherit distro_features_check autotools pkgconfig +inherit distro_features_check meson REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-kernel/agent-proxy/agent-proxy_git.bb b/meta-openembedded/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb index 8e370f962c..2eb19206d3 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/agent-proxy/agent-proxy_git.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb @@ -8,8 +8,7 @@ SECTION = "devel" EXTRA_OEMAKE = "'CC=${CC}'" -SRCREV = "e6c9d3d996bd55e7ab14dbd74deb7841e0c3a4f1" -PV = "1.96+git${SRCPV}" +SRCREV = "468fe4c31e6c62c9bbb328b06ba71eaf7be0b76a" SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kgdb/agent-proxy.git;protocol=git \ file://0001-Makefile-Add-LDFLAGS-variable.patch \ diff --git a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.7.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.8.1.bb index 1d04ed1bdb..70278ecca7 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.8.1.bb @@ -7,8 +7,7 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" -# SRCREV for 1.7.0 -SRCREV = "133f83e2c34b8d770ae06aa595cef3e254173fcb" +SRCREV = "8ae686757b708cd8df1d10c71586aff5355cfe1e" SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https \ file://libvpx-configure-support-blank-prefix.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.0.bb index ac463038aa..ac463038aa 100644 --- a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb +++ b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.0.bb diff --git a/meta-openembedded/meta-oe/recipes-support/digitemp/digitemp_git.bb b/meta-openembedded/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb index 460aa14384..9fcc278d35 100644 --- a/meta-openembedded/meta-oe/recipes-support/digitemp/digitemp_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb @@ -4,11 +4,9 @@ DEPENDS = "libusb1" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0" -PV = "3.7.1+git${SRCPV}" - SRC_URI = "git://github.com/bcl/digitemp" -SRCREV = "389f67655efa1674f595106c3a47b5ad082609a7" +SRCREV = "a162e63aad35358aab325388f3d5e88121606419" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.0.bb b/meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.2.bb index 29a1125cd5..6eea0c00ec 100644 --- a/meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.2.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df" SRC_URI = "git://github.com/gflags/gflags.git" -SRCREV = "f8a0efe03aa69b3336d8e228b37d4ccb17324b88" +SRCREV = "e171aa2d15ed9eb17054558e0b3a6a413bb01067" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.5.bb b/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.5.bb deleted file mode 100644 index 4e85418125..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -include gsl.inc - -SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz" - -SRC_URI[md5sum] = "52fcbe147ba413d78841084cb43c95fb" -SRC_URI[sha256sum] = "0460ad7c2542caaddc6729762952d345374784100223995eb14d614861f2258d" diff --git a/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.6.bb b/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.6.bb new file mode 100644 index 0000000000..367a08321e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.6.bb @@ -0,0 +1,5 @@ +include gsl.inc + +SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz" +SRC_URI[md5sum] = "bda73a3dd5ff2f30b5956764399db6e7" +SRC_URI[sha256sum] = "b782339fc7a38fe17689cb39966c4d821236c28018b6593ddb6fd59ee40786a8" diff --git a/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.7.bb b/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.9.bb index 12ccb2050b..be72d765ef 100644 --- a/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.9.bb @@ -2,9 +2,10 @@ SUMMARY = "Little cms is a small-footprint, speed optimized color management eng SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=6c786c3b7a4afbd3c990f1b81261d516" + SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms2-${PV}.tar.gz" -SRC_URI[md5sum] = "06c1626f625424a811fb4b5eb070839d" -SRC_URI[sha256sum] = "4524234ae7de185e6b6da5d31d6875085b2198bc63b1211f7dde6e2d197d6a53" +SRC_URI[md5sum] = "8de1b7724f578d2995c8fdfa35c3ad0e" +SRC_URI[sha256sum] = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20" DEPENDS = "tiff" diff --git a/meta-openembedded/meta-oe/recipes-support/libbytesize/files/0001-fix-out-of-tree-build-failure.patch b/meta-openembedded/meta-oe/recipes-support/libbytesize/files/0001-fix-out-of-tree-build-failure.patch deleted file mode 100644 index 3f42c25d7e..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libbytesize/files/0001-fix-out-of-tree-build-failure.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 55802fd187b844f0c114c1657b18482bfc80ec51 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 2 Jul 2019 02:52:31 +0000 -Subject: [PATCH] fix out of tree build failure - -Since commit [116da95 Add the '--version' option to bs_calc.py] applied, -while build out of tree, there is a install failure -... -|install -m0755 ../../git/tools/bs_calc.py /usr/bin/bscalc -|install: cannot stat '../../git/tools/bs_calc.py': No such file or directory -... - -The generated bs_calc.py locates in builddir rather than srcdir - -Upstream-Status: Submitted [https://github.com/storaged-project/libbytesize/pull/59] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - tools/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/Makefile.am b/tools/Makefile.am -index 08223a8..ae22fed 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -5,7 +5,7 @@ dist_man1_MANS = bscalc.man - - install-exec-local: - install -d ${DESTDIR}${bindir} -- install -m0755 ${srcdir}/bs_calc.py ${DESTDIR}${bindir}/bscalc -+ install -m0755 ${builddir}/bs_calc.py ${DESTDIR}${bindir}/bscalc - - uninstall-local: - rm ${DESTDIR}${bindir}/bscalc --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.0.bb b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.1.bb index 74f1800d18..07bf1faaeb 100644 --- a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.1.bb @@ -9,10 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" S = "${WORKDIR}/git" B = "${S}" -SRCREV = "92c00638a6f846df5c40dbb690f9fcf998ad6df2" -SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master \ - file://0001-fix-out-of-tree-build-failure.patch \ -" +SRCREV = "9ecc1042109528051983261ffd491d45e7c471e1" +SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master" inherit gettext autotools python3native diff --git a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb index e1deb662ae..f638848d15 100644 --- a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb @@ -18,3 +18,5 @@ FILES_${PN}-dev = "${includedir} ${datadir}/eigen3/cmake ${datadir}/cmake/Module # ${PN} is empty so we need to tweak -dev and -dbg package dependencies RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.59.bb b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb index 7e50edf7b2..7d349b94e4 100644 --- a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.59.bb +++ b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb @@ -1,13 +1,14 @@ DESCRIPTION = "A small C library that is supposed to make it easy to run an HTTP server as part of another application" HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" LICENSE = "LGPL-2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=9331186f4f80db7da0e724bdd6554ee5" +LIC_FILES_CHKSUM = "file://COPYING;md5=57d09285feac8a64efa878e692b14f36" SECTION = "net" + DEPENDS = "file" SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "8ab5123535549195aff19e91b4e49f48" -SRC_URI[sha256sum] = "9b9ccd7d0b11b0e179f1f58dc2caa3e0c62c8609e1e1dc7dcaadf941b67d923c" +SRC_URI[md5sum] = "ce4050e75cc40d68506e2b403e1a76f9" +SRC_URI[sha256sum] = "4e66d4db1574f4912fbd2690d10d227cc9cc56df6a10aa8f4fc2da75cea7ab1b" inherit autotools lib_package pkgconfig gettext diff --git a/meta-openembedded/meta-oe/recipes-support/upower/upower/0001-linux-lower-severity-of-unhandled-action-messages.patch b/meta-openembedded/meta-oe/recipes-support/upower/upower/0001-linux-lower-severity-of-unhandled-action-messages.patch deleted file mode 100644 index de89dc01cc..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/upower/upower/0001-linux-lower-severity-of-unhandled-action-messages.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f64b6ce8054b47e5bdcc8c4c7965534b388e6151 Mon Sep 17 00:00:00 2001 -From: Dmitry Torokhov <dmitry.torokhov@gmail.com> -Date: Fri, 6 Apr 2018 11:26:54 -0700 -Subject: [PATCH] linux: lower severity of "unhandled action" messages - -Newer kernels emit bind/unbind uevents that are not of interest to -powerd. To avoid littering logs with scary messages, let's lower their -severity to "debug". - -https://bugs.freedesktop.org/show_bug.cgi?id=106019 - -Upstream-Status: Backport ---- - src/linux/up-backend.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c -index e668dc8..b8021e7 100644 ---- a/src/linux/up-backend.c -+++ b/src/linux/up-backend.c -@@ -273,7 +273,7 @@ up_backend_uevent_signal_handler_cb (GUdevClient *client, const gchar *action, - g_debug ("SYSFS change %s", g_udev_device_get_sysfs_path (device)); - up_backend_device_changed (backend, device); - } else { -- g_warning ("unhandled action '%s' on %s", action, g_udev_device_get_sysfs_path (device)); -+ g_debug ("unhandled action '%s' on %s", action, g_udev_device_get_sysfs_path (device)); - } - } - --- -2.17.0.484.g0c8726318c-goog diff --git a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.7.bb b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb index ffa2c49ee9..c4cc627116 100644 --- a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb @@ -6,10 +6,9 @@ DEPENDS = "intltool-native libusb1 libgudev glib-2.0 dbus-glib" SRC_URI = " \ http://upower.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://0001-linux-lower-severity-of-unhandled-action-messages.patch \ " -SRC_URI[md5sum] = "236bb439d9ff1151450b3d8582399532" -SRC_URI[sha256sum] = "24bcc2f6ab25a2533bac70b587bcb019e591293076920f5b5e04bdedc140a401" +SRC_URI[md5sum] = "abe6acb617f11f2e8dbd9846fcf86e24" +SRC_URI[sha256sum] = "64b5ffbfccd5bdb15d925777979a4dbee1a957f9eaeb158dc76175267eddbdef" inherit autotools pkgconfig gettext gobject-introspection systemd distro_features_check diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-of-CVE-2017-16927.patch b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-of-CVE-2017-16927.patch deleted file mode 100644 index 4c93647f67..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-of-CVE-2017-16927.patch +++ /dev/null @@ -1,148 +0,0 @@ -Subject: [PATCH] Fix CVE-2017-16927 - -sesman: scpv0, accept variable length data fields - -Upstream-Status: Backport - ---- - sesman/libscp/libscp_v0.c | 32 +++++++++++++++++++++++++------- - 1 file changed, 25 insertions(+), 7 deletions(-) - -diff --git a/sesman/libscp/libscp_v0.c b/sesman/libscp/libscp_v0.c -index 5a0c8bf..5693407 100644 ---- a/sesman/libscp/libscp_v0.c -+++ b/sesman/libscp/libscp_v0.c -@@ -161,7 +161,7 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - struct SCP_SESSION *session = 0; - tui16 sz; - tui32 code = 0; -- char buf[257]; -+ char *buf = 0; - - if (!skipVchk) - { -@@ -226,27 +226,31 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - - /* reading username */ - in_uint16_be(c->in_s, sz); -- buf[sz] = '\0'; -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); -- -+ buf[sz] = '\0'; - if (0 != scp_session_set_username(session, buf)) - { - scp_session_destroy(session); - log_message(LOG_LEVEL_WARNING, "[v0:%d] connection aborted: error setting username", __LINE__); -+ g_free(buf); - return SCP_SERVER_STATE_INTERNAL_ERR; - } -+ g_free(buf); - - /* reading password */ - in_uint16_be(c->in_s, sz); -- buf[sz] = '\0'; -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); -- -+ buf[sz] = '\0'; - if (0 != scp_session_set_password(session, buf)) - { - scp_session_destroy(session); - log_message(LOG_LEVEL_WARNING, "[v0:%d] connection aborted: error setting password", __LINE__); -+ g_free(buf); - return SCP_SERVER_STATE_INTERNAL_ERR; - } -+ g_free(buf); - - /* width */ - in_uint16_be(c->in_s, sz); -@@ -272,9 +276,11 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - - if (sz > 0) - { -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); - buf[sz] = '\0'; - scp_session_set_domain(session, buf); -+ g_free(buf); - } - } - -@@ -285,9 +291,11 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - - if (sz > 0) - { -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); - buf[sz] = '\0'; - scp_session_set_program(session, buf); -+ g_free(buf); - } - } - -@@ -298,9 +306,11 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - - if (sz > 0) - { -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); - buf[sz] = '\0'; - scp_session_set_directory(session, buf); -+ g_free(buf); - } - } - -@@ -311,9 +321,11 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - - if (sz > 0) - { -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); - buf[sz] = '\0'; - scp_session_set_client_ip(session, buf); -+ g_free(buf); - } - } - } -@@ -332,29 +344,35 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - scp_session_set_type(session, SCP_GW_AUTHENTICATION); - /* reading username */ - in_uint16_be(c->in_s, sz); -- buf[sz] = '\0'; -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); -+ buf[sz] = '\0'; - - /* g_writeln("Received user name: %s",buf); */ - if (0 != scp_session_set_username(session, buf)) - { - scp_session_destroy(session); - /* until syslog merge log_message(s_log, LOG_LEVEL_WARNING, "[v0:%d] connection aborted: error setting username", __LINE__);*/ -+ g_free(buf); - return SCP_SERVER_STATE_INTERNAL_ERR; - } -+ g_free(buf); - - /* reading password */ - in_uint16_be(c->in_s, sz); -- buf[sz] = '\0'; -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); -+ buf[sz] = '\0'; - - /* g_writeln("Received password: %s",buf); */ - if (0 != scp_session_set_password(session, buf)) - { - scp_session_destroy(session); - /* until syslog merge log_message(s_log, LOG_LEVEL_WARNING, "[v0:%d] connection aborted: error setting password", __LINE__); */ -+ g_free(buf); - return SCP_SERVER_STATE_INTERNAL_ERR; - } -+ g_free(buf); - } - else - { --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-sesman.ini-and-xrdp.ini.patch b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-sesman.ini-and-xrdp.ini.patch deleted file mode 100644 index deaadde8c7..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-sesman.ini-and-xrdp.ini.patch +++ /dev/null @@ -1,75 +0,0 @@ -From a9c460f158d68c1b3de6a31ce853de5379977695 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Thu, 30 Nov 2017 11:10:04 +0900 -Subject: [PATCH] Fix sesman.ini and xrdp.ini - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- - sesman/sesman.ini | 20 ++++++-------------- - xrdp/xrdp.ini | 10 ---------- - 2 files changed, 6 insertions(+), 24 deletions(-) - -diff --git a/sesman/sesman.ini b/sesman/sesman.ini -index 8225ee4..c09189e 100644 ---- a/sesman/sesman.ini -+++ b/sesman/sesman.ini -@@ -54,12 +54,14 @@ LogLevel=DEBUG - EnableSyslog=1 - SyslogLevel=DEBUG - --[X11rdp] --param=X11rdp --param=-bs -+[Xorg] -+param=Xorg -+param=-config -+param=xrdp/xorg.conf -+param=-noreset - param=-nolisten - param=tcp --param=-uds -+ - - [Xvnc] - param=Xvnc -@@ -70,16 +72,6 @@ param=-localhost - param=-dpi - param=96 - --[Xorg] --param=Xorg --param=-config --param=xrdp/xorg.conf --param=-noreset --param=-nolisten --param=tcp --param=-logfile --param=.xorgxrdp.%s.log -- - [Chansrv] - ; drive redirection, defaults to xrdp_client if not set - FuseMountName=thinclient_drives -diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini -index cb6d7c3..9f63a69 100644 ---- a/xrdp/xrdp.ini -+++ b/xrdp/xrdp.ini -@@ -157,16 +157,6 @@ ip=127.0.0.1 - port=-1 - code=20 - --[X11rdp] --name=X11rdp --lib=libxup.so --username=ask --password=ask --ip=127.0.0.1 --port=-1 --xserverbpp=24 --code=10 -- - [Xvnc] - name=Xvnc - lib=libvnc.so --- -1.8.4.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.4.bb b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb index 3ef7c9853f..75caf8d6bb 100644 --- a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb @@ -12,15 +12,13 @@ REQUIRED_DISTRO_FEATURES = "x11 pam" SRC_URI = "git://github.com/neutrinolabs/xrdp.git \ file://xrdp.sysconfig \ - file://0001-Fix-sesman.ini-and-xrdp.ini.patch \ file://0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch \ file://0001-Fix-the-compile-error.patch \ - file://0001-Fix-of-CVE-2017-16927.patch \ " -SRCREV = "c295dd61b882e8b56677cf12791f43634f9190b5" +SRCREV = "1e4b03eb3c9aa7173de251a328c93c073dcc0fca" -PV = "0.9.4+git${SRCPV}" +PV = "0.9.11" S = "${WORKDIR}/git" @@ -68,9 +66,9 @@ do_install_append() { sed -i -e 's,@sbindir@,${sbindir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service install -m 0644 ${S}/instfiles/*.ini ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/sesman/sesman.ini ${D}${sysconfdir}/xrdp/ + install -m 0644 ${S}/sesman/sesman.ini.in ${D}${sysconfdir}/xrdp/ install -m 0644 ${S}/sesman/startwm.sh ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/xrdp/xrdp.ini ${D}${sysconfdir}/xrdp/ + install -m 0644 ${S}/xrdp/xrdp.ini.in ${D}${sysconfdir}/xrdp/ install -m 0644 ${S}/xrdp/xrdp_keyboard.ini ${D}${sysconfdir}/xrdp/ install -m 0644 ${S}/instfiles/xrdp.sh ${D}${sysconfdir}/xrdp/ install -m 0644 ${S}/keygen/openssl.conf ${D}${sysconfdir}/xrdp/ diff --git a/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.7.2.bb b/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.9.2.bb index b5c8573296..57fc935f77 100644 --- a/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.7.2.bb +++ b/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.9.2.bb @@ -5,10 +5,8 @@ HOMEPAGE = "https://github.com/catchorg/Catch2" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRC_URI = "git://github.com/catchorg/Catch2.git \ - " -# v2.7.2 -SRCREV = "7c37501b070c0e9ea9cdedbeac2059f0a6b0a8ab" +SRC_URI = "git://github.com/catchorg/Catch2.git" +SRCREV = "2c869e17e4803d30b3d5ca5b0d76387b9db97fa5" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.12.bb index 9907ea953c..f08fa20a13 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.10.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.12.bb @@ -9,8 +9,8 @@ DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \ " -SRC_URI[md5sum] = "5d21d5ae6423f0e41caa3400af44edac" -SRC_URI[sha256sum] = "d4332bbd4a0054fa4010b259c293b84d461bbd9d7a8ef528157d151c0398d886" +SRC_URI[md5sum] = "428b7a9e7e2d154a7ceb3e13536283e4" +SRC_URI[sha256sum] = "cdd4de2c4f5e58f287b12013ed7b41dee81d503c8d0d2397c5bd2fb01badf260" S = "${WORKDIR}/dbus-python-${PV}" inherit distutils-base autotools pkgconfig diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc index c9bee62874..57660060c5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/pytest-dev/pluggy" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=1c8206d16fd5cc02fa9b0bb98955e5c2" -SRC_URI[md5sum] = "e986647f5d786c0cc1bd065cf9bac658" -SRC_URI[sha256sum] = "0825a152ac059776623854c1543d65a4ad408eb3d33ee114dff91e57ec6ae6fc" +SRC_URI[md5sum] = "4b8384b69cddbc2e104fdd3ff5631788" +SRC_URI[sha256sum] = "fa5fa1622fa6dd5c030e9cad086fa19ef6a0cf6d7a2d12318e10cb49d6d68f34" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.12.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.13.0.bb index edcd4f512f..edcd4f512f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.12.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.13.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyserial.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyserial.inc index 52a7e05ce6..870f1d8a8a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyserial.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyserial.inc @@ -40,3 +40,5 @@ RDEPENDS_${PN} = "\ ${PYTHON_PN}-stringold \ ${PYTHON_PN}-threading \ " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyusb.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyusb.inc index 30bbe85a91..baf2db5301 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyusb.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyusb.inc @@ -8,3 +8,5 @@ SRC_URI[md5sum] = "862b56452c64948c787ad8ef9498590b" SRC_URI[sha256sum] = "4e9b72cc4a4205ca64fbf1f3fff39a335512166c151ad103e55c8223ac147362" inherit pypi + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.12.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.13.0.bb index 941e8e3d8c..941e8e3d8c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.12.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.13.0.bb |