From: Rongqing Li <rongqing.li@windriver.com>
To: <openembedded-devel@lists.openembedded.org>
Subject: Re: [meta-networking][PATCH] netcf: support multilib builds
Date: Tue, 18 Aug 2015 11:33:10 +0800 [thread overview]
Message-ID: <55D2A776.4020701@windriver.com> (raw)
In-Reply-To: <1439868248-25769-1-git-send-email-joe_macdonald@mentor.com>
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
-Roy
> SYSTEMD_SERVICE_${PN} = "netcf-transaction.service"
>
--
Best Reagrds,
Roy | RongQing Li
next prev parent reply other threads:[~2015-08-18 3:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-18 3:24 [meta-networking][PATCH] netcf: support multilib builds Joe MacDonald
2015-08-18 3:33 ` Rongqing Li [this message]
2015-08-19 19:01 ` Joe MacDonald
2015-08-20 1:50 ` Rongqing Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55D2A776.4020701@windriver.com \
--to=rongqing.li@windriver.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox