[arch-commits] Commit in open-iscsi/repos/community-testing-x86_64 (6 files)
Christian Hesse
eworm at archlinux.org
Thu Oct 18 07:23:49 UTC 2018
Date: Thursday, October 18, 2018 @ 07:23:48
Author: eworm
Revision: 395805
archrelease: copy trunk to community-testing-x86_64
Added:
open-iscsi/repos/community-testing-x86_64/0001-libkmod.patch
(from rev 395804, open-iscsi/trunk/0001-libkmod.patch)
open-iscsi/repos/community-testing-x86_64/PKGBUILD
(from rev 395804, open-iscsi/trunk/PKGBUILD)
open-iscsi/repos/community-testing-x86_64/open-iscsi.install
(from rev 395804, open-iscsi/trunk/open-iscsi.install)
Deleted:
open-iscsi/repos/community-testing-x86_64/0001-libkmod.patch
open-iscsi/repos/community-testing-x86_64/PKGBUILD
open-iscsi/repos/community-testing-x86_64/open-iscsi.install
--------------------+
0001-libkmod.patch | 70 ++++++++++++++++----------------
PKGBUILD | 109 +++++++++++++++++++++++++--------------------------
open-iscsi.install | 24 +++++------
3 files changed, 102 insertions(+), 101 deletions(-)
Deleted: 0001-libkmod.patch
===================================================================
--- 0001-libkmod.patch 2018-10-18 07:23:38 UTC (rev 395804)
+++ 0001-libkmod.patch 2018-10-18 07:23:48 UTC (rev 395805)
@@ -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)
Copied: open-iscsi/repos/community-testing-x86_64/0001-libkmod.patch (from rev 395804, open-iscsi/trunk/0001-libkmod.patch)
===================================================================
--- 0001-libkmod.patch (rev 0)
+++ 0001-libkmod.patch 2018-10-18 07:23:48 UTC (rev 395805)
@@ -0,0 +1,35 @@
+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 2018-10-18 07:23:38 UTC (rev 395804)
+++ PKGBUILD 2018-10-18 07:23:48 UTC (rev 395805)
@@ -1,54 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Stefan Kirrmann <stefan.kirrmann at gmail dot com>
-
-pkgname=open-iscsi
-pkgver=2.0.877
-pkgrel=1
-pkgdesc='iSCSI userland tools'
-arch=('x86_64')
-url='https://www.open-iscsi.com/'
-license=('GPL')
-depends=('libsystemd' '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"
- '0001-libkmod.patch')
-sha256sums=('69eb95b0c39dee2da9d0d751bfdcdb8d11f9d37390de15c1a0b4558f9d0c4a57'
- 'cacf5d5826868bc4afe4df6ac5721aafb75f82469c50d6d24cd7d685471a9cd8')
-
-prepare() {
- cd "$srcdir"/${pkgname}-${pkgver}
-
- # fix build with libkmod
- patch -Np1 < ../0001-libkmod.patch
-
- # include iscsistart in the package
- sed -i -e '/^PROGRAMS = /s/$/ usr\/iscsistart/' Makefile
-}
-
-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 -D -m0644 etc/systemd/iscsid.service "$pkgdir"/usr/lib/systemd/system/iscsid.service
- install -D -m0644 etc/systemd/iscsi.service "$pkgdir"/usr/lib/systemd/system/iscsi.service
-
- 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-testing-x86_64/PKGBUILD (from rev 395804, open-iscsi/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-10-18 07:23:48 UTC (rev 395805)
@@ -0,0 +1,55 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Stefan Kirrmann <stefan.kirrmann at gmail dot com>
+
+pkgname=open-iscsi
+pkgver=2.0.877
+pkgrel=2
+pkgdesc='iSCSI userland tools'
+arch=('x86_64')
+url='https://www.open-iscsi.com/'
+license=('GPL')
+depends=('libsystemd' '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"
+ '0001-libkmod.patch')
+sha256sums=('69eb95b0c39dee2da9d0d751bfdcdb8d11f9d37390de15c1a0b4558f9d0c4a57'
+ 'cacf5d5826868bc4afe4df6ac5721aafb75f82469c50d6d24cd7d685471a9cd8')
+
+prepare() {
+ cd "$srcdir"/${pkgname}-${pkgver}
+
+ # fix build with libkmod
+ patch -Np1 < ../0001-libkmod.patch
+
+ # include iscsistart in the package
+ sed -i -e '/^PROGRAMS = /s/$/ usr\/iscsistart/' Makefile
+}
+
+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 -D -m0644 etc/systemd/iscsid.service "$pkgdir"/usr/lib/systemd/system/iscsid.service
+ install -D -m0644 etc/systemd/iscsid.socket "$pkgdir"/usr/lib/systemd/system/iscsid.socket
+ install -D -m0644 etc/systemd/iscsi.service "$pkgdir"/usr/lib/systemd/system/iscsi.service
+
+ 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 2018-10-18 07:23:38 UTC (rev 395804)
+++ open-iscsi.install 2018-10-18 07:23:48 UTC (rev 395805)
@@ -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-testing-x86_64/open-iscsi.install (from rev 395804, open-iscsi/trunk/open-iscsi.install)
===================================================================
--- open-iscsi.install (rev 0)
+++ open-iscsi.install 2018-10-18 07:23:48 UTC (rev 395805)
@@ -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
+}
More information about the arch-commits
mailing list