sys-block/open-iscsi: Sync with Gentoo

It's from Gentoo commit e9cf1b010522d204490a6249e3b665041c4a45f6.
This commit is contained in:
Flatcar Buildbot 2025-03-17 07:11:34 +00:00 committed by Krzesimir Nowak
parent 4c4cae34ba
commit c4d0b924e6
2 changed files with 13 additions and 11 deletions

View File

@ -1 +1,2 @@
DIST open-iscsi-2.1.10.tar.gz 645825 BLAKE2B 6a2e279e2dcf77e8d340c025eb59168121ee0c50bd013d0b5d9dac2fbc7116cc54904b4206eea192bd3888e3bcf3da42caeae1e428268edc6c2f7184958b6b04 SHA512 18b92d3e9a85d8de66734d95e9ca74a8acc5167a98830134c18ad5e226b29a00d358f952edfab67b643c454ec63c0a382c7ab7e7e76970f7574b46cea0d5c82d DIST open-iscsi-2.1.10.tar.gz 645825 BLAKE2B 6a2e279e2dcf77e8d340c025eb59168121ee0c50bd013d0b5d9dac2fbc7116cc54904b4206eea192bd3888e3bcf3da42caeae1e428268edc6c2f7184958b6b04 SHA512 18b92d3e9a85d8de66734d95e9ca74a8acc5167a98830134c18ad5e226b29a00d358f952edfab67b643c454ec63c0a382c7ab7e7e76970f7574b46cea0d5c82d
DIST open-iscsi-2.1.11.tar.gz 644204 BLAKE2B 3db4d425b52cb88bfcaf798f779203f4a2caef253cb404de17bf71521d12c028ceb877f0ba20cbe031ad0528221278ee13678b3de18672bd0799d8577a420caa SHA512 5e7a160e675ce016123f703522758cbbf2ba3be6b97dc73a69b8ff0fe247c6d994c43ca67ebe6f21982bfa22eee27f2d08cbfc502767c0afc127852389411e4d

View File

@ -1,9 +1,9 @@
# Copyright 1999-2024 Gentoo Authors # Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 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" DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
HOMEPAGE="https://www.open-iscsi.com/" 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+" LICENSE="LGPL-3+ GPL-2+"
SLOT="0/0.2" SLOT="0/0.2"
KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="debug infiniband +tcp rdma systemd" IUSE="debug infiniband +tcp rdma systemd"
REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )" REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
# Tries to write to /run/lock/iscsi etc # Tries to write to /run/lock/iscsi etc
@ -39,10 +39,6 @@ PATCHES=(
pkg_setup() { pkg_setup() {
linux-info_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 # 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 # support loaded as module. Kernel builtin options don't work. See this for
# more information: # more information:
@ -88,8 +84,9 @@ src_configure() {
src_install() { src_install() {
meson_src_install meson_src_install
# Upstream make is not deterministic, per bug #601514 # We'll regenerate this later to avoid baking the value into binary
rm -f "${ED}"/etc/initiatorname.iscsi # packages. It doesn't get generated when cross-compiling.
tc-is-cross-compiler || rm "${ED}"/etc/iscsi/initiatorname.iscsi || die
docinto test/ docinto test/
dodoc $(find test -maxdepth 1 -type f ! -name ".*") dodoc $(find test -maxdepth 1 -type f ! -name ".*")
@ -107,13 +104,17 @@ src_install() {
pkg_postinst() { pkg_postinst() {
in='/etc/iscsi/initiatorname.iscsi' 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" cat "${EROOT}${in}.example"
echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)" 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}" } >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}"
fi fi
udev_reload udev_reload
} }
pkg_postrm() {
udev_reload
}