aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzangrc <zangrc.fnst@fujitsu.com>2021-07-09 09:36:24 +0800
committerBruce Ashfield <bruce.ashfield@gmail.com>2021-07-12 16:01:22 -0400
commitf99a5e405181858f4b913b13c886769ce1b3388f (patch)
tree766f938f87865b8aca79c0f824ea59dddd5d0724
parente62303eb5d332ed0ab7ef4e38bfa1211f4d43888 (diff)
downloadmeta-cloud-services-f99a5e405181858f4b913b13c886769ce1b3388f.tar.gz
meta-cloud-services-f99a5e405181858f4b913b13c886769ce1b3388f.tar.bz2
meta-cloud-services-f99a5e405181858f4b913b13c886769ce1b3388f.zip
open-iscsi-user: upgrade 2.0-873 -> 2.1.4
open-iscsi-2.1.3 - open-iscsi-2.1.4 Abhinav Rajagopalan (1): Fix typo in util.py Chris Leech (3): libopeniscsiusr: fix error messages libopeniscsiusr: skip over removed sessions libopeniscsiusr: dont error loudly if a session isn't found when working through iscsi_sessions_get() Fabian Möller (1): iscsid: Add NO_SYSTEMD to CFLAGS Helmut Grohne (1): Avoid hardcoding pkg-config to fix cross build John Schaeffer (1): Add etc/systemd/iscsi-init.service to SYSTEMDFILES Makefile variable Lee Duncan (4): iscsid: Do not allow conflicting pid-file options Fix iscsiadm segfault when exiting Fix iscsistart login issue when target is delayed. Enable iscsi.service asynchronous logins, cleanup services Matwey V. Kornilov (1): Wants=network-online.target in iscsi.service Patrick Lawrence (1): Change mkdir permissions to 0770, adjust usmask Wenchao Hao (4): idbm: Fix memory leak and NULL pointer dereference in idbm_rec_update_param() libopeniscsiusr: Fix memory leak in iscsi_nodes_get() libopeniscsiusr: Fix memory leak in iscsi_sessions_get() iscsiadm: Fix memory leak in iscsiadm 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/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 206da482..8eec2dc5 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 @@
-From 943a321104a5b2c4ac25bdb2ae81b5b208e3973c Mon Sep 17 00:00:00 2001
-From: Lei Maohui <leimaohui@cn.fujitsu.com>
-Date: Tue, 18 Aug 2015 10:29:35 +0900
+From 2ba83ff539c18d02f8e4b4ce7903a5b46f364609 Mon Sep 17 00:00:00 2001
+From: Lei Maohui <leimaohui@fujitsu.com>
+Date: Thu, 8 Jul 2021 15:06:27 +0900
Subject: [PATCH] fix build error of cross build
The error likes as following
| configure: error: cannot run C compiled programs.
| If you meant to cross compile, use `--host'.
-Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
+Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index c5d9700..1f31e43 100644
+index 7f52cc8..cadbc47 100644
--- a/Makefile
+++ b/Makefile
-@@ -42,7 +42,7 @@ user: utils/open-isns/Makefile
+@@ -78,7 +78,7 @@ user: iscsiuio/Makefile
@echo "Read README file for detailed information."
- utils/open-isns/Makefile: utils/open-isns/configure utils/open-isns/Makefile.in
-- cd utils/open-isns; ./configure CFLAGS="$(OPTFLAGS)" --with-security=no
-+ cd utils/open-isns; ./configure CFLAGS="$(OPTFLAGS)" --with-security=no ${CONFIGURE_ARGS}
+ iscsiuio/Makefile: iscsiuio/configure iscsiuio/Makefile.in
+- cd iscsiuio; ./configure $(WITHOUT_ARG)
++ cd iscsiuio; ./configure $(WITHOUT_ARG) $(CONFIGURE_ARGS)
- kernel: force
- $(MAKE) -C kernel
+ iscsiuio/configure iscsiuio/Makefile.in: iscsiuio/configure.ac iscsiuio/Makefile.am
+ cd iscsiuio; autoreconf --install
--
-1.8.4.2
+2.25.1
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 4c9326ee..00000000
--- a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-873.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-DESCRIPTION = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720."
-HOMEPAGE = "http://www.open-iscsi.org/"
-LICENSE = "GPLv2"
-PR = "r1"
-
-inherit systemd
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-SRC_URI = "http://www.open-iscsi.org/bits/open-iscsi-${PV}.tar.gz \
- file://0001-fix-build-error-of-cross-build.patch \
- file://open-iscsi \
- file://initiatorname.iscsi \
- "
-
-
-S = "${WORKDIR}/open-iscsi-${PV}"
-TARGET_CC_ARCH += "${LDFLAGS}"
-EXTRA_OEMAKE += "CONFIGURE_ARGS='--host=${HOST_SYS}'"
-
-do_compile () {
- oe_runmake user
-}
-
-do_install () {
- oe_runmake DESTDIR="${D}" install_user
- cp -f "${WORKDIR}/open-iscsi" "${D}/etc/init.d/"
- install -m 0644 ${WORKDIR}/initiatorname.iscsi ${D}/etc/iscsi/initiatorname.iscsi
-}
-
-
-SRC_URI[md5sum] = "8b8316d7c9469149a6cc6234478347f7"
-SRC_URI[sha256sum] = "7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9"
-
-# systemd support
-PACKAGES =+ "${PN}-systemd"
-SRC_URI_append = " file://iscsi-initiator \
- file://iscsi-initiator.service \
- file://iscsi-initiator-targets.service \
- "
-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-initiator.service iscsi-initiator-targets.service"
-
-do_install_append () {
- install -d ${D}${sysconfdir}/default/
- install -m 0644 ${WORKDIR}/iscsi-initiator ${D}${sysconfdir}/default/
- install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${WORKDIR}/iscsi-initiator.service ${D}${systemd_unitdir}/system/
- install -m 0644 ${WORKDIR}/iscsi-initiator-targets.service ${D}${systemd_unitdir}/system/
-}
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 00000000..139ce1db
--- /dev/null
+++ b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.4.bb
@@ -0,0 +1,61 @@
+DESCRIPTION = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720."
+HOMEPAGE = "http://www.open-iscsi.org/"
+LICENSE = "GPLv2"
+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 \
+ 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}/libcap-ng.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/
+}