summaryrefslogtreecommitdiff
path: root/sub/layout/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'sub/layout/Makefile')
-rw-r--r--sub/layout/Makefile7
1 files changed, 1 insertions, 6 deletions
diff --git a/sub/layout/Makefile b/sub/layout/Makefile
index ce9ebd5..ed63328 100644
--- a/sub/layout/Makefile
+++ b/sub/layout/Makefile
@@ -1,12 +1,7 @@
$(OUTPUT)/tmp/.lh_layout_copied: $(OUTPUT)/tmp/.lh_prepared layout | $(OUTPUT)/build-build/.lh_skarnet_installed
exec sub/layout/copylayout $(OUTPUT)
- exec sub/layout/configure-localoptions $(OUTPUT) $(COUNTRY_CODE) $(LOCAL_IP) $(ROUTER_IP)
exec setuidgid $(NORMALUSER) s6-touch $@
-$(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
+$(OUTPUT)/tmp/.lh_layout_installed: $(OUTPUT)/tmp/.lh_layout_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
exec setuidgid $(NORMALUSER) s6-touch $@