aboutsummaryrefslogtreecommitdiffstats
path: root/sub/skarnet.org
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2023-02-10 02:14:32 +0000
committerLaurent Bercot <ska@appnovation.com>2023-02-10 02:14:32 +0000
commit72e31924295d306203dce8a8f4e0e4c7cf1e66ca (patch)
tree7c92659325907c469a008f83221aa15d6f61dd81 /sub/skarnet.org
parent5d3e4a9f8241b40a47a1262c92051a001eb6d776 (diff)
downloadlh-bootstrap-72e31924295d306203dce8a8f4e0e4c7cf1e66ca.tar.gz
Install layout early
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'sub/skarnet.org')
-rw-r--r--sub/skarnet.org/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/sub/skarnet.org/Makefile b/sub/skarnet.org/Makefile
index a2e8086..5533e74 100644
--- a/sub/skarnet.org/Makefile
+++ b/sub/skarnet.org/Makefile
@@ -110,7 +110,7 @@ $(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION)/config.mak: $(OUTPUT)/b
$(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION)/$$($(1)_TOKEN): $(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION)/config.mak
cd $(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION) && setuidgid $(NORMALUSER) $(MAKE) all strip
-$(OUTPUT)/rootfs/package/$$($(1)_CATEGORY)/$$($(1)_NAME)/include/$$($(1)_NAME)/config.h: $(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION)/$$($(1)_TOKEN)
+$(OUTPUT)/rootfs/package/$$($(1)_CATEGORY)/$$($(1)_NAME)/include/$$($(1)_NAME)/config.h: $(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION)/$$($(1)_TOKEN) $(OUTPUT)/tmp/.lh_layout_installed
cd $(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION) && $(MAKE) -L install update global-links DESTDIR=$(OUTPUT)/rootfs
$(OUTPUT)/build-$(TRIPLE)/.lh_skarnet_installed: $(OUTPUT)/rootfs/package/$$($(1)_CATEGORY)/$$($(1)_NAME)/include/$$($(1)_NAME)/config.h
@@ -120,7 +120,7 @@ endef
$(foreach pkg,$(SKAWARE),$(eval $(call skaware_rules_definition,$(pkg))))
-$(OUTPUT)/build-$(TRIPLE)/.lh_s6li_laidout: $(OUTPUT)/rootfs/package/admin/s6-linux-init/include/s6-linux-init/config.h | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
+$(OUTPUT)/build-$(TRIPLE)/.lh_s6li_laidout: $(OUTPUT)/rootfs/package/admin/s6-linux-init/include/s6-linux-init/config.h | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed $(OUTPUT)/tmp/.lh_layout_installed
exec mkdir -p $(OUTPUT)/rootfs/etc/s6-linux-init
exec rm -rf $(OUTPUT)/rootfs/etc/s6-linux-init/s6lidir
exec s6-linux-init-maker -u $(NORMALUSER) $(EARLY_GETTY) -1 -p /command:/bin -s /run/kernel_env -U utmp -f $(OUTPUT)/build-build/etc/s6-linux-init/skel -- $(OUTPUT)/rootfs/etc/s6-linux-init/s6lidir