Arch Linux User Repository

Patch with some fixes: 1. Fix "Unknown distribution option: 'install_requires'" warning 2. Fix building when "BUILDDIR=" in makepkg.conf is not empty

diff --git a/.SRCINFO b/.SRCINFO
index 15cca8a..62763fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = targetd
    pkgdesc = Remote configuration of a LIO-based storage appliance
    pkgver = 0.9.1
-   pkgrel = 1
+   pkgrel = 2
    url = https://github.com/open-iscsi/targetd
    arch = any
    license = GPL3
@@ -18,7 +18,11 @@ pkgbase = targetd
    optdepends = zfs-dkms: ZFS block device support
    provides = targetd
    source = targetd-0.9.1.tar.gz::https://github.com/open-iscsi/targetd/archive/v0.9.1.tar.gz
+   source = targetd.service
+   source = targetd.yaml
    sha256sums = 40846e30a8f2d3ce9a6075a76dcf59f927932296b774a1b7f2875e82b96312e8
+   sha256sums = 221c660d89f94c5543991ce62127d1b30da78f133b6683b9f6be79293266aa73
+   sha256sums = fd9362d5dc32c976107114ef40a983f2440687c89e444c63f22c911df8010b06

 pkgname = targetd

diff --git a/PKGBUILD b/PKGBUILD
index c8aa96a..c0a9dc5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,18 @@

 pkgname=targetd
 pkgver=0.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Remote configuration of a LIO-based storage appliance"
 arch=('any')
 url="https://github.com/open-iscsi/targetd"
 license=('GPL3')
 provides=('targetd')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/open-iscsi/targetd/archive/v${pkgver}.tar.gz")
-sha256sums=('40846e30a8f2d3ce9a6075a76dcf59f927932296b774a1b7f2875e82b96312e8')
-
+source=("$pkgname-$pkgver.tar.gz::https://github.com/open-iscsi/targetd/archive/v${pkgver}.tar.gz"
+   "targetd.service"
+   "targetd.yaml")
+sha256sums=('40846e30a8f2d3ce9a6075a76dcf59f927932296b774a1b7f2875e82b96312e8'
+            '221c660d89f94c5543991ce62127d1b30da78f133b6683b9f6be79293266aa73'
+            'fd9362d5dc32c976107114ef40a983f2440687c89e444c63f22c911df8010b06')
 makedepends=('python-setuptools')
 depends=('targetcli-fb' 'python-rtslib-fb' 'python-configshell-fb' 'libblockdev' 'python-setproctitle' 'python-yaml')
 optdepends=('zfs-utils: ZFS block device support'
@@ -18,12 +21,17 @@ optdepends=('zfs-utils: ZFS block device support'
             'zfs-linux-lts: ZFS block device support'
             'zfs-dkms: ZFS block device support')

+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's/ distutils.core / setuptools /' setup.py
+}
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   python setup.py install --root="$pkgdir"
   install -D -m755 scripts/targetd "$pkgdir"/usr/bin/targetd
-  install -D -m644 ../../targetd.service "$pkgdir"/usr/lib/systemd/system/targetd.service
-  install -D -m644 ../../targetd.yaml "$pkgdir"/usr/share/targetd/targetd.yaml
+  install -D -m644 "$srcdir"/targetd.service "$pkgdir"/usr/lib/systemd/system/targetd.service
+  install -D -m644 "$srcdir"/targetd.yaml "$pkgdir"/usr/share/targetd/targetd.yaml
   install -D -m644 targetd.8 "$pkgdir"/usr/share/man/man8/targetd.8
   install -D -m644 targetd.yaml.5 "$pkgdir"/usr/share/man/man5/targetd.yaml.5
 }

It builds and installs fine on my system both with makepkg and pikaur.

Your AUR helper may be doing something unexpected, though I'm not quite sure what that might be.

Looks like this too is missing the service file:

[2020-12-05T18:59:25.041Z] running install_scripts
[2020-12-05T18:59:25.041Z] creating /build/targetd/pkg/targetd/usr/bin
[2020-12-05T18:59:25.041Z] copying build/scripts-3.9/targetd -> /build/targetd/pkg/targetd/usr/bin
[2020-12-05T18:59:25.041Z] changing mode of /build/targetd/pkg/targetd/usr/bin/targetd to 755
[2020-12-05T18:59:25.041Z] running install_egg_info
[2020-12-05T18:59:25.041Z] Writing /build/targetd/pkg/targetd/usr/lib/python3.9/site-packages/targetd-0.8.12-py3.9.egg-info
[2020-12-05T18:59:25.041Z] install: cannot stat '../../targetd.service': No such file or directory
[2020-12-05T18:59:25.041Z] ==> ERROR: A failure occurred in package().
[2020-12-05T18:59:25.041Z]     Aborting...
script returned exit code 255

I've added a temporary patch that does much the same thing. Sadly I don't currently have the time to fully test the package, as I am on vacation.

@amiga23, you might want to consider the targetd-git variant I submitted a few days ago. Master is not far ahead of 0.8.12. Once 0.8.13 is out this package could be updated without needing a patch. On the other hand, the only patch necessary is:

diff -r -c targetd-0.8.12.orig/setup.py targetd-0.8.12/setup.py
*** targetd-0.8.12.orig/setup.py        2020-07-14 15:58:39.000000000 +0200
--- targetd-0.8.12/setup.py     2020-07-31 21:05:54.756191143 +0200
***************
*** 10,15 ****
      maintainer='Andy Grover',
      maintainer_email='andy@groveronline.com',
      url='http://github.com/open-iscsi/targetd',
!     packages=['targetd'],
      install_requires=['setproctitle', 'yaml', 'rtslib_fb'],
      scripts=['scripts/targetd'])
--- 10,15 ----
      maintainer='Andy Grover',
      maintainer_email='andy@groveronline.com',
      url='http://github.com/open-iscsi/targetd',
!     packages=['targetd','targetd.backend'],
      install_requires=['setproctitle', 'yaml', 'rtslib_fb'],
      scripts=['scripts/targetd'])

I've added the backends folder manually and it seems to work. Could you please update the package to include the backends folder?

Just as a heads up as I built the package ahead of time with 0.8.12. Currently, this release does not yet have the right setup.py file to start the daemon. It lacks the 'targetd.backends' that got introduced with the ZFS support. I've submitted a patch which also got merged in, but that might take some time before it's released.