[meta-virtualization][m-c-s][PATCH 1/3] open-iscsi-user: Update the Upstream-Status accordingly

[meta-virtualization][m-c-s][PATCH 1/3] open-iscsi-user: Update the Upstream-Status accordingly

[Lei Maohui]

Fix the "QA Issue: Missing Upstream-Status in patch"

Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
---
 .../open-iscsi/files/0001-Fix-usr-bin-sed-to-sed.patch           | 1 +
 .../files/0001-Makefile-Fix-build-error-of-cross-build.patch     | 1 +
 ...01-Modified-path-of-systemd-service-from-usr-lib-to-lib.patch | 1 +
 .../open-iscsi/files/0001-fix-build-error-of-cross-build.patch   | 1 +
 4 files changed, 4 insertions(+)

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
index ef11366b..437c876a 100644
--- 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
@@ -3,6 +3,7 @@ From: Lei Maohui <leimaohui@fujitsu.com>
 Date: Wed, 18 May 2022 11:32:29 +0900
 Subject: [PATCH] Fix /usr/bin/sed to sed.
 
+Upstream-Status: Pending
 Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
 ---
  doc/Makefile   | 2 +-
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
index bdb9e45f..facca528 100644
--- 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
@@ -3,6 +3,7 @@ From: Lei Maohui <leimaohui@fujitsu.com>
 Date: Wed, 18 May 2022 10:28:53 +0900
 Subject: [PATCH] Makefile: Fix build error of cross build.
 
+Upstream-Status: Pending
 Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
 ---
  Makefile | 2 +-
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
index 8cea597e..aa1b5a30 100644
--- 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
@@ -3,6 +3,7 @@ From: Lei Maohui <leimaohui@fujitsu.com>
 Date: Fri, 20 May 2022 17:59:03 +0900
 Subject: [PATCH] Modified path of systemd service from /usr/lib to /lib.
 
+Upstream-Status: Pending
 Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
 ---
  etc/Makefile | 2 +-
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 8eec2dc5..ee1edead 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
@@ -7,6 +7,7 @@ The error likes as following
 | configure: error: cannot run C compiled programs.
 | If you meant to cross compile, use `--host'.
 
+Upstream-Status: Pending
 Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
 ---
  Makefile | 2 +-
-- 
2.43.0

[meta-virtualization][m-c-s][PATCH 2/3] open-iscsi-user: fix "no configure script found at ./configure"

[Lei Maohui]

1. open-iscsi's configure file is under iscsiuio/configure
2. according to open-iscsi repo README, need "autoreconf --install" when configure

Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
---
 .../recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb  | 4 ++++
 1 file changed, 4 insertions(+)

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 1f84508f..8d13ea44 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
@@ -44,6 +44,10 @@ FILES:${PN} += " \
     ${systemd_unitdir}/system-generators/ibft-rule-generator \
 "
 
+do_configure() {
+    cd ${S}/iscsiuio; autoreconf --install
+}
+
 do_install() {
     oe_runmake install DESTDIR=${D} prefix=${exec_prefix} LIBDIR=${libdir} sbindir=${sbindir} SBINDIR=${sbindir} systemddir=${systemd_unitdir}
 }
-- 
2.43.0

[meta-virtualization][m-c-s][PATCH 3/3] open-iscsi-user: fix calloc-transposed-args issue

[Lei Maohui]

Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
---
 ...Fix-the-calloc-transposed-args-issue.patch | 32 +++++++++++++++++++
 .../open-iscsi/open-iscsi-user_2.1.7.bb       |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 meta-openstack/recipes-connectivity/open-iscsi/files/0001-Fix-the-calloc-transposed-args-issue.patch

diff --git a/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Fix-the-calloc-transposed-args-issue.patch b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Fix-the-calloc-transposed-args-issue.patch
new file mode 100644
index 00000000..3b4acd8d
--- /dev/null
+++ b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Fix-the-calloc-transposed-args-issue.patch
@@ -0,0 +1,32 @@
+From 5a16752432b486b8e1d299142723ded284b81984 Mon Sep 17 00:00:00 2001
+From: Lei Maohui <leimaohui@fujitsu.com>
+Date: Mon, 7 Apr 2025 06:47:46 +0000
+Subject: [PATCH] Fix the calloc-transposed-args issue
+
+| fwparam_ppc.c:349:45: error: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args]
+|   349 |                         dev = calloc(sizeof(struct ofw_dev), 1);
+|       |                                             ^~~~~~
+| fwparam_ppc.c:349:45: note: earlier argument should specify number of elements, later size of each element
+
+Upstream-Status: Submitted [https://github.com/open-iscsi/open-iscsi/pull/504]
+Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
+---
+ usr/fwparam_ibft/fwparam_ppc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/usr/fwparam_ibft/fwparam_ppc.c b/usr/fwparam_ibft/fwparam_ppc.c
+index 7013d6c..74df13d 100644
+--- a/usr/fwparam_ibft/fwparam_ppc.c
++++ b/usr/fwparam_ibft/fwparam_ppc.c
+@@ -346,7 +346,7 @@ static int find_initiator(const char *fpath,
+ 				      "/aliases/iscsi-disk"))) {
+ 
+ 		if (dev_count < OFWDEV_MAX) {
+-			dev = calloc(sizeof(struct ofw_dev), 1);
++			dev = calloc(1, sizeof(struct ofw_dev));
+ 			if (!dev)
+ 				return -ENOMEM;
+ 
+-- 
+2.43.0
+
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 8d13ea44..d92404ac 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
@@ -13,6 +13,7 @@ SRC_URI = "git://github.com/open-iscsi/open-iscsi.git;protocol=https;branch=mast
            file://0001-Makefile-Fix-build-error-of-cross-build.patch \
            file://0001-Fix-usr-bin-sed-to-sed.patch \
            file://0001-Modified-path-of-systemd-service-from-usr-lib-to-lib.patch \
+           file://0001-Fix-the-calloc-transposed-args-issue.patch \
            "
 
 SRCREV = "7b53fcc502da8617110fd64d675b476772c28a6f"
-- 
2.43.0

Re: [meta-virtualization][m-c-s][PATCH 1/3] open-iscsi-user: Update the Upstream-Status accordingly

[Bruce Ashfield]

All three patches are applied.

Bruce

In message: [meta-virtualization][m-c-s][PATCH 1/3] open-iscsi-user: Update the Upstream-Status accordingly
on 07/04/2025 Lei Maohui wrote:

> Fix the "QA Issue: Missing Upstream-Status in patch"
> 
> Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
> ---
>  .../open-iscsi/files/0001-Fix-usr-bin-sed-to-sed.patch           | 1 +
>  .../files/0001-Makefile-Fix-build-error-of-cross-build.patch     | 1 +
>  ...01-Modified-path-of-systemd-service-from-usr-lib-to-lib.patch | 1 +
>  .../open-iscsi/files/0001-fix-build-error-of-cross-build.patch   | 1 +
>  4 files changed, 4 insertions(+)
> 
> 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
> index ef11366b..437c876a 100644
> --- 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
> @@ -3,6 +3,7 @@ From: Lei Maohui <leimaohui@fujitsu.com>
>  Date: Wed, 18 May 2022 11:32:29 +0900
>  Subject: [PATCH] Fix /usr/bin/sed to sed.
>  
> +Upstream-Status: Pending
>  Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
>  ---
>   doc/Makefile   | 2 +-
> 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
> index bdb9e45f..facca528 100644
> --- 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
> @@ -3,6 +3,7 @@ From: Lei Maohui <leimaohui@fujitsu.com>
>  Date: Wed, 18 May 2022 10:28:53 +0900
>  Subject: [PATCH] Makefile: Fix build error of cross build.
>  
> +Upstream-Status: Pending
>  Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
>  ---
>   Makefile | 2 +-
> 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
> index 8cea597e..aa1b5a30 100644
> --- 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
> @@ -3,6 +3,7 @@ From: Lei Maohui <leimaohui@fujitsu.com>
>  Date: Fri, 20 May 2022 17:59:03 +0900
>  Subject: [PATCH] Modified path of systemd service from /usr/lib to /lib.
>  
> +Upstream-Status: Pending
>  Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
>  ---
>   etc/Makefile | 2 +-
> 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 8eec2dc5..ee1edead 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
> @@ -7,6 +7,7 @@ The error likes as following
>  | configure: error: cannot run C compiled programs.
>  | If you meant to cross compile, use `--host'.
>  
> +Upstream-Status: Pending
>  Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
>  ---
>   Makefile | 2 +-
> -- 
> 2.43.0
>