diff options
| author | Tim Rice <tim@multitalents.net> | 2006-10-06 14:58:38 -0700 |
|---|---|---|
| committer | Tim Rice <tim@multitalents.net> | 2006-10-06 14:58:38 -0700 |
| commit | 09f1093a29e6dcbec76cfa1831d080ced2d4b627 (patch) | |
| tree | b405096a97a7793b03ac8eaaac2de65dbca63df1 | |
| parent | 1cfab23b7f9e29fa9d66c97334ef9331d033f83d (diff) | |
- (tim) [buildpkg.sh.in] Use uname -r instead of -v in OS_VER for Solaris.
Differentiate between OpenServer 5 and OpenServer 6
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | buildpkg.sh.in | 11 |
2 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,7 @@ +20061006 + - (tim) [buildpkg.sh.in] Use uname -r instead of -v in OS_VER for Solaris. + Differentiate between OpenServer 5 and OpenServer 6 + 20061003 - (tim) [configure.ac] Move CHECK_HEADERS test before platform specific section so additional platform specific CHECK_HEADER tests will work @@ -2515,4 +2519,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4566 2006/10/03 16:34:35 tim Exp $ +$Id: ChangeLog,v 1.4567 2006/10/06 21:58:38 tim Exp $ diff --git a/buildpkg.sh.in b/buildpkg.sh.in index a3b9014b..9e4ff423 100644 --- a/buildpkg.sh.in +++ b/buildpkg.sh.in @@ -154,15 +154,22 @@ ARCH=`uname -m` DEF_MSG="\n" OS_VER=`uname -v` SCRIPT_SHELL=/sbin/sh +UNAME_R=`uname -r` UNAME_S=`uname -s` case ${UNAME_S} in SunOS) UNAME_S=Solaris + OS_VER=${UNAME_R} ARCH=`uname -p` RCS_D=yes DEF_MSG="(default: n)" ;; - SCO_SV) UNAME_S=OpenServer + SCO_SV) case ${UNAME_R} in + 3.2) UNAME_S=OpenServer5 OS_VER=`uname -X | grep Release | sed -e 's/^Rel.*3.2v//'` + ;; + 5) UNAME_S=OpenServer6 + ;; + esac SCRIPT_SHELL=/bin/sh RC1_D=no DEF_MSG="(default: n)" @@ -481,7 +488,7 @@ _EOF [ -x /usr/bin/ckyorn ] || cat >> request << _EOF ckyorn() { -# for some strange reason OpenServer has no ckyorn +# for some strange reason OpenServer5 has no ckyorn # We build a striped down version here DEFAULT=n |