Install layout early

Signed-off-by: Laurent Bercot <ska@appnovation.com>

6 files changed, 6 insertions, 6 deletions

diff --git a/sub/dev/Makefile.curl b/sub/dev/Makefile.curl
index efe21ce..9c7ea64 100644
--- a/sub/dev/Makefile.curl
+++ b/sub/dev/Makefile.curl
@@ -112,7 +112,7 @@ $(OUTPUT)/build-$(TRIPLE)/.lh_curl_built: $(OUTPUT)/build-$(TRIPLE)/.lh_curl_con
 	exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/curl-$(CURL_VERSION) $(MAKE) $(CURL_MAKE_ARGS)
 	exec setuidgid $(NORMALUSER) s6-touch $@
 	
-$(OUTPUT)/build-$(TRIPLE)/.lh_curl_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_curl_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
+$(OUTPUT)/build-$(TRIPLE)/.lh_curl_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_curl_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed $(OUTPUT)/tmp/.lh_layout_installed
 	exec cd $(OUTPUT)/build-$(TRIPLE)/curl-$(CURL_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs
 	exec makenamelink $(OUTPUT)/rootfs/opt curl curl-$(CURL_VERSION) $(OUTPUT)/tmp
 	exec makelinks $(OUTPUT)/rootfs /bin /opt/curl/bin
diff --git a/sub/dev/Makefile.git b/sub/dev/Makefile.git
index dc487aa..26bb086 100644
--- a/sub/dev/Makefile.git
+++ b/sub/dev/Makefile.git
@@ -29,7 +29,7 @@ $(OUTPUT)/build-$(TRIPLE)/.lh_git_built: $(OUTPUT)/build-$(TRIPLE)/.lh_git_confi
 	exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/git-$(GIT_VERSION) $(MAKE) $(GIT_MAKE_ARGS)
 	exec setuidgid $(NORMALUSER) s6-touch $@
 	
-$(OUTPUT)/build-$(TRIPLE)/.lh_git_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_git_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
+$(OUTPUT)/build-$(TRIPLE)/.lh_git_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_git_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed $(OUTPUT)/tmp/.lh_layout_installed
 	exec cd $(OUTPUT)/build-$(TRIPLE)/git-$(GIT_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs $(GIT_MAKE_ARGS)
 	exec makenamelink $(OUTPUT)/rootfs/opt git git-$(GIT_VERSION) $(OUTPUT)/tmp
 	exec makelinks $(OUTPUT)/rootfs /bin /opt/git/bin
diff --git a/sub/dev/Makefile.libressl b/sub/dev/Makefile.libressl
index e30146d..3c10d79 100644
--- a/sub/dev/Makefile.libressl
+++ b/sub/dev/Makefile.libressl
@@ -25,7 +25,7 @@ $(OUTPUT)/build-$(TRIPLE)/.lh_libressl_built: $(OUTPUT)/build-$(TRIPLE)/.lh_libr
 	exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/libressl-$(LIBRESSL_VERSION) $(MAKE) $(LIBRESSL_MAKE_STATIC)
 	exec setuidgid $(NORMALUSER) s6-touch $@
 	
-$(OUTPUT)/build-$(TRIPLE)/.lh_libressl_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_libressl_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
+$(OUTPUT)/build-$(TRIPLE)/.lh_libressl_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_libressl_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed $(OUTPUT)/tmp/.lh_layout_installed
 	exec cd $(OUTPUT)/build-$(TRIPLE)/libressl-$(LIBRESSL_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs
 	exec makenamelink $(OUTPUT)/rootfs/opt libressl libressl-$(LIBRESSL_VERSION) $(OUTPUT)/tmp
 	exec makelinks $(OUTPUT)/rootfs /bin /opt/libressl/bin
diff --git a/sub/dev/Makefile.make b/sub/dev/Makefile.make
index 6eaa00c..e8c3aae 100644
--- a/sub/dev/Makefile.make
+++ b/sub/dev/Makefile.make
@@ -25,7 +25,7 @@ $(OUTPUT)/build-$(TRIPLE)/.lh_make_built: $(OUTPUT)/build-$(TRIPLE)/.lh_make_con
 	exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/make-$(MAKE_VERSION) $(MAKE) $(MAKE_MAKE_STATIC)
 	exec setuidgid $(NORMALUSER) s6-touch $@
 	
-$(OUTPUT)/build-$(TRIPLE)/.lh_make_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_make_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
+$(OUTPUT)/build-$(TRIPLE)/.lh_make_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_make_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed $(OUTPUT)/tmp/.lh_layout_installed
 	exec cd $(OUTPUT)/build-$(TRIPLE)/make-$(MAKE_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs
 	exec makenamelink $(OUTPUT)/rootfs/opt make make-$(MAKE_VERSION) $(OUTPUT)/tmp
 	exec makelinks $(OUTPUT)/rootfs /bin /opt/make/bin
diff --git a/sub/dev/Makefile.strace b/sub/dev/Makefile.strace
index 469dbbc..8df589e 100644
--- a/sub/dev/Makefile.strace
+++ b/sub/dev/Makefile.strace
@@ -25,7 +25,7 @@ $(OUTPUT)/build-$(TRIPLE)/.lh_strace_built: $(OUTPUT)/build-$(TRIPLE)/.lh_strace
 	exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/strace-$(STRACE_VERSION) $(MAKE) $(STRACE_MAKE_STATIC)
 	exec setuidgid $(NORMALUSER) s6-touch $@
 	
-$(OUTPUT)/build-$(TRIPLE)/.lh_strace_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_strace_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
+$(OUTPUT)/build-$(TRIPLE)/.lh_strace_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_strace_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed $(OUTPUT)/tmp/.lh_layout_installed
 	exec cd $(OUTPUT)/build-$(TRIPLE)/strace-$(STRACE_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs
 	exec makenamelink $(OUTPUT)/rootfs/opt strace strace-$(STRACE_VERSION) $(OUTPUT)/tmp
 	exec makelinks $(OUTPUT)/rootfs /bin /opt/strace/bin
diff --git a/sub/dev/Makefile.zlib b/sub/dev/Makefile.zlib
index e2c4ee6..a208955 100644
--- a/sub/dev/Makefile.zlib
+++ b/sub/dev/Makefile.zlib
@@ -24,7 +24,7 @@ $(OUTPUT)/build-$(TRIPLE)/.lh_zlib_built: $(OUTPUT)/build-$(TRIPLE)/.lh_zlib_con
 	exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/zlib-$(ZLIB_VERSION) $(MAKE)
 	exec setuidgid $(NORMALUSER) s6-touch $@
 	
-$(OUTPUT)/build-$(TRIPLE)/.lh_zlib_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_zlib_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
+$(OUTPUT)/build-$(TRIPLE)/.lh_zlib_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_zlib_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed $(OUTPUT)/tmp/.lh_layout_installed
 	exec cd $(OUTPUT)/build-$(TRIPLE)/zlib-$(ZLIB_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs
 	exec makenamelink $(OUTPUT)/rootfs/opt zlib zlib-$(ZLIB_VERSION) $(OUTPUT)/tmp
 	exec setuidgid $(NORMALUSER) s6-touch $@