X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=584924d8a59b3cd2cb4196083b0eba0f331f75b9;hb=refs%2Fheads%2F3.2;hp=9fe81cda495999b181b6685d4ea1a959a9ab0704;hpb=7558599465b80202c5857a7569936084c3d40135;p=bootmanager.git

diff --git a/build.sh b/build.sh
index 9fe81cd..584924d 100755
--- a/build.sh
+++ b/build.sh
@@ -1,19 +1,16 @@
 #!/bin/bash
 #
-# Builds bootmanager.sh[.sgn], the PlanetLab Boot Manager script, and
-# PlanetLab-Bootstrap.tar.bz2, the initial root filesystem of a new
-# PlanetLab node. For backward compatibility with old version 2.0 Boot
-# CDs, additional utilities are also built and packaged as
-# alpina-BootLVM.tar.gz and alpina-PartDisks.tar.gz.
+# Builds bootmanager.sh[.sgn], which is the PlanetLab Boot Manager script.
 #
 # The bootmanager.sh script contains in it a uuencoded tarball of the
 # Boot Manager, customized for this PLC installation.
 #
 # Aaron Klingaman <alk@absarokasoft.com>
 # Mark Huang <mlhuang@cs.princeton.edu>
-# Copyright (C) 2004-2006 The Trustees of Princeton University
+# Marc E. Fiuczynski <mef@cs.princeton.edu>
+# Copyright (C) 2004-2007 The Trustees of Princeton University
 #
-# $Id: build.sh,v 1.5 2006/04/03 19:40:55 mlhuang Exp $
+# $Id$
 #
 
 # Source PLC configuration
@@ -76,8 +73,16 @@ if [ -f "$PLC_DEBUG_SSH_KEY_PUB" ] ; then
     install -D -m 644 "$PLC_DEBUG_SSH_KEY_PUB" $srcdir/source/debug_files/debug_root_ssh_key
 fi
 
+# Add pypcilib and pyplnet
+extra_libs=`mktemp -d "/tmp/.bootmanager.XXXXXX"`
+mkdir $extra_libs/source
+cp -p $(rpm -ql pypcilib pyplnet | grep -v '\.py[co]$') $extra_libs/source
+
 # Embed the uuencoded tarball in the script
-tar -cj -C $srcdir source/ | uuencode -m - >> $DEST_SCRIPT
+tar -cj -C $srcdir source/ -C $extra_libs source/ | uuencode -m - >> $DEST_SCRIPT
+
+# Remove temp directory
+rm -fr $extra_libs
 
 echo '_EOF_' >> $DEST_SCRIPT
 echo 'cd /tmp/source' >> $DEST_SCRIPT