diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-03-25 20:14:15 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-03-25 20:14:34 +0300 |
commit | c64341c1756fdd5ed23b9f3e2d0f0a4d8bb93a6a (patch) | |
tree | 0df3674475549cc201f1e07082bad50ec5daa350 /meta-openembedded/meta-networking | |
parent | f8caae304a2fa94cf2770b72a313ee843b2f177b (diff) | |
download | openbmc-c64341c1756fdd5ed23b9f3e2d0f0a4d8bb93a6a.tar.xz |
meta-openembedded: refresh thud: 6ef9657068..4cd3a39f22
Update meta-openembedded to thud HEAD.
Adrian Bunk (2):
wireless-regdb: update 2018.05.31 -> 2018.10.24
Split ntpq into an own package
André Draszik (2):
mosquitto: fix build in systemd environments
mosquitto: fully switch over to using PACKAGECONFIG_CONFARGS
Khem Raj (1):
rtmpdump: Switch to using GNU TLS instead of openssl10
Ovidiu Panait (1):
python3-blivetgui: Fix _supported_filesystems crash
Change-Id: Id488182d26039d9a5bf170503f867b515688a738
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-networking')
-rw-r--r-- | meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb | 13 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2018.10.24.bb (renamed from meta-openembedded/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2018.05.31.bb) | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p12.bb | 5 |
3 files changed, 11 insertions, 11 deletions
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb index b4adfdada9..06c1d67da8 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb @@ -24,20 +24,17 @@ PACKAGECONFIG ??= "ssl uuid \ ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ " -PACKAGECONFIG[dns-srv] = ",,c-ares" -PACKAGECONFIG[ssl] = ",,openssl" -PACKAGECONFIG[uuid] = ",,util-linux" +PACKAGECONFIG[dns-srv] = "WITH_SRV=yes,WITH_SRV=no,c-ares" +PACKAGECONFIG[ssl] = "WITH_TLS=yes WITH_TLS_PSK=yes,WITH_TLS=no WITH_TLS_PSK=no,openssl" +PACKAGECONFIG[uuid] = "WITH_UUID=yes,WITH_UUID=no,util-linux" PACKAGECONFIG[systemd] = "WITH_SYSTEMD=yes,WITH_SYSTEMD=no,systemd" -PACKAGECONFIG[websockets] = ",,libwebsockets" +PACKAGECONFIG[websockets] = "WITH_WEBSOCKETS=yes,WITH_WEBSOCKETS=no,libwebsockets" EXTRA_OEMAKE = " \ prefix=${prefix} \ mandir=${mandir} \ localedir=${localedir} \ - ${@bb.utils.contains('PACKAGECONFIG', 'dns-srv', 'WITH_SRV=yes', 'WITH_SRV=no', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'ssl', 'WITH_TLS=yes WITH_TLS_PSK=yes', 'WITH_TLS=no WITH_TLS_PSK=no', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'uuid', 'WITH_UUID=yes', 'WITH_UUID=no', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'websockets', 'WITH_WEBSOCKETS=yes', 'WITH_WEBSOCKETS=no', d)} \ + ${PACKAGECONFIG_CONFARGS} \ STRIP=/bin/true \ WITH_DOCS=no \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2018.05.31.bb b/meta-openembedded/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2018.10.24.bb index 2b990db3cb..e1aa9a5171 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2018.05.31.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2018.10.24.bb @@ -5,8 +5,8 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "0cbbdc21186c76cf58aba01b03f3dc5b" -SRC_URI[sha256sum] = "e1dfbc3b97771373077f430c3c05082fae883145b37db5b2cfd12c56676fbe7b" +SRC_URI[md5sum] = "b81bd1f6525a4806a707881aa3dda63f" +SRC_URI[sha256sum] = "0d3e845ac77d21aac9b88642c3dd043a83e3920d706b63d5e5c31dffdbec9116" inherit bin_package allarch diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p12.bb b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p12.bb index 53e41297aa..289d2645bd 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p12.bb +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p12.bb @@ -105,7 +105,7 @@ do_install_append() { rmdir --ignore-fail-on-non-empty ${D}${libexecdir} } -PACKAGES += "ntpdate sntp ${PN}-tickadj ${PN}-utils" +PACKAGES += "ntpdate sntp ntpq ${PN}-tickadj ${PN}-utils" # NOTE: you don't need ntpdate, use "ntpd -q -g -x" # ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms @@ -117,6 +117,8 @@ RDEPENDS_${PN} += "libgcc" RPROVIDES_${PN}-utils = "${PN}-bin" RREPLACES_${PN}-utils = "${PN}-bin" RCONFLICTS_${PN}-utils = "${PN}-bin" +# ntpq was split out of ntp-utils +RDEPENDS_${PN}-utils = "ntpq" SYSTEMD_PACKAGES = "${PN} ntpdate sntp" SYSTEMD_SERVICE_${PN} = "ntpd.service" @@ -151,6 +153,7 @@ FILES_sntp = "${sbindir}/sntp \ ${sysconfdir}/default/sntp \ ${systemd_unitdir}/system/sntp.service \ " +FILES_ntpq = "${sbindir}/ntpq" CONFFILES_${PN} = "${sysconfdir}/ntp.conf" CONFFILES_ntpdate = "${sysconfdir}/default/ntpdate" |