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 <[email protected]> > --- > .../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 > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6694): https://lists.yoctoproject.org/g/meta-virtualization/message/6694 Mute This Topic: https://lists.yoctoproject.org/mt/84473428/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
