From a50234c0f63a216c36a31f8925dc29dc612438dd Mon Sep 17 00:00:00 2001 From: Juan Carlos Luciani Date: Thu, 5 Jun 2008 16:43:23 +0000 Subject: [PATCH] Applied Ruedigers envvars fix to all other scripts where we are trying to decide whether the platform is 64bit or not. We should have been checking for the existance of the /usr/lib64/jvm/jre folder instead of just checking for the existance of the /usr/lib64 folder. --- .../server-java/Jaas/linux/client_keystore_setup.sh | 2 +- CASA-auth-token/server-java/Svc/linux/envvars | 2 +- .../server-java/Svc/linux/refresh_trusted_ats_keystore.sh | 2 +- .../server-java/package/linux/CASA_auth_token_svc.changes | 7 +++++++ CASA-auth-token/server/AuthTokenValidate/Svc/linux/envvars | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CASA-auth-token/server-java/Jaas/linux/client_keystore_setup.sh b/CASA-auth-token/server-java/Jaas/linux/client_keystore_setup.sh index aaa24dc4..0f6a90e3 100755 --- a/CASA-auth-token/server-java/Jaas/linux/client_keystore_setup.sh +++ b/CASA-auth-token/server-java/Jaas/linux/client_keystore_setup.sh @@ -41,7 +41,7 @@ if [ "$1" != "" ]; then fi fi -if [ -d /usr/lib64 ]; then +if [ -d /usr/lib64/jvm/jre ]; then LIB=lib64 else LIB=lib diff --git a/CASA-auth-token/server-java/Svc/linux/envvars b/CASA-auth-token/server-java/Svc/linux/envvars index 08b0abe0..769a53fd 100644 --- a/CASA-auth-token/server-java/Svc/linux/envvars +++ b/CASA-auth-token/server-java/Svc/linux/envvars @@ -8,7 +8,7 @@ ############################################################ # Set JAVA_HOME -if [ -d /usr/lib64 ]; then +if [ -d /usr/lib64/jvm/jre ]; then LIB=lib64 else LIB=lib diff --git a/CASA-auth-token/server-java/Svc/linux/refresh_trusted_ats_keystore.sh b/CASA-auth-token/server-java/Svc/linux/refresh_trusted_ats_keystore.sh index 182ef271..eedb1c9b 100755 --- a/CASA-auth-token/server-java/Svc/linux/refresh_trusted_ats_keystore.sh +++ b/CASA-auth-token/server-java/Svc/linux/refresh_trusted_ats_keystore.sh @@ -34,7 +34,7 @@ # # ############################################################# -if [ -d /usr/lib64 ]; then +if [ -d /usr/lib64/jvm/jre ]; then LIB=lib64 else LIB=lib diff --git a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes index df3043d6..c13a3484 100644 --- a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes +++ b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jun 4 14:57:02 CEST 2008 - ro@suse.de + +- fix build on ppc: + do not assume machine is lib64 just because that directory + exists, rather test the directory we try to access + ------------------------------------------------------------------- Tue Jun 3 10:14:36 MDT 2008 - jluciani@novell.com diff --git a/CASA-auth-token/server/AuthTokenValidate/Svc/linux/envvars b/CASA-auth-token/server/AuthTokenValidate/Svc/linux/envvars index 08bb949d..0a5ab4e3 100644 --- a/CASA-auth-token/server/AuthTokenValidate/Svc/linux/envvars +++ b/CASA-auth-token/server/AuthTokenValidate/Svc/linux/envvars @@ -30,7 +30,7 @@ # /var/lib/CASA/authtoken/validate folder. # # # ############################################################ -if [ -d /usr/lib64 ]; then +if [ -d /usr/lib64/jvm/jre ]; then LIB=lib64 SUNLIBDIR=amd64 else