Does this fix the textrel QA issue reported in every world build in last couple months?
http://errors.yoctoproject.org/Errors/Details/157987/ On Thu, Nov 2, 2017 at 9:52 AM, Kang Kai <[email protected]> wrote: > Forgot layer info in title. :( > > --Kai > > > On 2017年11月02日 16:25, [email protected] wrote: > >> From: Kai Kang <[email protected]> >> >> Upgrade corosync from 2.4.2 to 2.4.3. >> >> * remove patch which is merged by upstream >> * disable autostart of corosync. It only works after configured and >> config file >> /etc/corosync/corosync.conf exists. >> * use bb.utils.filter >> * corosync init script requires command pidof. But pidof from busybox >> doesn't >> work well to filter calling process, so update runtime dependency >> >> Signed-off-by: Kai Kang <[email protected]> >> --- >> ...001-Include-fcntl.h-for-F_-and-O_-defines.patch | 28 >> ---------------------- >> .../{corosync_2.4.2.bb => corosync_2.4.3.bb} | 19 +++++++-------- >> 2 files changed, 9 insertions(+), 38 deletions(-) >> delete mode 100644 meta-networking/recipes-extend >> ed/corosync/corosync/0001-Include-fcntl.h-for-F_-and-O_-defines.patch >> rename meta-networking/recipes-extended/corosync/{corosync_2.4.2.bb => >> corosync_2.4.3.bb} (84%) >> >> diff --git a/meta-networking/recipes-extended/corosync/corosync/0001- >> Include-fcntl.h-for-F_-and-O_-defines.patch >> b/meta-networking/recipes-extended/corosync/corosync/0001- >> Include-fcntl.h-for-F_-and-O_-defines.patch >> deleted file mode 100644 >> index fe4b0793f..000000000 >> --- a/meta-networking/recipes-extended/corosync/corosync/0001- >> Include-fcntl.h-for-F_-and-O_-defines.patch >> +++ /dev/null >> @@ -1,28 +0,0 @@ >> -From 85ea47fedbc96ed9180e08b0d371d9966e3a88da Mon Sep 17 00:00:00 2001 >> -From: Khem Raj <[email protected]> >> -Date: Wed, 30 Aug 2017 17:28:55 -0700 >> -Subject: [PATCH] Include fcntl.h for F_* and O_* defines >> - >> -Fixes errors like >> -utils.c:95:22: error: use of undeclared identifier 'O_WRONLY' >> - >> -Signed-off-by: Khem Raj <[email protected]> >> ---- >> - qdevices/utils.c | 1 + >> - 1 file changed, 1 insertion(+) >> - >> -diff --git a/qdevices/utils.c b/qdevices/utils.c >> -index 41850b8c..87090853 100644 >> ---- a/qdevices/utils.c >> -+++ b/qdevices/utils.c >> -@@ -39,6 +39,7 @@ >> - >> - #include <err.h> >> - #include <errno.h> >> -+#include <fcntl.h> >> - #include <inttypes.h> >> - #include <libgen.h> >> - #include <stdio.h> >> --- >> -2.14.1 >> - >> diff --git a/meta-networking/recipes-extended/corosync/corosync_2.4.2.bb >> b/meta-networking/recipes-extended/corosync/corosync_2.4.3.bb >> similarity index 84% >> rename from meta-networking/recipes-extended/corosync/corosync_2.4.2.bb >> rename to meta-networking/recipes-extended/corosync/corosync_2.4.3.bb >> index 33e74e2ff..52d2a1098 100644 >> --- a/meta-networking/recipes-extended/corosync/corosync_2.4.2.bb >> +++ b/meta-networking/recipes-extended/corosync/corosync_2.4.3.bb >> @@ -7,11 +7,10 @@ SECTION = "base" >> inherit autotools pkgconfig systemd useradd >> -SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz >> \ >> - file://0001-Include-fcntl.h-for-F_-and-O_-defines.patch \ >> - " >> -SRC_URI[md5sum] = "547fa78704da53aa35912be58d31035f" >> -SRC_URI[sha256sum] = "f26e3011309fe4bcce94b1dc20ea8 >> c462f19483a73f3ca62f13b925d011a4ba9" >> +SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz"; >> + >> +SRC_URI[md5sum] = "bf0ede13018aadc8a046183bc593b0e0" >> +SRC_URI[sha256sum] = "b1e7e422e8d2f7af8e5315fa329b1 >> dbd1175fff32efaa55e8054584c80a2c597" >> LICENSE = "BSD" >> LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24 >> 033adb6088dd1d6ffc5e5d" >> @@ -22,7 +21,7 @@ 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" >> +SYSTEMD_AUTO_ENABLE = "disable" >> INITSCRIPT_NAME = "corosync-daemon" >> @@ -55,22 +54,22 @@ 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 >> + if [ ${@bb.utils.filter('PACKAGECONFIG', 'qnetd', 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 >> + if [ ${@bb.utils.filter('DISTRO_FEATURES','systemd',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 >> + if [ ${@bb.utils.filter('PACKAGECONFIG', 'qnetd', d)} ]; then >> install -m 0644 ${S}/conf/tmpfiles.d/corosync-qnetd.conf >> ${D}${sysconfdir}/tmpfiles.d >> fi >> fi >> } >> -RDEPENDS_${PN} += "bash" >> +RDEPENDS_${PN} += "bash ${@bb.utils.contains('DISTRO_FEATURES', >> 'sysvinit', 'sysvinit-pidof', 'procps', d)}" >> FILES_${PN}-dbg += "${libexecdir}/lcrso/.debug" >> FILES_${PN}-doc += "${datadir}/snmp/mibs/COROSYNC-MIB.txt" >> > > > -- > Regards, > Neil | Kai Kang > > > -- > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
