* [meta-oe][PATCH 0/2] corosync: fixes and add support for extra features @ 2017-08-29 9:27 jackie.huang 2017-08-29 9:27 ` [meta-oe][PATCH 1/2] corosync: fixes for sysvinit and systemd jackie.huang 2017-08-29 9:27 ` [meta-oe][PATCH 2/2] corosync: add support for extra features jackie.huang 0 siblings, 2 replies; 11+ messages in thread From: jackie.huang @ 2017-08-29 9:27 UTC (permalink / raw) To: openembedded-devel From: Jackie Huang <jackie.huang@windriver.com> -- 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 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [meta-oe][PATCH 1/2] corosync: fixes for sysvinit and systemd 2017-08-29 9:27 [meta-oe][PATCH 0/2] corosync: fixes and add support for extra features jackie.huang @ 2017-08-29 9:27 ` jackie.huang 2017-08-29 9:27 ` [meta-oe][PATCH 2/2] corosync: add support for extra features jackie.huang 1 sibling, 0 replies; 11+ messages in thread From: jackie.huang @ 2017-08-29 9:27 UTC (permalink / raw) To: openembedded-devel From: Jackie Huang <jackie.huang@windriver.com> * 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 <jackie.huang@windriver.com> --- .../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 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [meta-oe][PATCH 2/2] corosync: add support for extra features 2017-08-29 9:27 [meta-oe][PATCH 0/2] corosync: fixes and add support for extra features jackie.huang 2017-08-29 9:27 ` [meta-oe][PATCH 1/2] corosync: fixes for sysvinit and systemd jackie.huang @ 2017-08-29 9:27 ` jackie.huang 2017-09-05 12:30 ` Martin Jansa 1 sibling, 1 reply; 11+ messages in thread From: jackie.huang @ 2017-08-29 9:27 UTC (permalink / raw) To: openembedded-devel From: Jackie Huang <jackie.huang@windriver.com> * 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 <jackie.huang@windriver.com> --- .../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 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 2/2] corosync: add support for extra features 2017-08-29 9:27 ` [meta-oe][PATCH 2/2] corosync: add support for extra features jackie.huang @ 2017-09-05 12:30 ` Martin Jansa 2017-09-06 1:01 ` Huang, Jie (Jackie) 0 siblings, 1 reply; 11+ messages in thread From: Martin Jansa @ 2017-09-05 12:30 UTC (permalink / raw) To: JackieHuang; +Cc: openembedded-devel 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, <jackie.huang@windriver.com> wrote: > From: Jackie Huang <jackie.huang@windriver.com> > > * 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 <jackie.huang@windriver.com> > --- > .../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 > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 2/2] corosync: add support for extra features 2017-09-05 12:30 ` Martin Jansa @ 2017-09-06 1:01 ` Huang, Jie (Jackie) 2017-09-06 1:08 ` Khem Raj 0 siblings, 1 reply; 11+ messages in thread From: Huang, Jie (Jackie) @ 2017-09-06 1:01 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-devel 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:martin.jansa@gmail.com] 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, <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> wrote: From: Jackie Huang <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> * 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 <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> --- .../recipes-extended/corosync/corosync_2.4.2.bb<http://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<http://corosync_2.4.2.bb> b/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> index 2f3aef299..7d5a87e4c 100644 --- a/meta-oe/recipes-extended/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> @@ -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:$%7b@bb.utils.contains('PACKAGECONFIG>', 'qdevice', 'corosync-qdevice.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG<mailto:$%7b@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)}<mailto:$%7b@bb.utils.filter('DISTRO_FEATURES',%20'systemd',%20d)%7d>" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + dbus qdevice qnetd snmp \ +<mailto:$%7b@bb.utils.filter('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:$%7b@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)}<mailto:$%7b@bb.utils.contains('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:$%7b@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<mailto:Openembedded-devel@lists.openembedded.org> http://lists.openembedded.org/mailman/listinfo/openembedded-devel ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 2/2] corosync: add support for extra features 2017-09-06 1:01 ` Huang, Jie (Jackie) @ 2017-09-06 1:08 ` Khem Raj 2017-09-07 1:02 ` Huang, Jie (Jackie) 0 siblings, 1 reply; 11+ messages in thread From: Khem Raj @ 2017-09-06 1:08 UTC (permalink / raw) To: Huang, Jie (Jackie); +Cc: openembedded-devel 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 On Tue, Sep 5, 2017 at 6:01 PM, Huang, Jie (Jackie) <Jackie.Huang@windriver.com> wrote: > 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:martin.jansa@gmail.com] > 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, <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> wrote: > From: Jackie Huang <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> > > * 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 <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> > --- > .../recipes-extended/corosync/corosync_2.4.2.bb<http://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<http://corosync_2.4.2.bb> b/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> > index 2f3aef299..7d5a87e4c 100644 > --- a/meta-oe/recipes-extended/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> > @@ -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:$%7b@bb.utils.contains('PACKAGECONFIG>', 'qdevice', 'corosync-qdevice.service', '', d)} \ > + ${@bb.utils.contains('PACKAGECONFIG<mailto:$%7b@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)}<mailto:$%7b@bb.utils.filter('DISTRO_FEATURES',%20'systemd',%20d)%7d>" > +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ > + dbus qdevice qnetd snmp \ > +<mailto:$%7b@bb.utils.filter('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:$%7b@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)}<mailto:$%7b@bb.utils.contains('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:$%7b@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<mailto: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 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 2/2] corosync: add support for extra features 2017-09-06 1:08 ` Khem Raj @ 2017-09-07 1:02 ` Huang, Jie (Jackie) 2017-09-07 8:50 ` Martin Jansa 0 siblings, 1 reply; 11+ messages in thread From: Huang, Jie (Jackie) @ 2017-09-07 1:02 UTC (permalink / raw) To: Khem Raj; +Cc: openembedded-devel > -----Original Message----- > From: Khem Raj [mailto:raj.khem@gmail.com] > 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 > > 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 > > On Tue, Sep 5, 2017 at 6:01 PM, Huang, Jie (Jackie) > <Jackie.Huang@windriver.com> wrote: > > 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:martin.jansa@gmail.com] > > 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, > <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> wrote: > > From: Jackie Huang > <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> > > > > * 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 > <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> > > --- > > .../recipes-extended/corosync/corosync_2.4.2.bb<http://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<http://corosync_2.4.2.bb> b/meta- > oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> > > index 2f3aef299..7d5a87e4c 100644 > > --- a/meta-oe/recipes- > extended/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> > > @@ -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>" > > SRC_URI[md5sum] = "547fa78704da53aa35912be58d31035f" > > @@ -16,13 +16,23 @@ LIC_FILES_CHKSUM = > "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;m > d5=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:$%7b@bb.utils.contains('PACKA > GECONFIG>', 'qdevice', 'corosync-qdevice.service', '', d)} \ > > + > ${@bb.utils.contains('PACKAGECONFIG<mailto:$%7b@bb.utils.contains('PACKA > GECONFIG>', 'qnetd', 'corosync-qnetd.service', '', d)} \ > > +" > > SYSTEMD_AUTO_ENABLE = "enable" > > > > INITSCRIPT_NAME = "corosync-daemon" > > > > -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', > d)}<mailto:$%7b@bb.utils.filter('DISTRO_FEATURES',%20'systemd',%20d)%7d>" > > +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ > > + dbus qdevice qnetd snmp \ > > > +<mailto:$%7b@bb.utils.filter('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:$%7b@bb.utils.contains('PACKA > GECONFIG>', '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:$%7 > b@bb.utils.contains('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:$%7b@bb.utils.contains('PACKA > GECONFIG>', '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<mailto: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 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 2/2] corosync: add support for extra features 2017-09-07 1:02 ` Huang, Jie (Jackie) @ 2017-09-07 8:50 ` Martin Jansa 2017-09-08 2:37 ` Huang, Jie (Jackie) 0 siblings, 1 reply; 11+ messages in thread From: Martin Jansa @ 2017-09-07 8:50 UTC (permalink / raw) To: Huang, Jie (Jackie); +Cc: openembedded-devel 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 On Thu, Sep 7, 2017 at 3:02 AM, Huang, Jie (Jackie) < Jackie.Huang@windriver.com> wrote: > > > > -----Original Message----- > > From: Khem Raj [mailto:raj.khem@gmail.com] > > 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 > > > > 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 > > > > > On Tue, Sep 5, 2017 at 6:01 PM, Huang, Jie (Jackie) > > <Jackie.Huang@windriver.com> wrote: > > > 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:martin.jansa@gmail.com] > > > 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, > > <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> wrote: > > > From: Jackie Huang > > <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> > > > > > > * 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 > > <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> > > > --- > > > .../recipes-extended/corosync/corosync_2.4.2.bb<http:// > 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<http://corosync_2.4.2.bb> b/meta- > > oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> > > > index 2f3aef299..7d5a87e4c 100644 > > > --- a/meta-oe/recipes- > > extended/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> > > > @@ -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>" > > > SRC_URI[md5sum] = "547fa78704da53aa35912be58d31035f" > > > @@ -16,13 +16,23 @@ LIC_FILES_CHKSUM = > > "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;m > > d5=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:$%7b@bb.utils.contains('PACKA > > GECONFIG>', 'qdevice', 'corosync-qdevice.service', '', d)} \ > > > + > > ${@bb.utils.contains('PACKAGECONFIG<mailto:$%7b@bb.utils.contains('PACKA > > GECONFIG>', 'qnetd', 'corosync-qnetd.service', '', d)} \ > > > +" > > > SYSTEMD_AUTO_ENABLE = "enable" > > > > > > INITSCRIPT_NAME = "corosync-daemon" > > > > > > -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', > > d)}<mailto:$%7b@bb.utils.filter('DISTRO_FEATURES',%20' > systemd',%20d)%7d>" > > > +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', > d)} \ > > > + dbus qdevice qnetd snmp \ > > > > > +<mailto:$%7b@bb.utils.filter('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:$%7b@bb.utils.contains('PACKA > > GECONFIG>', '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:$%7 > > b@bb.utils.contains('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:$%7b@bb.utils.contains('PACKA > > GECONFIG>', '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<mailto: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 > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 2/2] corosync: add support for extra features 2017-09-07 8:50 ` Martin Jansa @ 2017-09-08 2:37 ` Huang, Jie (Jackie) 2017-09-08 3:50 ` Khem Raj 0 siblings, 1 reply; 11+ messages in thread From: Huang, Jie (Jackie) @ 2017-09-08 2:37 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-devel Yes, I built for qemux86-64, but never see this issue. From: Martin Jansa [mailto:martin.jansa@gmail.com] 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 On Thu, Sep 7, 2017 at 3:02 AM, Huang, Jie (Jackie) <Jackie.Huang@windriver.com<mailto:Jackie.Huang@windriver.com>> wrote: > -----Original Message----- > From: Khem Raj [mailto:raj.khem@gmail.com<mailto:raj.khem@gmail.com>] > 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 > > 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 > > On Tue, Sep 5, 2017 at 6:01 PM, Huang, Jie (Jackie) > <Jackie.Huang@windriver.com<mailto:Jackie.Huang@windriver.com>> wrote: > > 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:martin.jansa@gmail.com<mailto:martin.jansa@gmail.com>] > > 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, > <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com><mailto:jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>>> wrote: > > From: Jackie Huang > <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com><mailto:jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>>> > > > > * 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 > <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com><mailto:jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>>> > > --- > > .../recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb><http://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<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> > > index 2f3aef299..7d5a87e4c 100644 > > --- a/meta-oe/recipes- > extended/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> > > @@ -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>>" > > SRC_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>" > > > > 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:$%7b@bb.utils.contains('PACKA<mailto:$%7b@bb.utils.contains('PACKAGECONFIG%3cmailto:$%7b@bb.utils.contains('PACKA> > GECONFIG>', 'qdevice', 'corosync-qdevice.service', '', d)} \ > > + > ${@bb.utils.contains('PACKAGECONFIG<mailto:$%7b@bb.utils.contains('PACKA<mailto:$%7b@bb.utils.contains('PACKAGECONFIG%3cmailto:$%7b@bb.utils.contains('PACKA> > GECONFIG>', 'qnetd', 'corosync-qnetd.service', '', d)} \ > > +" > > SYSTEMD_AUTO_ENABLE = "enable" > > > > INITSCRIPT_NAME = "corosync-daemon" > > > > -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', > d)}<mailto:$%7b@bb.utils.filter('DISTRO_FEATURES',%20'systemd',%20d)%7d><mailto:$%7b@bb.utils.filter('DISTRO_FEATURES',%20'systemd',%0b%3e%20d)%7d%3cmailto:$%7b@bb.utils.filter('DISTRO_FEATURES',%20'systemd',%20d)%7d%3e>" > > +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ > > + dbus qdevice qnetd snmp \ > > > +<mailto:$%7b@bb.utils.filter('DISTRO_FEATURES',%20'systemd',%20d)%7d%20 > \%0b+ %20 %20 %20 %20 %20 %20 %20 %20 %20 > dbus%20qdevice%20qnetd%20snmp%20\%0b+><mailto:$%7b@bb.utils.filter('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:$%7b@bb.utils.filter('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>" > > > > +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:$%7b@bb.utils.contains('PACKA<mailto:$%7b@bb.utils.contains('PACKAGECONFIG%3cmailto:$%7b@bb.utils.contains('PACKA> > GECONFIG>', '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:$%7<mailto:$%7b@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)%7d%3cmailto:$%257> > b@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)%7d<mailto:b@bb.utils.contains('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:$%7b@bb.utils.contains('PACKA<mailto:$%7b@bb.utils.contains('PACKAGECONFIG%3cmailto:$%7b@bb.utils.contains('PACKA> > GECONFIG>', '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<mailto:Openembedded-devel@lists.openembedded.org><mailto:Openembedded-<mailto:Openembedded-> > devel@lists.openembedded.org<mailto:devel@lists.openembedded.org>> > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > > > -- > > _______________________________________________ > > Openembedded-devel mailing list > > Openembedded-devel@lists.openembedded.org<mailto:Openembedded-devel@lists.openembedded.org> > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 2/2] corosync: add support for extra features 2017-09-08 2:37 ` Huang, Jie (Jackie) @ 2017-09-08 3:50 ` Khem Raj 2017-09-08 6:01 ` Huang, Jie (Jackie) 0 siblings, 1 reply; 11+ messages in thread From: Khem Raj @ 2017-09-08 3:50 UTC (permalink / raw) To: Huang, Jie (Jackie); +Cc: openembedded-devel Can you set LDFLAGS += "-fuse-ld=gold" and see if that reproduces it On Thu, Sep 7, 2017 at 7:37 PM, Huang, Jie (Jackie) <Jackie.Huang@windriver.com> wrote: > Yes, I built for qemux86-64, but never see this issue. > > > > From: Martin Jansa [mailto:martin.jansa@gmail.com] > 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 > > > > On Thu, Sep 7, 2017 at 3:02 AM, Huang, Jie (Jackie) > <Jackie.Huang@windriver.com> wrote: > > > >> -----Original Message----- >> From: Khem Raj [mailto:raj.khem@gmail.com] >> 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 >> >> 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 > > >> >> On Tue, Sep 5, 2017 at 6:01 PM, Huang, Jie (Jackie) >> <Jackie.Huang@windriver.com> wrote: >> > 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:martin.jansa@gmail.com] >> > 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, >> <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> wrote: >> > From: Jackie Huang >> <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> >> > >> > * 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 >> <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> >> > --- >> > >> > .../recipes-extended/corosync/corosync_2.4.2.bb<http://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<http://corosync_2.4.2.bb> b/meta- >> oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> >> > index 2f3aef299..7d5a87e4c 100644 >> > --- a/meta-oe/recipes- >> extended/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> >> > @@ -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>" >> > SRC_URI[md5sum] = "547fa78704da53aa35912be58d31035f" >> > @@ -16,13 +16,23 @@ LIC_FILES_CHKSUM = >> "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;m >> d5=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:$%7b@bb.utils.contains('PACKA >> GECONFIG>', 'qdevice', 'corosync-qdevice.service', '', d)} \ >> > + >> ${@bb.utils.contains('PACKAGECONFIG<mailto:$%7b@bb.utils.contains('PACKA >> GECONFIG>', 'qnetd', 'corosync-qnetd.service', '', d)} \ >> > +" >> > SYSTEMD_AUTO_ENABLE = "enable" >> > >> > INITSCRIPT_NAME = "corosync-daemon" >> > >> > -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', >> d)}<mailto:$%7b@bb.utils.filter('DISTRO_FEATURES',%20'systemd',%20d)%7d>" >> > +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} >> > \ >> > + dbus qdevice qnetd snmp \ >> > >> +<mailto:$%7b@bb.utils.filter('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:$%7b@bb.utils.contains('PACKA >> GECONFIG>', '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:$%7 >> b@bb.utils.contains('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:$%7b@bb.utils.contains('PACKA >> GECONFIG>', '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<mailto: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 > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 2/2] corosync: add support for extra features 2017-09-08 3:50 ` Khem Raj @ 2017-09-08 6:01 ` Huang, Jie (Jackie) 0 siblings, 0 replies; 11+ messages in thread From: Huang, Jie (Jackie) @ 2017-09-08 6:01 UTC (permalink / raw) To: Khem Raj; +Cc: openembedded-devel > -----Original Message----- > From: Khem Raj [mailto:raj.khem@gmail.com] > 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 > > Can you set > > LDFLAGS += "-fuse-ld=gold" I tried but still couldn't reproduce it. Thanks, Jackie > > and see if that reproduces it > > On Thu, Sep 7, 2017 at 7:37 PM, Huang, Jie (Jackie) > <Jackie.Huang@windriver.com> wrote: > > Yes, I built for qemux86-64, but never see this issue. > > > > > > > > From: Martin Jansa [mailto:martin.jansa@gmail.com] > > 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=opene > mbedded+corosync+textrel > > > > > > > > On Thu, Sep 7, 2017 at 3:02 AM, Huang, Jie (Jackie) > > <Jackie.Huang@windriver.com> wrote: > > > > > > > >> -----Original Message----- > >> From: Khem Raj [mailto:raj.khem@gmail.com] > >> 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 > >> > >> 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 > > > > > >> > >> On Tue, Sep 5, 2017 at 6:01 PM, Huang, Jie (Jackie) > >> <Jackie.Huang@windriver.com> wrote: > >> > 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:martin.jansa@gmail.com] > >> > 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, > >> <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> wrote: > >> > From: Jackie Huang > >> <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> > >> > > >> > * 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 > >> <jackie.huang@windriver.com<mailto:jackie.huang@windriver.com>> > >> > --- > >> > > >> > .../recipes- > extended/corosync/corosync_2.4.2.bb<http://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<http://corosync_2.4.2.bb> b/meta- > >> oe/recipes-extended/corosync/corosync_2.4.2.bb<http://corosync_2.4.2.bb> > >> > index 2f3aef299..7d5a87e4c 100644 > >> > --- a/meta-oe/recipes- > >> extended/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> > >> > @@ -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>" > >> > SRC_URI[md5sum] = "547fa78704da53aa35912be58d31035f" > >> > @@ -16,13 +16,23 @@ LIC_FILES_CHKSUM = > >> > "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d<file:///\\LICENSE;m > >> d5=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:$%7b@bb.utils.contains('PACKA > >> GECONFIG>', 'qdevice', 'corosync-qdevice.service', '', d)} \ > >> > + > >> > ${@bb.utils.contains('PACKAGECONFIG<mailto:$%7b@bb.utils.contains('PACKA > >> GECONFIG>', 'qnetd', 'corosync-qnetd.service', '', d)} \ > >> > +" > >> > SYSTEMD_AUTO_ENABLE = "enable" > >> > > >> > INITSCRIPT_NAME = "corosync-daemon" > >> > > >> > -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', > >> > d)}<mailto:$%7b@bb.utils.filter('DISTRO_FEATURES',%20'systemd',%20d)%7d>" > >> > +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} > >> > \ > >> > + dbus qdevice qnetd snmp \ > >> > > >> > +<mailto:$%7b@bb.utils.filter('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:$%7b@bb.utils.contains('PACKA > >> GECONFIG>', '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:$%7 > >> b@bb.utils.contains('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:$%7b@bb.utils.contains('PACKA > >> GECONFIG>', '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<mailto: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 > > > > ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2017-09-08 6:01 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-08-29 9:27 [meta-oe][PATCH 0/2] corosync: fixes and add support for extra features jackie.huang 2017-08-29 9:27 ` [meta-oe][PATCH 1/2] corosync: fixes for sysvinit and systemd jackie.huang 2017-08-29 9:27 ` [meta-oe][PATCH 2/2] corosync: add support for extra features jackie.huang 2017-09-05 12:30 ` Martin Jansa 2017-09-06 1:01 ` Huang, Jie (Jackie) 2017-09-06 1:08 ` Khem Raj 2017-09-07 1:02 ` Huang, Jie (Jackie) 2017-09-07 8:50 ` Martin Jansa 2017-09-08 2:37 ` Huang, Jie (Jackie) 2017-09-08 3:50 ` Khem Raj 2017-09-08 6:01 ` Huang, Jie (Jackie)
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.