corosync: fixes and add support for extra features
cover corosync: fixes and add support for extra features
From: Jackie Huang <[email protected]>
--
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(-)
Signature · 1 line
2.11.0
PATCH 1/2 corosync: fixes for sysvinit and systemd
From: Jackie Huang <[email protected]>
* 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.
--- .../recipes-extended/corosync/corosync_2.4.2.bb | 24 ++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-)
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb +11 -13
@@ -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 }
Signature · 1 line
2.11.0
PATCH 2/2 corosync: add support for extra features
In reply to [email protected]From: Jackie Huang <[email protected]>
* Add support for features: dbus qdevice qnetd snmp
* Add related PACKAGECONFIG
* inherit useradd to add proper user for qnetd service
--- .../recipes-extended/corosync/corosync_2.4.2.bb | 30 +++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-)
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb +27 -3
@@ -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"
Signature · 1 line
2.11.0
Re: [meta-oe][PATCH 2/2] corosync: add support for extra features
Can you please also fix:
corosync-2.4.2: ELF binary '/tmp/work/core2-64-oe-linux/ corosync/2.4.2-r0/packages-split/corosync/usr/sbin/corosync' has relocations in .text [textrel]
it's been there for long time.
Quoted 100 lines · On Tue, Aug 29, 2017 at 11:27 AM, <[email protected]> wrote:
From: Jackie Huang <[email protected]>
* Add support for features: dbus qdevice qnetd snmp
* Add related PACKAGECONFIG
* inherit useradd to add proper user for qnetd serviceSigned-off-by Jackie Huang <[email protected]>--- .../recipes-extended/corosync/corosync_2.4.2.bb | 30 +++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-)meta-oe/recipes-extended/corosync/corosync_2.4.2.bb +1
-1@@ -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"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb +2
-1-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"meta-oe/recipes-extended/corosync/corosync_2.4.2.bb +8
-1-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"meta-oe/recipes-extended/corosync/corosync_2.4.2.bb +0
-0@@ -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)}; thenmeta-oe/recipes-extended/corosync/corosync_2.4.2.bb +2
-0+ chown -R coroqnetd:coroqnetd ${D}${sysconfdir}/${BPN}/qnetd + echo "d coroqnetd coroqnetd 0770 /var/run/corosync-qnetd none" >>${D}${sysconfdir}/default/volatiles/05_corosync
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb +2
-0+ 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.confmeta-oe/recipes-extended/corosync/corosync_2.4.2.bb +2
-0+ + if ${@bb.utils.contains('PACKAGECONFIG', 'qnetd', 'true','false', d)}; then
+ install -m 0644${S}/conf/tmpfiles.d/corosync-qnetd.conf
${D}${sysconfdir}/tmpfiles.dmeta-oe/recipes-extended/corosync/corosync_2.4.2.bb +6
-0+ 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 forcorosync-qnetd' -g coroqnetd coroqnetd"
--
2.11.0--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-oe][PATCH 2/2] corosync: add support for extra features
Yes, sure, but I can’t reproduce this, could you show me the config that had this issue? Thanks!
Thanks,
Jackie
From: Martin Jansa [mailto:[email protected]]
Sent: Tuesday, September 05, 2017 20:30
To: Huang, Jie (Jackie)
Cc: openembedded-devel
Subject: Re: [oe] [meta-oe][PATCH 2/2] corosync: add support for extra features
Can you please also fix:
corosync-2.4.2: ELF binary '/tmp/work/core2-64-oe-linux/corosync/2.4.2-r0/packages-split/corosync/usr/sbin/corosync' has relocations in .text [textrel]
it's been there for long time.
On Tue, Aug 29, 2017 at 11:27 AM, <[email protected]<mailto:[email protected]>> wrote:
From: Jackie Huang <[email protected]<mailto:[email protected]>>
* Add support for features: dbus qdevice qnetd snmp
* Add related PACKAGECONFIG
* inherit useradd to add proper user for qnetd service
--- .../recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> | 30 +++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-)
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +27 -3
@@ -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<http://build.clusterlabs.org/corosync/releases/$%7bBP%7d.tar.gz>" SRC_URI[md5sum] = "547fa78704da53aa35912be58d31035f"
@@ -16,13 +16,23 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<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<mailto:$%[email protected]('PACKAGECONFIG>', 'qdevice', 'corosync-qdevice.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKAGECONFIG>', 'qnetd', 'corosync-qnetd.service', '', d)} \ +" SYSTEMD_AUTO_ENABLE = "enable" INITSCRIPT_NAME = "corosync-daemon" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}<mailto:$%[email protected]('DISTRO_FEATURES',%20'systemd',%20d)%7d>" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + dbus qdevice qnetd snmp \ +<mailto:$%[email protected]('DISTRO_FEATURES',%20'systemd',%20d)%7d%20\%0b+ %20 %20 %20 %20 %20 %20 %20 %20 %20 dbus%20qdevice%20qnetd%20snmp%20\%0b+>" +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<mailto:$%[email protected]('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)}<mailto:$%[email protected]('DISTRO_FEATURES','systemd','true','false',d)%7d>; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d ${localstatedir}/log/cluster - - - -" > ${D}${sysconfdir}/tmpfiles.d/corosync.conf + + if ${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('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 [email protected]<mailto:[email protected]>
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-oe][PATCH 2/2] corosync: add support for extra features
include security-flags.inc file in distro config. if you use poky for distro then set DISTRO=poky-lsb and you will be able to reproduce it
Quoted 108 lines · Jie (Jackie)
Yes, sure, but I can’t reproduce this, could you show me the config that had this issue? Thanks!
Thanks,
JackieFrom: Martin Jansa [mailto:[email protected]]
Sent: Tuesday, September 05, 2017 20:30
To: Huang, Jie (Jackie)
Cc: openembedded-devel
Subject: Re: [oe] [meta-oe][PATCH 2/2] corosync: add support for extra featuresCan you please also fix:
corosync-2.4.2: ELF binary '/tmp/work/core2-64-oe-linux/corosync/2.4.2-r0/packages-split/corosync/usr/sbin/corosync' has relocations in .text [textrel]it's been there for long time.
On Tue, Aug 29, 2017 at 11:27 AM, <[email protected]<mailto:[email protected]>> wrote:
From: Jackie Huang <[email protected]<mailto:[email protected]>>* Add support for features: dbus qdevice qnetd snmp
* Add related PACKAGECONFIG
* inherit useradd to add proper user for qnetd service--- .../recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> | 30 +++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-)meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +27
-4@@ -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<http://build.clusterlabs.org/corosync/releases/$%7bBP%7d.tar.gz>" SRC_URI[md5sum] = "547fa78704da53aa35912be58d31035f"@@ -16,13 +16,23 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<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<mailto:$%[email protected]('PACKAGECONFIG>', 'qdevice', 'corosync-qdevice.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKAGECONFIG>', 'qnetd', 'corosync-qnetd.service', '', d)} \ +" SYSTEMD_AUTO_ENABLE = "enable" INITSCRIPT_NAME = "corosync-daemon" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}<mailto:$%[email protected]('DISTRO_FEATURES',%20'systemd',%20d)%7d>" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + dbus qdevice qnetd snmp \ +<mailto:$%[email protected]('DISTRO_FEATURES',%20'systemd',%20d)%7d%20\%0b+ %20 %20 %20 %20 %20 %20 %20 %20 %20 dbus%20qdevice%20qnetd%20snmp%20\%0b+>" +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<mailto:$%[email protected]('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)}<mailto:$%[email protected]('DISTRO_FEATURES','systemd','true','false',d)%7d>; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d ${localstatedir}/log/cluster - - - -" > ${D}${sysconfdir}/tmpfiles.d/corosync.conf + + if ${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('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 [email protected]<mailto:[email protected]>
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-oe][PATCH 2/2] corosync: add support for extra features
Quoted 10 lines
-----Original Message-----
From: Khem Raj [mailto:[email protected]]
Sent: Wednesday, September 06, 2017 09:09
To: Huang, Jie (Jackie)
Cc: Martin Jansa; openembedded-devel
Subject: Re: [oe] [meta-oe][PATCH 2/2] corosync: add support for extra features
Quoted 2 lines
include security-flags.inc file in distro config. if you use poky for distro then set DISTRO=poky-lsb and you will be able to reproduce it
Unfortunately I still can't reproduce it with DISTRO=poky-lsb, do I miss anything else?
Thanks,
Jackie
Quoted 148 lines
Quoted 1 line · Jie (Jackie)
Yes, sure, but I can’t reproduce this, could you show me the config that had
this issue? Thanks!
Quoted 9 lines
Thanks,
JackieFrom: Martin Jansa [mailto:[email protected]]
Sent: Tuesday, September 05, 2017 20:30
To: Huang, Jie (Jackie)
Cc: openembedded-devel
Subject: Re: [oe] [meta-oe][PATCH 2/2] corosync: add support for extrafeatures
Quoted 3 lines
Can you please also fix:
corosync-2.4.2: ELF binary '/tmp/work/core2-64-oe-linux/corosync/2.4.2-r0/packages-split/corosync/usr/sbin/corosync' has relocations in .text [textrel]
Quoted 4 lines
it's been there for long time.
On Tue, Aug 29, 2017 at 11:27 AM,
Quoted 1 line · <[email protected]<mailto:[email protected]>> wrote:
From: Jackie Huang
<[email protected]<mailto:[email protected]>>
Quoted 6 lines
* Add support for features: dbus qdevice qnetd snmp
* Add related PACKAGECONFIG
* inherit useradd to add proper user for qnetd serviceSigned-off-by Jackie Huang<[email protected]<mailto:[email protected]>>
Quoted 2 lines
---
.../recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb>| 30 +++++++++++++++++++---
Review
Quoted 3 lines
1 file changed, 27 insertions(+), 3 deletions(-)(quoted diff) +0
-0extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> b/meta- oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb>
Quoted 2 lines
index
2f3aef299..7d5a87e4c100644
--- a/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb>
Quoted 1 line
+++ b/meta-oe/recipes-
extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb>
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> HOMEPAGE = "http://corosync.github.io/corosync/" · line 10
Quoted 8 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +1
-1@@ -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<http://build.cluster labs.org/corosync/releases/$%7bBP%7d.tar.gz>"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM =
Quoted 2 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +0
-0SRC_URI[md5sum] = "547fa78704da53aa35912be58d31035f"@@ -16,13 +16,23 @@ LIC_FILES_CHKSUM ="file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;m d5=a85eb4ce24033adb6088dd1d6ffc5e5d>"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d>"
Quoted 6 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +2
-1DEPENDS = "groff-native nss libqb" -SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service" +SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service \ +${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKA GECONFIG>', 'qdevice', 'corosync-qdevice.service', '', d)} \
Review LIC_FILES_CHKSUM = · line 20
Quoted 1 line
(quoted diff) +1
-0+${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKA GECONFIG>', 'qnetd', 'corosync-qnetd.service', '', d)} \
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d>"
Quoted 6 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +1
-1+" SYSTEMD_AUTO_ENABLE = "enable" INITSCRIPT_NAME = "corosync-daemon" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd',d)}<mailto:$%[email protected]('DISTRO_FEATURES',%20'systemd',%20d)%7d>"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d>" · line 30
Quoted 3 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +2
-0+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + dbus qdevice qnetd snmp \+<mailto:$%[email protected]('DISTRO_FEATURES',%20'systemd',%20d)%7d%20 \%0b+ %20 %20 %20 %20 %20 %20 %20 %20 %20 dbus%20qdevice%20qnetd%20snmp%20\%0b+>"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d>"
Quoted 7 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +5
-0+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"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> do_install_append() { · line 54
Quoted 5 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +0
-0EXTRA_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
Review do_install_append() { · line 55
Quoted 2 lines
(quoted diff) +1
-0+ if${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKA GECONFIG>', 'qnetd', 'true', 'false', d)}; then
Review do_install_append() { · line 57
Quoted 2 lines
(quoted diff) +2
-0+ chown -R coroqnetd:coroqnetd ${D}${sysconfdir}/${BPN}/qnetd + echo "d coroqnetd coroqnetd 0770 /var/run/corosync-qnetd none" >>${D}${sysconfdir}/default/volatiles/05_corosync
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> do_install_append() {
Quoted 3 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +2
-0+ fi + if${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}<mailto:$%7 [email protected]('DISTRO_FEATURES','systemd','true','false',d)%7d>; then
Review do_install_append() { · line 62
Quoted 2 lines
(quoted diff) +0
-0install -d ${D}${sysconfdir}/tmpfiles.d echo "d ${localstatedir}/log/cluster - - - -" >
${D}${sysconfdir}/tmpfiles.d/corosync.confReview do_install_append() { · line 64
Quoted 2 lines
(quoted diff) +2
-0+ + if${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKA GECONFIG>', 'qnetd', 'true', 'false', d)}; then
Review do_install_append() { · line 65
Quoted 1 line
(quoted diff) +1
-0+ install -m 0644 ${S}/conf/tmpfiles.d/corosync-qnetd.conf${D}${sysconfdir}/tmpfiles.d
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> do_install_append() {
Quoted 12 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +6
-0+ 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 forcorosync-qnetd' -g coroqnetd coroqnetd"
Quoted 7 lines
(quoted diff) +0
-1--2.11.0
--
_______________________________________________
Openembedded-devel mailing list [email protected]<mailto:Openembedded-Quoted 7 lines
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-oe][PATCH 2/2] corosync: add support for extra features
Are you building for qemux86-64?
This issue is being reported since 2015, but always in qemux86-64 builds:
https://www.google.cz/search?q=openembedded+corosync+textrel&oq=openembedded+corosync+textrel
Quoted 178 lines · Jie (Jackie)
Quoted 10 lines
-----Original Message-----
From: Khem Raj [mailto:[email protected]]
Sent: Wednesday, September 06, 2017 09:09
To: Huang, Jie (Jackie)
Cc: Martin Jansa; openembedded-devel
Subject: Re: [oe] [meta-oe][PATCH 2/2] corosync: add support for extra featuresQuoted 2 lines
include security-flags.inc file in distro config. if you use poky for distro then set DISTRO=poky-lsb and you will be able to reproduce it
Unfortunately I still can't reproduce it with DISTRO=poky-lsb, do I miss anything else?
Thanks,
JackieQuoted 4 lines
Quoted 1 line · Jie (Jackie)
Yes, sure, but I can’t reproduce this, could you show me the config
that had
Quoted 5 lines
this issue? Thanks!
Quoted 4 lines
Thanks,
JackieQuoted 9 lines
Quoted 5 lines
From: Martin Jansa [mailto:[email protected]]
Sent: Tuesday, September 05, 2017 20:30
To: Huang, Jie (Jackie)
Cc: openembedded-devel
Subject: Re: [oe] [meta-oe][PATCH 2/2] corosync: add support for extrafeatures
Quoted 3 lines
Can you please also fix:
corosync-2.4.2: ELF binary '/tmp/work/core2-64-oe-linux/corosync/2.4.2-
Quoted 1 line
r0/packages-split/corosync/usr/sbin/corosync' has relocations in .text
[textrel]
Quoted 6 lines
Quoted 4 lines
it's been there for long time.
On Tue, Aug 29, 2017 at 11:27 AM,
Quoted 1 line · <[email protected]<mailto:[email protected]>> wrote:
From: Jackie Huang
Quoted 10 lines
<[email protected]<mailto:[email protected]>>
Quoted 6 lines
* Add support for features: dbus qdevice qnetd snmp
* Add related PACKAGECONFIG
* inherit useradd to add proper user for qnetd serviceSigned-off-by Jackie Huang<[email protected]<mailto:[email protected]>>
Quoted 2 lines
---
.../recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb>
Quoted 13 lines
| 30 +++++++++++++++++++---
Review
Quoted 3 lines
1 file changed, 27 insertions(+), 3 deletions(-)(quoted diff) +0
-0extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> b/meta- oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb>
Quoted 2 lines
index
2f3aef299..7d5a87e4c100644
--- a/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb>
Quoted 1 line
+++ b/meta-oe/recipes-
extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb>
Quoted 2 lines
(quoted diff) +0
-0@@ -5,7 +5,7 @@ HOMEPAGE = "http://corosync.github.io/corosync/"Quoted 7 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> HOMEPAGE = "http://corosync.github.io/corosync/"
Quoted 6 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +1
-1SECTION = "base" -inherit autotools pkgconfig systemd +inherit autotools pkgconfig systemd useradd SRC_URI ="http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz<
Quoted 16 lines
labs.org/corosync/releases/$%7bBP%7d.tar.gz>"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM =
Quoted 2 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +0
-0SRC_URI[md5sum] = "547fa78704da53aa35912be58d31035f"@@ -16,13 +16,23 @@ LIC_FILES_CHKSUM ="file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;m d5=a85eb4ce24033adb6088dd1d6ffc5e5d>"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d>"
Quoted 6 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +2
-1DEPENDS = "groff-native nss libqb" -SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service" +SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service \ +${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKA GECONFIG>', 'qdevice', 'corosync-qdevice.service', '', d)} \
Review LIC_FILES_CHKSUM = · line 20
Quoted 1 line
(quoted diff) +1
-0+${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKA GECONFIG>', 'qnetd', 'corosync-qnetd.service', '', d)} \
Quoted 7 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d>"
Quoted 6 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +1
-1+" SYSTEMD_AUTO_ENABLE = "enable" INITSCRIPT_NAME = "corosync-daemon" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd',d)}<mailto:$%[email protected]('DISTRO_FEATURES',%20'
systemd',%20d)%7d>"
Quoted 1 line
Review LIC_FILES_CHKSUM = · line 26
Quoted 1 line
(quoted diff) +1
-0+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd',d)} \
Quoted 21 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d>" · line 30
Quoted 2 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +1
-0+ dbus qdevice qnetd snmp \+<mailto:$%[email protected]('DISTRO_FEATURES',%20'systemd',%20d)%7d%20 \%0b+ %20 %20 %20 %20 %20 %20 %20 %20 %20 dbus%20qdevice%20qnetd%20snmp%20\%0b+>"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d>"
Quoted 7 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +5
-0+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"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> do_install_append() { · line 54
Quoted 5 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +0
-0EXTRA_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
Quoted 1 line
Quoted 5 lines
Quoted 1 line
+ if
${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKA GECONFIG>', 'qnetd', 'true', 'false', d)}; then
Quoted 2 lines
(quoted diff) +2
-0+ chown -R coroqnetd:coroqnetd ${D}${sysconfdir}/${BPN}/qnetd + echo "d coroqnetd coroqnetd 0770 /var/run/corosync-qnetdnone" >>
Quoted 5 lines
${D}${sysconfdir}/default/volatiles/05_corosync
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> do_install_append() {
Quoted 3 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +2
-0+ fi + if${@bb.utils.contains('DISTRO_FEATURES','systemd','true','
false',d)}<mailto:$%7
Quoted 1 line
[email protected]('DISTRO_FEATURES','systemd','true','false',d)%7d>;
then
Quoted 37 lines
Quoted 2 lines
install -d ${D}${sysconfdir}/tmpfiles.d echo "d ${localstatedir}/log/cluster - - - -" >
${D}${sysconfdir}/tmpfiles.d/corosync.confReview
Quoted 2 lines
(quoted diff) +2
-0+ + if${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKA GECONFIG>', 'qnetd', 'true', 'false', d)}; then
Quoted 1 line
+ install -m 0644
${S}/conf/tmpfiles.d/corosync-qnetd.conf${D}${sysconfdir}/tmpfiles.d
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> do_install_append() {
Quoted 12 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +6
-0+ 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 forcorosync-qnetd' -g coroqnetd coroqnetd"
Quoted 7 lines
--
2.11.0--
_______________________________________________
Openembedded-devel mailing list [email protected]<mailto:Openembedded-Quoted 7 lines
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-oe][PATCH 2/2] corosync: add support for extra features
Yes, I built for qemux86-64, but never see this issue.
From: Martin Jansa [mailto:[email protected]]
Sent: Thursday, September 07, 2017 16:50
To: Huang, Jie (Jackie)
Cc: Khem Raj; openembedded-devel
Subject: Re: [oe] [meta-oe][PATCH 2/2] corosync: add support for extra features
Are you building for qemux86-64?
This issue is being reported since 2015, but always in qemux86-64 builds:
https://www.google.cz/search?q=openembedded+corosync+textrel&oq=openembedded+corosync+textrel
Quoted 10 lines · On Thu, Sep 7, 2017 at 3:02 AM, Huang, Jie (Jackie)…
-----Original Message-----
From: Khem Raj [mailto:[email protected]<mailto:[email protected]>]
Sent: Wednesday, September 06, 2017 09:09
To: Huang, Jie (Jackie)
Cc: Martin Jansa; openembedded-devel
Subject: Re: [oe] [meta-oe][PATCH 2/2] corosync: add support for extra featuresinclude security-flags.inc file in distro config. if you use poky for distro then set DISTRO=poky-lsb and you will be able to reproduce it
Unfortunately I still can't reproduce it with DISTRO=poky-lsb, do I miss anything else?
Thanks,
Jackie
Quoted 148 lines
Quoted 1 line · On Tue, Sep 5, 2017 at 6:01 PM, Huang, Jie (Jackie)…
Yes, sure, but I can’t reproduce this, could you show me the config that had
this issue? Thanks!
Quoted 9 lines
Thanks,
JackieFrom: Martin Jansa [mailto:[email protected]<mailto:[email protected]>]
Sent: Tuesday, September 05, 2017 20:30
To: Huang, Jie (Jackie)
Cc: openembedded-devel
Subject: Re: [oe] [meta-oe][PATCH 2/2] corosync: add support for extrafeatures
Quoted 3 lines
Can you please also fix:
corosync-2.4.2: ELF binary '/tmp/work/core2-64-oe-linux/corosync/2.4.2-r0/packages-split/corosync/usr/sbin/corosync' has relocations in .text [textrel]
Quoted 4 lines
it's been there for long time.
On Tue, Aug 29, 2017 at 11:27 AM,
Quoted 1 line · <[email protected]<mailto:[email protected]><mailto:jackie.hu…
From: Jackie Huang
<[email protected]<mailto:[email protected]><mailto:[email protected]<mailto:[email protected]>>>
Quoted 6 lines
* Add support for features: dbus qdevice qnetd snmp
* Add related PACKAGECONFIG
* inherit useradd to add proper user for qnetd serviceSigned-off-by Jackie Huang<[email protected]<mailto:[email protected]><mailto:[email protected]<mailto:[email protected]>>>
Quoted 2 lines
---
.../recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb><http://corosync_2.4.2.bb>| 30 +++++++++++++++++++---
Review
Quoted 3 lines
1 file changed, 27 insertions(+), 3 deletions(-)(quoted diff) +0
-0extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb><http://corosync_2.4.2.bb> b/meta- oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb><http://corosync_2.4.2.bb>
Quoted 2 lines
index
2f3aef299..7d5a87e4c100644
--- a/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb><http://corosync_2.4.2.bb>
Quoted 1 line
+++ b/meta-oe/recipes-
extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb><http://corosync_2.4.2.bb>
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> HOMEPAGE = "http://corosync.github.io/corosync/" · line 10
Quoted 8 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +1
-1@@ -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<http://build.clusterlabs.org/corosync/releases/$%7bBP%7d.tar.gz><http://build.cluster labs.org/corosync/releases/$%7bBP%7d.tar.gz<http://labs.org/corosync/releases/$%7bBP%7d.tar.gz>>"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM =
Quoted 2 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +0
-0SRC_URI[md5sum] = "547fa78704da53aa35912be58d31035f"@@ -16,13 +16,23 @@ LIC_FILES_CHKSUM ="file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;m d5=a85eb4ce24033adb6088dd1d6ffc5e5d><file:///\\LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d%3cfile:\LICENSE;m%0b%3e%20d5=a85eb4ce24033adb6088dd1d6ffc5e5d%3e>"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d>"
Quoted 6 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +2
-1DEPENDS = "groff-native nss libqb" -SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service" +SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service \ +${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKA<mailto:$%[email protected]('PACKAGECONFIG%3cmailto:$%[email protected]('PACKA> GECONFIG>', 'qdevice', 'corosync-qdevice.service', '', d)} \
Review LIC_FILES_CHKSUM = · line 20
Quoted 1 line
(quoted diff) +1
-0+${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKA<mailto:$%[email protected]('PACKAGECONFIG%3cmailto:$%[email protected]('PACKA> GECONFIG>', 'qnetd', 'corosync-qnetd.service', '', d)} \
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d>"
Quoted 6 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +1
-1+" SYSTEMD_AUTO_ENABLE = "enable" INITSCRIPT_NAME = "corosync-daemon" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd',d)}<mailto:$%[email protected]('DISTRO_FEATURES',%20'systemd',%20d)%7d><mailto:$%[email protected]('DISTRO_FEATURES',%20'systemd',%0b%3e%20d)%7d%3cmailto:$%[email protected]('DISTRO_FEATURES',%20'systemd',%20d)%7d%3e>"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d>" · line 30
Quoted 3 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +2
-0+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + dbus qdevice qnetd snmp \+<mailto:$%[email protected]('DISTRO_FEATURES',%20'systemd',%20d)%7d%20
\%0b+ %20 %20 %20 %20 %20 %20 %20 %20 %20
dbus%20qdevice%20qnetd%20snmp%20\%0b+><mailto:$%[email protected]('DISTRO_FEATURES',%20'systemd',%20d)%7d%20\%0b%3e%20%3e%20+ %20 %20 %20 %20 %20 %20 %20 %20 %20 dbus%20qdevice%20qnetd%20snmp%20\%0b%3e%20%3e%0b%3e%20+%3cmailto:$%[email protected]('DISTRO_FEATURES',%20'systemd',%20d)%7d%20%0b%3e%20\%0b+%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%0b%3e%20dbus%20qdevice%20qnetd%20snmp%20\%0b+%3e>"meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d>"
Quoted 7 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +5
-0+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"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> do_install_append() { · line 54
Quoted 5 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +0
-0EXTRA_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
Review do_install_append() { · line 55
Quoted 2 lines
(quoted diff) +1
-0+ if${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKA<mailto:$%[email protected]('PACKAGECONFIG%3cmailto:$%[email protected]('PACKA> GECONFIG>', 'qnetd', 'true', 'false', d)}; then
Review do_install_append() { · line 57
Quoted 2 lines
(quoted diff) +2
-0+ chown -R coroqnetd:coroqnetd ${D}${sysconfdir}/${BPN}/qnetd + echo "d coroqnetd coroqnetd 0770 /var/run/corosync-qnetd none" >>${D}${sysconfdir}/default/volatiles/05_corosync
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> do_install_append() {
Quoted 3 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +2
-0+ fi + if${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}<mailto:$%7<mailto:$%[email protected]('DISTRO_FEATURES','systemd','true','false',d)%7d%3cmailto:$%257> [email protected]('DISTRO_FEATURES','systemd','true','false',d)%7d<mailto:[email protected]('DISTRO_FEATURES','systemd','true','false',d)%7d>>; then
Review do_install_append() { · line 62
Quoted 2 lines
(quoted diff) +0
-0install -d ${D}${sysconfdir}/tmpfiles.d echo "d ${localstatedir}/log/cluster - - - -" >
${D}${sysconfdir}/tmpfiles.d/corosync.confReview do_install_append() { · line 64
Quoted 2 lines
(quoted diff) +2
-0+ + if${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKA<mailto:$%[email protected]('PACKAGECONFIG%3cmailto:$%[email protected]('PACKA> GECONFIG>', 'qnetd', 'true', 'false', d)}; then
Review do_install_append() { · line 65
Quoted 1 line
(quoted diff) +1
-0+ install -m 0644 ${S}/conf/tmpfiles.d/corosync-qnetd.conf${D}${sysconfdir}/tmpfiles.d
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> do_install_append() {
Quoted 12 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +6
-0+ 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 forcorosync-qnetd' -g coroqnetd coroqnetd"
Quoted 7 lines
(quoted diff) +0
-1--2.11.0
--
_______________________________________________
Openembedded-devel mailing list [email protected]<mailto:[email protected]><mailto:Openembedded-<mailto:Openembedded->[email protected]<mailto:[email protected]>>
Quoted 7 lines
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
_______________________________________________
Openembedded-devel mailing list [email protected]<mailto:[email protected]>
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-oe][PATCH 2/2] corosync: add support for extra features
Can you set
LDFLAGS += "-fuse-ld=gold"
and see if that reproduces it
Quoted 206 lines · Jie (Jackie)
Yes, I built for qemux86-64, but never see this issue.
From: Martin Jansa [mailto:[email protected]]
Sent: Thursday, September 07, 2017 16:50
To: Huang, Jie (Jackie)
Cc: Khem Raj; openembedded-develSubject: Re: [oe] [meta-oe][PATCH 2/2] corosync: add support for extra features
Are you building for qemux86-64?
This issue is being reported since 2015, but always in qemux86-64 builds:
https://www.google.cz/search?q=openembedded+corosync+textrel&oq=openembedded+corosync+textrel
Quoted 10 lines · Jie (Jackie)
-----Original Message-----
From: Khem Raj [mailto:[email protected]]
Sent: Wednesday, September 06, 2017 09:09
To: Huang, Jie (Jackie)
Cc: Martin Jansa; openembedded-devel
Subject: Re: [oe] [meta-oe][PATCH 2/2] corosync: add support for extra featuresinclude security-flags.inc file in distro config. if you use poky for distro then set DISTRO=poky-lsb and you will be able to reproduce it
Unfortunately I still can't reproduce it with DISTRO=poky-lsb, do I miss anything else?
Thanks,
JackieQuoted 156 lines
Quoted 2 lines · Jie (Jackie)
Yes, sure, but I can’t reproduce this, could you show me the config that had
this issue? Thanks!
Quoted 9 lines
Thanks,
JackieFrom: Martin Jansa [mailto:[email protected]]
Sent: Tuesday, September 05, 2017 20:30
To: Huang, Jie (Jackie)
Cc: openembedded-devel
Subject: Re: [oe] [meta-oe][PATCH 2/2] corosync: add support for extrafeatures
Quoted 3 lines
Can you please also fix:
corosync-2.4.2: ELF binary '/tmp/work/core2-64-oe-linux/corosync/2.4.2-r0/packages-split/corosync/usr/sbin/corosync' has relocations in .text [textrel]
Quoted 4 lines
it's been there for long time.
On Tue, Aug 29, 2017 at 11:27 AM,
Quoted 1 line · <[email protected]<mailto:[email protected]>> wrote:
From: Jackie Huang
<[email protected]<mailto:[email protected]>>
Quoted 6 lines
* Add support for features: dbus qdevice qnetd snmp
* Add related PACKAGECONFIG
* inherit useradd to add proper user for qnetd serviceSigned-off-by Jackie Huang<[email protected]<mailto:[email protected]>>
Quoted 3 lines
---
.../recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb>
| 30 +++++++++++++++++++---
Review
Quoted 3 lines
1 file changed, 27 insertions(+), 3 deletions(-)(quoted diff) +0
-0extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> b/meta- oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb>
Quoted 2 lines
index
2f3aef299..7d5a87e4c100644
--- a/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb>
Quoted 1 line
+++ b/meta-oe/recipes-
extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb>
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> HOMEPAGE = "http://corosync.github.io/corosync/" · line 10
Quoted 8 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +1
-1@@ -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<http://build.cluster labs.org/corosync/releases/$%7bBP%7d.tar.gz>"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM =
Quoted 2 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +0
-0SRC_URI[md5sum] = "547fa78704da53aa35912be58d31035f"@@ -16,13 +16,23 @@ LIC_FILES_CHKSUM ="file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;m d5=a85eb4ce24033adb6088dd1d6ffc5e5d>"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d>"
Quoted 6 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +2
-1DEPENDS = "groff-native nss libqb" -SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service" +SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service \ +${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKA GECONFIG>', 'qdevice', 'corosync-qdevice.service', '', d)} \
Review LIC_FILES_CHKSUM = · line 20
Quoted 1 line
(quoted diff) +1
-0+${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKA GECONFIG>', 'qnetd', 'corosync-qnetd.service', '', d)} \
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d>"
Quoted 6 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +1
-1+" SYSTEMD_AUTO_ENABLE = "enable" INITSCRIPT_NAME = "corosync-daemon" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd',d)}<mailto:$%[email protected]('DISTRO_FEATURES',%20'systemd',%20d)%7d>"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d>" · line 30
Quoted 4 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +2
-0+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + dbus qdevice qnetd snmp \+<mailto:$%[email protected]('DISTRO_FEATURES',%20'systemd',%20d)%7d%20 \%0b+ %20 %20 %20 %20 %20 %20 %20 %20 %20 dbus%20qdevice%20qnetd%20snmp%20\%0b+>"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d>"
Quoted 7 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +5
-0+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"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> do_install_append() { · line 54
Quoted 5 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +0
-0EXTRA_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
Review do_install_append() { · line 55
Quoted 2 lines
(quoted diff) +1
-0+ if${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKA GECONFIG>', 'qnetd', 'true', 'false', d)}; then
Quoted 3 lines
(quoted diff) +2
-0+ chown -R coroqnetd:coroqnetd ${D}${sysconfdir}/${BPN}/qnetd + echo "d coroqnetd coroqnetd 0770 /var/run/corosync-qnetd none"Quoted 1 line
Quoted 1 line
${D}${sysconfdir}/default/volatiles/05_corosync
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> do_install_append() {
Quoted 3 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +2
-0+ fi + if${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}<mailto:$%7 [email protected]('DISTRO_FEATURES','systemd','true','false',d)%7d>; then
Quoted 2 lines
install -d ${D}${sysconfdir}/tmpfiles.d echo "d ${localstatedir}/log/cluster - - - -" >
${D}${sysconfdir}/tmpfiles.d/corosync.confReview
Quoted 2 lines
(quoted diff) +2
-0+ + if${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKA GECONFIG>', 'qnetd', 'true', 'false', d)}; then
Quoted 1 line
+ install -m 0644
${S}/conf/tmpfiles.d/corosync-qnetd.conf${D}${sysconfdir}/tmpfiles.d
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> do_install_append() {
Quoted 12 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +6
-0+ 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 forcorosync-qnetd' -g coroqnetd coroqnetd"
Quoted 7 lines
--
2.11.0--
_______________________________________________
Openembedded-devel mailing list [email protected]<mailto:Openembedded-Quoted 7 lines
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-oe][PATCH 2/2] corosync: add support for extra features
Quoted 10 lines
-----Original Message-----
From: Khem Raj [mailto:[email protected]]
Sent: Friday, September 08, 2017 11:51
To: Huang, Jie (Jackie)
Cc: Martin Jansa; openembedded-devel
Subject: Re: [oe] [meta-oe][PATCH 2/2] corosync: add support for extra features
Quoted 3 lines
Can you set
LDFLAGS += "-fuse-ld=gold"
I tried but still couldn't reproduce it.
Thanks,
Jackie
Quoted 223 lines
and see if that reproduces it
Quoted 15 lines · Jie (Jackie)
Yes, I built for qemux86-64, but never see this issue.
From: Martin Jansa [mailto:[email protected]]
Sent: Thursday, September 07, 2017 16:50
To: Huang, Jie (Jackie)
Cc: Khem Raj; openembedded-develSubject: Re: [oe] [meta-oe][PATCH 2/2] corosync: add support for extra features
Quoted 7 lines
Are you building for qemux86-64?
This issue is being reported since 2015, but always in qemux86-64 builds:
https://www.google.cz/search?q=openembedded+corosync+textrel&oq=opene
mbedded+corosync+textrelQuoted 16 lines
Quoted 8 lines · Jie (Jackie)
-----Original Message-----
From: Khem Raj [mailto:[email protected]]
Sent: Wednesday, September 06, 2017 09:09
To: Huang, Jie (Jackie)
Cc: Martin Jansa; openembedded-devel
Subject: Re: [oe] [meta-oe][PATCH 2/2] corosync: add support for extra featuresQuoted 48 lines
Quoted 2 lines
include security-flags.inc file in distro config. if you use poky for distro then set DISTRO=poky-lsb and you will be able to reproduce it
Unfortunately I still can't reproduce it with DISTRO=poky-lsb, do I miss anything else?
Thanks,
JackieQuoted 38 lines
Quoted 2 lines · Jie (Jackie)
Yes, sure, but I can’t reproduce this, could you show me the config that had
this issue? Thanks!
Quoted 9 lines
Thanks,
JackieFrom: Martin Jansa [mailto:[email protected]]
Sent: Tuesday, September 05, 2017 20:30
To: Huang, Jie (Jackie)
Cc: openembedded-devel
Subject: Re: [oe] [meta-oe][PATCH 2/2] corosync: add support for extrafeatures
Quoted 3 lines
Can you please also fix:
corosync-2.4.2: ELF binary '/tmp/work/core2-64-oe-linux/corosync/2.4.2-r0/packages-split/corosync/usr/sbin/corosync' has relocations in .text [textrel]
Quoted 4 lines
it's been there for long time.
On Tue, Aug 29, 2017 at 11:27 AM,
Quoted 1 line · <[email protected]<mailto:[email protected]>> wrote:
From: Jackie Huang
<[email protected]<mailto:[email protected]>>
Quoted 6 lines
* Add support for features: dbus qdevice qnetd snmp
* Add related PACKAGECONFIG
* inherit useradd to add proper user for qnetd serviceSigned-off-by Jackie Huang<[email protected]<mailto:[email protected]>>
Quoted 3 lines
---
.../recipes-
extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb>
Quoted 13 lines
Quoted 13 lines
| 30 +++++++++++++++++++---
Review
Quoted 3 lines
1 file changed, 27 insertions(+), 3 deletions(-)(quoted diff) +0
-0extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> b/meta- oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb>
Quoted 2 lines
index
2f3aef299..7d5a87e4c100644
--- a/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb>
Quoted 1 line
+++ b/meta-oe/recipes-
extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb>
Quoted 2 lines
(quoted diff) +0
-0@@ -5,7 +5,7 @@ HOMEPAGE = "http://corosync.github.io/corosync/"Quoted 8 lines
Quoted 8 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> HOMEPAGE = "http://corosync.github.io/corosync/"
Quoted 6 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +1
-1SECTION = "base" -inherit autotools pkgconfig systemd +inherit autotools pkgconfig systemd useradd SRC_URI ="http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz<http://build.cluster
Quoted 4 lines
Quoted 4 lines
labs.org/corosync/releases/$%7bBP%7d.tar.gz>"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM =
Quoted 2 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +0
-0SRC_URI[md5sum] = "547fa78704da53aa35912be58d31035f"@@ -16,13 +16,23 @@ LIC_FILES_CHKSUM ="file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;m
Quoted 8 lines
Quoted 8 lines
d5=a85eb4ce24033adb6088dd1d6ffc5e5d>"
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d>"
Quoted 6 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +2
-1DEPENDS = "groff-native nss libqb" -SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service" +SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service \ +${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKA
Quoted 3 lines
Quoted 3 lines
GECONFIG>', 'qdevice', 'corosync-qdevice.service', '', d)} \
Quoted 1 line
(quoted diff) +1
-0+${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKA
Quoted 8 lines
Quoted 8 lines
GECONFIG>', 'qnetd', 'corosync-qnetd.service', '', d)} \
Quoted 6 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +1
-1+" SYSTEMD_AUTO_ENABLE = "enable" INITSCRIPT_NAME = "corosync-daemon" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd',d)}<mailto:$%[email protected]('DISTRO_FEATURES',%20'systemd',%20d)%7d>"
Quoted 5 lines
Quoted 5 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d>" · line 30
Quoted 4 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +2
-0+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + dbus qdevice qnetd snmp \+<mailto:$%[email protected]('DISTRO_FEATURES',%20'systemd',%20d)%7d%20
Quoted 12 lines
Quoted 12 lines
\%0b+ %20 %20 %20 %20 %20 %20 %20 %20 %20
dbus%20qdevice%20qnetd%20snmp%20\%0b+>"meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d>"
Quoted 7 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +5
-0+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"
Quoted 1 line
Quoted 8 lines
Quoted 8 lines
Review do_install_append() { · line 54
Quoted 4 lines
EXTRA_OECONF= "ac_cv_path_BASHPATH=${base_bindir}/bash"(quoted diff) +0
-0@@ -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
Quoted 2 lines
(quoted diff) +1
-0+ if${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKA
Quoted 10 lines
Quoted 10 lines
GECONFIG>', 'qnetd', 'true', 'false', d)}; then
Quoted 3 lines
(quoted diff) +2
-0+ chown -R coroqnetd:coroqnetd ${D}${sysconfdir}/${BPN}/qnetd + echo "d coroqnetd coroqnetd 0770 /var/run/corosync-qnetd none"Quoted 1 line
Quoted 1 line
${D}${sysconfdir}/default/volatiles/05_corosync
Quoted 3 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +2
-0+ fi + if${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}<mailto:$%7
Quoted 8 lines
Quoted 8 lines
[email protected]('DISTRO_FEATURES','systemd','true','false',d)%7d>; then
Quoted 2 lines
install -d ${D}${sysconfdir}/tmpfiles.d echo "d ${localstatedir}/log/cluster - - - -" >
${D}${sysconfdir}/tmpfiles.d/corosync.confQuoted 2 lines
(quoted diff) +2
-0+ + if${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKA
Quoted 33 lines
Quoted 31 lines
GECONFIG>', 'qnetd', 'true', 'false', d)}; then
Quoted 1 line
+ install -m 0644
${S}/conf/tmpfiles.d/corosync-qnetd.conf${D}${sysconfdir}/tmpfiles.d
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> do_install_append() {
Quoted 12 lines
meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> +6
-0+ 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 forcorosync-qnetd' -g coroqnetd coroqnetd"
Quoted 7 lines
--
2.11.0--
_______________________________________________
Openembedded-devel mailing list [email protected]<mailto:Openembedded-Quoted 7 lines
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel