From 7ae830f1bc4c355eaf76f99655160420edc520e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sun, 21 Aug 2016 20:34:27 +0100 Subject: 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/ --- strata/build-essential.morph | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'strata/build-essential.morph') 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 -- cgit v1.2.1