summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2020-01-29 15:02:42 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2020-01-29 15:02:42 +0000
commitc03bc0bc80892ba8145816e5586d475e0f661787 (patch)
tree16aada5816fa3da3aee00020e5f09287e2fc97f0
parent3dcb6c6a73cd16acc7bcae9e54cda16fed89f35b (diff)
downloadlh-bootstrap-c03bc0bc80892ba8145816e5586d475e0f661787.tar.xz
Reimport s6-rc_cloned target
-rw-r--r--sub/skarnet.org/Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/sub/skarnet.org/Makefile b/sub/skarnet.org/Makefile
index 4401128..d1e5b75 100644
--- a/sub/skarnet.org/Makefile
+++ b/sub/skarnet.org/Makefile
@@ -58,6 +58,12 @@ $(OUTPUT)/sources/.lh_s6_cloned: | $(OUTPUT)/tmp/.lh_prepared
exec setuidgid $(NORMALUSER) sh -c "cd $(OUTPUT)/sources/s6 && git checkout $(S6_VERSION) && :> package/deps-build"
exec setuidgid $(NORMALUSER) touch $@
+$(OUTPUT)/sources/.lh_s6rc_cloned: | $(OUTPUT)/tmp/.lh_prepared
+ if test -d $(OUTPUT)/sources/s6-rc ; then cd $(OUTPUT)/sources/s6-rc && setuidgid $(NORMALUSER) git fetch ; else cd $(OUTPUT)/sources && setuidgid $(NORMALUSER) git clone $(url)/s6-rc$(suffix) s6-rc ; fi
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources/s6-rc git checkout $(S6_RC_VERSION)
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources/s6-rc redirfd -w 1 package/deps-build true
+ exec setuidgid $(NORMALUSER) touch $@
+
$(OUTPUT)/sources/.lh_s6li_cloned: | $(OUTPUT)/tmp/.lh_prepared
if test -d $(OUTPUT)/sources/s6-linux-init ; then cd $(OUTPUT)/sources/s6-linux-init && setuidgid $(NORMALUSER) git fetch ; else cd $(OUTPUT)/sources && setuidgid $(NORMALUSER) git clone $(url)/s6-linux-init$(suffix) s6-linux-init ; fi
exec setuidgid $(NORMALUSER) sh -c "cd $(OUTPUT)/sources/s6-linux-init && git checkout $(S6_LINUX_INIT_VERSION) && :> package/deps-build"