diff options
| author | Javier Jardón <jjardon@gnome.org> | 2016-08-21 20:34:27 +0100 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2016-08-21 20:35:14 +0100 |
| commit | 7311f48d3cded691368b23381b790f1636a463d5 (patch) | |
| tree | 4713e25a3ff2c67362d03aa7740aaae556b8e165 | |
| parent | 1b85c3e545e53a2023c5dbf9e869d3cd737e870d (diff) | |
| download | definitions-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
| -rw-r--r-- | strata/build-essential.morph | 8 | ||||
| -rw-r--r-- | strata/build-essential/stage2-fhs-dirs.morph | 4 |
2 files changed, 6 insertions, 6 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 diff --git a/strata/build-essential/stage2-fhs-dirs.morph b/strata/build-essential/stage2-fhs-dirs.morph index 64080217..6f842403 100644 --- a/strata/build-essential/stage2-fhs-dirs.morph +++ b/strata/build-essential/stage2-fhs-dirs.morph @@ -3,8 +3,8 @@ kind: chunk description: create the FHS 2.3 directory hierarchy and the usual files install-commands: - sh ./create-fhs-dirs "$DESTDIR" -- rmdir "$DESTDIR/bin" -- ln -s "$PREFIX/bin" "$DESTDIR/bin" +- rmdir "$DESTDIR/usr/bin" +- ln -s "$PREFIX/bin" "$DESTDIR/usr/bin" - install -m 644 passwd "$DESTDIR/etc/passwd" - install -m 600 shadow "$DESTDIR/etc/shadow" - install -m 644 interfaces "$DESTDIR/etc/network/interfaces" |