commit: 7a0083f1f3ce2e4c1629776e97f9189465254713 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Mon Oct 14 14:13:37 2019 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Mon Oct 14 14:52:53 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7a0083f1
open-iscsi bumped to v2.0.878 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> defaults/software.sh | 9 +- gkbuilds/kmod.gkbuild | 30 ++++++ gkbuilds/open-iscsi.gkbuild | 4 + .../open-iscsi-2.0.874-musl-ethtool-compat.patch | 69 ------------- .../2.0.875/open-iscsi-2.0.874-musl-fixes.patch | 51 ---------- ...eclare-inline-best_match_bufcmp-as-static.patch | 24 ----- .../open-iscsi-2.0.875-include-sysmacros.patch | 21 ---- .../open-iscsi-2.0.875-static-iscsistart.patch | 13 --- .../2.0.878/open-iscsi-2.0.878-Makefiles.patch | 108 +++++++++++++++++++++ .../open-iscsi-2.0.878-static-iscsistart.patch | 11 +++ 10 files changed, 161 insertions(+), 179 deletions(-) diff --git a/defaults/software.sh b/defaults/software.sh index 793c90e..4be9c92 100644 --- a/defaults/software.sh +++ b/defaults/software.sh @@ -88,7 +88,7 @@ GKPKG_GPG_BINPKG="${GKPKG_GPG_BINPKG:-%%CACHE%%/gnupg-${GKPKG_GPG_PV}-%%ARCH%%.t GKPKG_ISCSI_PN="open-iscsi" GKPKG_ISCSI_PV="${GKPKG_ISCSI_PV:-VERSION_ISCSI}" -GKPKG_ISCSI_DEPS="util-linux" +GKPKG_ISCSI_DEPS="kmod zlib util-linux" GKPKG_ISCSI_SRCDIR="${GKPKG_ISCSI_SRCDIR:-open-iscsi-${GKPKG_ISCSI_PV}}" GKPKG_ISCSI_SRCTAR="${GKPKG_ISCSI_SRCTAR:-${DISTDIR}/open-iscsi-${GKPKG_ISCSI_PV}.tar.gz}" GKPKG_ISCSI_BINPKG="${GKPKG_ISCSI_BINPKG:-%%CACHE%%/iscsi-${GKPKG_ISCSI_PV}-%%ARCH%%.tar.xz}" @@ -100,6 +100,13 @@ GKPKG_JSON_C_SRCDIR="${GKPKG_JSON_C_SRCDIR:-json-c-${GKPKG_JSON_C_PV}}" GKPKG_JSON_C_SRCTAR="${GKPKG_JSON_C_SRCTAR:-${DISTDIR}/json-c-${GKPKG_JSON_C_PV}.tar.gz}" GKPKG_JSON_C_BINPKG="${GKPKG_JSON_C_BINPKG:-%%CACHE%%/json-c-${GKPKG_JSON_C_PV}-%%ARCH%%.tar.xz}" +GKPKG_KMOD_PN="kmod" +GKPKG_KMOD_PV="${GKPKG_KMOD_PV:-VERSION_KMOD}" +GKPKG_KMOD_DEPS="zlib" +GKPKG_KMOD_SRCDIR="${GKPKG_KMOD_SRCDIR:-kmod-${GKPKG_KMOD_PV}}" +GKPKG_KMOD_SRCTAR="${GKPKG_KMOD_SRCTAR:-${DISTDIR}/kmod-${GKPKG_KMOD_PV}.tar.xz}" +GKPKG_KMOD_BINPKG="${GKPKG_KMOD_BINPKG:-%%CACHE%%/kmod-${GKPKG_KMOD_PV}-%%ARCH%%.tar.xz}" + GKPKG_LIBAIO_PN="libaio" GKPKG_LIBAIO_PV="${GKPKG_LIBAIO_PV:-VERSION_LIBAIO}" GKPKG_LIBAIO_DEPS="" diff --git a/gkbuilds/kmod.gkbuild b/gkbuilds/kmod.gkbuild new file mode 100644 index 0000000..6bdc0c4 --- /dev/null +++ b/gkbuilds/kmod.gkbuild @@ -0,0 +1,30 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +src_prepare() { + default + + sed -i \ + -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ + configure || die "Failed to re-enable static support" +} + +src_configure() { + local myconf=( + --without-xz + --with-zlib + --without-openssl + --disable-python + --disable-tools + --enable-static + ) + + gkconf "${myconf[@]}" +} + +src_install() { + default + + rm -rf \ + "${D}"/usr/share/ +} diff --git a/gkbuilds/open-iscsi.gkbuild b/gkbuilds/open-iscsi.gkbuild index afe4677..d2686ca 100644 --- a/gkbuilds/open-iscsi.gkbuild +++ b/gkbuilds/open-iscsi.gkbuild @@ -2,8 +2,12 @@ # Distributed under the terms of the GNU General Public License v2 src_compile() { + append-cppflags -DNO_SYSTEMD + export NO_SYSTEMD=1 + gkmake -C utils/sysdeps V=1 gkmake -C utils/fwparam_ibft V=1 + gkmake -C libopeniscsiusr V=1 gkmake -C usr -j1 V=1 iscsistart } diff --git a/patches/open-iscsi/2.0.875/open-iscsi-2.0.874-musl-ethtool-compat.patch b/patches/open-iscsi/2.0.875/open-iscsi-2.0.874-musl-ethtool-compat.patch deleted file mode 100644 index 12b82c7..0000000 --- a/patches/open-iscsi/2.0.875/open-iscsi-2.0.874-musl-ethtool-compat.patch +++ /dev/null @@ -1,69 +0,0 @@ -From: Anthony G. Basiel <bluen...@gentoo.org> - -diff -Naur open-iscsi-2.0.874.orig/iscsiuio/src/unix/libs/bnx2x.c open-iscsi-2.0.874/iscsiuio/src/unix/libs/bnx2x.c ---- open-iscsi-2.0.874.orig/iscsiuio/src/unix/libs/bnx2x.c 2016-09-29 18:33:24.000000000 +0000 -+++ open-iscsi-2.0.874/iscsiuio/src/unix/libs/bnx2x.c 2017-01-03 21:45:47.504035833 +0000 -@@ -42,7 +42,7 @@ - #include <arpa/inet.h> - #include <linux/types.h> /* Needed for linux/ethtool.h on RHEL 5.x */ - #include <linux/sockios.h> --#include <linux/ethtool.h> -+#include "ethtool-compat.h" - #include <sys/mman.h> - #include <sys/ioctl.h> - #include <sys/types.h> -diff -Naur open-iscsi-2.0.874.orig/iscsiuio/src/unix/libs/ethtool-compat.h open-iscsi-2.0.874/iscsiuio/src/unix/libs/ethtool-compat.h ---- open-iscsi-2.0.874.orig/iscsiuio/src/unix/libs/ethtool-compat.h 1970-01-01 00:00:00.000000000 +0000 -+++ open-iscsi-2.0.874/iscsiuio/src/unix/libs/ethtool-compat.h 2017-01-03 21:45:23.016034980 +0000 -@@ -0,0 +1,51 @@ -+/* -+ * ethtool-compat.h: adopted from -+ # ethtool.h: Defines for Linux ethtool. -+ * -+ * Copyright (C) 1998 David S. Miller (da...@redhat.com) -+ * Copyright 2001 Jeff Garzik <jgar...@pobox.com> -+ * Portions Copyright 2001 Sun Microsystems (thoc...@sun.com) -+ * Portions Copyright 2002 Intel (eli.kuperm...@intel.com, -+ * christopher.le...@intel.com, -+ * scott.feld...@intel.com) -+ * Portions Copyright (C) Sun Microsystems 2008 -+ */ -+ -+#include <linux/types.h> -+#include <netinet/if_ether.h> -+ -+#define ETHTOOL_FWVERS_LEN 32 -+#define ETHTOOL_BUSINFO_LEN 32 -+#define ETHTOOL_EROMVERS_LEN 32 -+ -+struct ethtool_drvinfo { -+ __u32 cmd; -+ char driver[32]; -+ char version[32]; -+ char fw_version[ETHTOOL_FWVERS_LEN]; -+ char bus_info[ETHTOOL_BUSINFO_LEN]; -+ char erom_version[ETHTOOL_EROMVERS_LEN]; -+ char reserved2[12]; -+ __u32 n_priv_flags; -+ __u32 n_stats; -+ __u32 testinfo_len; -+ __u32 eedump_len; -+ __u32 regdump_len; -+}; -+ -+struct ethtool_tcpip4_spec { -+ __be32 ip4src; -+ __be32 ip4dst; -+ __be16 psrc; -+ __be16 pdst; -+ __u8 tos; -+}; -+ -+struct ethtool_ah_espip4_spec { -+ __be32 ip4src; -+ __be32 ip4dst; -+ __be32 spi; -+ __u8 tos; -+}; -+ -+#define ETHTOOL_GDRVINFO 0x00000003 /* Get driver info. */ diff --git a/patches/open-iscsi/2.0.875/open-iscsi-2.0.874-musl-fixes.patch b/patches/open-iscsi/2.0.875/open-iscsi-2.0.874-musl-fixes.patch deleted file mode 100644 index cf8b762..0000000 --- a/patches/open-iscsi/2.0.875/open-iscsi-2.0.874-musl-fixes.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- ./utils/fwparam_ibft/fwparam_ppc.c 2016-09-29 13:33:24.000000000 -0500 -+++ ./utils/fwparam_ibft/fwparam_ppc.c 2017-01-02 11:37:32.738351217 -0600 -@@ -356,7 +356,7 @@ - * Sort the nics into "natural" order. The proc fs - * device-tree has them in somewhat random, or reversed order. - */ -- qsort(niclist, nic_count, sizeof(char *), (__compar_fn_t)nic_cmp); -+ qsort(niclist, nic_count, sizeof(char *), (int (*)(const void *, const void *))nic_cmp); - - snprintf(prefix, sizeof(prefix), "%s/%s", devtree, "aliases"); - dev_count = 0; ---- ./usr/idbm.c.orig -+++ ./usr/idbm.c -@@ -25,6 +25,7 @@ - #include <stdlib.h> - #include <string.h> - #include <errno.h> -+#include <fcntl.h> - #include <dirent.h> - #include <limits.h> - #include <sys/stat.h> ---- a/usr/iscsiadm.c 2016-09-29 13:33:24.000000000 -0500 -+++ b/usr/iscsiadm.c 2017-01-02 11:46:37.643506953 -0600 -@@ -3262,6 +3262,7 @@ - int tpgt = PORTAL_GROUP_TAG_UNKNOWN, killiscsid=-1, do_show=0; - int packet_size=32, ping_count=1, ping_interval=0; - int do_discover = 0, sub_mode = -1; -+ int argerror = 0; - int portal_type = -1; - struct sigaction sa_old; - struct sigaction sa_new; -@@ -3426,6 +3427,9 @@ - break; - case 'h': - usage(0); -+ case '?': -+ log_error("unrecognized character '%c'", optopt); -+ argerror = 1; - } - - if (name && value) { -@@ -3441,8 +3445,7 @@ - } - } - -- if (optopt) { -- log_error("unrecognized character '%c'", optopt); -+ if (argerror) { - rc = ISCSI_ERR_INVAL; - goto free_ifaces; - } diff --git a/patches/open-iscsi/2.0.875/open-iscsi-2.0.875-declare-inline-best_match_bufcmp-as-static.patch b/patches/open-iscsi/2.0.875/open-iscsi-2.0.875-declare-inline-best_match_bufcmp-as-static.patch deleted file mode 100644 index 7bd7f9a..0000000 --- a/patches/open-iscsi/2.0.875/open-iscsi-2.0.875-declare-inline-best_match_bufcmp-as-static.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ec9865c5b2a05908dff774eda352d84d6a001e1a Mon Sep 17 00:00:00 2001 -From: Lee Duncan <ldun...@suse.com> -Date: Sat, 2 Dec 2017 14:24:52 -0800 -Subject: [PATCH] Declare inline best_match_bufcmp() as static. - -The 7.2.1 version of gcc seems to be more strict -about this. See https://gcc.gnu.org/onlinedocs/gcc/Inline.html ---- - iscsiuio/src/uip/ipv6.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/iscsiuio/src/uip/ipv6.c b/iscsiuio/src/uip/ipv6.c -index ced98a67..05efa73f 100644 ---- a/iscsiuio/src/uip/ipv6.c -+++ b/iscsiuio/src/uip/ipv6.c -@@ -49,7 +49,7 @@ - #include "dhcpv6.h" - #include "ping.h" - --inline int best_match_bufcmp(u8_t *a, u8_t *b, int len) -+static inline int best_match_bufcmp(u8_t *a, u8_t *b, int len) - { - int i; - diff --git a/patches/open-iscsi/2.0.875/open-iscsi-2.0.875-include-sysmacros.patch b/patches/open-iscsi/2.0.875/open-iscsi-2.0.875-include-sysmacros.patch deleted file mode 100644 index 7c19a1e..0000000 --- a/patches/open-iscsi/2.0.875/open-iscsi-2.0.875-include-sysmacros.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 6d68ef5871c94c6ebbbe6e6b1fe0bc2dce711052 Mon Sep 17 00:00:00 2001 -From: Lee Duncan <ldun...@suse.com> -Date: Sat, 2 Dec 2017 14:19:26 -0800 -Subject: [PATCH] Include <sys/sysmacros.h> to properly define minor() - ---- - iscsiuio/src/unix/libs/qedi.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/iscsiuio/src/unix/libs/qedi.c b/iscsiuio/src/unix/libs/qedi.c -index c6ff6e77..b81fecdf 100644 ---- a/iscsiuio/src/unix/libs/qedi.c -+++ b/iscsiuio/src/unix/libs/qedi.c -@@ -58,6 +58,7 @@ - #include <sys/user.h> - #include <fcntl.h> - #include <unistd.h> -+#include <sys/sysmacros.h> - - #include "config.h" - diff --git a/patches/open-iscsi/2.0.875/open-iscsi-2.0.875-static-iscsistart.patch b/patches/open-iscsi/2.0.875/open-iscsi-2.0.875-static-iscsistart.patch deleted file mode 100644 index c190627..0000000 --- a/patches/open-iscsi/2.0.875/open-iscsi-2.0.875-static-iscsistart.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/usr/Makefile b/usr/Makefile -index c1866b6..2990060 100644 ---- a/usr/Makefile -+++ b/usr/Makefile -@@ -61,7 +61,7 @@ iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o mntcheck - - iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ - iscsistart.o statics.o -- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt -+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -static -lrt - clean: - rm -f *.o $(PROGRAMS) .depend $(LIBSYS) - diff --git a/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-Makefiles.patch b/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-Makefiles.patch new file mode 100644 index 0000000..3c34bf2 --- /dev/null +++ b/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-Makefiles.patch @@ -0,0 +1,108 @@ +--- a/libopeniscsiusr/Makefile ++++ b/libopeniscsiusr/Makefile +@@ -23,7 +23,7 @@ endif + INCLUDE_DIR ?= $(prefix)/include + PKGCONF_DIR ?= $(LIB_DIR)/pkgconfig + +-PKG_CONFIG = /usr/bin/pkg-config ++PKG_CONFIG ?= pkg-config + + LIBISCSI_USR_DIR=$(TOPDIR)/libopeniscsiusr + +@@ -44,17 +44,18 @@ 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 += -Wextra -fvisibility=hidden -fPIC + CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) + + LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) + + LIBADD = + +-all: $(LIBS) $(LIBS_MAJOR) $(TESTS) doc ++all: $(LIBS) $(LIBS_MAJOR) + + $(LIBS): $(OBJS) + @echo CFLAGS= $(CFLAGS) ++ $(AR) $(ARFLAGS) libopeniscsiusr.a $^ + $(CC) $(CFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LDFLAGS) $(LIBADD) + ln -sf $@ $(DEVLIB) + +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -32,7 +32,7 @@ IPC_OBJ=ioctl.o + endif + endif + +-PKG_CONFIG = /usr/bin/pkg-config ++PKG_CONFIG ?= pkg-config + + CFLAGS ?= -O2 -g + WARNFLAGS ?= -Wall -Wstrict-prototypes +@@ -40,7 +40,7 @@ CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ + -I$(TOPDIR)/libopeniscsiusr + CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) + ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr +-LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) ++LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) -lz + ifeq ($(NO_SYSTEMD),) + LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd) + endif +@@ -76,9 +76,9 @@ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ + iscsistart.o statics.o + $(CC) $(CFLAGS) $^ -o $@ -static -lrt $(LDFLAGS) $(ISCSI_LIB) + clean: +- rm -f *.o $(PROGRAMS) .depend $(LIBSYS) ++ $(RM) *.o $(PROGRAMS) .depend $(LIBSYS) + + depend: +- gcc $(CFLAGS) -M `ls *.c` > .depend ++ $(CC) $(CFLAGS) -M `ls *.c` > .depend + + -include .depend +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -10,9 +10,9 @@ iscsi-iname: md5.o iscsi-iname.o + $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@ + + clean: +- rm -f *.o $(PROGRAMS) .depend ++ $(RM) *.o $(PROGRAMS) .depend + + depend: +- gcc $(CFLAGS) -M `ls *.c` > .depend ++ $(CC) $(CFLAGS) -M `ls *.c` > .depend + + -include .depend +--- a/utils/fwparam_ibft/Makefile ++++ b/utils/fwparam_ibft/Makefile +@@ -41,11 +41,11 @@ LDFLAGS += -L$(TOPDIR)/libopeniscsiusr -liscsiusr + all: $(OBJS) + + clean: +- rm -f *.o $(CLEANFILES) .depend ++ $(RM) *.o $(CLEANFILES) .depend + + $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h + + depend: +- gcc $(CFLAGS) -M `ls *.c` > .depend ++ $(CC) $(CFLAGS) -M `ls *.c` > .depend + + -include .depend +--- a/utils/sysdeps/Makefile ++++ b/utils/sysdeps/Makefile +@@ -8,9 +8,9 @@ SYSDEPS_OBJS=sysdeps.o + all: $(SYSDEPS_OBJS) + + clean: +- rm -f *.o .depend ++ $(RM) *.o .depend + + depend: +- gcc $(CFLAGS) -M `ls *.c` > .depend ++ $(CC) $(CFLAGS) -M `ls *.c` > .depend + + -include .depend diff --git a/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-static-iscsistart.patch b/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-static-iscsistart.patch new file mode 100644 index 0000000..2b06109 --- /dev/null +++ b/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-static-iscsistart.patch @@ -0,0 +1,11 @@ +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -74,7 +74,7 @@ iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o mntcheck + + iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ + iscsistart.o statics.o +- $(CC) $(CFLAGS) $^ -o $@ -lrt $(LDFLAGS) $(ISCSI_LIB) ++ $(CC) $(CFLAGS) $^ -o $@ -static -lrt $(LDFLAGS) $(ISCSI_LIB) + clean: + rm -f *.o $(PROGRAMS) .depend $(LIBSYS) +