From ea378dd8b9846be0755b6941da11f633be935e80 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 31 May 2022 15:38:04 +0200 Subject: [PATCH] open-iscsi: update to 2.1.7. --- srcpkgs/open-iscsi-devel | 1 + srcpkgs/open-iscsi/template | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) create mode 120000 srcpkgs/open-iscsi-devel diff --git a/srcpkgs/open-iscsi-devel b/srcpkgs/open-iscsi-devel new file mode 120000 index 00000000000..f92aa5b0a19 --- /dev/null +++ b/srcpkgs/open-iscsi-devel @@ -0,0 +1 @@ +open-iscsi \ No newline at end of file diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template index b95d5d710b6..83f64fbf970 100644 --- a/srcpkgs/open-iscsi/template +++ b/srcpkgs/open-iscsi/template @@ -1,6 +1,6 @@ # Template file for 'open-iscsi' pkgname=open-iscsi -version=2.1.6 +version=2.1.7 revision=1 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi" build_style=gnu-configure @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="http://www.open-iscsi.com/" distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz" -checksum=b67350d106696779c6bee421c60a64ade2a9dabe247dc4bd44f59c751e22d7f7 +checksum=d96761e47a69f8214c5fbd251d844f37961b14c3e437b63a15cc64f5b8cba2f0 case "$XBPS_TARGET_MACHINE" in *-musl) CFLAGS+=" -D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";; @@ -27,18 +27,26 @@ do_configure() { } do_build() { make ${makejobs} CC="$CC" \ - OPTFLAGS="$CFLAGS $(pkg-config --cflags libkmod) -DNO_SYSTEMD" \ - LDFLAGS="$LDFLAGS $(pkg-config --libs libkmod)" NO_SYSTEMD=1 + OPTFLAGS="$CFLAGS $(pkg-config --cflags libkmod) -pthread -DNO_SYSTEMD" \ + LDFLAGS="$LDFLAGS $(pkg-config --libs libkmod) -pthread" NO_SYSTEMD=1 } do_install() { - make install exec_prefix=/usr sbindir=/usr/bin DESTDIR="$DESTDIR" + make install exec_prefix=/usr SBINDIR=/usr/bin RULESDIR=/usr/lib/udev/rules.d DESTDIR="$DESTDIR" - vbin usr/iscsistart - for m in doc/*.8; do - vman $m - done + rm -rf ${DESTDIR}/usr/lib/systemd true >${DESTDIR}/etc/iscsi/initiatorname.iscsi vsconf ${DESTDIR}/etc/iscsi/ifaces/iface.example rm ${DESTDIR}/etc/iscsi/ifaces/iface.example } + +open-iscsi-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/*.so + vmove usr/lib/pkgconfig + vmove usr/share/man/man3 + } +}