commit: c8db050cb16cebb026a64896f7ac1dff57beee7a Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jul 27 10:42:44 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jul 27 10:42:44 2023 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c8db050c
open-iscsi: update to 2.1.8 Signed-off-by: Sam James <sam <AT> gentoo.org> gkbuilds/open-iscsi.gkbuild | 6 +++--- .../2.1.8/open-iscsi-2.1.8-Makefiles.patch | 24 ++++++++++++++++++++++ .../2.1.8/open-iscsi-2.1.8-static-iscsistart.patch | 11 ++++++++++ 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/gkbuilds/open-iscsi.gkbuild b/gkbuilds/open-iscsi.gkbuild index 250d0a2..595b68e 100644 --- a/gkbuilds/open-iscsi.gkbuild +++ b/gkbuilds/open-iscsi.gkbuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 src_compile() { @@ -6,8 +6,8 @@ src_compile() { export NO_SYSTEMD=1 export PKG_CONFIG="$(tc-getPKG_CONFIG) --static" - gkmake -C utils/sysdeps V=1 - gkmake -C utils/fwparam_ibft V=1 + gkmake -C sysdeps V=1 + gkmake -C usr/fwparam_ibft V=1 gkmake -C libopeniscsiusr V=1 gkmake -C usr -j1 V=1 iscsistart } diff --git a/patches/open-iscsi/2.1.8/open-iscsi-2.1.8-Makefiles.patch b/patches/open-iscsi/2.1.8/open-iscsi-2.1.8-Makefiles.patch new file mode 100644 index 0000000..5d0bef1 --- /dev/null +++ b/patches/open-iscsi/2.1.8/open-iscsi-2.1.8-Makefiles.patch @@ -0,0 +1,24 @@ +--- a/libopeniscsiusr/Makefile ++++ b/libopeniscsiusr/Makefile +@@ -50,7 +50,7 @@ EXTRA_MAN_FILE = 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 += -Wextra -fvisibility=hidden -fPIC + CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) + CFLAGS += -DSBINDIR=\"$(SBINDIR)\" + CFLAGS += -DISCSI_DB_ROOT=\"$(DBROOT)\" +@@ -60,9 +60,10 @@ LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) + + LIBADD = + +-all: $(LIBS) $(LIBS_MAJOR) $(TESTS) doc ++all: $(LIBS) $(LIBS_MAJOR) + + $(LIBS): $(OBJS) ++ $(AR) $(ARFLAGS) libopeniscsiusr.a $^ + $(CC) $(CFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LDFLAGS) $(LIBADD) + ln -sf $@ $(DEVLIB) + +-- diff --git a/patches/open-iscsi/2.1.8/open-iscsi-2.1.8-static-iscsistart.patch b/patches/open-iscsi/2.1.8/open-iscsi-2.1.8-static-iscsistart.patch new file mode 100644 index 0000000..9ac800a --- /dev/null +++ b/patches/open-iscsi/2.1.8/open-iscsi-2.1.8-static-iscsistart.patch @@ -0,0 +1,11 @@ +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -99,7 +99,7 @@ iscsiadm: $(ISCSI_LIB_OBJS) $(SYSDEPS_OBJS) $(DISCOVERY_OBJS) $(FW_BOOT_OBJS) \ + + iscsistart: $(ISCSI_LIB_OBJS) $(SYSDEPS_OBJS) $(INITIATOR_OBJS) $(FW_BOOT_OBJS) \ + $(ISCSISTART_OBJS) +- $(CC) $(CFLAGS) $^ -o $@ -lcrypto -lrt $(LDFLAGS) $(ISCSI_LIB) ++ $(CC) $(CFLAGS) $^ -o $@ -static -lcrypto -lrt $(LDFLAGS) $(ISCSI_LIB) + + install: $(DESTDIR)$(SBINDIR) $(PROGRAMS_DEST) +