diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2020-01-29 15:00:01 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2020-01-29 15:00:01 +0000 |
| commit | 3dcb6c6a73cd16acc7bcae9e54cda16fed89f35b (patch) | |
| tree | e2b2b231622470ddc95a74f62b3cebcdcc492914 /sub/layout/Makefile | |
| parent | 5809b2dc1536794cff7df2ab4f79d2fe7b6720bc (diff) | |
| download | lh-bootstrap-3dcb6c6a73cd16acc7bcae9e54cda16fed89f35b.tar.xz | |
Reimport userfs, rwfs and s6-rc from master
Diffstat (limited to 'sub/layout/Makefile')
| -rw-r--r-- | sub/layout/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sub/layout/Makefile b/sub/layout/Makefile index ed63328..85ac809 100644 --- a/sub/layout/Makefile +++ b/sub/layout/Makefile @@ -3,5 +3,9 @@ $(OUTPUT)/tmp/.lh_layout_copied: $(OUTPUT)/tmp/.lh_prepared layout | $(OUTPUT)/b exec sub/layout/copylayout $(OUTPUT) exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/tmp/.lh_layout_installed: $(OUTPUT)/tmp/.lh_layout_copied | $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/tmp/.lh_layout_s6rcdb_made: $(OUTPUT)/tmp/.lh_layout_copied | $(OUTPUT)/build-build/.lh_skarnet_installed + stamp=$$(s6-clock) && s6-rc-compile -v2 -h sysfdh $(OUTPUT)/rootfs/etc/s6-rc/compiled-$$stamp $(OUTPUT)/rootfs/etc/s6-rc/source-base && s6-ln -s compiled-$$stamp $(OUTPUT)/rootfs/etc/s6-rc/compiled.new && s6-rename $(OUTPUT)/rootfs/etc/s6-rc/compiled.new $(OUTPUT)/rootfs/etc/s6-rc/compiled + exec setuidgid $(NORMALUSER) s6-touch $@ + +$(OUTPUT)/tmp/.lh_layout_installed: $(OUTPUT)/tmp/.lh_layout_copied $(OUTPUT)/tmp/.lh_layout_s6rcdb_made | $(OUTPUT)/build-build/.lh_skarnet_installed exec setuidgid $(NORMALUSER) s6-touch $@ |