From a6e67496ee6d1fac0af3f538dcb7742fc2cb287c Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Thu, 29 Jul 2010 15:22:31 +0200 Subject: [PATCH] scripts/Build-Pkg: fixed to allow lib64 to be flisted for 64 bit architectures and lib32 in the case we build a multilib system --- scripts/Build-Pkg | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg index 9cb5205..f5eaaab 100755 --- a/scripts/Build-Pkg +++ b/scripts/Build-Pkg @@ -3,7 +3,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: scripts/Build-Pkg -# Copyright (C) 2006 - 2009 The OpenSDE Project +# Copyright (C) 2006 - 2010 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -372,10 +372,15 @@ fi # allowed toplevel directories that will be flisted flistroot="bin boot etc lib sbin usr var opt" -# add lib32 and lib64 in the case the target has multilib support -if [ "$SDECFG_MULTILIB" = 1 ]; then - var_append flistroot ' ' "lib32 lib64" -fi +# additionally allowed toplevel directories for 64 bit architectures +case $arch_machine in + powerpc64|sparc64|x86_64|mips64) + var_append flistroot ' ' "lib64" + if [ "$SDECFG_MULTILIB" = 1 ]; then + var_append flistroot ' ' "lib32" + fi + ;; +esac # remove the obvious noise: ldconfig and our /var/adm as well as due to # rare i18n locale directories ...