summaryrefslogtreecommitdiff
path: root/sys-block
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-09-05 12:28:41 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-09-05 12:28:41 +0100
commit5d93bae2c1576ab817f482024a6d47592829407b (patch)
tree1fd9619473e6cdba4c004554cb1743ec16654102 /sys-block
parent518b45bffd19d0b75715f338985f96c459f9d129 (diff)
gentoo auto-resync : 05:09:2024 - 12:28:40
Diffstat (limited to 'sys-block')
-rw-r--r--sys-block/Manifest.gzbin10892 -> 10885 bytes
-rw-r--r--sys-block/gparted/Manifest4
-rw-r--r--sys-block/gparted/gparted-1.5.0-r1.ebuild90
-rw-r--r--sys-block/gparted/gparted-1.6.0-r1.ebuild (renamed from sys-block/gparted/gparted-1.6.0.ebuild)6
-rw-r--r--sys-block/open-iscsi/Manifest6
-rw-r--r--sys-block/open-iscsi/files/open-iscsi-2.1.9-usr-idbm.c-fix-musl-build-426.patch43
-rw-r--r--sys-block/open-iscsi/open-iscsi-2.1.10-r1.ebuild (renamed from sys-block/open-iscsi/open-iscsi-2.1.9.ebuild)20
-rw-r--r--sys-block/open-iscsi/open-iscsi-2.1.8.ebuild117
8 files changed, 18 insertions, 268 deletions
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 5fd39e5906af..29acb8fbaf56 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
Binary files differ
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index 9bc9fdc77987..9ea1e5e9320e 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,5 +1,3 @@
-DIST gparted-1.5.0.tar.gz 5416965 BLAKE2B 034fcbfde4b74f99769f5bff27ec7a84f7f6cf8e37d944aa7bce61d0421f02711d77bc695667ea34523b066c6f925437e24d34c5b172fe56be5ce23f99283f53 SHA512 af32358bc470d30c38cdf688e8f940548c7361808fbc7712dc79ef6d196e3bfbf9c9e0ee499729e78d4b782ed1f52ea1f55c983e9afe8fc3fea765078ffbddad
DIST gparted-1.6.0.tar.gz 5404754 BLAKE2B 994023a85281036d4a10733144d63f7a9f57d0aca29fde0502a594b4da629061f1f6eef4b0db3e22ef28db6567f27e824de124f42309980388bc038240fdcdd6 SHA512 359accfee955fb68131eb7b5737a2e74702abe2c29766ce07475a4c789983801ee129dec28b20c72d74210533423dfefd0626b794a540840ed0b36f0d71ccc60
-EBUILD gparted-1.5.0-r1.ebuild 2741 BLAKE2B 9a4894503f66a4458c533786f3e96b0f8b2a08101cb3021dd3ca8ab2b8ff1b80b8303cd394aa1b51f938ecfa515aea19541874a206cb9c0ae6a39bfd914d18dd SHA512 bda48bda0905566560596d856b6caf759c85b620e1a53a5bb5ca3ad23e69c70435dcd912b28f7cb14a38732f37bf8bf4e08df4174080da33eb9e40da4a8ee17d
-EBUILD gparted-1.6.0.ebuild 2741 BLAKE2B 85fbeb5f415f551a4f79176c6f8ba68bc2311cdb3408fc05420d98f99060c0c36a3683b23e74f44fc6da8a195cf1c3a9ffd53bacde15a086cecbdb2b40f77202 SHA512 56d7ee43c4741f14214b9152150386273953917a55f7ccc6b028d628441f5d3b9b234e290a23aa18cbcc6b53bf1e0fe1791b345f9ec39ec81807b80a50cd8ed7
+EBUILD gparted-1.6.0-r1.ebuild 2772 BLAKE2B 618c5026ace1323be4b61acbad89621cffbcb03b15a4a25e5a1742bbae4ac2d78f764e7c0ad4e2d5cf21aec896a38e482f8b321861c20ef019907594b083c8a2 SHA512 4bf627298c2a3307d2855f21f61b2ac4f40842d9f2c767baf061ea1b323a1b540e7af4a6634c8258ad008a9ddf8c1441aa476c0e39f2562eea8bcbc12ac385e2
MISC metadata.xml 1007 BLAKE2B 9ac47d4a18d3f0a9743de27544cc2ca9c30014b6bec3c1538fdcf867d8ea683b85733e25713fd5cb943c1a6f2c1b43cbf09e45162e1bdb0c2a2dd85d30b5406a SHA512 33863a91927a45758ab0f56ac9bad51f5143d68b02e6e04c1a488a6a7a6554c57ddf72abfe92993845b3ce561325dd37af901e8be7689164eaee9c3a50c427cf
diff --git a/sys-block/gparted/gparted-1.5.0-r1.ebuild b/sys-block/gparted/gparted-1.5.0-r1.ebuild
deleted file mode 100644
index fcf4eb595189..000000000000
--- a/sys-block/gparted/gparted-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2 optfeature virtualx
-
-DESCRIPTION="Partition editor for graphically managing your disk partitions"
-HOMEPAGE="https://gparted.org/ https://gitlab.gnome.org/GNOME/gparted/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
-IUSE="kde policykit wayland"
-
-DEPEND="
- !policykit? (
- kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1:*[kdesu] ) )
- policykit? ( >=sys-auth/polkit-0.102 )
- >=dev-cpp/glibmm-2.56.1:2
- >=dev-cpp/gtkmm-3.24:3.0
- >=dev-libs/glib-2.58.3-r1:2
- >=sys-block/parted-3.2:=
- >=dev-libs/libsigc++-2.10.1:2
-"
-RDEPEND="${DEPEND}
- >=sys-apps/util-linux-2.33.2
- wayland? ( x11-apps/xhost )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.1.2
- dev-util/itstool
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_configure() {
- gnome2_src_configure \
- --enable-doc \
- --enable-online-resize \
- $(use_enable wayland xhost-root) \
- GKSUPROG=kdesu \
- ac_cv_prog_have_scrollkeeper_update=no
-}
-
-src_install() {
- gnome2_src_install
-
- local _ddir="${D}"/usr/share/applications
- local _bdir="${D}"/usr/bin
-
- if ! use policykit; then
- if use kde; then
- cp "${_ddir}"/gparted{,-kde}.desktop || die
- cp "${_bdir}"/gparted{,-kde} || die
- sed -i -e '/Exec/ s:gparted:gparted-kde:' "${_ddir}"/gparted-kde.desktop || die
- echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop || die
- fi
- else
- sed -i -e 's:kdesu::' "${_bdir}"/gparted || die
- fi
-
- mv "${ED}"/usr/share/{appdata,metainfo}
-}
-
-src_test() {
- virtx emake check
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- optfeature_header
- optfeature "BTRFS support" sys-fs/btrfs-progs
- optfeature "DMRAID support" sys-fs/dmraid sys-fs/multipath-tools
- optfeature "Encrypted device / LUKS support" sys-fs/cryptsetup
- optfeature "exFAT support" sys-fs/exfatprogs
- optfeature "EXT2/EXT3/EXT4 support" sys-fs/e2fsprogs
- optfeature "F2FS support" sys-fs/f2fs-tools
- optfeature "FAT support" sys-fs/dosfstools sys-fs/mtools
- optfeature "HFS support" sys-fs/diskdev_cmds sys-fs/hfsutils virtual/udev
- optfeature "JFS support" sys-fs/jfsutils
- optfeature "MDADM support" sys-fs/mdadm
- optfeature "NTFS support" sys-fs/ntfs3g[ntfsprogs]
- optfeature "Reiser4 support" sys-fs/reiser4progs
- optfeature "ReiserFS support" sys-fs/reiserfsprogs
- optfeature "UDF support" sys-fs/udftools
- optfeature "XFS support" sys-fs/xfsprogs sys-fs/xfsdump
-}
diff --git a/sys-block/gparted/gparted-1.6.0.ebuild b/sys-block/gparted/gparted-1.6.0-r1.ebuild
index 9b9129a804a9..e6b5ff10483d 100644
--- a/sys-block/gparted/gparted-1.6.0.ebuild
+++ b/sys-block/gparted/gparted-1.6.0-r1.ebuild
@@ -15,8 +15,10 @@ KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
IUSE="kde policykit wayland"
DEPEND="
- !policykit? (
- kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1:*[kdesu] ) )
+ !policykit? ( kde? ( || (
+ kde-plasma/kdesu-gui
+ >=kde-plasma/kde-cli-tools-5.8.6-r1:*[kdesu]
+ ) ) )
policykit? ( >=sys-auth/polkit-0.102 )
>=dev-cpp/glibmm-2.56.1:2
>=dev-cpp/gtkmm-3.24:3.0
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 9e40e6fa7364..8bd700b414b6 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -2,11 +2,7 @@ AUX initiatorname.iscsi 1152 BLAKE2B 32ddfef007a3cef2c22c6f49319587065d527000d0d
AUX iscsid-conf.d 422 BLAKE2B 2871024472d5308b395aeb8c67f7b47aed4618790295d3ef7e51aaddd32f12fafbe1b8542fc8a34d5da0233a26ee557c7e9613fa8436d9c9312a9e2f6902a1e5 SHA512 d197bbe2ce610cc2d4a1269c8d7a067ca5e3b0f3d8bb0804c2c39e0cf512bcbf7b5de45b7d6ffd5cf918dc395c7cf32c40e64b4348d00a4d0223ee44c463709a
AUX iscsid-init.d 2094 BLAKE2B e13fc820e74a79e3c1f220b827c3188b6cb3bc149f450e3ee668d851faacd59e1e44b51250ba3f53a321d287eb81b580a332605226564269dbcd3e2762c0c95e SHA512 a5544e35da3433dfde96984d2e5783991d961554b8843f4f96d4317a38d7534864882342633ed0dc15c2f9e49a419e51958593b0de1ce84644938dafabe392fc
AUX open-iscsi-2.1.7-fix_bitwise.patch 1480 BLAKE2B c5076f91885866042d99eef8d905fef4375645863bbf840fbec6c1bbc568ee98866b7fc74b2a78eb675a72cf800c82d11fd28438e9653e696f7d6260896b3f1a SHA512 b9474d78f1616bfdcfc2e11f51faa4a0398a30d00af50a7ae885a8ea07fdf1ba06a354e2ffec777ee2d9598c386093a1f89c4bb633a85a85011f6fa42b307a71
-AUX open-iscsi-2.1.9-usr-idbm.c-fix-musl-build-426.patch 1429 BLAKE2B 5ac6b28fc6003a5335a3ce24b9fe5fda4cc3dd4d164574b40aaaa8ef3236f4721a54aae3dc84a7a9e7e5df8087543c5f8969bfaf2146f97b3d3e6f12c75bb9bf SHA512 1a5ff5acf08dcce356425ce4bcd7a867ec3f9ec176f83d3d187da7b96669b56e61e46317d9c3b983fca4c3ebbd137ee424342d41735eab562145951bc715654e
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
+EBUILD open-iscsi-2.1.10-r1.ebuild 3673 BLAKE2B ab34a3d70a97d5688ab069681df17ee89e5656b754d47ff3bab5efa24ec70648982971ed7c2cdc6e34b6bccae0e0ea297e30d2066ca37e17befb9e1809ad1012 SHA512 e01184da3c61950815704640b4fe7a1c1e782c2526713795b419740b11d9cad590723c2bb98ce9867b6b6da79a3e9fc41a4587447d0f5e98171ae4353a82127b
EBUILD open-iscsi-2.1.10.ebuild 3482 BLAKE2B bebcd0962f8d43fcd2338482410f915d434658075e74996a10e74962d9b5805faddadabdecc5a8cea216f9fe99909fcdffbda02d6fa6fffca60e512452ff8a3d SHA512 84f9c6e5b91f6f63346608dbd634654231d83458aec4ab0f7509b256bdb0de5a79d36e64dfd9dad4aeb66b87f9588f83cf57ade98c691fd7873510f0a1f2e3d3
-EBUILD open-iscsi-2.1.8.ebuild 3346 BLAKE2B b575b5b9238c7218fcc7d2dc64d7ca76c032100df942b72782d1c7b3a8d3628dde40126933cbf5b5e85a928dba7b96a8a8080e99d50dbedb67a5c17c83d340a5 SHA512 0780ea38e6b96d7a02867dbb3467aa4bfe22899644dfc65c100f8622e15257c9ff5f78a75a00a5b54108c9434ca96dad17ca84f99c8ef54d20d3b4de2173b8a6
-EBUILD open-iscsi-2.1.9.ebuild 3538 BLAKE2B df3fcb0b6f73c893fd31826fef4413b2d5f00046d9867db1593691c0b62f7a62cced7f6800ab5ee7c33c6f8e68ad31fd99383b6c74ae23fd2d3d17c26d2466ba SHA512 f70da5936347427583248e5a292fcd76da7d7cd1ba179c191eeb7c2bb92a79a0786f34e8f3fa6a22598d144c3dc9f41766a11b4b2a5bb5d86a30ee0eee13e58e
MISC metadata.xml 532 BLAKE2B 201e4a44b240ad6ba1096927924ef8c84027f092ffed238db0d92cce1fe8f37e4c927dc1f8ae8393578cf66831df2c2590409349b980edb09e5187ac4369aad0 SHA512 67ed8a95407e6cce2fbfc35a6b0df99586eff99ec51f41666de298739f233282cad15c4d9d73fb42d3d2972f85da274fe47699c87f8ba2ccc44a841d563087f4
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.9-usr-idbm.c-fix-musl-build-426.patch b/sys-block/open-iscsi/files/open-iscsi-2.1.9-usr-idbm.c-fix-musl-build-426.patch
deleted file mode 100644
index 13215dafbb69..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.1.9-usr-idbm.c-fix-musl-build-426.patch
+++ /dev/null
@@ -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
-
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.10-r1.ebuild
index d5126eaad442..fa3f81798159 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.10-r1.ebuild
@@ -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 ~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
@@ -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
+}
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
deleted file mode 100644
index 93b8afb21848..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
+++ /dev/null
@@ -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
-}