iscsi-initiator-utils: upgrade 2.1.7 -> 2.1.8

0002-iscsiuio-Use-pthread_t-for-INVALID_THREAD.patch
removed since it's included in 2.1.8.

0001-Makefile-Do-not-set-Werror.patch
refreshed for 2.1.8

Changelog:
===========
 make: avoid hard-coding path to sed (#357)
 etc: install system unit with without executable bit (#354)
 Add ability for MGMT IPC to check UID only
 Use config for iscsistart and iscsiadm fw login
 iscsiuio: Use pthread_t for INVALID_THREAD (#363)
 Add a 'distclean' Makefile top-level target
 Cleanup fwparam makefile (#360)
 Small bug fixes (#364)
 Use meson as the main build system (#365)
 libopeniscsiusr: cleanup recent reallocarray->realloc change (#369)
 Added examples in man file for iscsiadm session commands.
 iscsid: fix logout pdu send failure handling
 Update README's error handler/timeout section
 iscsiuio: fix LDADD
 libopeniscsiusr: use realloc instead of reallocarray (#368)
 iscsiadm: enable specify iface name-value parameters when creating iface
 Fix a possible passing null pointer in usr/iface.c (#356)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu 2023-02-16 16:33:20 +08:00 committed by Khem Raj
parent b448af492d
commit c24f88a02b
3 changed files with 7 additions and 33 deletions

View File

@ -9,13 +9,12 @@ warning as errors
Upstream-Status: Inappropriate [OE-Specific]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
usr/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr/Makefile b/usr/Makefile
index 3fc2248..2b5a234 100644
index 84f33bc..9e7b839 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -44,7 +44,7 @@ HOMEDIR ?= $(etcdir)/iscsi
@ -25,5 +24,8 @@ index 3fc2248..2b5a234 100644
-WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common
+WARNFLAGS ?= -Wall -Wextra -Wstrict-prototypes -fno-common
CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
-I$(TOPDIR)/libopeniscsiusr
CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
-I$(TOPDIR)/libopeniscsiusr \
-DISCSI_VERSION_STR=\"$(ISCSI_VERSION_STR)\"
--
2.34.1

View File

@ -1,27 +0,0 @@
From ef54a6f4a81da8ab653d352bfbd3b2521ce9eb7c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 29 Aug 2022 15:55:32 -0700
Subject: [PATCH] iscsiuio: Use pthread_t for INVALID_THREAD
pthread_t is opaque, therefore avoid compiler errors on musl when
compiling since pthread_t is not a plain old data type, like glibc
Upstream-Status: Submitted [https://github.com/open-iscsi/open-iscsi/pull/363]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
iscsiuio/src/unix/options.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/iscsiuio/src/unix/options.h b/iscsiuio/src/unix/options.h
index 63b8635..873a98a 100644
--- a/iscsiuio/src/unix/options.h
+++ b/iscsiuio/src/unix/options.h
@@ -86,7 +86,7 @@
#define DEBUG_ON 0x2
#define INVALID_FD -1
-#define INVALID_THREAD -1
+#define INVALID_THREAD (pthread_t)-1
#define INVALID_HOST_NO -1
struct options {

View File

@ -12,7 +12,7 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRCREV = "7b53fcc502da8617110fd64d675b476772c28a6f"
SRCREV = "543ba0f15d340b97f30782308cec424a6738fec3"
SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \
file://0001-Makefile-Do-not-set-Werror.patch \
@ -22,7 +22,6 @@ SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \
file://iscsi-initiator.service \
file://iscsi-initiator-targets.service \
file://set_initiatorname \
file://0002-iscsiuio-Use-pthread_t-for-INVALID_THREAD.patch \
"
S = "${WORKDIR}/git"