summaryrefslogtreecommitdiff
path: root/strata/build-essential.morph
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2016-08-21 20:34:27 +0100
committerJavier Jardón <jjardon@gnome.org>2016-11-08 19:17:34 +0000
commit8342678159f391e1e4db9f0198966103c75c20a2 (patch)
treecdc6805d3eff8ae69f7ffdce36a1a287954ddd2b /strata/build-essential.morph
parent3dcb1a2d6f541449ba7d5192c7db9e09204a799b (diff)
downloaddefinitions-8342678159f391e1e4db9f0198966103c75c20a2.tar.gz
Implement /usr merge
Do not create /bin, /sbin, /usr/sbin and /lib Create symlinks /bin -> /usr/bin /sbin -> /usr/bin /usr/sbin -> /usr/bin /lib -> /usr/lib More info here: https://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/ Change-Id: Ideee202f3063eb867eea40ca85336f6643951289
Diffstat (limited to 'strata/build-essential.morph')
-rw-r--r--strata/build-essential.morph8
1 files changed, 4 insertions, 4 deletions
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index c1b09172..280b4950 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -167,8 +167,8 @@ chunks:
- name: stage2-fhs-dirs
morph: strata/build-essential/stage2-fhs-dirs.morph
repo: baserock:baserock/fhs-dirs
- ref: 1218cbd38a4f4e9da75af6f7fae946ca92666afb
- unpetrify-ref: master
+ ref: 9fafca436000bb57ddd5c498f8a75ea7b274f6c5
+ unpetrify-ref: baserock/usr_merge
build-mode: bootstrap
prefix: /tools
@@ -214,8 +214,8 @@ chunks:
- name: fhs-dirs
morph: strata/build-essential/fhs-dirs.morph
repo: baserock:baserock/fhs-dirs
- ref: 1218cbd38a4f4e9da75af6f7fae946ca92666afb
- unpetrify-ref: master
+ ref: 9fafca436000bb57ddd5c498f8a75ea7b274f6c5
+ unpetrify-ref: baserock/usr_merge
build-depends:
- stage2-binutils
- stage2-busybox