summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-connectivity/open-iscsi
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openstack/recipes-connectivity/open-iscsi')
-rw-r--r--meta-openstack/recipes-connectivity/open-iscsi/files/0001-fix-build-error-of-cross-build.patch24
-rw-r--r--meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-873.bb55
-rw-r--r--meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.4.bb61
3 files changed, 73 insertions, 67 deletions
diff --git a/meta-openstack/recipes-connectivity/open-iscsi/files/0001-fix-build-error-of-cross-build.patch b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-fix-build-error-of-cross-build.patch
index 206da48..8eec2dc 100644
--- a/meta-openstack/recipes-connectivity/open-iscsi/files/0001-fix-build-error-of-cross-build.patch
+++ b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-fix-build-error-of-cross-build.patch
@@ -1,30 +1,30 @@
1From 943a321104a5b2c4ac25bdb2ae81b5b208e3973c Mon Sep 17 00:00:00 2001 1From 2ba83ff539c18d02f8e4b4ce7903a5b46f364609 Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@cn.fujitsu.com> 2From: Lei Maohui <leimaohui@fujitsu.com>
3Date: Tue, 18 Aug 2015 10:29:35 +0900 3Date: Thu, 8 Jul 2021 15:06:27 +0900
4Subject: [PATCH] fix build error of cross build 4Subject: [PATCH] fix build error of cross build
5 5
6The error likes as following 6The error likes as following
7| configure: error: cannot run C compiled programs. 7| configure: error: cannot run C compiled programs.
8| If you meant to cross compile, use `--host'. 8| If you meant to cross compile, use `--host'.
9 9
10Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> 10Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
11--- 11---
12 Makefile | 2 +- 12 Makefile | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/Makefile b/Makefile 15diff --git a/Makefile b/Makefile
16index c5d9700..1f31e43 100644 16index 7f52cc8..cadbc47 100644
17--- a/Makefile 17--- a/Makefile
18+++ b/Makefile 18+++ b/Makefile
19@@ -42,7 +42,7 @@ user: utils/open-isns/Makefile 19@@ -78,7 +78,7 @@ user: iscsiuio/Makefile
20 @echo "Read README file for detailed information." 20 @echo "Read README file for detailed information."
21 21
22 utils/open-isns/Makefile: utils/open-isns/configure utils/open-isns/Makefile.in 22 iscsiuio/Makefile: iscsiuio/configure iscsiuio/Makefile.in
23- cd utils/open-isns; ./configure CFLAGS="$(OPTFLAGS)" --with-security=no 23- cd iscsiuio; ./configure $(WITHOUT_ARG)
24+ cd utils/open-isns; ./configure CFLAGS="$(OPTFLAGS)" --with-security=no ${CONFIGURE_ARGS} 24+ cd iscsiuio; ./configure $(WITHOUT_ARG) $(CONFIGURE_ARGS)
25 25
26 kernel: force 26 iscsiuio/configure iscsiuio/Makefile.in: iscsiuio/configure.ac iscsiuio/Makefile.am
27 $(MAKE) -C kernel 27 cd iscsiuio; autoreconf --install
28-- 28--
291.8.4.2 292.25.1
30 30
diff --git a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-873.bb b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-873.bb
deleted file mode 100644
index 4c9326e..0000000
--- a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-873.bb
+++ /dev/null
@@ -1,55 +0,0 @@
1DESCRIPTION = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720."
2HOMEPAGE = "http://www.open-iscsi.org/"
3LICENSE = "GPLv2"
4PR = "r1"
5
6inherit systemd
7
8LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
9
10SRC_URI = "http://www.open-iscsi.org/bits/open-iscsi-${PV}.tar.gz \
11 file://0001-fix-build-error-of-cross-build.patch \
12 file://open-iscsi \
13 file://initiatorname.iscsi \
14 "
15
16
17S = "${WORKDIR}/open-iscsi-${PV}"
18TARGET_CC_ARCH += "${LDFLAGS}"
19EXTRA_OEMAKE += "CONFIGURE_ARGS='--host=${HOST_SYS}'"
20
21do_compile () {
22 oe_runmake user
23}
24
25do_install () {
26 oe_runmake DESTDIR="${D}" install_user
27 cp -f "${WORKDIR}/open-iscsi" "${D}/etc/init.d/"
28 install -m 0644 ${WORKDIR}/initiatorname.iscsi ${D}/etc/iscsi/initiatorname.iscsi
29}
30
31
32SRC_URI[md5sum] = "8b8316d7c9469149a6cc6234478347f7"
33SRC_URI[sha256sum] = "7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9"
34
35# systemd support
36PACKAGES =+ "${PN}-systemd"
37SRC_URI_append = " file://iscsi-initiator \
38 file://iscsi-initiator.service \
39 file://iscsi-initiator-targets.service \
40 "
41RDEPENDS_${PN} += "bash"
42RDEPENDS_${PN}-systemd += "${PN}"
43FILES_${PN}-systemd += " ${base_libdir}/systemd \
44 ${sysconfdir}/default/iscsi-initiator \
45 "
46SYSTEMD_PACKAGES = "${PN}-systemd"
47SYSTEMD_SERVICE_${PN}-systemd = "iscsi-initiator.service iscsi-initiator-targets.service"
48
49do_install_append () {
50 install -d ${D}${sysconfdir}/default/
51 install -m 0644 ${WORKDIR}/iscsi-initiator ${D}${sysconfdir}/default/
52 install -d ${D}${systemd_unitdir}/system
53 install -m 0644 ${WORKDIR}/iscsi-initiator.service ${D}${systemd_unitdir}/system/
54 install -m 0644 ${WORKDIR}/iscsi-initiator-targets.service ${D}${systemd_unitdir}/system/
55}
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
new file mode 100644
index 0000000..139ce1d
--- /dev/null
+++ b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.4.bb
@@ -0,0 +1,61 @@
1DESCRIPTION = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720."
2HOMEPAGE = "http://www.open-iscsi.org/"
3LICENSE = "GPLv2"
4PR = "r1"
5
6inherit systemd autotools pkgconfig
7
8LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
9DEPENDS = "kmod openssl util-linux open-isns"
10DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
11
12SRC_URI = "git://github.com/open-iscsi/open-iscsi.git;protocol=https \
13 file://0001-fix-build-error-of-cross-build.patch \
14 "
15
16SRCREV = "095f59ca464220eae285de6b5f2ee31185a6a84c"
17
18S = "${WORKDIR}/git"
19B = "${S}"
20
21TARGET_CC_ARCH += "${LDFLAGS}"
22EXTRA_OEMAKE += "CONFIGURE_ARGS='--host=${HOST_SYS}'"
23
24do_configure () {
25 :
26}
27
28do_compile () {
29 oe_runmake user
30}
31
32
33do_install () {
34 oe_runmake DESTDIR="${D}" install_user
35 install ${S}/etc/initd/initd.debian ${D}/etc/init.d/open-iscsi
36 install -m 0644 ${S}/etc/iscsid.conf ${D}/etc/iscsi/
37
38 install -d ${D}${libdir}
39 install -Dm 0644 ${S}/libopeniscsiusr/libopeniscsiusr.so.0.2.0 ${D}${libdir}/
40 ln -sf ${libdir}/libopeniscsiusr.so.0.2.0 ${D}${libdir}/libcap-ng.so
41}
42
43# systemd support
44PACKAGES =+ "${PN}-systemd"
45RDEPENDS_${PN} += "bash"
46RDEPENDS_${PN}-systemd += "${PN}"
47FILES_${PN}-systemd += "${base_libdir}/systemd \
48 ${sysconfdir}/default/iscsi-initiator \
49 "
50SYSTEMD_PACKAGES = "${PN}-systemd"
51SYSTEMD_SERVICE_${PN}-systemd = "iscsi.service \
52 iscsiuio.service \
53 iscsid.service \
54 iscsi-init.service \
55 iscsid.socket \
56 iscsiuio.socket "
57
58do_install_append () {
59 install -d ${D}${systemd_unitdir}/system
60 install -m 0644 ${S}/etc/systemd/* ${D}${systemd_unitdir}/system/
61}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 09:25:23 +0000