move to base64-13.1.0, remote LD_LIBRARY_PATH evil

Author: nshalman

README.md

@@ -6,5 +6,5 @@ Build scripts for building Spice-enabled QEMU for SmartOS
 Full documentation is kept on the wiki Page:
 http://wiki.smartos.org/display/DOC/Spice+on+SmartOS
 
-1. Create a multiarch-12.4.1 zone with a delegated dataset and log in to it as root.
+1. Create a base64-13.1.0 zone with a delegated dataset and log in to it as root.
 1. curl -k https://raw.github.com/nshalman/qemu-smartos-build/master/full-build | bash

config.sh

@@ -1,13 +1,13 @@
 export MAKEFLAGS="-j$(psrinfo | wc -l)"
 export LC_ALL=C
 export MY_PREFIX=/opt/local
-export MY_LIBS=${MY_PREFIX}/lib/amd64
+export MY_LIBS=${MY_PREFIX}/lib
 export MY_INCS=${MY_PREFIX}/include
 export LDFLAGS="-m64 -L${MY_LIBS}"
 export CFLAGS="-m64 -I${MY_INCS}"
 export CXXLAGS=${CFLAGS}
 export CPPFLAGS="-I${MY_INCS}"
-export SMARTDC=/smartdc2
+export SMARTDC=/opt/local
 
 export QEMU_VERSION=qemu-kvm-1.1.2
 export VERSION=1.0.1

dataset-built.do

@@ -1,5 +1,5 @@
 #!/bin/bash -x
-redo-ifchange config.sh qemu-built
+redo-ifchange config.sh qemu-built || exit 1
 exec >&2
 set -o xtrace
 . ./config.sh
@@ -24,8 +24,6 @@ mkdir ${ZONEDIR}/root
 
 ( cd qemu.source && gmake DESTDIR="${ZONEDIR}/root" install ; ) || exit 1
 
-mkdir -p ${ZONEDIR}/root/${SMARTDC}/lib
-
 #
 # Now figure out the libs we need to copy...
 #
@@ -35,7 +33,7 @@ for LIB in $LIBS; do
   ISOPT=$(echo "${LIB}" | egrep -e "^/opt/")
   if test -n "$ISOPT"; then
     echo "Copying ${LIB}"
-    cp ${LIB} ${ZONEDIR}/root/${SMARTDC}/lib || exit 1
+    rsync -LR ${LIB} ${ZONEDIR}/root/ || exit 1
   fi
 done
 

full-build

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+sm-summary | grep -q "base64 13.1.0" || { echo "Only the base64 13.1.0 is currently supported for building" ; exit 1 ;}
+
 # need git to get code
 pkgin up && pkgin -y in scmgit
 cd /root

prep.do

@@ -1,13 +1,6 @@
 #!/bin/bash -x
 exec 1>&2
 
-cat > /opt/local/etc/pkgin/repositories.conf <<EOF
-http://pkgsrc.smartos.org/packages/SmartOS/2012Q4-multiarch/All
-http://www.shalman.org/spice/2012Q4-multiarch-spice
-http://www.shalman.org/spice/2012Q4-multiarch-onbld
-EOF
-
-rm -rf /var/db/pkgin/
 pkgin -y up
 
 # need git to get code
@@ -16,8 +9,8 @@ pkgin -y in scmgit bsdtar
 # build tools
 pkgin -y in gcc47 gmake libtool-base automake pkg-config
 
-# build tools I provide
-pkgin -y in onbld
+# onbld tools from illumos
+curl http://www.shalman.org/spice/2012Q4-multiarch-onbld/onbld-0.0.1.tgz | tar xzv -C /opt/local bin lib
 
 # dependencies
 pkgin -y in png spice-protocol libspice usbredir

startvm.zone

@@ -3,7 +3,6 @@
 # This is a vm start script that processes the standard arguments from vmadmd
 # and translates them to work with the new qemu.
 #
-export LD_LIBRARY_PATH=/lib/64:/usr/lib/64:/smartdc2/lib
 
 #
 # We need to build the list of arguments... we need to inject 
@@ -13,7 +12,7 @@ export LD_LIBRARY_PATH=/lib/64:/usr/lib/64:/smartdc2/lib
 ARGV[0]="-machine"
 ARGV[1]="pc,accel=kvm,kernel_irqchip=on"
 ARGV[2]="-readconfig"
-ARGV[3]="/smartdc2/etc/qemu/usbredir.cfg"
+ARGV[3]="/opt/local/etc/qemu/usbredir.cfg"
 argc=4
 for ARG in "$@"; do
 	echo "ARG=$ARG"
@@ -25,4 +24,4 @@ done
 
 echo "FINAL ARGS: " ${ARGV[@]}
 
-exec /smartdc2/bin/qemu-system-x86_64 "${ARGV[@]}"
+exec /opt/local/bin/qemu-system-x86_64 "${ARGV[@]}"