Date: Thursday, May 8, 2014 @ 14:32:59 Author: spupykin Revision: 110828
upgpkg: open-iscsi 2.0_873-6 upd Added: open-iscsi/trunk/open-iscsi.service Modified: open-iscsi/trunk/PKGBUILD open-iscsi/trunk/open-iscsi.install --------------------+ PKGBUILD | 40 +++++++++++++++++++--------------------- open-iscsi.install | 6 ------ open-iscsi.service | 10 ++++++++++ 3 files changed, 29 insertions(+), 27 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-05-08 12:32:46 UTC (rev 110827) +++ PKGBUILD 2014-05-08 12:32:59 UTC (rev 110828) @@ -1,22 +1,23 @@ +# $Id$ +# Maintainer: Sergej Pupykin <[email protected]> # Maintainer: Stefan Kirrmann <stefan.kirrmann at gmail dot com> + pkgname=open-iscsi -pkgver=2.0.873 -_pkgver=2.0-873 -pkgrel=4 -pkgdesc="High performance, transport independent iSCSI implementation" +pkgver=2.0_873 +_pkgver=${pkgver/_/-} +pkgrel=6 +pkgdesc="userland tools" arch=('i686' 'x86_64') url="http://www.open-iscsi.org"; license=('GPL') depends=('bash') install=$pkgname.install -backup=('etc/iscsi/iscsid.conf' 'etc/iscsi/initiatorname.iscsi' 'etc/conf.d/open-iscsi') +backup=('etc/iscsi/iscsid.conf' 'etc/iscsi/initiatorname.iscsi') source=("http://www.open-iscsi.org/bits/${pkgname}-${_pkgver}.tar.gz"; \ - "open-iscsi" "open-iscsi.conf.d") + "open-iscsi.service") options=('docs') -changelog=Changelog sha256sums=('7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9' - '649536c4abc9c4d9f994cc1c0033449d46c120b73a836854a228f7e103711314' - '289ba27b72a3bd9d251e08b3d61dd3ae2f6ad545e5ffe2edaa2b79638996654c') + '7b8e37dd10a909a67ba7f7126f699920639be39adfa65f1d2b2bcd8846e58db7') build() { cd ${srcdir}/${pkgname}-${_pkgver} @@ -24,29 +25,26 @@ # include iscsistart in the package sed -i -e '/^PROGRAMS = /s/$/ usr\/iscsistart/' Makefile - # fix sbindir, so it installs to /usr/bin/ instead of /sbin - sed -i -e 's/\/bin/\/usr\/bin/' Makefile - sed -i -e 's/sbindir/bindir/' Makefile - sed -i -e 's/\/sbin\//\/usr\/bin\//' Makefile - # build breaks if the openslp package is installed - sed -i -e 's/\(\.\/configure\)/ \1 --without-slp/g' Makefile + sed -i -e 's/\(\.\/configure\)/ \1 --without-slp/g' Makefile make user } -package(){ +package() { cd ${srcdir}/${pkgname}-${_pkgver} + make DESTDIR=${pkgdir} install_user - - # install config files - install -D -m755 ${srcdir}/open-iscsi ${pkgdir}/etc/rc.d/open-iscsi - install -D -m644 ${srcdir}/open-iscsi.conf.d ${pkgdir}/etc/conf.d/open-iscsi + install -D -m644 ${srcdir}/${pkgname}-${_pkgver}/etc/iscsid.conf ${pkgdir}/etc/iscsi + install -D -m644 ${srcdir}/open-iscsi.service ${pkgdir}/usr/lib/systemd/system/open-iscsi.service touch ${pkgdir}/etc/iscsi/initiatorname.iscsi - + # copy docs mkdir -p ${pkgdir}/usr/share/doc/${pkgname} + install -m644 Changelog ${pkgdir}/usr/share/doc/${pkgname}/ install -m644 README ${pkgdir}/usr/share/doc/${pkgname}/ + + mv $pkgdir/sbin $pkgdir/usr/bin } Modified: open-iscsi.install =================================================================== --- open-iscsi.install 2014-05-08 12:32:46 UTC (rev 110827) +++ open-iscsi.install 2014-05-08 12:32:59 UTC (rev 110828) @@ -6,12 +6,6 @@ echo ">>> Setting Initiatorname '$name'" echo "InitiatorName=$name" > /etc/iscsi/initiatorname.iscsi fi - echo - echo "Configure /etc/conf.d/open-iscsi to enable:" - echo " - portal discovery" - echo " - automatic login to available targets" - echo " - automount of targets" - echo } post_upgrade() { Added: open-iscsi.service =================================================================== --- open-iscsi.service (rev 0) +++ open-iscsi.service 2014-05-08 12:32:59 UTC (rev 110828) @@ -0,0 +1,10 @@ +[Unit] +Description=Open iSCSI Daemon +After=network.target + +[Service] +Type=forking +ExecStart=/sbin/iscsid + +[Install] +WantedBy=multi-user.target
