diff options
Diffstat (limited to 'stage2-fhs-dirs.morph.yaml')
| -rw-r--r-- | stage2-fhs-dirs.morph.yaml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/stage2-fhs-dirs.morph.yaml b/stage2-fhs-dirs.morph.yaml index 056b94a..e58fff6 100644 --- a/stage2-fhs-dirs.morph.yaml +++ b/stage2-fhs-dirs.morph.yaml @@ -7,8 +7,17 @@ install-commands: # the one sysroot (/tools). We use symlinked versions of /bin and /lib. - sh ./create-fhs-dirs "$DESTDIR" - rmdir "$DESTDIR/bin" "$DESTDIR/lib" - - ln -s "/tools/bin" "$DESTDIR/bin" - - ln -s "/tools/lib" "$DESTDIR/lib" + - ln -s "$PREFIX/bin" "$DESTDIR/bin" + - ln -s "$PREFIX/lib" "$DESTDIR/lib" + + # This path is hardcoded into eglibc in the file + # sysdeps/unix/sysv/linux/configure; this ugly hack is a compromise. + - | + cpu=$(echo $TARGET | cut -d '-' -f 1) + if [ "$cpu" == "x86_64" ]; then + mkdir -p "$DESTDIR/lib64" + ln -s "/lib/ld-linux-x86-64.so.2" "$DESTDIR/lib64/ld-linux-x86-64.so.2" + fi - sh ./create-dev-nodes "$DESTDIR" - install -m 644 passwd "$DESTDIR/etc/passwd" |