Re: [meta-networking][PATCH] netcf: support multilib builds

[Joe MacDonald <joe@deserted.net>]

[-- Attachment #1: Type: text/plain, Size: 2534 bytes --]

[Re: [oe] [meta-networking][PATCH] netcf: support multilib builds] On 15.08.18 (Tue 11:33) Rongqing Li wrote:

> 
> 
> On 2015年08月18日 11:24, Joe MacDonald wrote:
> >When doing a multilib build, /usr/lib is still created but not collected
> >into FILES_${PN} by default, resulting in a QA error.  Adding both
> >${libdir} and ${nonarch_libdir} catches all scenarios.
> >
> >It also turns out that the previous do_install_append would throw an error
> >in a multilib build since systemd always installs to .../lib/... but
> >${libdir] would point at .../lib64/...
> >
> >Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
> >---
> >  meta-networking/recipes-support/netcf/netcf_git.bb | 14 ++++++++++++--
> >  1 file changed, 12 insertions(+), 2 deletions(-)
> >
> >diff --git a/meta-networking/recipes-support/netcf/netcf_git.bb b/meta-networking/recipes-support/netcf/netcf_git.bb
> >index d47bb3b..8a8963e 100644
> >--- a/meta-networking/recipes-support/netcf/netcf_git.bb
> >+++ b/meta-networking/recipes-support/netcf/netcf_git.bb
> >@@ -32,12 +32,22 @@ do_configure_prepend() {
> >  do_install_append() {
> >      if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
> >         install -d ${D}${systemd_unitdir}/system
> >-       mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/
> >-       rm -rf ${D}${libdir}/systemd/
> >+       if [ -d "${D}${libdir}/systemd/system" ]; then
> >+           mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/
> >+           rm -rf ${D}${libdir}/systemd/
> >+       else
> >+           mv ${D}${nonarch_libdir}/systemd/system/* ${D}${systemd_unitdir}/system/
> >+           rm -rf ${D}${nonarch_libdir}/systemd/
> >+       fi
> >      else
> >         mv ${D}${sysconfdir}/rc.d/init.d/ ${D}${sysconfdir}
> >         rm -rf ${D}${sysconfdir}/rc.d/
> >      fi
> >  }
> >
> >+FILES_${PN} += " \
> >+        ${libdir} \
> >+        ${nonarch_libdir} \
> >+        "
> >+
> 
> a similar fix has been submitted,
> 
> 【oe] [PATCH][meta-networking] netcf: align the systemd file path with
> Makefile

I looked at that fix but from what I can tell it unconditionally deletes
the 32-bit netcf shared and static libs in a multilib configuration.
That squelches the QA warning, but it's probably not what we want.

-J.

> 
> 
> －Roy
> 
> >  SYSTEMD_SERVICE_${PN} = "netcf-transaction.service"
> >
> 
> -- 
> Best Reagrds,
> Roy | RongQing Li
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]