summaryrefslogtreecommitdiffstats
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
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 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 () {
29 oe_runmake user 29 oe_runmake user
30} 30}
31 31
32inherit update-alternatives
33
34ALTERNATIVE_PRIORITY = "60"
35ALTERNATIVE_${PN}-dev = "libcap-ng.so"
36ALTERNATIVE_LINK_NAME[libcap-ng.so] = "${libdir}/libcap-ng.so"
37
38do_install () { 32do_install () {
39 oe_runmake DESTDIR="${D}" install_user 33 oe_runmake DESTDIR="${D}" install_user
40 install ${S}/etc/initd/initd.debian ${D}/etc/init.d/open-iscsi 34 install ${S}/etc/initd/initd.debian ${D}/etc/init.d/open-iscsi
@@ -42,7 +36,7 @@ do_install () {
42 36
43 install -d ${D}${libdir} 37 install -d ${D}${libdir}
44 install -Dm 0644 ${S}/libopeniscsiusr/libopeniscsiusr.so.0.2.0 ${D}${libdir}/ 38 install -Dm 0644 ${S}/libopeniscsiusr/libopeniscsiusr.so.0.2.0 ${D}${libdir}/
45 ln -sf ${libdir}/libopeniscsiusr.so.0.2.0 ${D}${libdir}/libcap-ng.so 39 ln -sf ${libdir}/libopeniscsiusr.so.0.2.0 ${D}${libdir}/libopeniscsiusr.so
46} 40}
47 41
48# systemd support 42# systemd support