summaryrefslogtreecommitdiff
path: root/buildpkg.sh.in
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2006-10-06 14:58:38 -0700
committerTim Rice <tim@multitalents.net>2006-10-06 14:58:38 -0700
commit09f1093a29e6dcbec76cfa1831d080ced2d4b627 (patch)
treeb405096a97a7793b03ac8eaaac2de65dbca63df1 /buildpkg.sh.in
parent1cfab23b7f9e29fa9d66c97334ef9331d033f83d (diff)
20061006
- (tim) [buildpkg.sh.in] Use uname -r instead of -v in OS_VER for Solaris. Differentiate between OpenServer 5 and OpenServer 6
Diffstat (limited to 'buildpkg.sh.in')
-rw-r--r--buildpkg.sh.in11
1 files changed, 9 insertions, 2 deletions
diff --git a/buildpkg.sh.in b/buildpkg.sh.in
index a3b9014bc..9e4ff4239 100644
--- a/buildpkg.sh.in
+++ b/buildpkg.sh.in
@@ -154,15 +154,22 @@ ARCH=`uname -m`
154DEF_MSG="\n" 154DEF_MSG="\n"
155OS_VER=`uname -v` 155OS_VER=`uname -v`
156SCRIPT_SHELL=/sbin/sh 156SCRIPT_SHELL=/sbin/sh
157UNAME_R=`uname -r`
157UNAME_S=`uname -s` 158UNAME_S=`uname -s`
158case ${UNAME_S} in 159case ${UNAME_S} in
159 SunOS) UNAME_S=Solaris 160 SunOS) UNAME_S=Solaris
161 OS_VER=${UNAME_R}
160 ARCH=`uname -p` 162 ARCH=`uname -p`
161 RCS_D=yes 163 RCS_D=yes
162 DEF_MSG="(default: n)" 164 DEF_MSG="(default: n)"
163 ;; 165 ;;
164 SCO_SV) UNAME_S=OpenServer 166 SCO_SV) case ${UNAME_R} in
167 3.2) UNAME_S=OpenServer5
165 OS_VER=`uname -X | grep Release | sed -e 's/^Rel.*3.2v//'` 168 OS_VER=`uname -X | grep Release | sed -e 's/^Rel.*3.2v//'`
169 ;;
170 5) UNAME_S=OpenServer6
171 ;;
172 esac
166 SCRIPT_SHELL=/bin/sh 173 SCRIPT_SHELL=/bin/sh
167 RC1_D=no 174 RC1_D=no
168 DEF_MSG="(default: n)" 175 DEF_MSG="(default: n)"
@@ -481,7 +488,7 @@ _EOF
481[ -x /usr/bin/ckyorn ] || cat >> request << _EOF 488[ -x /usr/bin/ckyorn ] || cat >> request << _EOF
482 489
483ckyorn() { 490ckyorn() {
484# for some strange reason OpenServer has no ckyorn 491# for some strange reason OpenServer5 has no ckyorn
485# We build a striped down version here 492# We build a striped down version here
486 493
487DEFAULT=n 494DEFAULT=n