Author: jfrederic.clere(a)jboss.com
Date: 2008-01-17 09:39:35 -0500 (Thu, 17 Jan 2008)
New Revision: 1286
Modified:
trunk/build/unix/util/buildroot.solaris.sh
Log:
Get it running on i386 Solaris 10.
Modified: trunk/build/unix/util/buildroot.solaris.sh
===================================================================
--- trunk/build/unix/util/buildroot.solaris.sh 2008-01-17 12:20:21 UTC (rev 1285)
+++ trunk/build/unix/util/buildroot.solaris.sh 2008-01-17 14:39:35 UTC (rev 1286)
@@ -24,7 +24,7 @@
# Build a chrootable environment.
# $1 : Directory where the chroot will takes place.
tools="/bin/bash /etc/passwd /etc/group /etc/hosts /etc/netconfig /etc/resolv.conf
/etc/inet/ipnodes /usr/lib/ld.so.1"
-depfiles="/bin/sh /usr/bin/test /usr/bin/dirname /bin/basename /bin/uname /bin/grep
/usr/bin/sh /usr/bin/expr /bin/false /bin/true"
+depfiles="/bin/sh /usr/bin/test /usr/bin/dirname /usr/bin/basename /usr/bin/uname
/usr/bin/grep /usr/bin/sh /usr/bin/expr /usr/bin/false /usr/bin/true"
# tools are the tools we need for the tests.
# depfiles are files the packages needed (to be generated).
files="$tools $depfiles"
@@ -32,7 +32,14 @@
# Those are dependencies (to be generated).
toolpackages=""
# SUNWlibC is for java.
-deppackages="SUNWlibms SUNWcsl SUNWzlib SUNWlibC"
+case `/bin/uname -p` in
+ sparc)
+ deppackages="SUNWlibms SUNWcsl SUNWzlib SUNWlibC"
+ ;;
+ i386)
+ deppackages="SUNWlibms SUNWcsl SUNWzlib SUNWlibC SUNWcslr"
+ ;;
+esac
packages="$toolpackages $deppackages"
# Copy library need by one file
@@ -63,7 +70,7 @@
# $2 : name of the package
Processpackage()
{
- for file in `pkgchk -l $2 | grep Pathname: | awk ' { print $2 } '`
+ for file in `/usr/sbin/pkgchk -l $2 | grep Pathname: | awk ' { print $2 } '`
do
Processfile $1 $file
done
Show replies by date