mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-31 10:58:21 -07:00
sys-block/open-iscsi: Removed old
Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
This commit is contained in:
Lars Wendler
@@ -1,6 +1,5 @@
|
||||
DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
|
||||
DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36
|
||||
DIST open-iscsi-2.0.877.tar.gz 605075 BLAKE2B 85106a7137b2a70a56418e2c76df81d5bf464268b5030fef2560addd8a96a0b6ba767c811f7c8a181a7b30a902d3973f0f7dad7cd3cc0796979a8a1b2f9164ef SHA512 1e6a6772c59dd7a809938f1ef4c9fe0310d70bf0e0f7e80643bcfa22236af8a8027122cf9ff598ce70a3ff51ccb9d5ef99fc5b9c517379bf590b8da74bfeb9a6
|
||||
DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48 SHA512 2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33
|
||||
DIST open-iscsi-2.1.0.tar.gz 604689 BLAKE2B 1741f4ac5072e3e952ba8268b1f52c6d296156b4c2696efad9fd0ccfe54870f74ac54b21144e4e71eed03cf8674a6aff96eee4f72f8a608fde40dc463f962b6f SHA512 bb1a4ff2bab0562bfd4281d757dd888e8f5d2d1ae16561cabf5598073c343e8c2dc9b35992c2bc51398faffceb9b70ea2eae214ab205a586bcb971d741d5f59d
|
||||
DIST open-iscsi-2.1.1.tar.gz 616859 BLAKE2B 7004b0866e55837f06cfe9e45f49f6a482932fda8a2c21c55819d658fb96113f1913290d490f28baccea86ceb755c63b73bd010b201f974c9803d39fbf5d0672 SHA512 88dbea433fe5266714c5c73ce4b60dfb8ddeffcaad4ff77abbdda2a865d29d4307ca51b8f45376f54542b19baed30d5f2f1836a8c136eb0af840f489f47e4fb3
|
||||
|
||||
@@ -1,87 +0,0 @@
|
||||
From f66608aa9ce989c91f744bb2f3f34d2e01aedc87 Mon Sep 17 00:00:00 2001
|
||||
From: Lee Duncan <lduncan@suse.com>
|
||||
Date: Tue, 14 May 2019 13:11:34 -0700
|
||||
Subject: [PATCH] Make iscsid systemd usage optional
|
||||
|
||||
You can compile without system now by using something
|
||||
like:
|
||||
|
||||
make OPTFLAGS="-DNO_SYSTEMD ..." NO_SYSTEMD=1
|
||||
|
||||
This will skip systemd code for iscsid and iscsiuio.
|
||||
---
|
||||
Makefile | 5 +++++
|
||||
usr/Makefile | 2 ++
|
||||
usr/iscsid.c | 6 ++++++
|
||||
3 files changed, 13 insertions(+)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index c941740c..9a337741 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -40,6 +40,11 @@ ifneq (,$(CFLAGS))
|
||||
export CFLAGS
|
||||
endif
|
||||
|
||||
+# export systemd disablement if set
|
||||
+ifneq ($(NO_SYSTEMD),)
|
||||
+export NO_SYSTEMD
|
||||
+endif
|
||||
+
|
||||
# Random comments:
|
||||
# using '$(MAKE)' instead of just 'make' allows make to run in parallel
|
||||
# over multiple makefile.
|
||||
diff --git a/usr/Makefile b/usr/Makefile
|
||||
index f1c35aa7..0203127c 100644
|
||||
--- a/usr/Makefile
|
||||
+++ b/usr/Makefile
|
||||
@@ -41,7 +41,9 @@ CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
|
||||
CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
|
||||
ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr
|
||||
LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
|
||||
+ifeq ($(NO_SYSTEMD),)
|
||||
LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd)
|
||||
+endif
|
||||
PROGRAMS = iscsid iscsiadm iscsistart
|
||||
|
||||
# libc compat files
|
||||
diff --git a/usr/iscsid.c b/usr/iscsid.c
|
||||
index 0c984409..37c13b39 100644
|
||||
--- a/usr/iscsid.c
|
||||
+++ b/usr/iscsid.c
|
||||
@@ -34,7 +34,9 @@
|
||||
#include <sys/wait.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
+#ifndef NO_SYSTEMD
|
||||
#include <systemd/sd-daemon.h>
|
||||
+#endif
|
||||
|
||||
#include "iscsid.h"
|
||||
#include "mgmt_ipc.h"
|
||||
@@ -339,6 +341,7 @@ static void missing_iname_warn(char *initiatorname_file)
|
||||
/* called right before we enter the event loop */
|
||||
static void set_state_to_ready(void)
|
||||
{
|
||||
+#ifndef NO_SYSTEMD
|
||||
if (sessions_to_recover)
|
||||
sd_notify(0, "READY=1\n"
|
||||
"RELOADING=1\n"
|
||||
@@ -346,14 +349,17 @@ static void set_state_to_ready(void)
|
||||
else
|
||||
sd_notify(0, "READY=1\n"
|
||||
"STATUS=Ready to process requests\n");
|
||||
+#endif
|
||||
}
|
||||
|
||||
/* called when recovery process has been reaped */
|
||||
static void set_state_done_reloading(void)
|
||||
{
|
||||
+#ifndef NO_SYSTEMD
|
||||
sessions_to_recover = 0;
|
||||
sd_notifyf(0, "READY=1\n"
|
||||
"STATUS=Ready to process requests\n");
|
||||
+#endif
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
@@ -1,84 +0,0 @@
|
||||
From 623a81123c494f5c69dc6616bd72e838862e2f1f Mon Sep 17 00:00:00 2001
|
||||
From: Lee Duncan <lduncan@suse.com>
|
||||
Date: Mon, 12 Nov 2018 13:10:04 -0800
|
||||
Subject: [PATCH] Use pkg-config in Makefiles for newer libraries.
|
||||
|
||||
These two recently-added libraries can be in different
|
||||
locations on different distros, so use pkg-config to
|
||||
added the appropriate actions in the make files.
|
||||
---
|
||||
libopeniscsiusr/Makefile | 8 +++++++-
|
||||
usr/Makefile | 11 ++++++++---
|
||||
2 files changed, 15 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile
|
||||
index bf7c96c7..a045a459 100644
|
||||
--- a/libopeniscsiusr/Makefile
|
||||
+++ b/libopeniscsiusr/Makefile
|
||||
@@ -23,6 +23,8 @@ endif
|
||||
INCLUDE_DIR ?= $(prefix)/include
|
||||
PKGCONF_DIR ?= $(LIB_DIR)/pkgconfig
|
||||
|
||||
+PKG_CONFIG = /usr/bin/pkg-config
|
||||
+
|
||||
LIBISCSI_USR_DIR=$(TOPDIR)/libopeniscsiusr
|
||||
|
||||
LIBISCSI_USR_VERSION_MAJOR=0
|
||||
@@ -43,13 +45,17 @@ 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 += $(shell $(PKG_CONFIG) --cflags libkmod)
|
||||
+
|
||||
+LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
|
||||
|
||||
LIBADD =
|
||||
|
||||
all: $(LIBS) $(LIBS_MAJOR) $(TESTS) doc
|
||||
|
||||
$(LIBS): $(OBJS)
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LIBADD)
|
||||
+ @echo CFLAGS= $(CFLAGS)
|
||||
+ $(CC) $(CFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LDFLAGS) $(LIBADD)
|
||||
ln -sf $@ $(DEVLIB)
|
||||
|
||||
$(LIBS_MAJOR): $(LIBS)
|
||||
diff --git a/usr/Makefile b/usr/Makefile
|
||||
index f9445ada..f1c35aa7 100644
|
||||
--- a/usr/Makefile
|
||||
+++ b/usr/Makefile
|
||||
@@ -32,11 +32,16 @@ IPC_OBJ=ioctl.o
|
||||
endif
|
||||
endif
|
||||
|
||||
+PKG_CONFIG = /usr/bin/pkg-config
|
||||
+
|
||||
CFLAGS ?= -O2 -g
|
||||
WARNFLAGS ?= -Wall -Wstrict-prototypes
|
||||
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 libsystemd)
|
||||
PROGRAMS = iscsid iscsiadm iscsistart
|
||||
|
||||
# libc compat files
|
||||
@@ -60,14 +65,14 @@ all: $(PROGRAMS)
|
||||
|
||||
iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \
|
||||
iscsid.o session_mgmt.o discoveryd.o mntcheck.o
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount $(ISCSI_LIB)
|
||||
+ $(CC) $(CFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount $(LDFLAGS) $(ISCSI_LIB)
|
||||
|
||||
iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o mntcheck.o
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(ISCSI_LIB)
|
||||
+ $(CC) $(CFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(LDFLAGS) $(ISCSI_LIB)
|
||||
|
||||
iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
|
||||
iscsistart.o statics.o
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB)
|
||||
+ $(CC) $(CFLAGS) $^ -o $@ -lrt $(LDFLAGS) $(ISCSI_LIB)
|
||||
clean:
|
||||
rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
|
||||
|
||||
@@ -1,136 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd
|
||||
|
||||
DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
|
||||
HOMEPAGE="http://www.open-iscsi.com/"
|
||||
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0/0.2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="debug infiniband libressl +tcp rdma systemd"
|
||||
|
||||
DEPEND="
|
||||
sys-apps/kmod
|
||||
sys-block/open-isns:=
|
||||
sys-kernel/linux-headers
|
||||
infiniband? ( sys-fabric/ofed )
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
systemd? ( sys-apps/systemd )
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
sys-fs/lsscsi
|
||||
sys-apps/util-linux"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
|
||||
"${FILESDIR}/${PN}-2.0.877-pkgconfig.patch"
|
||||
"${FILESDIR}/${PN}-2.0.877-optional_systemd.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
linux-info_pkg_setup
|
||||
|
||||
if kernel_is -lt 2 6 16; then
|
||||
die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
|
||||
fi
|
||||
|
||||
# Needs to be done, as iscsid currently only starts, when having the iSCSI
|
||||
# support loaded as module. Kernel builtin options don't work. See this for
|
||||
# more information:
|
||||
# https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
|
||||
# If there's a new release, check whether this is still valid!
|
||||
TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
|
||||
RDMA_MODULES="INFINIBAND_ISER"
|
||||
INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
|
||||
CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
|
||||
if linux_config_exists; then
|
||||
if use tcp; then
|
||||
for module in ${TCP_MODULES}; do
|
||||
linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
|
||||
done
|
||||
fi
|
||||
if use infiniband; then
|
||||
for module in ${INFINIBAND_MODULES}; do
|
||||
linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
|
||||
done
|
||||
fi
|
||||
if use rdma; then
|
||||
for module in ${RDMA_MODULES}; do
|
||||
linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
|
||||
done
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sed -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' \
|
||||
-i etc/iscsid.conf || die
|
||||
sed -e 's@\(/sbin/\)@/usr\1@' \
|
||||
-i etc/systemd/iscsi* || die
|
||||
default
|
||||
|
||||
pushd iscsiuio >/dev/null || die
|
||||
eautoreconf
|
||||
popd >/dev/null || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
|
||||
append-lfs-flags
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
|
||||
# is messed up already here, so it's not making it that much worse.
|
||||
KSRC="${KV_DIR}" CFLAGS="" \
|
||||
emake \
|
||||
OPTFLAGS="${CFLAGS} ${CPPFLAGS} $(usex systemd '' -DNO_SYSTEMD)" \
|
||||
AR="$(tc-getAR)" CC="$(tc-getCC)" \
|
||||
$(usex systemd '' NO_SYSTEMD=1) \
|
||||
user
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${ED}" sbindir="/usr/sbin" install
|
||||
# Upstream make is not deterministic, per bug #601514
|
||||
rm -f "${ED}"/etc/initiatorname.iscsi
|
||||
|
||||
dodoc README THANKS
|
||||
|
||||
docinto test/
|
||||
dodoc test/*
|
||||
|
||||
insinto /etc/iscsi
|
||||
newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
|
||||
|
||||
newconfd "${FILESDIR}"/iscsid-conf.d iscsid
|
||||
newinitd "${FILESDIR}"/iscsid-init.d iscsid
|
||||
|
||||
systemd_dounit etc/systemd/iscsi.service
|
||||
systemd_dounit etc/systemd/iscsid.service
|
||||
systemd_dounit etc/systemd/iscsid.socket
|
||||
|
||||
keepdir /var/db/iscsi
|
||||
fperms 700 /var/db/iscsi
|
||||
fperms 600 /etc/iscsi/iscsid.conf
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
in='/etc/iscsi/initiatorname.iscsi'
|
||||
if [ ! -f "${EROOT}${in}" -a -f "${EROOT}${in}.example" ]; then
|
||||
{
|
||||
cat "${EROOT}${in}.example"
|
||||
echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)"
|
||||
echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)"
|
||||
} >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}"
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user