diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-08-29 16:02:40 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-08-30 00:14:58 -0700 |
commit | 2bbccfe1aeed9114d1146f57d7fdb0811a19f9ec (patch) | |
tree | 8190f52a405feef796f11f4834c33d7f04786673 /meta-networking/recipes-daemons/iscsi-initiator-utils | |
parent | e458eb326dd35c42cd3da8e246ead98c909daa07 (diff) | |
download | meta-openembedded-contrib-2bbccfe1aeed9114d1146f57d7fdb0811a19f9ec.tar.gz |
iscsi-initiator-utils: Upgrade to 2.1.7
Fix build on musl by using proper typecast for pthread_t
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-daemons/iscsi-initiator-utils')
-rw-r--r-- | meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch | 12 | ||||
-rw-r--r-- | meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-Use-pthread_t-for-INVALID_THREAD.patch | 27 | ||||
-rw-r--r-- | meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.7.bb (renamed from meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.6.bb) | 3 |
3 files changed, 34 insertions, 8 deletions
diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch index d5e0deb899..ab6ff6e131 100644 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch @@ -1,4 +1,4 @@ -From 31d88f46bfc67de2659991674253a5d5dfb92afc Mon Sep 17 00:00:00 2001 +From 6afdfbdf1ecf3e7e9158734a3994a57ea151d680 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 12 Aug 2020 12:00:29 -0700 Subject: [PATCH] Makefile: Do not set -Werror @@ -9,16 +9,17 @@ 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 21bb154..0018605 100644 +index 3fc2248..2b5a234 100644 --- a/usr/Makefile +++ b/usr/Makefile -@@ -35,7 +35,7 @@ endif - PKG_CONFIG = /usr/bin/pkg-config +@@ -44,7 +44,7 @@ HOMEDIR ?= $(etcdir)/iscsi + PKG_CONFIG ?= /usr/bin/pkg-config CFLAGS ?= -O2 -g -WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common @@ -26,6 +27,3 @@ index 21bb154..0018605 100644 CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ -I$(TOPDIR)/libopeniscsiusr CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) --- -2.28.0 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-Use-pthread_t-for-INVALID_THREAD.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-Use-pthread_t-for-INVALID_THREAD.patch new file mode 100644 index 0000000000..02669e9c80 --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-Use-pthread_t-for-INVALID_THREAD.patch @@ -0,0 +1,27 @@ +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 { diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.6.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.7.bb index 921f7d4883..63155b4811 100644 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.6.bb +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.7.bb @@ -12,7 +12,7 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d) LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV ?= "ee575fd19429ec6dc24b49f2ce3822b4a01f57de" +SRCREV = "7b53fcc502da8617110fd64d675b476772c28a6f" SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \ file://0001-Makefile-Do-not-set-Werror.patch \ @@ -22,6 +22,7 @@ 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" |