aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorCem Keylan <cem@ckyln.com>2022-01-10 17:28:04 +0300
committerCem Keylan <cem@ckyln.com>2022-01-10 17:28:04 +0300
commit9f8f9ce4992f4775cb3f1a22c50499663b12c0dc (patch)
tree0392b198498adb651a18c80973db1b80bd4faa0e /core
parent11706b43e698e12eb03bfcf3c2987a665f22b8d3 (diff)
downloadrepository-9f8f9ce4992f4775cb3f1a22c50499663b12c0dc.tar.gz
carbs-init: apply patch
Diffstat (limited to 'core')
-rwxr-xr-xcore/carbs-init/build4
-rw-r--r--core/carbs-init/checksums6
-rw-r--r--core/carbs-init/patches/fd.patch13
-rw-r--r--core/carbs-init/patches/respawn-fix.patch (renamed from core/carbs-init/files/respawn-fix.patch)0
-rw-r--r--core/carbs-init/sources3
-rw-r--r--core/carbs-init/version2
6 files changed, 23 insertions, 5 deletions
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/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/files/respawn-fix.patch b/core/carbs-init/patches/respawn-fix.patch
index 12761e89..12761e89 100644
--- a/core/carbs-init/files/respawn-fix.patch
+++ b/core/carbs-init/patches/respawn-fix.patch
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