diff options
author | leimaohui <leimaohui@fujitsu.com> | 2022-06-07 11:15:06 +0800 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-06-07 10:04:41 -0400 |
commit | 2284490c3e2f81716fcd7dfcee8d74ca54912334 (patch) | |
tree | 7daf00947d30893f29c9181863a3364f5b8c10f3 | |
parent | 58de4a7436b0636ef7daf9dd635c5be780e9f4f8 (diff) | |
download | meta-cloud-services-2284490c3e2f81716fcd7dfcee8d74ca54912334.tar.gz |
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>
-rw-r--r-- | meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.4.bb | 60 | ||||
-rw-r--r-- | meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb | 10 |
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 @@ | |||
1 | DESCRIPTION = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720." | ||
2 | HOMEPAGE = "http://www.open-iscsi.org/" | ||
3 | LICENSE = "GPL-2.0-only" | ||
4 | PR = "r1" | ||
5 | |||
6 | inherit systemd autotools pkgconfig | ||
7 | |||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
9 | DEPENDS = "kmod openssl util-linux open-isns" | ||
10 | DEPENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | ||
11 | |||
12 | SRC_URI = "git://github.com/open-iscsi/open-iscsi.git;protocol=https;branch=master \ | ||
13 | file://0001-fix-build-error-of-cross-build.patch \ | ||
14 | " | ||
15 | |||
16 | SRCREV = "095f59ca464220eae285de6b5f2ee31185a6a84c" | ||
17 | |||
18 | S = "${WORKDIR}/git" | ||
19 | B = "${S}" | ||
20 | |||
21 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
22 | EXTRA_OEMAKE += "CONFIGURE_ARGS='--host=${HOST_SYS}'" | ||
23 | |||
24 | do_configure () { | ||
25 | : | ||
26 | } | ||
27 | |||
28 | do_compile () { | ||
29 | oe_runmake user | ||
30 | } | ||
31 | |||
32 | do_install () { | ||
33 | oe_runmake DESTDIR="${D}" install_user | ||
34 | install ${S}/etc/initd/initd.debian ${D}/etc/init.d/open-iscsi | ||
35 | install -m 0644 ${S}/etc/iscsid.conf ${D}/etc/iscsi/ | ||
36 | |||
37 | install -d ${D}${libdir} | ||
38 | install -Dm 0644 ${S}/libopeniscsiusr/libopeniscsiusr.so.0.2.0 ${D}${libdir}/ | ||
39 | ln -sf ${libdir}/libopeniscsiusr.so.0.2.0 ${D}${libdir}/libopeniscsiusr.so | ||
40 | } | ||
41 | |||
42 | # systemd support | ||
43 | PACKAGES =+ "${PN}-systemd" | ||
44 | RDEPENDS:${PN} += "bash" | ||
45 | RDEPENDS:${PN}-systemd += "${PN}" | ||
46 | FILES:${PN}-systemd += "${base_libdir}/systemd \ | ||
47 | ${sysconfdir}/default/iscsi-initiator \ | ||
48 | " | ||
49 | SYSTEMD_PACKAGES = "${PN}-systemd" | ||
50 | SYSTEMD_SERVICE:${PN}-systemd = "iscsi.service \ | ||
51 | iscsiuio.service \ | ||
52 | iscsid.service \ | ||
53 | iscsi-init.service \ | ||
54 | iscsid.socket \ | ||
55 | iscsiuio.socket " | ||
56 | |||
57 | do_install:append () { | ||
58 | install -d ${D}${systemd_unitdir}/system | ||
59 | install -m 0644 ${S}/etc/systemd/* ${D}${systemd_unitdir}/system/ | ||
60 | } | ||
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} += " \ | |||
43 | ${systemd_system_unitdir}/iscsiuio.service \ | 43 | ${systemd_system_unitdir}/iscsiuio.service \ |
44 | ${systemd_unitdir}/system-generators/ibft-rule-generator \ | 44 | ${systemd_unitdir}/system-generators/ibft-rule-generator \ |
45 | " | 45 | " |
46 | |||
47 | do_install:append() { | ||
48 | rm -rf ${D}${systemd_unitdir}/ | ||
49 | |||
50 | install -d ${D}${systemd_unitdir}/system | ||
51 | install -d ${D}${systemd_unitdir}/system-generators | ||
52 | install -m 0644 ${S}/etc/systemd/*.service ${D}${systemd_unitdir}/system/ | ||
53 | install -m 0644 ${S}/etc/systemd/*.socket ${D}${systemd_unitdir}/system/ | ||
54 | install -m 0644 ${S}/etc/systemd/ibft-rule-generator ${D}${systemd_unitdir}/system-generators/ | ||
55 | } | ||