From 9f8f9ce4992f4775cb3f1a22c50499663b12c0dc Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Mon, 10 Jan 2022 17:28:04 +0300
Subject: carbs-init: apply patch

---
 core/carbs-init/build                     |  4 +++-
 core/carbs-init/checksums                 |  6 ++++--
 core/carbs-init/files/respawn-fix.patch   | 28 ----------------------------
 core/carbs-init/patches/fd.patch          | 13 +++++++++++++
 core/carbs-init/patches/respawn-fix.patch | 28 ++++++++++++++++++++++++++++
 core/carbs-init/sources                   |  3 ++-
 core/carbs-init/version                   |  2 +-
 7 files changed, 51 insertions(+), 33 deletions(-)
 delete mode 100644 core/carbs-init/files/respawn-fix.patch
 create mode 100644 core/carbs-init/patches/fd.patch
 create mode 100644 core/carbs-init/patches/respawn-fix.patch

(limited to 'core')

diff --git a/core/carbs-init/build b/core/carbs-init/build
index c46dc3e2..b2b1e639 100755
--- a/core/carbs-init/build
+++ b/core/carbs-init/build
@@ -1,5 +1,7 @@
 #!/bin/sh -e
 
-patch -p1 < respawn-fix.patch
+for patch in *.patch; do
+    patch -p1 < "$patch"
+done
 
 make DESTDIR="$1" install
diff --git a/core/carbs-init/checksums b/core/carbs-init/checksums
index f955dca2..28a64745 100644
--- a/core/carbs-init/checksums
+++ b/core/carbs-init/checksums
@@ -1,2 +1,4 @@
-264278beed9d9824994d17b8470bb2b348d32770cd76507dc141074339daffdb  1.2.2.tar.gz
-6127641969ece64f657ce1883d31ea84e55b059cfd611cb9b0d01c238b4f38df  respawn-fix.patch
+%BLAKE3
+fa98711a4f22e170b7a45df79b461b76a0762cdab8a4a21620017e908e9b8173  1.2.2.tar.gz
+130b82bf18025e79bad4fc60309afe05740bd589c54731352dfb08e9810455fd  respawn-fix.patch
+08669189a6abba83d4b542121b6a8c7bc1114ad97ed84061d4e2502c1360092a  fd.patch
diff --git a/core/carbs-init/files/respawn-fix.patch b/core/carbs-init/files/respawn-fix.patch
deleted file mode 100644
index 12761e89..00000000
--- a/core/carbs-init/files/respawn-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/patches/fd.patch b/core/carbs-init/patches/fd.patch
new file mode 100644
index 00000000..ff5af2da
--- /dev/null
+++ b/core/carbs-init/patches/fd.patch
@@ -0,0 +1,13 @@
+diff --git a/rc.boot b/rc.boot
+index 49d7fa5..ba5d3dd 100755
+--- a/rc.boot
++++ b/rc.boot
+@@ -27,7 +27,7 @@ out "Mounting pseudo filesystems..."; {
+     mnt mode=1777,nosuid,nodev        tmpfs  shm    /dev/shm
+ 
+     {
+-        ln -sf /proc/self/fs /dev/fd
++        ln -sf /proc/self/fd /dev/fd
+         ln -sf fd/0          /dev/stdin
+         ln -sf fd/1          /dev/stdout
+         ln -sf fd/2          /dev/stderr
diff --git a/core/carbs-init/patches/respawn-fix.patch b/core/carbs-init/patches/respawn-fix.patch
new file mode 100644
index 00000000..12761e89
--- /dev/null
+++ b/core/carbs-init/patches/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 eac26e54..848b4813 100644
--- a/core/carbs-init/sources
+++ b/core/carbs-init/sources
@@ -1,2 +1,3 @@
 https://github.com/CarbsLinux/init/archive/1.2.2.tar.gz
-files/respawn-fix.patch
+patches/respawn-fix.patch
+patches/fd.patch
diff --git a/core/carbs-init/version b/core/carbs-init/version
index dae8d4e3..78fba327 100644
--- a/core/carbs-init/version
+++ b/core/carbs-init/version
@@ -1 +1 @@
-1.2.2 3
+1.2.2 4
-- 
cgit v1.2.3