From 77c46bae1bc8aa0ea717710495c4ccf06ce01085 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 21 May 2013 17:59:10 +0200 Subject: 1. Fix ARCH_TRIPLET for distos that don'T have it. 2. Add suse-specific .conf file for openbox 3. Add libnss_mdns* to pam 4. Add vmchooser and openbox to stage32-opensuse --- helper/system.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'helper') diff --git a/helper/system.inc b/helper/system.inc index 2e619a3c..0cfcfbc6 100644 --- a/helper/system.inc +++ b/helper/system.inc @@ -5,7 +5,8 @@ # please try not to use this to find/fetch libs in /lib or /usr/lib. # Use ARCH_LIB_DIR, like "$ARCH_LIB_DIR/somefile.so" or "/usr$ARCH_LIB_DIR/somefile.so" ARCH_TRIPLET=$(ldd $SHELL|grep "libc.so" | awk -F "/" '{print $3}') -[ -z "$ARCH_TRIPLET" ] && pwarning "Could not determine arch triplet." +#[ -z "$ARCH_TRIPLET" ] && pwarning "Could not determine arch triplet." +[[ $ARCH_TRIPLET == *\(*\) ]] && ARCH_TRIPLET="" ARCH_LIB_DIR=$(ldd $SHELL | grep "libc.so" | sed -r 's#^.*(/lib.*)/libc.so.*$#\1#g') [ -z "$ARCH_LIB_DIR" -o ! -d "$ARCH_LIB_DIR" ] && perror "Could not determine arch dependent lib dir (where libc.so resides)" -- cgit v1.2.3-55-g7522