From 0cc488d38ad99a2fa42b000bbc9d41dce91c57db Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Thu, 31 Jan 2013 09:11:52 -0500 Subject: functions: add /usr/lib64 -> lib symlink Relegate this and the other lib64 symlink to x86_64, too, since we have no business creating this on i686. Signed-off-by: Dave Reisner --- functions | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/functions b/functions index 19b56ef..4df91bc 100644 --- a/functions +++ b/functions @@ -598,7 +598,7 @@ initialize_buildroot() { # creates a temporary directory for the buildroot and initialize it with a # basic set of necessary directories and symlinks - local workdir= kernver=$1 + local workdir= kernver=$1 arch=$(uname -m) if ! workdir=$(mktemp -d --tmpdir mkinitcpio.XXXXXX); then error 'Failed to create temporary working directory in %s' "${TMPDIR:-/tmp}" @@ -608,7 +608,6 @@ initialize_buildroot() { # base directory structure install -dm755 "$workdir/root"/{new_root,proc,sys,dev,run,tmp,etc,usr/{local,lib,bin}} ln -s "usr/lib" "$workdir/root/lib" - ln -s "usr/lib" "$workdir/root/lib64" ln -s "../lib" "$workdir/root/usr/local/lib" ln -s "bin" "$workdir/root/usr/sbin" ln -s "usr/bin" "$workdir/root/bin" @@ -616,6 +615,13 @@ initialize_buildroot() { ln -s "../bin" "$workdir/root/usr/local/bin" ln -s "../bin" "$workdir/root/usr/local/sbin" + case $arch in + x86_64) + ln -s "lib" "$workdir/root/usr/lib64" + ln -s "usr/lib" "$workdir/root/lib64" + ;; + esac + # kernel module dir install -dm755 "$workdir/root/usr/lib/modules/$kernver/kernel" -- cgit v1.2.3-24-g4f1b