open-iscsi-user: Fix conflict error with systemd and net-snmp-server-snmptrapd.

- reinstall service files
- deleted older version

Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 10 insertions, 60 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
deleted file mode 100644
index 928290f..0000000
--- a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.4.bb
+++ /dev/null
@@ -1,60 +0,0 @@
-DESCRIPTION = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720."
-HOMEPAGE = "http://www.open-iscsi.org/"
-LICENSE = "GPL-2.0-only"
-PR = "r1"
-
-inherit systemd autotools pkgconfig
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-DEPENDS = "kmod openssl util-linux open-isns"
-DEPENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
-
-SRC_URI = "git://github.com/open-iscsi/open-iscsi.git;protocol=https;branch=master \
-           file://0001-fix-build-error-of-cross-build.patch \
-           "
-
-SRCREV = "095f59ca464220eae285de6b5f2ee31185a6a84c"
-
-S = "${WORKDIR}/git"
-B = "${S}"
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-EXTRA_OEMAKE += "CONFIGURE_ARGS='--host=${HOST_SYS}'"
-
-do_configure () {
-    :
-}
-
-do_compile () {
-        oe_runmake user
-}
-
-do_install () {
-        oe_runmake DESTDIR="${D}" install_user
-        install ${S}/etc/initd/initd.debian ${D}/etc/init.d/open-iscsi
-        install -m 0644 ${S}/etc/iscsid.conf ${D}/etc/iscsi/
-
-        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}/libopeniscsiusr.so
-}
-
-# systemd support
-PACKAGES =+ "${PN}-systemd"
-RDEPENDS:${PN} += "bash"
-RDEPENDS:${PN}-systemd += "${PN}"
-FILES:${PN}-systemd +=  "${base_libdir}/systemd                  \
-                         ${sysconfdir}/default/iscsi-initiator   \
-                        "
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE:${PN}-systemd = "iscsi.service \
-                                 iscsiuio.service \
-                                 iscsid.service \
-                                 iscsi-init.service \
-                                 iscsid.socket \
-                                 iscsiuio.socket "
-
-do_install:append () {
-        install -d ${D}${systemd_unitdir}/system
-        install -m 0644 ${S}/etc/systemd/* ${D}${systemd_unitdir}/system/
-}
diff --git a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb
index b4b9ebc..8cedff4 100644
--- a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb
+++ b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb
@@ -43,3 +43,13 @@ FILES:${PN} += " \
     ${systemd_system_unitdir}/iscsiuio.service \
     ${systemd_unitdir}/system-generators/ibft-rule-generator \
 "
+
+do_install:append() {
+    rm -rf ${D}${systemd_unitdir}/
+
+    install -d ${D}${systemd_unitdir}/system
+    install -d ${D}${systemd_unitdir}/system-generators
+    install -m 0644 ${S}/etc/systemd/*.service ${D}${systemd_unitdir}/system/
+    install -m 0644 ${S}/etc/systemd/*.socket ${D}${systemd_unitdir}/system/
+    install -m 0644 ${S}/etc/systemd/ibft-rule-generator ${D}${systemd_unitdir}/system-generators/
+}