summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-04-28 12:18:04 (GMT)
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-04-28 12:18:04 (GMT)
commit913944e4c8730d6454751b94f98ef7c4ff356784 (patch)
treefe5ec126f9edef56981f6ae9b31727e820541773
parent2bf01667c7ef1f79a6b94693bb796a457f837b2b (diff)
downloaddefinitions-913944e4c8730d6454751b94f98ef7c4ff356784.tar.gz
Fix staging order of symlinks resulting from /usr mergestaging/fix-symlink-competition
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
-rw-r--r--strata/build-essential.morph1
1 files changed, 1 insertions, 0 deletions
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 2eaca69..e56d757 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