[oe] [meta-oe][PATCH] udisk: fix dependency about libdevmapper
From: Chen QiWe have separated libdevmapper from lvm2, so we need to also fix related dependency for udisk. Instead of simply replacing lvm2 with libdevmapper in DEPENDS, we add PACKAGECONFIG for libdevmapper. Signed-off-by: Chen Qi --- meta-oe/recipes-support/udisks/udisks_1.0.5.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb b/meta-oe/recipes-support/udisks/udisks_1.0.5.bb index ffe2c26..e332660 100644 --- a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb +++ b/meta-oe/recipes-support/udisks/udisks_1.0.5.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A storage daemon that implements well-defined D-Bus interfaces th LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=73d83aebe7e4b62346afde80e0e94273" -DEPENDS = "libatasmart sg3-utils polkit libgudev dbus-glib glib-2.0 intltool-native lvm2 \ +DEPENDS = "libatasmart sg3-utils polkit libgudev dbus-glib glib-2.0 intltool-native \ dbus-glib-native \ " # optional dependencies: device-mapper parted @@ -24,7 +24,8 @@ SRC_URI[udisks.sha256sum] = "f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3 inherit autotools-brokensep systemd gtk-doc -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "libdevmapper" +PACKAGECONFIG[libdevmapper] = "--enable-devmapper,--disable-devmapper,libdevmapper" PACKAGECONFIG[parted] = "--enable-parted,--disable-parted,parted" EXTRA_OECONF = "--disable-man-pages --libdir=${base_libdir} --sbindir=${base_sbindir}" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH 3/3] smbnetfs: unblacklist recipe
That's probably caused by my change in master-next to remove blacklisted recipes (and their patch files), I've removed smbfs from that commit, but forgot to restore the .patch file On Tue, Aug 29, 2017 at 5:45 PM, Khem Rajwrote: > On Mon, Aug 28, 2017 at 9:39 AM, Ioan-Adrian Ratiu > wrote: > > All its dependencies have been fixed and it builds correctly. > > > > I see > ERROR: smbnetfs-git-r0 do_fetch: Fetcher failure for URL: > 'file://configure.patch'. Unable to fetch URL from any source. > > > Signed-off-by: Ioan-Adrian Ratiu > > --- > > meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb | 2 -- > > 1 file changed, 2 deletions(-) > > > > diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_ > git.bb b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb > > index 6995ad3f5..f1420fbed 100644 > > --- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb > > +++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb > > @@ -24,5 +24,3 @@ PACKAGECONFIG ??= "" > > PACKAGECONFIG[gnome-keyring] = "--with-gnome-keyring=yes,-- > with-gnome-keyring=no,libgnome-keyring" > > > > S = "${WORKDIR}/git" > > - > > -PNBLACKLIST[smbnetfs] ?= "Fails to build with RSS > http://errors.yoctoproject.org/Errors/Details/132827/ - the recipe will > be removed on 2017-09-01 unless the issue is fixed" > > -- > > 2.14.1 > > > > -- > > ___ > > Openembedded-devel mailing list > > Openembedded-devel@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH 3/3] smbnetfs: unblacklist recipe
On Mon, Aug 28, 2017 at 9:39 AM, Ioan-Adrian Ratiuwrote: > All its dependencies have been fixed and it builds correctly. > I see ERROR: smbnetfs-git-r0 do_fetch: Fetcher failure for URL: 'file://configure.patch'. Unable to fetch URL from any source. > Signed-off-by: Ioan-Adrian Ratiu > --- > meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb > b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb > index 6995ad3f5..f1420fbed 100644 > --- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb > +++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb > @@ -24,5 +24,3 @@ PACKAGECONFIG ??= "" > PACKAGECONFIG[gnome-keyring] = > "--with-gnome-keyring=yes,--with-gnome-keyring=no,libgnome-keyring" > > S = "${WORKDIR}/git" > - > -PNBLACKLIST[smbnetfs] ?= "Fails to build with RSS > http://errors.yoctoproject.org/Errors/Details/132827/ - the recipe will be > removed on 2017-09-01 unless the issue is fixed" > -- > 2.14.1 > > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH] python-aws-iot-device-sdk-python: Add recipe for version 1.1.2
The AWS IoT Device SDK for Python allows developers to write Python script to use their devices to access the AWS IoT platform through MQTT or MQTT over the WebSocket protocol. Signed-off-by: Fabio Berton--- .../python/python-aws-iot-device-sdk-python.inc| 18 ++ .../python/python-aws-iot-device-sdk-python_1.1.2.bb | 2 ++ .../python/python3-aws-iot-device-sdk-python_1.1.2.bb | 2 ++ 3 files changed, 22 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc create mode 100644 meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.1.2.bb create mode 100644 meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.1.2.bb diff --git a/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc b/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc new file mode 100644 index 0..a64c6c49a --- /dev/null +++ b/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc @@ -0,0 +1,18 @@ +DESCRIPTION = "SDK for connecting to AWS IoT using Python." +HOMEPAGE = "https://github.com/aws/aws-iot-device-sdk-python; +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9ac49901b833e769c7d6f21e8dbd7b30" + +SRC_URI[md5sum] = "6835982c7fb36b19aa474d346f29ec3d" +SRC_URI[sha256sum] = "ac98d39d7230e06fc9a30bdb3398c985a7c357b10898a769db022d315855102a" + +inherit pypi + +PYPI_PACKAGE = "AWSIoTPythonSDK" + +RDEPENDS_${PN} += " \ +${PYTHON_PN}-pyopenssl \ +${PYTHON_PN}-json \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.1.2.bb b/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.1.2.bb new file mode 100644 index 0..12ae978e3 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.1.2.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-aws-iot-device-sdk-python.inc diff --git a/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.1.2.bb b/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.1.2.bb new file mode 100644 index 0..c43649dbf --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.1.2.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-aws-iot-device-sdk-python.inc -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] vboxguestdrivers: update to fix build issues with 4.12+
On 08/29/2017 01:07 AM, Khem Raj wrote: On Mon, Aug 28, 2017 at 8:09 PM, Bruce Ashfieldwrote: Bumping the version to 5.1.26 fixes the build issues with the 4.12+ kernel (and headers). i.e.: tmp/work-shared/qemux86-64/kernel-source/arch/x86/include/asm/atomic.h: In function 'atomic_try_cmpxchg': | tmp/work-shared/qemux86-64/kernel-source/arch/x86/include/asm/atomic.h:192:2: error: undefined named operand 'new' | return try_cmpxchg(>counter, old, new); | ^~ | tmp/work-shared/qemux86-64/kernel-source/arch/x86/include/asm/atomic.h:192:2: error: undefined named operand 'new' | tmp/work-shared/qemux86-64/kernel-source/arch/x86/include/asm/atomic.h:192:2: error: undefined named operand 'new' | tmp/work-shared/qemux86-64/kernel-source/arch/x86/include/asm/atomic.h:192:2: error: undefined named operand 'new' fixed with https://patchwork.openembedded.org/patch/143347/ Hah. I see the series you sent now. Sorry for the extra noise! Bruce Signed-off-by: Bruce Ashfield --- .../{vboxguestdrivers_5.1.18.bb => vboxguestdrivers_5.1.26.bb}| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_5.1.18.bb => vboxguestdrivers_5.1.26.bb} (93%) diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.18.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb similarity index 93% rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.18.bb rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb index 4085b9fc7339..fdefe03172d2 100644 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.18.bb +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb @@ -14,8 +14,8 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ " -SRC_URI[md5sum] = "1a7db64cd69ba6d39574fb333e031251" -SRC_URI[sha256sum] = "7ed0959bbbd02826b86b3d5dc8348931ddfab267c31f8ed36ee53c12f5522cd9" +SRC_URI[md5sum] = "d3aec8190c649d7e0d92ba374779dfe3" +SRC_URI[sha256sum] = "b5715035e681a11ef1475f83f9503d34a00f0276b89c572eebec363dda80c8a9" S = "${WORKDIR}/vbox_module" -- 2.5.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] wireguard: fix kernel 4.12 build issues
On 08/29/2017 01:06 AM, Khem Raj wrote: On Mon, Aug 28, 2017 at 8:38 PM, Bruce Ashfieldwrote: We upgrade the module + tools recipes to fix the following build error: wireguard-module/0.0.20170517-r0/WireGuard-0.0.20170517/src/device.c: In function 'setup': | wireguard-module/0.0.20170517-r0/WireGuard-0.0.20170517/src/device.c:269:7: error: 'struct net_device' has no member named 'destructor'; did you mean 'priv_destructor'? | dev->destructor = destruct; |^~ |priv_destructor We also add a RDEPENDS on "bash" to the wireguard-tools recipe to fix the following QA issue that appeared with the version bump: ERROR: wireguard-tools-0.0.20170810-r0 do_package_qa: QA Issue: /usr/bin/wg-quick contained in package wireguard-tools requires /bin/bash, but no providers found in RDEPENDS_wireguard-tools? [file-rdeps] already fixed with https://patchwork.openembedded.org/patch/143341/ https://patchwork.openembedded.org/patch/143280/ Damn! I missed that going to the list. Luckily, it wasn't much work to fix :D Bruce your commit msg is better though Signed-off-by: Bruce Ashfield --- ...eguard-module_0.0.20170517.bb => wireguard-module_0.0.20170810.bb} | 0 ...ireguard-tools_0.0.20170517.bb => wireguard-tools_0.0.20170810.bb} | 2 +- meta-networking/recipes-kernel/wireguard/wireguard.inc| 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename meta-networking/recipes-kernel/wireguard/{wireguard-module_0.0.20170517.bb => wireguard-module_0.0.20170810.bb} (100%) rename meta-networking/recipes-kernel/wireguard/{wireguard-tools_0.0.20170517.bb => wireguard-tools_0.0.20170810.bb} (93%) diff --git a/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170517.bb b/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170810.bb similarity index 100% rename from meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170517.bb rename to meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170810.bb diff --git a/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170517.bb b/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170810.bb similarity index 93% rename from meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170517.bb rename to meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170810.bb index 79d420f1a417..c4ddbcb0e90f 100644 --- a/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170517.bb +++ b/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170810.bb @@ -24,4 +24,4 @@ FILES_${PN} = " \ ${bindir} \ " -RDEPENDS_${PN} = "wireguard-module" +RDEPENDS_${PN} = "wireguard-module bash" diff --git a/meta-networking/recipes-kernel/wireguard/wireguard.inc b/meta-networking/recipes-kernel/wireguard/wireguard.inc index 9e38c57ffa5b..b26536d3308c 100644 --- a/meta-networking/recipes-kernel/wireguard/wireguard.inc +++ b/meta-networking/recipes-kernel/wireguard/wireguard.inc @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz; -SRC_URI[md5sum] = "e9969ebbdf525fcbe91a513db8a5c864" -SRC_URI[sha256sum] = "7303e973654a3585039f4789e89a562f807f0d6010c7787b9b69ca72aa7a6908" +SRC_URI[md5sum] = "8dd3e080407b8295c25565a847a4ca27" +SRC_URI[sha256sum] = "ab96230390625aad6f4816fa23aef6e9f7fee130f083d838919129ff12089bf7" S = "${WORKDIR}/WireGuard-${PV}/src/" -- 2.5.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] iproute2: Move append to meta-networking layer
I agree that is better move libmnl to oe-core, you can abandon this patch and Yi Zhao patch. On Mon, Aug 28, 2017 at 10:54 PM, Yi Zhaowrote: > > > 在 2017年08月29日 09:48, Mark Hatle 写道: > >> On 8/28/17 8:30 PM, Yi Zhao wrote: >> >>> >>> 在 2017年08月29日 09:19, Mark Hatle 写道: >>> On 8/28/17 8:07 PM, Mark Hatle wrote: > On 8/28/17 1:13 PM, Fabio Berton wrote: > >> meta-openembedded commit eb8994f44a080d9c7fd2c87b6b6935ad0a55eb27 >> added >> iproute2 append to enable tipc PACKAGECONFIG that install libmnl >> package. libmnl recipe is in meta-networking layer and this layer >> needs to be added to bblayers.conf file to build libmnl. Move >> iproute2 append to meta-networking to allow build iproute2 without add >> meta-networking layer to bblayers.conf. >> > At first I thought this was the right answer.. but the more I look at > this, the > more issues I find. > > The iproute2 bbappend modifies the PACKAGECONFIG. The modification of > the > PACKAGECONFIG (other then adding new options) should not be done in a > bbappend, > otherwise it 'changes' the settings for that recipe. > > I'm thinking the right fix is actually to remove iproute2 bbappend. > And any > distributions or users who need tipc should enable it themselves > within their > distribution configuration files (and also include the meta-networking > layer) as > necessary. > Sorry to reply to my reply.. but Simply reverting this ends up with: ERROR: Nothing RPROVIDES 'iproute2-tipc' (but /home/mhatle/git/lpd/master/layers/meta-openembedded/meta-ne tworking/recipes-extended/tipcutils/tipcutils_git.bb RDEPENDS on or otherwise requires it) So somehow tipcutils requirement needs to be based on the configuration of iproute2. I'm not sure how to do this. >>> Hi Mark, >>> >>> The tipcutils 2.2 removed the tipc-config tool and recommended to use >>> the new configuration tool named "tipc" in iproute2 package for >>> configuring the tipc. >>> >> The problem still remains that the PACKAGECONFIG change violates the Yocto >> Project compliance check scripts requirement that PACKAGECONFIGs only be >> set by >> the original .bb or by a distribution configuration. >> >> I agree with the other comments that libmnl should be moved to oe-core >> (if that >> is still possible), but the PACKAGECONFIG piece is still a problem that >> needs to >> be resolved. >> > > Once the libmnl is moved, the iproute2 can build tipc directly and no > need PACKAGECONFIG, we can remove it too. > > Yi > > > >> The tipc in iproute2 needs libmnl as dependency but it is in >>> meta-networking layer now. so I add this bbappend because we can not >>> enable tipc build in oe-core directly. >>> Randy had pointed the best way is move libmnl to oe-core and enable tipc >>> build in iproute2 by default. >>> >>> Yi >>> >>> --Mark --Mark > > Signed-off-by: Fabio Berton >> --- >>.../recipes-connectivity/iproute2/iproute2_%.bbappend >> | 0 >>1 file changed, 0 insertions(+), 0 deletions(-) >>rename {meta-oe => meta-networking}/recipes-conne >> ctivity/iproute2/iproute2_%.bbappend (100%) >> >> diff --git a/meta-oe/recipes-connectivity/iproute2/iproute2_%.bbappend >> b/meta-networking/recipes-connectivity/iproute2/iproute2_%.bbappend >> similarity index 100% >> rename from meta-oe/recipes-connectivity/iproute2/iproute2_%.bbappend >> rename to meta-networking/recipes-connectivity/iproute2/iproute2_%. >> bbappend >> >> >> > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/2] corosync: add support for extra features
From: Jackie Huang* Add support for features: dbus qdevice qnetd snmp * Add related PACKAGECONFIG * inherit useradd to add proper user for qnetd service Signed-off-by: Jackie Huang --- .../recipes-extended/corosync/corosync_2.4.2.bb| 30 +++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb b/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb index 2f3aef299..7d5a87e4c 100644 --- a/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb +++ b/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://corosync.github.io/corosync/; SECTION = "base" -inherit autotools pkgconfig systemd +inherit autotools pkgconfig systemd useradd SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz; SRC_URI[md5sum] = "547fa78704da53aa35912be58d31035f" @@ -16,13 +16,23 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d" DEPENDS = "groff-native nss libqb" -SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service" +SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service \ + ${@bb.utils.contains('PACKAGECONFIG', 'qdevice', 'corosync-qdevice.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'qnetd', 'corosync-qnetd.service', '', d)} \ +" SYSTEMD_AUTO_ENABLE = "enable" INITSCRIPT_NAME = "corosync-daemon" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + dbus qdevice qnetd snmp \ +" +PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" +PACKAGECONFIG[qdevice] = "--enable-qdevices,--disable-qdevices" +PACKAGECONFIG[qnetd] = "--enable-qnetd,--disable-qnetd" +PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma" +PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp" PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_system_unitdir},--disable-systemd --without-systemddir,systemd" EXTRA_OECONF = "ac_cv_path_BASHPATH=${base_bindir}/bash" @@ -43,12 +53,26 @@ do_install_append() { install -d ${D}${sysconfdir}/default/volatiles echo "d root root 0755 ${localstatedir}/log/cluster none" > ${D}${sysconfdir}/default/volatiles/05_corosync +if ${@bb.utils.contains('PACKAGECONFIG', 'qnetd', 'true', 'false', d)}; then +chown -R coroqnetd:coroqnetd ${D}${sysconfdir}/${BPN}/qnetd +echo "d coroqnetd coroqnetd 0770 /var/run/corosync-qnetd none" >> ${D}${sysconfdir}/default/volatiles/05_corosync +fi + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d ${localstatedir}/log/cluster - - - -" > ${D}${sysconfdir}/tmpfiles.d/corosync.conf + +if ${@bb.utils.contains('PACKAGECONFIG', 'qnetd', 'true', 'false', d)}; then +install -m 0644 ${S}/conf/tmpfiles.d/corosync-qnetd.conf ${D}${sysconfdir}/tmpfiles.d +fi fi } RDEPENDS_${PN} += "bash" FILES_${PN}-dbg += "${libexecdir}/lcrso/.debug" +FILES_${PN}-doc += "${datadir}/snmp/mibs/COROSYNC-MIB.txt" + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "--system coroqnetd" +USERADD_PARAM_${PN} = "--system -d / -M -s /bin/nologin -c 'User for corosync-qnetd' -g coroqnetd coroqnetd" -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 0/2] corosync: fixes and add support for extra features
From: Jackie Huang-- The following changes since commit 108cb0394a96ea51c2c3fffb470622b6cd357c63: multipath-tools: RDEPEND on bash (2017-08-28 11:06:07 +0200) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git jhuang0/d_corosync_170829_0 http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_corosync_170829_0 Jackie Huang (2): corosync: fixes for sysvinit and systemd corosync: add support for extra features .../recipes-extended/corosync/corosync_2.4.2.bb| 54 +++--- 1 file changed, 38 insertions(+), 16 deletions(-) -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] corosync: fixes for sysvinit and systemd
From: Jackie Huang* Replace ${systemd_unitdir}/system with ${systemd_system_unitdir} * Remove the upstar settings and don't install upstar config files * Add volatile for sysvinit and tmpfiles for systemd * Set the correct bash path for init scripts to avoid QA issue: | corosync-2.4.2: /usr/share/corosync/corosync contained in package corosync requires /tmp/hosttools/bash, but no providers found in RDEPENDS_corosync? [file-rdeps] * The systemd services are intalled properly by "make install", no need to install manually. Signed-off-by: Jackie Huang --- .../recipes-extended/corosync/corosync_2.4.2.bb| 24 ++ 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb b/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb index ec1deaca5..2f3aef299 100644 --- a/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb +++ b/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb @@ -23,9 +23,10 @@ INITSCRIPT_NAME = "corosync-daemon" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_unitdir}/system/,--with-systemddir=" +PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_system_unitdir},--disable-systemd --without-systemddir,systemd" -EXTRA_OECONF = "--with-upstartdir=%{_sysconfdir}/init" +EXTRA_OECONF = "ac_cv_path_BASHPATH=${base_bindir}/bash" +EXTRA_OEMAKE = "tmpfilesdir_DATA=" do_configure_prepend() { ( cd ${S} @@ -34,20 +35,17 @@ do_configure_prepend() { do_install_append() { install -d ${D}${sysconfdir}/sysconfig/ -install -d ${D}/${sysconfdir}/init.d install -m 0644 ${S}/init/corosync.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync -install -m 0644 ${S}/init/corosync-notifyd.conf.in ${D}${sysconfdir}/sysconfig/corosync-notifyd.conf -install -m 0644 ${S}/init/corosync.conf.in ${D}${sysconfdir}/sysconfig/corosync.conf -install -m 0644 ${S}/init/corosync.in ${D}${sysconfdir}/init.d/corosync -install -m 0644 ${S}/init/corosync-notifyd.in ${D}${sysconfdir}/init.d/corosync-notifyd +install -m 0644 ${S}/tools/corosync-notifyd.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync-notifyd + +rm -rf "${D}${localstatedir}/run" + +install -d ${D}${sysconfdir}/default/volatiles +echo "d root root 0755 ${localstatedir}/log/cluster none" > ${D}${sysconfdir}/default/volatiles/05_corosync if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then -install -d ${D}${systemd_unitdir}/system -install -m 0644 ${S}/init/corosync.service.in ${D}${systemd_unitdir}/system/corosync.service -install -m 0644 ${S}/init/corosync-notifyd.service.in ${D}${systemd_unitdir}/system/corosync-notifyd.service -sed -i -e 's,@INITWRAPPERSDIR@,${sysconfdir}/init.d,g' ${D}${systemd_unitdir}/system/corosync.service -sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/corosync-notifyd.service -sed -i -e 's,@SBINDIR@,${base_sbindir},g' ${D}${systemd_unitdir}/system/corosync-notifyd.service +install -d ${D}${sysconfdir}/tmpfiles.d +echo "d ${localstatedir}/log/cluster - - - -" > ${D}${sysconfdir}/tmpfiles.d/corosync.conf fi } -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] samba: 4.6.5 -> 4.6.7
From: Kai KangUpgrade samba from 4.6.5 to 4.6.7 to fix CVE-2017-11103. Signed-off-by: Kai Kang --- .../recipes-connectivity/samba/{samba_4.6.5.bb => samba_4.6.7.bb}| 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename meta-networking/recipes-connectivity/samba/{samba_4.6.5.bb => samba_4.6.7.bb} (98%) diff --git a/meta-networking/recipes-connectivity/samba/samba_4.6.5.bb b/meta-networking/recipes-connectivity/samba/samba_4.6.7.bb similarity index 98% rename from meta-networking/recipes-connectivity/samba/samba_4.6.5.bb rename to meta-networking/recipes-connectivity/samba/samba_4.6.7.bb index 389a2743e..7f0770bf0 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.6.5.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.6.7.bb @@ -25,8 +25,9 @@ SRC_URI_append_libc-musl = " \ file://samba-4.2.7-pam.patch \ file://samba-4.3.9-remove-getpwent_r.patch \ " -SRC_URI[md5sum] = "2ae8ce2862d8bfa95e4681371ebb1623" -SRC_URI[sha256sum] = "c06901e1d318b425b8c3ecea3ef23a91e7371312a9ea7adbf34fb8eb42ca3b84" + +SRC_URI[md5sum] = "c6ee5c766016d59908c8fb672fbbd445" +SRC_URI[sha256sum] = "9ef24393de08390f236cabccd6a420b5cea304e959cbf1a99ff317325db3ddfa" inherit systemd waf-samba cpan-base perlnative update-rc.d # remove default added RDEPENDS on perl -- 2.14.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] imagemagick: 7.0.5 -> 7.0.6_9
On 2017年08月25日 05:29, Randy MacLeod wrote: On 2017-08-24 11:16 AM, kai.k...@windriver.com wrote: From: Kai KangUpgrade imagemagick from 7.0.5 patchset 6 to 7.0.9 patchset 9. * update SRC_URI. Replace tarball with git repo that it only keeps latest tarball on www.imagemagick.org This avoids the imagemagick disappearing tarball problem but the impact is ~350 MB for the git repo rather than 8 MB for the tarball. Any objections to using the gentoo distfiles site: http://distfiles.gentoo.org/distfiles/ Kai, If not please send a revised upgrade to 7.0.6 using that URL. OK. I'll be waiting for 2 more days. --Kai ../Randy -- Regards, Neil | Kai Kang -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 1/2] tftp-hpa: Fix PIE build with clang
clang finds a name clash with libc and linker errors out like below tftpd.o: relocation R_ARM_REL32 against external or undefined symbol `__progname@@GLIBC_2.4' can not be used when making a PIE executable; recompile with -fPIC Signed-off-by: Khem Raj--- .../0001-__progname-is-provided-by-libc.patch | 62 ++ .../recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb | 1 + 2 files changed, 63 insertions(+) create mode 100644 meta-networking/recipes-daemons/tftp-hpa/files/0001-__progname-is-provided-by-libc.patch diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/0001-__progname-is-provided-by-libc.patch b/meta-networking/recipes-daemons/tftp-hpa/files/0001-__progname-is-provided-by-libc.patch new file mode 100644 index 0..cead977e2 --- /dev/null +++ b/meta-networking/recipes-daemons/tftp-hpa/files/0001-__progname-is-provided-by-libc.patch @@ -0,0 +1,62 @@ +From 941038fc05be21202cab7a7a9434097fb55ecbe0 Mon Sep 17 00:00:00 2001 +From: Thorsten Glaser +Date: Thu, 31 Jul 2014 16:29:41 +0930 +Subject: [PATCH] __progname[] is provided by libc + +Rename local variable to tftpd_progname to avoid a clash with glibc +global symbols and work around Debian bug #519006 (Closes: #564052). + +[ hpa: specifically, double-underscore symbols in C are reserved for + the implementation, i.e. compiler/libc. ] + +Signed-off-by: Ron Lee +Signed-off-by: H. Peter Anvin +--- + tftpd/tftpd.c | 10 +- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/tftpd/tftpd.c b/tftpd/tftpd.c +index e247b97..5fec7bf 100644 +--- a/tftpd/tftpd.c b/tftpd/tftpd.c +@@ -76,7 +76,7 @@ static int ai_fam = AF_INET; + #define TRIES 6 /* Number of attempts to send each packet */ + #define TIMEOUT_LIMIT ((1 << TRIES)-1) + +-const char *__progname; ++const char *tftpd_progname; + static int peer; + static unsigned long timeout = TIMEOUT;/* Current timeout value */ + static unsigned long rexmtval = TIMEOUT; /* Basic timeout value */ +@@ -395,9 +395,9 @@ int main(int argc, char **argv) + /* basename() is way too much of a pain from a portability standpoint */ + + p = strrchr(argv[0], '/'); +-__progname = (p && p[1]) ? p + 1 : argv[0]; ++tftpd_progname = (p && p[1]) ? p + 1 : argv[0]; + +-openlog(__progname, LOG_PID | LOG_NDELAY, LOG_DAEMON); ++openlog(tftpd_progname, LOG_PID | LOG_NDELAY, LOG_DAEMON); + + srand(time(NULL) ^ getpid()); + +@@ -946,14 +946,14 @@ int main(int argc, char **argv) +syslog daemon gets restarted by the time we get here. */ + if (secure && standalone) { + closelog(); +-openlog(__progname, LOG_PID | LOG_NDELAY, LOG_DAEMON); ++openlog(tftpd_progname, LOG_PID | LOG_NDELAY, LOG_DAEMON); + } + + #ifdef HAVE_TCPWRAPPERS + /* Verify if this was a legal request for us. This has to be +done before the chroot, while /etc is still accessible. */ + request_init(_request, +- RQ_DAEMON, __progname, ++ RQ_DAEMON, tftpd_progname, + RQ_FILE, fd, + RQ_CLIENT_SIN, , RQ_SERVER_SIN, , 0); + sock_methods(_request); +-- +2.14.1 + diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb index 0a418b97f..fe8a32e7d 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb +++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb @@ -26,6 +26,7 @@ SRC_URI = "http://kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-${PV}.t file://add-error-check-for-disk-filled-up.patch \ file://tftp-hpa-bug-fix-on-separated-CR-and-LF.patch \ file://fix-writing-emtpy-file.patch \ + file://0001-__progname-is-provided-by-libc.patch \ file://tftpd-hpa.socket \ file://tftpd-hpa.service \ " -- 2.14.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH V2 2/2] iscsitarget: Fix kernel with new 4.12+ kernel
Fix patch to be able to work kernel < 4.12.0 Signed-off-by: Khem Raj--- changes from: v1 -> v2: - Fix build with kernel < 4.12.0 ...vent-netlink_ack-now-requires-4-arguments.patch | 40 ++ .../iscsitarget/iscsitarget_1.4.20.3+svn502.bb | 4 ++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-extended/iscsitarget/files/0001-kernel-event-netlink_ack-now-requires-4-arguments.patch diff --git a/meta-networking/recipes-extended/iscsitarget/files/0001-kernel-event-netlink_ack-now-requires-4-arguments.patch b/meta-networking/recipes-extended/iscsitarget/files/0001-kernel-event-netlink_ack-now-requires-4-arguments.patch new file mode 100644 index 0..4426d3552 --- /dev/null +++ b/meta-networking/recipes-extended/iscsitarget/files/0001-kernel-event-netlink_ack-now-requires-4-arguments.patch @@ -0,0 +1,40 @@ +From cbc5f8151017f45231b75a826f18354a81c287c4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 26 Aug 2017 07:52:59 -0700 +Subject: [PATCH] kernel/event: netlink_ack() now requires 4 arguments + +see https://patchwork.kernel.org/patch/9670181/ + +event.c:32:4: error: too few arguments to function 'netlink_ack' +| netlink_ack(skb, nlh, 0); +| ^~~ + +Signed-off-by: Khem Raj +--- + kernel/event.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: iscsitarget-1.4.20.3+svn502/kernel/event.c +=== +--- iscsitarget-1.4.20.3+svn502.orig/kernel/event.c iscsitarget-1.4.20.3+svn502/kernel/event.c +@@ -6,6 +6,7 @@ + * Some functions are based on audit code. + */ + ++#include + #include + #include + #include "iet_u.h" +@@ -29,7 +30,11 @@ static void event_recv_skb(struct sk_buf + ietd_pid = NETLINK_CB(skb).portid; + WARN_ON(ietd_pid == 0); + if (nlh->nlmsg_flags & NLM_F_ACK) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ netlink_ack(skb, nlh, 0, NULL); ++#else + netlink_ack(skb, nlh, 0); ++#endif + skb_pull(skb, rlen); + } + } diff --git a/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb b/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb index 5c1e38e17..659366107 100644 --- a/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb +++ b/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb @@ -14,7 +14,9 @@ SRC_URI = "http://ftp.heanet.ie/mirrors/ubuntu/pool/universe/i/${BPN}/${BPN}_${P file://access-sk_v6_daddr-iff-IPV6-defined.patch \ file://build_with_updated_bio_struct_of_linux_v4.3_and_above.patch \ file://build_with_updated_interfaces_of_linux_v4.8_and_above.patch \ - file://fix-call-trace-of-ahash-API-calling.patch" + file://fix-call-trace-of-ahash-API-calling.patch \ + file://0001-kernel-event-netlink_ack-now-requires-4-arguments.patch \ + " SRC_URI[md5sum] = "ef9bc823bbabd3c772208c00d5f2d089" SRC_URI[sha256sum] = "d3196ccb78a43266dce28587bfe30d8ab4db7566d7bce96057dfbb84100babb5" -- 2.14.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] tcpreplay: upgrade to 4.2.6
Signed-off-by: Dengke Du--- .../tcpreplay/{tcpreplay_4.1.2.bb => tcpreplay_4.2.6.bb}| 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-networking/recipes-support/tcpreplay/{tcpreplay_4.1.2.bb => tcpreplay_4.2.6.bb} (59%) diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.1.2.bb b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.2.6.bb similarity index 59% rename from meta-networking/recipes-support/tcpreplay/tcpreplay_4.1.2.bb rename to meta-networking/recipes-support/tcpreplay/tcpreplay_4.2.6.bb index 6ee9d73..681ef02 100644 --- a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.1.2.bb +++ b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.2.6.bb @@ -6,10 +6,10 @@ SECTION = "net" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=890b830b22fd632e9ffd996df20338f8" -SRC_URI = "http://prdownloads.sourceforge.net/tcpreplay/${PV}/tcpreplay-${PV}.tar.gz; +SRC_URI = "https://github.com/appneta/tcpreplay/releases/download/v${PV}/tcpreplay-${PV}.tar.gz; -SRC_URI[md5sum] = "3105b10b07dbc0b07ce2da07a2368359" -SRC_URI[sha256sum] = "da483347e83a9b5df0e0dbb0f822a2d37236e79dda35f4bc4e6684fa827f25ea" +SRC_URI[md5sum] = "3e65d5b872e441c6a0038191a3dc7ce9" +SRC_URI[sha256sum] = "043756c532dab93e2be33a517ef46b1341f7239278a1045ae670041dd8a4531d" DEPENDS = "libpcap" -- 2.8.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel