From 913944e4c8730d6454751b94f98ef7c4ff356784 Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Fri, 28 Apr 2017 21:18:04 +0900 Subject: Fix staging order of symlinks resulting from /usr merge Making linux-api-headers depend on fhs-dirs causes fhs-dirs to be staged first for anything that depends on build-essential. This fixes the issue of competing chunks trying to stage symlinks, or failing to stage the symlinks cause they would otherwise nuke non-empty directories. Change-Id: Ic2101dfd49634f60bcb51422039608c7bf5db1f4 --- strata/build-essential.morph | 1 + 1 file changed, 1 insertion(+) diff --git a/strata/build-essential.morph b/strata/build-essential.morph index 2eaca692..e56d7579 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -242,6 +242,7 @@ chunks: - stage2-linux-api-headers - stage2-make - stage2-reset-specs + - fhs-dirs - name: glibc morph: strata/build-essential/glibc.morph -- cgit v1.2.1