diff options
4 files changed, 148 insertions, 0 deletions
diff --git a/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Fix-usr-bin-sed-to-sed.patch b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Fix-usr-bin-sed-to-sed.patch new file mode 100644 index 0000000..ef11366 --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Fix-usr-bin-sed-to-sed.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | From 569886070a273e914f2662d10b03e1767d488aee Mon Sep 17 00:00:00 2001 | ||
2 | From: Lei Maohui <leimaohui@fujitsu.com> | ||
3 | Date: Wed, 18 May 2022 11:32:29 +0900 | ||
4 | Subject: [PATCH] Fix /usr/bin/sed to sed. | ||
5 | |||
6 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> | ||
7 | --- | ||
8 | doc/Makefile | 2 +- | ||
9 | etc/Makefile | 2 +- | ||
10 | utils/Makefile | 2 +- | ||
11 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
12 | |||
13 | diff --git a/doc/Makefile b/doc/Makefile | ||
14 | index 9ed025d..e121270 100644 | ||
15 | --- a/doc/Makefile | ||
16 | +++ b/doc/Makefile | ||
17 | @@ -7,7 +7,7 @@ ifeq ($(TOPDIR),) | ||
18 | TOPDIR = .. | ||
19 | endif | ||
20 | |||
21 | -SED = /usr/bin/sed | ||
22 | +SED = sed | ||
23 | INSTALL = install | ||
24 | |||
25 | DESTDIR ?= | ||
26 | diff --git a/etc/Makefile b/etc/Makefile | ||
27 | index d065319..2d98027 100644 | ||
28 | --- a/etc/Makefile | ||
29 | +++ b/etc/Makefile | ||
30 | @@ -19,7 +19,7 @@ initddir ?= $(etcdir)/init.d | ||
31 | |||
32 | HOMEDIR ?= $(etcdir)/iscsi | ||
33 | |||
34 | -SED = /usr/bin/sed | ||
35 | +SED = sed | ||
36 | INSTALL = install | ||
37 | |||
38 | SYSTEMD_SOURCE_FILES = iscsid.socket iscsiuio.socket | ||
39 | diff --git a/utils/Makefile b/utils/Makefile | ||
40 | index a7eb352..15539eb 100644 | ||
41 | --- a/utils/Makefile | ||
42 | +++ b/utils/Makefile | ||
43 | @@ -7,7 +7,7 @@ | ||
44 | # from the top-level make file. | ||
45 | # | ||
46 | |||
47 | -SED = /usr/bin/sed | ||
48 | +SED = sed | ||
49 | INSTALL = install | ||
50 | CHMOD = chmod | ||
51 | |||
52 | -- | ||
53 | 2.25.1 | ||
diff --git a/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Makefile-Fix-build-error-of-cross-build.patch b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Makefile-Fix-build-error-of-cross-build.patch new file mode 100644 index 0000000..bdb9e45 --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Makefile-Fix-build-error-of-cross-build.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From 69fa594af5a09e356319cc0ec2e71809ac964d9b Mon Sep 17 00:00:00 2001 | ||
2 | From: Lei Maohui <leimaohui@fujitsu.com> | ||
3 | Date: Wed, 18 May 2022 10:28:53 +0900 | ||
4 | Subject: [PATCH] Makefile: Fix build error of cross build. | ||
5 | |||
6 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> | ||
7 | --- | ||
8 | Makefile | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/Makefile b/Makefile | ||
12 | index d2f143b..127ba90 100644 | ||
13 | --- a/Makefile | ||
14 | +++ b/Makefile | ||
15 | @@ -69,7 +69,7 @@ user: iscsiuio/Makefile | ||
16 | @echo "Read README file for detailed information." | ||
17 | |||
18 | iscsiuio/Makefile: iscsiuio/configure iscsiuio/Makefile.in | ||
19 | - cd iscsiuio; ./configure $(WITHOUT_ARG) --sbindir=$(SBINDIR) | ||
20 | + cd iscsiuio; ./configure $(WITHOUT_ARG) --sbindir=$(SBINDIR) $(CONFIGURE_ARGS) | ||
21 | |||
22 | iscsiuio/configure: iscsiuio/configure.ac iscsiuio/Makefile.am | ||
23 | cd iscsiuio; autoreconf --install | ||
24 | -- | ||
25 | 2.25.1 | ||
diff --git a/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Modified-path-of-systemd-service-from-usr-lib-to-lib.patch b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Modified-path-of-systemd-service-from-usr-lib-to-lib.patch new file mode 100644 index 0000000..8cea597 --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Modified-path-of-systemd-service-from-usr-lib-to-lib.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From 280fbda492256d2ef70c6d377e8bd8935e7a4f9c Mon Sep 17 00:00:00 2001 | ||
2 | From: Lei Maohui <leimaohui@fujitsu.com> | ||
3 | Date: Fri, 20 May 2022 17:59:03 +0900 | ||
4 | Subject: [PATCH] Modified path of systemd service from /usr/lib to /lib. | ||
5 | |||
6 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> | ||
7 | --- | ||
8 | etc/Makefile | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/etc/Makefile b/etc/Makefile | ||
12 | index 2d98027..d24fd03 100644 | ||
13 | --- a/etc/Makefile | ||
14 | +++ b/etc/Makefile | ||
15 | @@ -7,7 +7,7 @@ ifeq ($(TOPDIR),) | ||
16 | TOPDIR = .. | ||
17 | endif | ||
18 | |||
19 | -prefix = /usr | ||
20 | +prefix = | ||
21 | DESTDIR ?= | ||
22 | SBINDIR ?= /sbin | ||
23 | |||
24 | -- | ||
25 | 2.25.1 | ||
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 new file mode 100644 index 0000000..b4b9ebc --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb | |||
@@ -0,0 +1,45 @@ | |||
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 autotools systemd 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-Makefile-Fix-build-error-of-cross-build.patch \ | ||
14 | file://0001-Fix-usr-bin-sed-to-sed.patch \ | ||
15 | file://0001-Modified-path-of-systemd-service-from-usr-lib-to-lib.patch \ | ||
16 | " | ||
17 | |||
18 | SRCREV = "7b53fcc502da8617110fd64d675b476772c28a6f" | ||
19 | |||
20 | S = "${WORKDIR}/git" | ||
21 | B = "${S}" | ||
22 | |||
23 | PARALLEL_MAKEINST = "" | ||
24 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
25 | EXTRA_OEMAKE += "CONFIGURE_ARGS='--host=${HOST_SYS}' MFLAGS='' LIB_DIR=${libdir}" | ||
26 | RDEPENDS:${PN} += "bash" | ||
27 | |||
28 | SYSTEMD_PACKAGES = "${PN}" | ||
29 | SYSTEMD_SERVICE:${PN} = "iscsi.service \ | ||
30 | iscsid.socket \ | ||
31 | iscsiuio.socket \ | ||
32 | iscsid.service \ | ||
33 | iscsi-init.service \ | ||
34 | iscsiuio.service \ | ||
35 | " | ||
36 | SYSTEMD_AUTO_ENABLE = "disable" | ||
37 | FILES:${PN} += " \ | ||
38 | ${systemd_system_unitdir}/iscsi.service \ | ||
39 | ${systemd_system_unitdir}/iscsid.socket \ | ||
40 | ${systemd_system_unitdir}/iscsiuio.socket \ | ||
41 | ${systemd_system_unitdir}/iscsid.service \ | ||
42 | ${systemd_system_unitdir}/iscsi-init.service \ | ||
43 | ${systemd_system_unitdir}/iscsiuio.service \ | ||
44 | ${systemd_unitdir}/system-generators/ibft-rule-generator \ | ||
45 | " | ||