Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] open-iscsi: add runit service [ci skip]
@ 2023-03-19 17:15 thetredev
  2023-03-19 17:49 ` mhmdanas
                   ` (23 more replies)
  0 siblings, 24 replies; 25+ messages in thread
From: thetredev @ 2023-03-19 17:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 557 bytes --]

There is a new pull request by thetredev against master on the void-packages repository

https://github.com/thetredev/void-packages open-iscsi/add-runit-service
https://github.com/void-linux/void-packages/pull/42864

open-iscsi: add runit service [ci skip]
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, `x86_64-glibc`

#### Notes
- This fixes issue #40861 

A patch file from https://github.com/void-linux/void-packages/pull/42864.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-open-iscsi/add-runit-service-42864.patch --]
[-- Type: text/x-diff, Size: 2585 bytes --]

From bc78d00672db1d6c74e23d1f3bcd2591cf72c926 Mon Sep 17 00:00:00 2001
From: Timo Reichl <thetredev@gmail.com>
Date: Sun, 19 Mar 2023 17:40:05 +0100
Subject: [PATCH 1/2] open-iscsi: Add runit service

Signed-off-by: Timo Reichl <thetredev@gmail.com>
---
 srcpkgs/open-iscsi/files/iscsid/run | 4 ++++
 srcpkgs/open-iscsi/template         | 1 +
 2 files changed, 5 insertions(+)
 create mode 100755 srcpkgs/open-iscsi/files/iscsid/run

diff --git a/srcpkgs/open-iscsi/files/iscsid/run b/srcpkgs/open-iscsi/files/iscsid/run
new file mode 100755
index 000000000000..d78c31b747dd
--- /dev/null
+++ b/srcpkgs/open-iscsi/files/iscsid/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec 2>&1
+[ -r conf ] && . ./conf
+exec iscsid -f
diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index a146dae7a7b2..f152ef2a693b 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -32,6 +32,7 @@ do_build() {
 }
 do_install() {
 	make install exec_prefix=/usr SBINDIR=/usr/bin RULESDIR=/usr/lib/udev/rules.d DESTDIR="$DESTDIR"
+	vsv iscsid
 
 	rm -rf ${DESTDIR}/usr/lib/systemd
 

From f740b0149703bedaefe79913cdc146cfd0b20720 Mon Sep 17 00:00:00 2001
From: Timo Reichl <thetredev@gmail.com>
Date: Sun, 19 Mar 2023 17:40:27 +0100
Subject: [PATCH 2/2] open-iscsi: Improve template readability

Signed-off-by: Timo Reichl <thetredev@gmail.com>
---
 srcpkgs/open-iscsi/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index f152ef2a693b..159f9e80861b 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -16,20 +16,24 @@ checksum=9565bdf6b68b223e1e0d455d9a04d7536724a3f5b5a254e9398d06b2a0c6b6d2
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+=" -D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";;
 esac
+
 post_extract() {
 	vsed -i -e '/CC.*-o/s/$/ $(LDFLAGS)/' utils/Makefile usr/Makefile
 	vsed -i -e 's/lib64/lib/g' libopeniscsiusr/Makefile
 	vsed -i -e 's,<linux/if_ether.h>,<netinet/if_ether.h>,g' usr/iscsi_net_util.c
 	vsed -i -e '1i#include <netinet/if_ether.h>' iscsiuio/src/unix/libs/bnx2x.c libopeniscsiusr/misc.c
 }
+
 do_configure() {
 	( cd iscsiuio && autoreconf -fi && ./configure ${configure_args} CFLAGS="-DNO_SYSTEMD" )
 }
+
 do_build() {
 	make ${makejobs} CC="$CC" \
 		OPTFLAGS="$CFLAGS $(pkg-config --cflags libkmod) -pthread -DNO_SYSTEMD" \
 		LDFLAGS="$LDFLAGS $(pkg-config --libs libkmod) -pthread" NO_SYSTEMD=1
 }
+
 do_install() {
 	make install exec_prefix=/usr SBINDIR=/usr/bin RULESDIR=/usr/lib/udev/rules.d DESTDIR="$DESTDIR"
 	vsv iscsid

^ permalink raw reply	[flat|nested] 25+ messages in thread
end of thread, other threads:[~2023-07-20 14:41 UTC | newest]

Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-19 17:15 [PR PATCH] open-iscsi: add runit service [ci skip] thetredev
2023-03-19 17:49 ` mhmdanas
2023-03-19 17:50 ` mhmdanas
2023-03-19 18:32 ` classabbyamp
2023-03-19 20:35 ` [PR REVIEW] " paper42
2023-03-19 21:50 ` thetredev
2023-03-19 21:51 ` thetredev
2023-03-19 21:52 ` thetredev
2023-03-19 21:52 ` classabbyamp
2023-03-19 21:53 ` [PR PATCH] [Updated] " thetredev
2023-03-19 21:53 ` open-iscsi: add runit service thetredev
2023-03-19 21:54 ` [PR REVIEW] " thetredev
2023-03-19 21:56 ` mhmdanas
2023-03-19 21:57 ` [PR PATCH] [Updated] " thetredev
2023-03-19 21:58 ` [PR REVIEW] " thetredev
2023-03-19 22:05 ` thetredev
2023-03-19 22:06 ` thetredev
2023-03-20 15:42 ` mhmdanas
2023-05-10 19:51 ` classabbyamp
2023-05-11 11:01 ` [PR PATCH] [Updated] " thetredev
2023-05-11 11:01 ` thetredev
2023-06-18 14:25 ` [PR PATCH] [Updated] " thetredev
2023-06-18 14:25 ` thetredev
2023-06-18 18:14 ` classabbyamp
2023-07-20 14:41 ` [PR PATCH] [Merged]: " leahneukirchen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).