[oe] [meta-oe][PATCH 2/2] corosync: add support for extra features

Thu Sep 7 08:50:16 UTC 2017

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 at windriver.com> wrote:

>
>
> > -----Original Message-----
> > From: Khem Raj [mailto:raj.khem at 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 at 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 at 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 at windriver.com<mailto:jackie.huang at windriver.com>> wrote:
> > > From: Jackie Huang
> > <jackie.huang at windriver.com<mailto:jackie.huang at 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 at windriver.com<mailto:jackie.huang at 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 at bb.utils.contains('PACKA
> > GECONFIG>', 'qdevice', 'corosync-qdevice.service', '', d)} \
> > > +
> > ${@bb.utils.contains('PACKAGECONFIG<mailto:$%7b at 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 at bb.utils.filter('DISTRO_FEATURES',%20'
> systemd',%20d)%7d>"
> > > +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd',
> d)} \
> > > +                   dbus qdevice qnetd snmp \
> > >
> > +<mailto:$%7b at 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 at 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 at 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 at 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 at lists.openembedded.org<mailto:Openembedded-
> > devel at lists.openembedded.org>
> > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> > >
> > > --
> > > _______________________________________________
> > > Openembedded-devel mailing list
> > > Openembedded-devel at lists.openembedded.org
> > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>