aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorCem Keylan <cem@ckyln.com>2020-09-17 00:16:13 +0300
committerCem Keylan <cem@ckyln.com>2020-09-17 00:16:13 +0300
commitc046ba6bc2188b78c9544394ba5ba73a3afb2f87 (patch)
tree87b604d69f3d6abac9340556e41b93ecce21aae6 /core
parentce76140283b16bc4ca48be13c7f0198486c5d30e (diff)
downloadrepository-c046ba6bc2188b78c9544394ba5ba73a3afb2f87.tar.gz
carbs-init: use proper patch instead
Diffstat (limited to 'core')
-rwxr-xr-xcore/carbs-init/build5
-rw-r--r--core/carbs-init/checksums1
-rw-r--r--core/carbs-init/files/respawn-fix.patch28
-rw-r--r--core/carbs-init/sources1
-rw-r--r--core/carbs-init/version2
5 files changed, 33 insertions, 4 deletions
diff --git a/core/carbs-init/build b/core/carbs-init/build
index 22378f18..c46dc3e2 100755
--- a/core/carbs-init/build
+++ b/core/carbs-init/build
@@ -1,6 +1,5 @@
#!/bin/sh -e
-make DESTDIR="$1" install
+patch -p1 < respawn-fix.patch
-# Fix shebang
-sed -i '1s|/bin/sh -e|/bin/sh|' "$1/usr/bin/respawn"
+make DESTDIR="$1" install
diff --git a/core/carbs-init/checksums b/core/carbs-init/checksums
index e5354b14..f955dca2 100644
--- a/core/carbs-init/checksums
+++ b/core/carbs-init/checksums
@@ -1 +1,2 @@
264278beed9d9824994d17b8470bb2b348d32770cd76507dc141074339daffdb 1.2.2.tar.gz
+6127641969ece64f657ce1883d31ea84e55b059cfd611cb9b0d01c238b4f38df respawn-fix.patch
diff --git a/core/carbs-init/files/respawn-fix.patch b/core/carbs-init/files/respawn-fix.patch
new file mode 100644
index 00000000..12761e89
--- /dev/null
+++ b/core/carbs-init/files/respawn-fix.patch
@@ -0,0 +1,28 @@
+From cab27917dc954294e92c3979570841b85f67619d Mon Sep 17 00:00:00 2001
+From: Cem Keylan <cem@ckyln.com>
+Date: Thu, 17 Sep 2020 00:14:49 +0300
+Subject: [PATCH] respawn: handle errors
+
+---
+ contrib/respawn | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/respawn b/contrib/respawn
+index 1b914ea..4126cdb 100644
+--- a/contrib/respawn
++++ b/contrib/respawn
+@@ -18,6 +18,10 @@ case "$1" in
+ esac
+
+ while :; do
+- "$@"
++ "$@" || err=$?
++ case $err in
++ # Usually Ctrl+C interrupt.
++ 12[7-9]|130) exit 0
++ esac
+ [ "$delay" ] && sleep "$delay"
+ done
+--
+2.28.0
+
diff --git a/core/carbs-init/sources b/core/carbs-init/sources
index 4edf369a..eac26e54 100644
--- a/core/carbs-init/sources
+++ b/core/carbs-init/sources
@@ -1 +1,2 @@
https://github.com/CarbsLinux/init/archive/1.2.2.tar.gz
+files/respawn-fix.patch
diff --git a/core/carbs-init/version b/core/carbs-init/version
index e13c61d4..dae8d4e3 100644
--- a/core/carbs-init/version
+++ b/core/carbs-init/version
@@ -1 +1 @@
-1.2.2 2
+1.2.2 3