Date: Wednesday, November 20, 2019 @ 13:12:24 Author: eworm Revision: 530737
archrelease: copy trunk to community-x86_64 Added: open-iscsi/repos/community-x86_64/PKGBUILD (from rev 530736, open-iscsi/trunk/PKGBUILD) open-iscsi/repos/community-x86_64/open-iscsi.install (from rev 530736, open-iscsi/trunk/open-iscsi.install) Deleted: open-iscsi/repos/community-x86_64/0001-libkmod.patch open-iscsi/repos/community-x86_64/PKGBUILD open-iscsi/repos/community-x86_64/open-iscsi.install --------------------+ 0001-libkmod.patch | 35 ---------------------- PKGBUILD | 78 +++++++++++++++++++++++++-------------------------- open-iscsi.install | 24 +++++++-------- 3 files changed, 51 insertions(+), 86 deletions(-) Deleted: 0001-libkmod.patch =================================================================== --- 0001-libkmod.patch 2019-11-20 13:12:21 UTC (rev 530736) +++ 0001-libkmod.patch 2019-11-20 13:12:24 UTC (rev 530737) @@ -1,35 +0,0 @@ -diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile -index bf7c96c..589c69b 100644 ---- a/libopeniscsiusr/Makefile -+++ b/libopeniscsiusr/Makefile -@@ -44,7 +44,7 @@ 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 - --LIBADD = -+LIBADD = -lkmod - - all: $(LIBS) $(LIBS_MAJOR) $(TESTS) doc - -diff --git a/usr/Makefile b/usr/Makefile -index f9445ad..13a719d 100644 ---- a/usr/Makefile -+++ b/usr/Makefile -@@ -36,7 +36,7 @@ CFLAGS ?= -O2 -g - WARNFLAGS ?= -Wall -Wstrict-prototypes - CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ - -I$(TOPDIR)/libopeniscsiusr --ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr -+ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr -lkmod - PROGRAMS = iscsid iscsiadm iscsistart - - # libc compat files -@@ -60,7 +60,7 @@ 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) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount -lsystemd $(ISCSI_LIB) - - iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o mntcheck.o - $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(ISCSI_LIB) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-11-20 13:12:21 UTC (rev 530736) +++ PKGBUILD 2019-11-20 13:12:24 UTC (rev 530737) @@ -1,39 +0,0 @@ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Maintainer: Stefan Kirrmann <stefan.kirrmann at gmail dot com> - -pkgname=open-iscsi -pkgver=2.0.878 -pkgrel=1 -pkgdesc='iSCSI userland tools' -arch=('x86_64') -url='https://www.open-iscsi.com/' -license=('GPL') -depends=('systemd-libs' 'libutil-linux' 'kmod' 'openssl' 'open-isns') -install=$pkgname.install -backup=('etc/iscsi/iscsid.conf' - 'etc/iscsi/initiatorname.iscsi') -options=('docs') -source=("$pkgname-$pkgver.tar.gz::https://github.com/open-iscsi/open-iscsi/archive/$pkgver.tar.gz") -sha256sums=('5aeef0069c4a9d7f288269bcf56588d09a3c529a35f865f16dd8119ab8672208') - -build() { - cd "$srcdir"/${pkgname}-${pkgver} - - make user LIB_DIR=/usr/lib -} - -package() { - cd "$srcdir"/${pkgname}-${pkgver} - - make DESTDIR="$pkgdir" LIB_DIR=/usr/lib install install_systemd - - install -D -m0644 "$srcdir"/${pkgname}-${pkgver}/etc/iscsid.conf "$pkgdir"/etc/iscsi - echo -n > "$pkgdir"/etc/iscsi/initiatorname.iscsi - - # copy docs - mkdir -p "$pkgdir"/usr/share/doc/${pkgname} - install -m0644 Changelog "$pkgdir"/usr/share/doc/${pkgname}/ - install -m0644 README "$pkgdir"/usr/share/doc/${pkgname}/ - - mv "$pkgdir"/sbin "$pkgdir"/usr/bin -} Copied: open-iscsi/repos/community-x86_64/PKGBUILD (from rev 530736, open-iscsi/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-11-20 13:12:24 UTC (rev 530737) @@ -0,0 +1,39 @@ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: Stefan Kirrmann <stefan.kirrmann at gmail dot com> + +pkgname=open-iscsi +pkgver=2.1.0 +pkgrel=1 +pkgdesc='iSCSI userland tools' +arch=('x86_64') +url='https://www.open-iscsi.com/' +license=('GPL') +depends=('systemd-libs' 'libutil-linux' 'kmod' 'openssl' 'open-isns') +install=$pkgname.install +backup=('etc/iscsi/iscsid.conf' + 'etc/iscsi/initiatorname.iscsi') +options=('docs') +source=("$pkgname-$pkgver.tar.gz::https://github.com/open-iscsi/open-iscsi/archive/$pkgver.tar.gz") +sha256sums=('5b381b6a74bef3ca57cd8d5fa7a3ff07d45c8009b0e4aac5ba3a811ff0c48ee4') + +build() { + cd "$srcdir"/${pkgname}-${pkgver} + + make user LIB_DIR=/usr/lib +} + +package() { + cd "$srcdir"/${pkgname}-${pkgver} + + make DESTDIR="$pkgdir" LIB_DIR=/usr/lib install install_systemd + + install -D -m0644 "$srcdir"/${pkgname}-${pkgver}/etc/iscsid.conf "$pkgdir"/etc/iscsi + echo -n > "$pkgdir"/etc/iscsi/initiatorname.iscsi + + # copy docs + mkdir -p "$pkgdir"/usr/share/doc/${pkgname} + install -m0644 Changelog "$pkgdir"/usr/share/doc/${pkgname}/ + install -m0644 README "$pkgdir"/usr/share/doc/${pkgname}/ + + mv "$pkgdir"/sbin "$pkgdir"/usr/bin +} Deleted: open-iscsi.install =================================================================== --- open-iscsi.install 2019-11-20 13:12:21 UTC (rev 530736) +++ open-iscsi.install 2019-11-20 13:12:24 UTC (rev 530737) @@ -1,12 +0,0 @@ -post_install() { - if [ -z $(<etc/iscsi/initiatorname.iscsi) ]; then - name=$(iscsi-iname) - echo - echo ">>> Setting Initiatorname '$name'" - echo "InitiatorName=$name" >etc/iscsi/initiatorname.iscsi - fi -} - -post_upgrade() { - post_install -} Copied: open-iscsi/repos/community-x86_64/open-iscsi.install (from rev 530736, open-iscsi/trunk/open-iscsi.install) =================================================================== --- open-iscsi.install (rev 0) +++ open-iscsi.install 2019-11-20 13:12:24 UTC (rev 530737) @@ -0,0 +1,12 @@ +post_install() { + if [ -z $(<etc/iscsi/initiatorname.iscsi) ]; then + name=$(iscsi-iname) + echo + echo ">>> Setting Initiatorname '$name'" + echo "InitiatorName=$name" >etc/iscsi/initiatorname.iscsi + fi +} + +post_upgrade() { + post_install +}