aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzangrc <zangrc.fnst@fujitsu.com>2021-07-27 21:44:37 +0800
committerBruce Ashfield <bruce.ashfield@gmail.com>2021-07-29 11:02:50 -0400
commite887a996155f8b9f22d6aca0e31b5fbccd82751e (patch)
tree928178eea0fb6c9c57154091104b1edfac325eae
parentc171990e9ca1e70fee82794a5f0661732aaa575c (diff)
downloadmeta-cloud-services-e887a996155f8b9f22d6aca0e31b5fbccd82751e.tar.gz
meta-cloud-services-e887a996155f8b9f22d6aca0e31b5fbccd82751e.tar.bz2
meta-cloud-services-e887a996155f8b9f22d6aca0e31b5fbccd82751e.zip
open-iscsi-user: Fix link errors
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> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.4.bb8
1 files changed, 1 insertions, 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 73b5a661..b71d8dc1 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