build.sh will now build natively within the current hosting

environment rather than building myplc-devel.

planetlab.mk no longer creates myplc-devel

diff --git a/build.sh b/build.sh
index 2d0efc9..937dade 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -138,8 +138,12 @@ else
     # Checkout build directory
     svn checkout ${SVNPATH}/${MODULE}/${TAG} ${BASE}
 
-    # Build
-    ${BASE}/make.sh TAG=${TAG} PLDISTRO=${PLDISTRO}
+    # Build myplc-devel-native, install it to ensure we've got the right packages, and let it rip
+    make TAG=${TAG} PLDISTRO=${PLDISTRO} -C ${BASE} BASE=$BASE BUILDS=$BUILDS myplc-devel-native
+    sudo yum -y localinstall RPMS/i386/myplc-devel-native-*.*.rpm 
+
+    # Build everything
+    make TAG=${TAG} PLDISTRO=${PLDISTRO} -C ${BASE} BASE=$BASE BUILDS=$BUILDS
 
     # Install to boot server
     make TAG=${TAG} PLDISTRO=${PLDISTRO} -C ${BASE} install BASE=$BASE BUILDS=$BUILDS

diff --git a/planetlab.mk b/planetlab.mk
index e16362b..e38c047 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -374,45 +374,45 @@ MyPLC-RPMBUILD := sudo bash ./rpmbuild.sh
 ALL += MyPLC
 
 # MyPLC may require current packages
-#MyPLC: $(filter-out MyPLC,$(ALL))
+MyPLC: $(filter-out MyPLC,$(ALL))
 
 # ...and the yum manifest
 MyPLC: RPMS/yumgroups.xml
 
-#
-# MyPLC development environment
-#
-
-myplc-devel-MODULE := MyPLC build 
-myplc-devel-SPEC := myplc-devel.spec
-# Package must be built as root
-myplc-devel-RPMBUILD := sudo bash ./rpmbuild.sh
-ALL += myplc-devel
 
 #
 # MyPLC native
 #
 
-myplc-native-MODULE := MyPLC build
-myplc-native-SPEC := myplc-native.spec
+MyPLC-native-MODULE := MyPLC build WWW
+MyPLC-native-SPEC := myplc-native.spec
 # Package must be built as root
-myplc-native-RPMBUILD := sudo bash ./rpmbuild.sh
-#ALL += myplc-native
+MyPLC-native-RPMBUILD := sudo bash ./rpmbuild.sh
+ALL += MyPLC-native
 
 # MyPLC may require current packages
-myplc-native: $(filter-out MyPLC,$(ALL))
+MyPLC-native: $(filter-out MyPLC,$(ALL))
 
 # ...and the yum manifest
-myplc-native: RPMS/yumgroups.xml
+MyPLC-native: RPMS/yumgroups.xml
 
+#
+# MyPLC development environment
+#
+
+myplc-devel-MODULE := MyPLC build 
+myplc-devel-SPEC := myplc-devel.spec
+# Package must be built as root
+myplc-devel-RPMBUILD := sudo bash ./rpmbuild.sh
+#ALL += myplc-devel
 
 #
-# MyPLC native
+# MyPLC native development environment
 #
 
 myplc-devel-native-MODULE := MyPLC
 myplc-devel-native-SPEC := myplc-devel-native.spec
-#ALL += myplc-devel-native
+ALL += myplc-devel-native
 
 #
 # libnl