Commit 7ae830f1 authored by Javier Jardón's avatar Javier Jardón

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/
parent 08958c0a
......@@ -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
......
......@@ -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"
......
......@@ -10,8 +10,3 @@ build-commands:
- make WERROR_CFLAGS=
install-commands:
- make INSTALL_PROGRAM=install DESTDIR="$DESTDIR" install
# This hack is for supporting "fdatasync" argument in "dd" command
# which busybox "dd" does not support.
# This hack should dissappear when we merge /usr/bin and /bin.
- mkdir -p "$DESTDIR"/bin/
- ln -sf ../usr/bin/dd "$DESTDIR"/bin/
......@@ -6,8 +6,3 @@ pre-configure-commands:
- ./bootstrap --skip-po --no-git --gnulib-srcdir=gnulib
configure-commands:
- ./configure --prefix="$PREFIX" --disable-gcc-warnings
post-install-commands:
# This hack is to use GNU sed instead the busybox one.
# This will dissappear when we merge /usr/bin and /bin.
- mkdir -p "$DESTDIR"/bin/
- ln -sf ../usr/bin/sed "$DESTDIR"/bin/
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment