From: "Bruce Ashfield" <bruce.ashfield@gmail.com>
To: zangrc <zangrc.fnst@fujitsu.com>
Cc: meta-virtualization@lists.yoctoproject.org
Subject: Re: [meta-virtualization] [PATCH] open-iscsi-user: Fix link errors
Date: Thu, 29 Jul 2021 11:03:07 -0400 [thread overview]
Message-ID: <20210729150304.GA41177@gmail.com> (raw)
In-Reply-To: <1627393477-28317-1-git-send-email-zangrc.fnst@fujitsu.com>
merged.
Bruce
In message: [meta-virtualization] [PATCH] open-iscsi-user: Fix link errors
on 27/07/2021 zangrc wrote:
> The wrong link caused conflicts with other packages, so the link error was fixed and the conflict handling was removed.
>
> Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com>
> ---
> .../open-iscsi/open-iscsi-user_2.1.4.bb | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.4.bb b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.4.bb
> index 73b5a66..b71d8dc 100644
> --- a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.4.bb
> +++ b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.4.bb
> @@ -29,12 +29,6 @@ do_compile () {
> oe_runmake user
> }
>
> -inherit update-alternatives
> -
> -ALTERNATIVE_PRIORITY = "60"
> -ALTERNATIVE_${PN}-dev = "libcap-ng.so"
> -ALTERNATIVE_LINK_NAME[libcap-ng.so] = "${libdir}/libcap-ng.so"
> -
> do_install () {
> oe_runmake DESTDIR="${D}" install_user
> install ${S}/etc/initd/initd.debian ${D}/etc/init.d/open-iscsi
> @@ -42,7 +36,7 @@ do_install () {
>
> install -d ${D}${libdir}
> install -Dm 0644 ${S}/libopeniscsiusr/libopeniscsiusr.so.0.2.0 ${D}${libdir}/
> - ln -sf ${libdir}/libopeniscsiusr.so.0.2.0 ${D}${libdir}/libcap-ng.so
> + ln -sf ${libdir}/libopeniscsiusr.so.0.2.0 ${D}${libdir}/libopeniscsiusr.so
> }
>
> # systemd support
> --
> 2.25.1
>
>
>
>
prev parent reply other threads:[~2021-07-29 15:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-27 13:44 [meta-virtualization] [PATCH] open-iscsi-user: Fix link errors zangrc
2021-07-29 15:03 ` Bruce Ashfield [this message]
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=20210729150304.GA41177@gmail.com \
--to=bruce.ashfield@gmail.com \
--cc=meta-virtualization@lists.yoctoproject.org \
--cc=zangrc.fnst@fujitsu.com \
/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 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.