mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-09 22:16:58 +02:00
sys-block/open-iscsi: Sync with Gentoo
It's from Gentoo commit 0e727a3a16bc2abfd39386f10821d3e5ce89c45a.
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
3655197412
commit
a684a6fa32
@ -1,3 +1 @@
|
||||
DIST open-iscsi-2.1.10.tar.gz 645825 BLAKE2B 6a2e279e2dcf77e8d340c025eb59168121ee0c50bd013d0b5d9dac2fbc7116cc54904b4206eea192bd3888e3bcf3da42caeae1e428268edc6c2f7184958b6b04 SHA512 18b92d3e9a85d8de66734d95e9ca74a8acc5167a98830134c18ad5e226b29a00d358f952edfab67b643c454ec63c0a382c7ab7e7e76970f7574b46cea0d5c82d
|
||||
DIST open-iscsi-2.1.8.tar.gz 638346 BLAKE2B 1e85b6bd75ac31e5aaa65ea8869c2e6e13190786e28e473ab8bd1ea3edb0ef835624194e2ba53718fb2a49c25af53bff9035f5109e1a569155244f03a7dccdc0 SHA512 168ce68dc495cc8b2f217ad0373851d681f9274036b8ec562ece513de493adfdbba55f2038518f246f5244f6405102b2e096a9cce15e73fce9654f06790002c1
|
||||
DIST open-iscsi-2.1.9.tar.gz 641974 BLAKE2B 87570329dd5902bf96f1c11786c7a814892c851eabb63148f35b85494242f7379db1770a93549dcb871bafa148d37b320b389a98eed2ac46b7252ed22187ecd1 SHA512 25c28da5918b775ca54d3e55591eca0b4f7b5be33d803cad28fce1e9b2334b43cee1423a4e1819497b322e0f420dcd8d74226f442ca432233d1753565b11a5bb
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
https://github.com/open-iscsi/open-iscsi/commit/11bdc17938ba648c81a853355a6bbddad69a9fc7
|
||||
https://bugs.gentoo.org/908587
|
||||
|
||||
From 11bdc17938ba648c81a853355a6bbddad69a9fc7 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Wed, 4 Oct 2023 23:18:20 +0200
|
||||
Subject: [PATCH] usr/idbm.c: fix musl build (#426)
|
||||
|
||||
Fix the following musl build failure raised since version 2.1.9 and
|
||||
https://github.com/open-iscsi/open-iscsi/commit/7b571d76d6937a78c141630fc38c3c57c532466c:
|
||||
|
||||
../usr/idbm.c: In function 'idbm_rec_write_old':
|
||||
../usr/idbm.c:2230:27: error: 'GLOB_ONLYDIR' undeclared (first use in this function)
|
||||
2230 | rc = glob(portal, GLOB_ONLYDIR, NULL, &globbuf);
|
||||
| ^~~~~~~~~~~~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/14fc1c139f055b5b1eaa6e04e327863c06176a7b
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
usr/idbm.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/usr/idbm.c b/usr/idbm.c
|
||||
index ca4a4ec..c39abb6 100644
|
||||
--- a/usr/idbm.c
|
||||
+++ b/usr/idbm.c
|
||||
@@ -45,6 +45,11 @@
|
||||
#include "fw_context.h"
|
||||
#include "iscsi_err.h"
|
||||
|
||||
+// GLOB_ONLYDIR is not defined under musl
|
||||
+#ifndef GLOB_ONLYDIR
|
||||
+#define GLOB_ONLYDIR 0x100
|
||||
+#endif
|
||||
+
|
||||
#define IDBM_HIDE 0 /* Hide parameter when print. */
|
||||
#define IDBM_SHOW 1 /* Show parameter when print. */
|
||||
#define IDBM_MASKED 2 /* Show "stars" instead of real value when print */
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit flag-o-matic linux-info meson systemd udev
|
||||
inherit flag-o-matic linux-info meson systemd toolchain-funcs udev
|
||||
|
||||
DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
|
||||
HOMEPAGE="https://www.open-iscsi.com/"
|
||||
@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-3+ GPL-2+"
|
||||
SLOT="0/0.2"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
|
||||
IUSE="debug infiniband +tcp rdma systemd"
|
||||
REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
|
||||
# Tries to write to /run/lock/iscsi etc
|
||||
@ -34,7 +34,6 @@ BDEPEND="virtual/pkgconfig"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.1.7-fix_bitwise.patch
|
||||
"${FILESDIR}"/${P}-usr-idbm.c-fix-musl-build-426.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
@ -89,8 +88,9 @@ src_configure() {
|
||||
src_install() {
|
||||
meson_src_install
|
||||
|
||||
# Upstream make is not deterministic, per bug #601514
|
||||
rm -f "${ED}"/etc/initiatorname.iscsi
|
||||
# We'll regenerate this later to avoid baking the value into binary
|
||||
# packages. It doesn't get generated when cross-compiling.
|
||||
tc-is-cross-compiler || rm "${ED}"/etc/iscsi/initiatorname.iscsi || die
|
||||
|
||||
docinto test/
|
||||
dodoc $(find test -maxdepth 1 -type f ! -name ".*")
|
||||
@ -108,13 +108,17 @@ src_install() {
|
||||
|
||||
pkg_postinst() {
|
||||
in='/etc/iscsi/initiatorname.iscsi'
|
||||
if [[ ! -f "${EROOT}${in}" ]] && [[ -f "${EROOT}${in}.example" ]] ; then
|
||||
if ! tc-is-cross-compiler && [[ ! -f "${EROOT}${in}" ]] && [[ -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)"
|
||||
echo "InitiatorName=$("${EROOT}"/usr/sbin/iscsi-iname)"
|
||||
} >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}"
|
||||
fi
|
||||
|
||||
udev_reload
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
udev_reload
|
||||
}
|
||||
@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-3+ GPL-2+"
|
||||
SLOT="0/0.2"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86"
|
||||
IUSE="debug infiniband +tcp rdma systemd"
|
||||
REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
|
||||
# Tries to write to /run/lock/iscsi etc
|
||||
|
||||
@ -1,117 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit flag-o-matic linux-info meson systemd udev
|
||||
|
||||
DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
|
||||
HOMEPAGE="https://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 ~riscv sparc x86"
|
||||
IUSE="debug infiniband +tcp rdma systemd"
|
||||
REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
|
||||
# Tries to write to /run/lock/iscsi etc
|
||||
RESTRICT="test"
|
||||
|
||||
DEPEND="
|
||||
dev-libs/openssl:=
|
||||
sys-apps/kmod
|
||||
sys-block/open-isns:=
|
||||
sys-kernel/linux-headers
|
||||
infiniband? ( sys-cluster/rdma-core )
|
||||
systemd? ( sys-apps/systemd:= )
|
||||
"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
sys-fs/lsscsi
|
||||
sys-apps/util-linux
|
||||
"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.1.7-fix_bitwise.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_configure() {
|
||||
use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
|
||||
|
||||
local emesonargs=(
|
||||
-Dsystemddir="$(systemd_get_utildir)"
|
||||
-Drulesdir="$(get_udevdir)"/rules.d
|
||||
$(meson_use !systemd no_systemd)
|
||||
)
|
||||
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
meson_src_install
|
||||
|
||||
# Upstream make is not deterministic, per bug #601514
|
||||
rm -f "${ED}"/etc/initiatorname.iscsi
|
||||
|
||||
docinto test/
|
||||
dodoc $(find test -maxdepth 1 -type f ! -name ".*")
|
||||
|
||||
insinto /etc/iscsi
|
||||
newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
|
||||
|
||||
newconfd "${FILESDIR}"/iscsid-conf.d iscsid
|
||||
newinitd "${FILESDIR}"/iscsid-init.d iscsid
|
||||
|
||||
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}" ]] && [[ -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
|
||||
|
||||
udev_reload
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user