- MyPLC 0.4 RC2

diff --git a/groups/v3_yumgroups.xml b/groups/v3_yumgroups.xml
index d23cf1c..8598c52 100644 (file)
--- a/groups/v3_yumgroups.xml
+++ b/groups/v3_yumgroups.xml
@@ -24,6 +24,7 @@
       <packagereq type="mandatory">iputils</packagereq>
       <packagereq type="mandatory">kbd</packagereq>
       <packagereq type="mandatory">kernel</packagereq>
+      <packagereq type="mandatory">kernel-smp</packagereq>
       <packagereq type="mandatory">libtermcap</packagereq>
       <packagereq type="mandatory">passwd</packagereq>
       <packagereq type="mandatory">procps</packagereq>
@@ -116,7 +117,6 @@
       <packagereq type="mandatory">planetlab_sudo</packagereq>
       <packagereq type="mandatory">pl_sshd</packagereq>
       <packagereq type="mandatory">ipod</packagereq>
-      <packagereq type="mandatory">ksymoops</packagereq>
       <packagereq type="mandatory">vserver-reference</packagereq>
       <packagereq type="mandatory">vserver-system-packages</packagereq>
       <packagereq type="mandatory">proper</packagereq>
@@ -221,7 +221,6 @@
     <description></description>
     <grouplist/>
     <packagelist>
-      <packagereq type="mandatory">kernel-smp</packagereq>
     </packagelist>
   </group>
 

diff --git a/mkbuild b/mkbuild
index 9a385ff..09151cf 100755 (executable)
--- a/mkbuild
+++ b/mkbuild
@@ -7,7 +7,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
+# $Id: mkbuild,v 1.2 2006/07/17 21:26:06 mlhuang Exp $
 #
 
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@ -162,7 +162,7 @@ fi
 # If a preferred mirror was specified, configure mkfedora to use it
 if [ -n "$mirror" ] ; then
     mkdir -p $vroot/etc/planetlab
-    echo "mirrors=($mirror)" >$vroot/etc/planetlab/mkfedora.conf
+    echo "PLC_DEVEL_FEDORA_URL=$mirror" >$vroot/etc/planetlab/plc_config
 fi
 
 # Install local CVS repository.

diff --git a/mkfedora b/mkfedora
index bf6b6e3..987f976 100755 (executable)
--- a/mkfedora
+++ b/mkfedora
@@ -13,7 +13,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 #
-# $Id: mkfedora,v 1.16 2006/07/06 22:55:47 mlhuang Exp $
+# $Id: mkfedora,v 1.17 2006/07/17 21:25:42 mlhuang Exp $
 #
 
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@ -47,9 +47,12 @@ exclude=()
 # Exclude kernel* (and related) packages from all repositories except bootstrap
 exclude_kernel=
 
-# Local overrides (usually a better set of mirrors to choose from)
-if [ -f /etc/planetlab/mkfedora.conf ] ; then
-    . /etc/planetlab/mkfedora.conf
+# PlanetLab development environment
+if [ -f /etc/planetlab/plc_config ] ; then
+    . /etc/planetlab/plc_config
+    if [ -n "$PLC_DEVEL_FEDORA_URL" ] ; then
+       mirrors=($PLC_DEVEL_FEDORA_URL)
+    fi
 fi
 
 usage()
@@ -206,7 +209,7 @@ cleanup ()
 }
 
 # Clean up before exiting if anything goes wrong
-trap "cleanup" ERR
+trap "cleanup" ERR INT
 
 # Create a dummy /etc/fstab in reference image
 mkdir -p $vroot/etc

diff --git a/planetlab.mk b/planetlab.mk
index 13fa239..2757d9b 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 #
-# $Id: planetlab.mk,v 1.27 2006/07/07 02:13:17 mlhuang Exp $
+# $Id: planetlab.mk,v 1.30 2006/07/15 19:49:40 mlhuang Exp $
 #
 
 #
@@ -66,17 +66,6 @@ util-vserver-MODULE := util-vserver
 util-vserver-SPEC := util-vserver/util-vserver.spec
 ALL += util-vserver
 
-#
-# lkcdutils
-#
-
-lkcdutils-MODULE := lkcdutils
-lkcdutils-SPEC := lkcdutils/spec/lkcdutils.spec
-ALL += lkcdutils
-
-# Build kernel first so we can bootstrap off of its build
-lkcdutils: kernel
-
 #
 # yum
 #
@@ -85,14 +74,6 @@ yum-MODULE := yum
 yum-SPEC := yum/yum.spec
 ALL += yum
 
-#
-# ksymoops
-#
-
-ksymoops-MODULE := ksymoops
-ksymoops-SPEC := ksymoops/ksymoops.spec
-ALL += ksymoops
-
 #
 # PlanetLabAccounts
 #
@@ -334,7 +315,7 @@ bootcd: $(filter-out bootcd,$(ALL))
 # MyPLC
 #
 
-myplc-MODULE := myplc build pl_db plc_api plc_www plc/scripts
+myplc-MODULE := $(sort $(foreach module,$(ALL),$($(module)-MODULE)) myplc pl_db plc_api plc_www plc/scripts)
 myplc-SPEC := myplc/myplc.spec
 # Package must be built as root
 myplc-RPMBUILD := sudo rpmbuild