diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2015-05-29 12:17:31 -0600 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2015-06-11 15:29:34 -0600 |
| commit | 8da79f75c9041b6391f7e100b690e4297c356d0a (patch) | |
| tree | 50a25b0afde0caecbeeb4c4202a9b3dd89d883a7 /base/java-tools/templates | |
| parent | d8ce02c30834982946af80383426186b7f3a04ae (diff) | |
| download | pki-8da79f75c9041b6391f7e100b690e4297c356d0a.tar.gz pki-8da79f75c9041b6391f7e100b690e4297c356d0a.tar.xz pki-8da79f75c9041b6391f7e100b690e4297c356d0a.zip | |
Remove x86 architecture limitations
- PKI Trac Ticket #1392 - Remove i686/x86_64 architecture
Diffstat (limited to 'base/java-tools/templates')
3 files changed, 0 insertions, 49 deletions
diff --git a/base/java-tools/templates/pki_java_command_wrapper.in b/base/java-tools/templates/pki_java_command_wrapper.in index 09e059edb..404bcf0a1 100644 --- a/base/java-tools/templates/pki_java_command_wrapper.in +++ b/base/java-tools/templates/pki_java_command_wrapper.in @@ -70,25 +70,6 @@ if [ "${OS}" = "Linux" ] ; then ARCHITECTURE=`arch` JAVA="java" JAVA_OPTIONS="" - - if [ "${ARCHITECTURE}" = "i686" ] ; then - LD_LIBRARY_PATH=/usr/lib:/lib - LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} - export LD_LIBRARY_PATH - elif [ "${ARCHITECTURE}" = "x86_64" ] ; then - LD_LIBRARY_PATH=/usr/lib:/lib - LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib64:/lib64:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib64/jss:${LD_LIBRARY_PATH} - export LD_LIBRARY_PATH - elif [ "${ARCHITECTURE}" = "armv7l" ] ; then - LD_LIBRARY_PATH=/usr/lib:/lib - LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} - export LD_LIBRARY_PATH - else - invalid_architecture "${ARCHITECTURE}" - exit 255 - fi elif [ "${OS}" = "SunOS" ] ; then ARCHITECTURE=`uname -p` if [ "${ARCHITECTURE}" = "sparc" ] && diff --git a/base/java-tools/templates/pretty_print_cert_command_wrapper.in b/base/java-tools/templates/pretty_print_cert_command_wrapper.in index 3a67e3a2a..6c1abc7a1 100644 --- a/base/java-tools/templates/pretty_print_cert_command_wrapper.in +++ b/base/java-tools/templates/pretty_print_cert_command_wrapper.in @@ -70,21 +70,6 @@ if [ "${OS}" = "Linux" ] ; then ARCHITECTURE=`arch` JAVA="java" JAVA_OPTIONS="" - - if [ "${ARCHITECTURE}" = "i686" ] ; then - LD_LIBRARY_PATH=/usr/lib:/lib - LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} - export LD_LIBRARY_PATH - elif [ "${ARCHITECTURE}" = "x86_64" ] ; then - LD_LIBRARY_PATH=/usr/lib:/lib - LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib64:/lib64:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib64/jss:${LD_LIBRARY_PATH} - export LD_LIBRARY_PATH - else - invalid_architecture "${ARCHITECTURE}" - exit 255 - fi elif [ "${OS}" = "SunOS" ] ; then ARCHITECTURE=`uname -p` if [ "${ARCHITECTURE}" = "sparc" ] && diff --git a/base/java-tools/templates/pretty_print_crl_command_wrapper.in b/base/java-tools/templates/pretty_print_crl_command_wrapper.in index 900a887cc..19f8bd8d0 100644 --- a/base/java-tools/templates/pretty_print_crl_command_wrapper.in +++ b/base/java-tools/templates/pretty_print_crl_command_wrapper.in @@ -70,21 +70,6 @@ if [ "${OS}" = "Linux" ] ; then ARCHITECTURE=`arch` JAVA="java" JAVA_OPTIONS="" - - if [ "${ARCHITECTURE}" = "i686" ] ; then - LD_LIBRARY_PATH=/usr/lib:/lib - LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} - export LD_LIBRARY_PATH - elif [ "${ARCHITECTURE}" = "x86_64" ] ; then - LD_LIBRARY_PATH=/usr/lib:/lib - LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib64:/lib64:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib64/jss:${LD_LIBRARY_PATH} - export LD_LIBRARY_PATH - else - invalid_architecture "${ARCHITECTURE}" - exit 255 - fi elif [ "${OS}" = "SunOS" ] ; then ARCHITECTURE=`uname -p` if [ "${ARCHITECTURE}" = "sparc" ] && |