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-08-21 20:35:14 +0100
commit7311f48d3cded691368b23381b790f1636a463d5 (patch)
tree4713e25a3ff2c67362d03aa7740aaae556b8e165 /strata/build-essential.morph
parent1b85c3e545e53a2023c5dbf9e869d3cd737e870d (diff)
downloaddefinitions-7311f48d3cded691368b23381b790f1636a463d5.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