From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Wed, 5 Dec 2007 17:02:01 +0000 (+0000)
Subject: Support old BootCDs which do not have pypcilib.
X-Git-Tag: bootmanager-3.2-2~15
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=c3664d156c352c2abb88a469b3746feface696d0

Support old BootCDs which do not have pypcilib.
---

diff --git a/bootmanager.spec b/bootmanager.spec
index 07c7de5..9098895 100644
--- a/bootmanager.spec
+++ b/bootmanager.spec
@@ -2,14 +2,14 @@
 # $Id: bootmanager.spec 856 2007-09-21 13:54:58Z thierry $
 #
 %define name bootmanager
-%define version 3.1
-%define subversion 16
+%define version 3.2
+%define subversion 1
 
 %define release %{subversion}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
-Distribution: PlanetLab 4.1
+Distribution: PlanetLab 4.2
 URL: http://cvs.planet-lab.org/cvs/bootmanager
 
 Summary: The PlanetLab Boot Manager
@@ -21,7 +21,7 @@ Group: System Environment/Base
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-Requires: tar, gnupg, sharutils, bzip2
+Requires: tar, gnupg, sharutils, bzip2, pypcilib
 
 AutoReqProv: no
 %define debug_package %{nil}
diff --git a/build.sh b/build.sh
index 87e07c2..b238fb8 100755
--- a/build.sh
+++ b/build.sh
@@ -73,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
+pypcilib=`mktemp -d "/tmp/.bootmanager.XXXXXX"`
+mkdir $pypcilib/source
+cp $(rpm -ql pypcilib | grep -v '\.py[co]$') $pypcilib/source
+
 # Embed the uuencoded tarball in the script
-tar -cj -C $srcdir source/ | uuencode -m - >> $DEST_SCRIPT
+tar -cj -C $srcdir source/ -C $pypcilib source/ | uuencode -m - >> $DEST_SCRIPT
+
+# Remove temp directory
+rm -fr $pypcilib
 
 echo '_EOF_' >> $DEST_SCRIPT
 echo 'cd /tmp/source' >> $DEST_SCRIPT