diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /sys-block/open-iscsi/files | |
parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) |
gentoo resync : 29.12.2022
Diffstat (limited to 'sys-block/open-iscsi/files')
4 files changed, 145 insertions, 81 deletions
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.6-Makefiles.patch b/sys-block/open-iscsi/files/open-iscsi-2.1.6-Makefiles.patch deleted file mode 100644 index a25acc0c85db..000000000000 --- a/sys-block/open-iscsi/files/open-iscsi-2.1.6-Makefiles.patch +++ /dev/null @@ -1,81 +0,0 @@ -https://github.com/open-iscsi/open-iscsi/pull/333 - -It's not the full series from that PR yet because -our previous patch handles some of it (the most important bits) -and some layout changed upstream pre-next release. - -From 96667e0e06a65c94fd875db048776aad29eea829 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sun, 3 Apr 2022 03:22:32 +0100 -Subject: [PATCH] iscsiuio: don't clobber LDFLAGS in configure.ac - -The systemd check currently clobbers LDFLAGS from the environment -rather than appending to it. - -But we actually want LIBS here anyway, rather than LDFLAGS. - -Signed-off-by: Sam James <sam@gentoo.org> ---- a/iscsiuio/configure.ac -+++ b/iscsiuio/configure.ac -@@ -72,7 +72,7 @@ AC_ARG_WITH([systemd], - *) AC_MSG_ERROR([bad value $withval for --with-systemd]) ;; - esac],[with_libsystemd=auto]) - AS_IF([test "$with_libsystemd" != no],[ -- PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[LDFLAGS=$LIBSYSTEMD_LIBS],[ -+ PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[LIBS="${LIBS} $LIBSYSTEMD_LIBS"],[ - if test "$with_libsystemd" = yes; then - AC_MSG_ERROR([could not find libsystemd using pkg-config]) - else -From 9fbd6009cd917f1152a367fa7e5ae3993133c1e4 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sun, 3 Apr 2022 03:23:28 +0100 -Subject: [PATCH] iscsiuio: respect LDFLAGS fully - -Use LIBS rather than LDFLAGS which ensures automake gets the ordering -right (some LDFLAGS values won't work correctly if not placed exactly before -libraries). - -This should functionally work the same as before, just improve compatibility -with bits like -Wl,--as-needed. - -Signed-off-by: Sam James <sam@gentoo.org> ---- a/iscsiuio/src/unix/Makefile.am -+++ b/iscsiuio/src/unix/Makefile.am -@@ -27,13 +27,14 @@ iscsiuio_CFLAGS = $(AM_CFLAGS) \ - $(LIBNL_CFLAGS) \ - -DBYTE_ORDER=@ENDIAN@ - --iscsiuio_LDFLAGS= $(AM_LDADD) \ -+iscsiuio_LIBS = $(AM_LIBS) \ - -ldl \ - -rdynamic \ - $(LIBNL_LIBS) \ - -lpthread - --iscsiuio_LDADD = ${top_srcdir}/src/uip/lib_iscsi_uip.a \ -+iscsiuio_LDADD = $(AM_LDADD) \ -+ ${top_srcdir}/src/uip/lib_iscsi_uip.a \ - ${top_srcdir}/src/apps/dhcpc/lib_apps_dhcpc.a\ - ${top_srcdir}/src/apps/brcm-iscsi/lib_apps_brcm_iscsi.a \ - ${top_srcdir}/src/unix/libs/lib_iscsiuio_hw_cnic.a -From 980b1d36e1f5f38c6b33fe3b68a2cb89e4a77b90 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sun, 3 Apr 2022 03:34:48 +0100 -Subject: [PATCH] libopeniscsiusr: fix version in installed pkgconfig (.pc) - file - -Looks like a typo from libnvme. Previously, the installed -.pc file had a blank Version field. - -Signed-off-by: Sam James <sam@gentoo.org> ---- a/libopeniscsiusr/Makefile -+++ b/libopeniscsiusr/Makefile -@@ -89,7 +89,7 @@ install: $(LIBS) $(LIBS_MAJOR) - ln -sf $(LIBS) $(DESTDIR)/$(LIB_DIR)/$(LIBS_MAJOR) - $(INSTALL) $(HEADERS) $(DESTDIR)$(INCLUDE_DIR)/ - $(INSTALL) -m 644 -D $(PKGFILE).in $(DESTDIR)$(PKGCONF_DIR)/$(PKGFILE) -- perl -i -pe 's|__VERSION__|$(LIBNVME_VERSION)|g' \ -+ perl -i -pe 's|__VERSION__|$(LIBISCSI_USR_VERSION)|g' \ - $(DESTDIR)$(PKGCONF_DIR)/$(PKGFILE) - perl -i -pe 's|__LIB_DIR__|$(LIB_DIR)|g' \ - $(DESTDIR)$(PKGCONF_DIR)/$(PKGFILE) diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_bitwise.patch b/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_bitwise.patch new file mode 100644 index 000000000000..2ff094c83f0f --- /dev/null +++ b/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_bitwise.patch @@ -0,0 +1,52 @@ +From 0a6432de1a2186449d5e6557f75a9f30e487471d Mon Sep 17 00:00:00 2001 +From: Matthias Maier <tamiko@43-1.org> +Date: Thu, 2 Jun 2022 13:12:43 -0500 +Subject: [PATCH] Use __bitwise instead of __bitwise__ + +The iscsi_proto.h header goes into great length ensuring that the +__bitwise macro is defined: + + #if !defined(__bitwise) + /* + * If running svn modules we may need to define these. + * This should not go upstream since this is already properly defined there + */ + #ifdef __CHECKER__ + #define __bitwise__ __attribute__((bitwise)) + #else + #define __bitwise__ + #endif + #ifdef __CHECK_ENDIAN__ + #define __bitwise __bitwise__ + #else + #define __bitwise + #endif + #endif + +But then uses the __bitwise__ macro instead: + + typedef uint32_t __bitwise__ itt_t; + +(This is the only occurence where the __bitwise__ (or __bitwise) macro +is actually used). This seems to be a typo, changing this to __bitwise +fixes compilation with gcc-11 onwards. +--- + include/iscsi_proto.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/iscsi_proto.h b/include/iscsi_proto.h +index 1d14b89..3fe9018 100644 +--- a/include/iscsi_proto.h ++++ b/include/iscsi_proto.h +@@ -63,7 +63,7 @@ + #endif + + /* initiator tags; opaque for target */ +-typedef uint32_t __bitwise__ itt_t; ++typedef uint32_t __bitwise itt_t; + /* below makes sense only for initiator that created this tag */ + #define build_itt(itt, age) ((__force itt_t)\ + ((itt) | ((age) << ISCSI_AGE_SHIFT))) +-- +2.35.1 + diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_sed.patch b/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_sed.patch new file mode 100644 index 000000000000..ad56b823b557 --- /dev/null +++ b/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_sed.patch @@ -0,0 +1,67 @@ +From 66d76978f2ffbe276e84b03a7fac1041a7c3b4c3 Mon Sep 17 00:00:00 2001 +From: Matthias Maier <tamiko@43-1.org> +Date: Thu, 2 Jun 2022 13:17:10 -0500 +Subject: [PATCH] Do not hardcode the path of sed + +--- + doc/Makefile | 2 +- + etc/Makefile | 2 +- + libopeniscsiusr/Makefile | 2 +- + utils/Makefile | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/doc/Makefile b/doc/Makefile +index 9ed025d..e121270 100644 +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -7,7 +7,7 @@ ifeq ($(TOPDIR),) + TOPDIR = .. + endif + +-SED = /usr/bin/sed ++SED = sed + INSTALL = install + + DESTDIR ?= +diff --git a/etc/Makefile b/etc/Makefile +index d065319..2d98027 100644 +--- a/etc/Makefile ++++ b/etc/Makefile +@@ -19,7 +19,7 @@ initddir ?= $(etcdir)/init.d + + HOMEDIR ?= $(etcdir)/iscsi + +-SED = /usr/bin/sed ++SED = sed + INSTALL = install + + SYSTEMD_SOURCE_FILES = iscsid.socket iscsiuio.socket +diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile +index 523518b..90903dd 100644 +--- a/libopeniscsiusr/Makefile ++++ b/libopeniscsiusr/Makefile +@@ -29,7 +29,7 @@ PKGCONF_DIR ?= $(LIB_DIR)/pkgconfig + MAN_DIR = $(prefix)/share/man + + PKG_CONFIG ?= /usr/bin/pkg-config +-SED ?= /usr/bin/sed ++SED ?= sed + + LIBISCSI_USR_DIR=$(TOPDIR)/libopeniscsiusr + +diff --git a/utils/Makefile b/utils/Makefile +index a7eb352..15539eb 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -7,7 +7,7 @@ + # from the top-level make file. + # + +-SED = /usr/bin/sed ++SED = sed + INSTALL = install + CHMOD = chmod + +-- +2.35.1 + diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.7-no_werror.patch b/sys-block/open-iscsi/files/open-iscsi-2.1.7-no_werror.patch new file mode 100644 index 000000000000..a94caebafb13 --- /dev/null +++ b/sys-block/open-iscsi/files/open-iscsi-2.1.7-no_werror.patch @@ -0,0 +1,26 @@ +diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile +index 52e453a..523518b 100644 +--- a/libopeniscsiusr/Makefile ++++ b/libopeniscsiusr/Makefile +@@ -51,7 +51,7 @@ EXTRA_MAN_FILES = libopeniscsiusr.h.3 + OBJS = context.o misc.o session.o sysfs.o iface.o idbm.o node.o default.o + + CFLAGS ?= -O2 -g +-CFLAGS += -Wall -Werror -Wextra -fvisibility=hidden -fPIC ++CFLAGS += -Wall -Wextra -fvisibility=hidden -fPIC + CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) + CFLAGS += -DSBINDIR=\"$(SBINDIR)\" + CFLAGS += -DISCSI_DB_ROOT=\"$(DBROOT)\" +diff --git a/usr/Makefile b/usr/Makefile +index 3fc2248..c3580a3 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -44,7 +44,7 @@ HOMEDIR ?= $(etcdir)/iscsi + PKG_CONFIG ?= /usr/bin/pkg-config + + CFLAGS ?= -O2 -g +-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) |