commit 9dbd9403b4c193962aebbcf58253a6a6ddd506c7
parent d08fba6bedf8d585bde75c9041b04be3e7b8370d
Author: ccx <root@dorje.wpr.cz>
Date: Thu, 11 Mar 2021 16:04:26 +0100
Add init submodule for s6-linux-init
Diffstat:
3 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
[submodule "carbon-s6-rc"]
path = s6-rc
url = https://ccx.te2000.cz/git/carbon-s6-rc
+[submodule "init"]
+ path = init
+ url = https://ccx.te2000.cz/git/carbon-s6-init
diff --git a/init b/init
@@ -0,0 +1 @@
+Subproject commit ea32f20d1a0cc0ec25d21e4505dcdc49b8d0ca56
diff --git a/install b/install
@@ -46,10 +46,16 @@ install_rc() {
$cmd/s6-rc-compile $dst/s6-rc/compiled $dst/s6-rc/source || exit $?
}
+install_init() {
+ mkdir -p ${sm_dst[$submodule]}/init || exit $?
+ ./install ${sm_dst[$submodule]}/init || exit $?
+}
+
install_submodule() {
case $submodule in
(package) install_package;;
(s6-rc) install_rc;;
+ (init) install_init;;
(*) echo >&2 "unhandled submodule: ${(qqq)submodule}";;
esac
}
@@ -120,14 +126,19 @@ typeset -g submodule
typeset -gA sm_commit sm_dst
submodule -c s6-rc
+submodule -c init
submodule -c .
submodule package
require installed
+PATH=${sm_dst[package]}/command:/bin
submodule=s6-rc
require installed
+submodule=init
+require installed
+
submodule=.
require union
require current