[arch-commits] Commit in open-iscsi/repos/community-x86_64 (5 files)

Christian Hesse eworm at gemini.archlinux.org
Thu Jul 7 08:38:32 UTC 2022


    Date: Thursday, July 7, 2022 @ 08:38:32
  Author: eworm
Revision: 1247648

archrelease: copy trunk to community-x86_64

Added:
  open-iscsi/repos/community-x86_64/0001-etc-install-system-unit-with-without-executable-bit.patch
    (from rev 1247647, open-iscsi/trunk/0001-etc-install-system-unit-with-without-executable-bit.patch)
  open-iscsi/repos/community-x86_64/PKGBUILD
    (from rev 1247647, open-iscsi/trunk/PKGBUILD)
  open-iscsi/repos/community-x86_64/open-iscsi.install
    (from rev 1247647, open-iscsi/trunk/open-iscsi.install)
Deleted:
  open-iscsi/repos/community-x86_64/PKGBUILD
  open-iscsi/repos/community-x86_64/open-iscsi.install

----------------------------------------------------------------+
 0001-etc-install-system-unit-with-without-executable-bit.patch |   31 ++
 PKGBUILD                                                       |  104 +++++-----
 open-iscsi.install                                             |   24 +-
 3 files changed, 99 insertions(+), 60 deletions(-)

Copied: open-iscsi/repos/community-x86_64/0001-etc-install-system-unit-with-without-executable-bit.patch (from rev 1247647, open-iscsi/trunk/0001-etc-install-system-unit-with-without-executable-bit.patch)
===================================================================
--- 0001-etc-install-system-unit-with-without-executable-bit.patch	                        (rev 0)
+++ 0001-etc-install-system-unit-with-without-executable-bit.patch	2022-07-07 08:38:32 UTC (rev 1247648)
@@ -0,0 +1,31 @@
+From dda3eeb61ab5134da02ea916d7be10434dc18b94 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Thu, 7 Jul 2022 10:32:07 +0200
+Subject: [PATCH 1/1] etc: install system unit with without executable bit
+
+All systemd unit files are expected to be not executable, so install
+with correct permissions.
+---
+ etc/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/etc/Makefile b/etc/Makefile
+index 6a03c32..c47c180 100644
+--- a/etc/Makefile
++++ b/etc/Makefile
+@@ -81,10 +81,10 @@ install_systemd_service_files: $(DESTDIR)$(systemddir)/system $(SYSTEMD_DEST_SVC
+ install_systemd_generator_files: $(DESTDIR)$(systemddir)/system-generators $(SYSTEMD_DEST_GEN_FILES)
+ 
+ $(SYSTEMD_DEST_SVC_FILES): $(DESTDIR)$(systemddir)/system/%: systemd/%
+-	$(INSTALL) $? $@
++	$(INSTALL) -m 644 $? $@
+ 
+ $(SYSTEMD_DEST_GEN_FILES): $(DESTDIR)$(systemddir)/system-generators/%: systemd/%
+-	$(INSTALL) $? $@
++	$(INSTALL) -m 755 $? $@
+ 
+ install_iname: $(DESTDIR)$(HOMEDIR) $(ISCSI_INAME)
+ 	if [ ! -f $(INAME_DEST_FILE) ]; then \
+-- 
+2.37.0
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-07 08:38:29 UTC (rev 1247647)
+++ PKGBUILD	2022-07-07 08:38:32 UTC (rev 1247648)
@@ -1,48 +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.1.7
-pkgrel=1
-pkgdesc='iSCSI userland tools'
-arch=('x86_64')
-url='https://www.open-iscsi.com/'
-license=('GPL')
-makedepends=('systemd')
-depends=('systemd-libs' 'util-linux-libs' '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=('d96761e47a69f8214c5fbd251d844f37961b14c3e437b63a15cc64f5b8cba2f0')
-
-build() {
-  cd "$srcdir"/${pkgname}-${pkgver}
-
-  make \
-    LIB_DIR=/usr/lib \
-    RULESDIR=/usr/lib/udev/rules.d \
-    SBINDIR=/usr/bin \
-    user
-}
-
-package() {
-  cd "$srcdir"/${pkgname}-${pkgver}
-
-  make -j1 \
-    DESTDIR="$pkgdir" \
-    LIB_DIR=/usr/lib \
-    RULESDIR=/usr/lib/udev/rules.d \
-    SBINDIR=/usr/bin \
-    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}/
-}

Copied: open-iscsi/repos/community-x86_64/PKGBUILD (from rev 1247647, open-iscsi/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-07-07 08:38:32 UTC (rev 1247648)
@@ -0,0 +1,56 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Stefan Kirrmann <stefan.kirrmann at gmail dot com>
+
+pkgname=open-iscsi
+pkgver=2.1.7
+pkgrel=2
+pkgdesc='iSCSI userland tools'
+arch=('x86_64')
+url='https://www.open-iscsi.com/'
+license=('GPL')
+makedepends=('systemd')
+depends=('systemd-libs' 'util-linux-libs' '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-etc-install-system-unit-with-without-executable-bit.patch')
+sha256sums=('d96761e47a69f8214c5fbd251d844f37961b14c3e437b63a15cc64f5b8cba2f0'
+            '4958b838c548f6797ee25aea47b018a03be2ee11299ff41e9b56ad74f1121ead')
+
+prepare() {
+  cd "$srcdir"/${pkgname}-${pkgver}
+
+  patch -Np1 < ../0001-etc-install-system-unit-with-without-executable-bit.patch
+}
+
+build() {
+  cd "$srcdir"/${pkgname}-${pkgver}
+
+  make \
+    LIB_DIR=/usr/lib \
+    RULESDIR=/usr/lib/udev/rules.d \
+    SBINDIR=/usr/bin \
+    user
+}
+
+package() {
+  cd "$srcdir"/${pkgname}-${pkgver}
+
+  make -j1 \
+    DESTDIR="$pkgdir" \
+    LIB_DIR=/usr/lib \
+    RULESDIR=/usr/lib/udev/rules.d \
+    SBINDIR=/usr/bin \
+    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}/
+}

Deleted: open-iscsi.install
===================================================================
--- open-iscsi.install	2022-07-07 08:38:29 UTC (rev 1247647)
+++ open-iscsi.install	2022-07-07 08:38:32 UTC (rev 1247648)
@@ -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 1247647, open-iscsi/trunk/open-iscsi.install)
===================================================================
--- open-iscsi.install	                        (rev 0)
+++ open-iscsi.install	2022-07-07 08:38:32 UTC (rev 1247648)
@@ -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