final changes to gets things to build on FC6

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index daef499..d037837 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.45.2.7 2007/02/09 01:34:38 mlhuang Exp $
+# $Id: planetlab.mk,v 1.64 2007/08/14 16:16:39 faiyaza Exp $
 #
 
 #
@@ -49,20 +49,40 @@ endif
 # kernel
 #
 
-kernel-MODULE := linux-2.6
-kernel-SPEC := linux-2.6/scripts/kernel-2.6-planetlab.spec
-ALL += kernel
+# Figure out whether we are building on i386 or x86_64 host
+HOSTARCH := $(shell uname -i)
+
+kernel-$(HOSTARCH)-MODULE := linux-2.6
+kernel-$(HOSTARCH)-SPEC := linux-2.6/scripts/kernel-2.6-planetlab.spec
+ifeq ($(HOSTARCH),i386)
+kernel-$(HOSTARCH)-RPMFLAGS:= --target i686
+else
+kernel-$(HOSTARCH)-RPMFLAGS:= --target $(HOSTARCH)
+endif
+
+ALL += kernel-$(HOSTARCH)
+
+kernel-clean: kernel-$(HOSTARCH)-clean
+kernel: kernel-$(HOSTARCH)
 
 #
-# vnet
+# madwifi
 #
 
-vnet-MODULE := vnet
-vnet-SPEC := vnet/vnet.spec
-ALL += vnet
+madwifi-ng-MODULE := madwifi-ng
+madwifi-ng-SPEC := madwifi-ng/madwifi.spec
+#ALL += madwifi-ng
 
 # Build kernel first so we can bootstrap off of its build
-vnet: kernel
+madwifi-ng: kernel
+
+#
+# ivtv 
+#
+
+ivtv-MODULE := ivtv
+ivtv-SPEC := ivtv/ivtv.spec
+#ALL += ivtv
 
 #
 # util-vserver
@@ -167,10 +187,19 @@ ALL += libhttpd++
 
 proper-MODULE := proper
 proper-SPEC := proper/proper.spec
+proper-RPMBUILD := sudo sh .rpmbuild.sh
 ALL += proper
 
 proper: libhttpd++
 
+#
+# CoDemux: Port 80 demux
+#
+
+codemux-MODULE := codemux
+codemux-SPEC   := codemux/codemux.spec
+#ALL += codemux
+
 #
 # MySQL
 #
@@ -261,7 +290,7 @@ ALL += PLCAPI
 vserver-reference-MODULE := vserver-reference build
 vserver-reference-SPEC := vserver-reference/vserver-reference.spec
 # Package must be built as root
-vserver-reference-RPMBUILD := sudo rpmbuild
+vserver-reference-RPMBUILD := sudo sh .rpmbuild.sh
 ALL += vserver-reference
 
 # vserver-reference may require current packages
@@ -273,7 +302,7 @@ vserver-reference: $(filter-out vserver-reference,$(ALL))
 
 bootmanager-MODULE := bootmanager build
 bootmanager-SPEC := bootmanager/bootmanager.spec
-bootmanager-RPMBUILD := sudo rpmbuild
+bootmanager-RPMBUILD := sudo sh .rpmbuild.sh
 ALL += bootmanager
 
 # bootmanager requires current packages
@@ -288,7 +317,7 @@ bootmanager: RPMS/yumgroups.xml
 
 bootcd-MODULE := bootcd build bootmanager
 bootcd-SPEC := bootcd/bootcd.spec
-bootcd-RPMBUILD := sudo rpmbuild
+bootcd-RPMBUILD := sudo sh .rpmbuild.sh
 ALL += bootcd
 
 # bootcd requires current packages
@@ -301,7 +330,7 @@ bootcd: $(filter-out bootcd,$(ALL))
 myplc-MODULE := build myplc new_plc_www plc/scripts
 myplc-SPEC := myplc/myplc.spec
 # Package must be built as root
-myplc-RPMBUILD := sudo rpmbuild
+myplc-RPMBUILD := sudo sh .rpmbuild.sh
 ALL += myplc
 
 # MyPLC may require current packages
@@ -317,15 +346,26 @@ myplc: RPMS/yumgroups.xml
 myplc-devel-MODULE := build myplc
 myplc-devel-SPEC := myplc/myplc-devel.spec
 # Package must be built as root
-myplc-devel-RPMBUILD := sudo rpmbuild
+myplc-devel-RPMBUILD := sudo sh .rpmbuild.sh
 ALL += myplc-devel
 
+#
+# libnl
+#
+
+libnl-MODULE := libnl
+libnl-SPEC := libnl/libnl.spec
+ALL += libnl
+
+util-vserver: libnl
+
 #
 # Installation rules
 # 
 
 # Upload packages to boot server
-SERVER := build@boot.planet-lab.org
+SERVERA := build@boot1.planet-lab.org
+SERVERB := build@boot2.planet-lab.org
 ARCHIVE := /plc/data/var/www/html/install-rpms/archive
 
 # Put nightly alpha builds in a subdirectory
@@ -335,7 +375,7 @@ REPOS := /plc/data/var/www/html/install-rpms/planetlab-alpha
 endif
 
 RPMS/yumgroups.xml:
-       install -D -m 644 groups/v3_yumgroups.xml RPMS/yumgroups.xml
+       install -D -m 644 groups/v4_yumgroups.xml RPMS/yumgroups.xml
 
 install:
 ifeq ($(BASE),)
@@ -354,7 +394,8 @@ ifneq ($(wildcard /etc/planetlab/secring.gpg),)
 endif
 ifneq ($(BUILDS),)
         # Remove old runs
-       echo "cd $(ARCHIVE) && ls -t | sed -n $(BUILDS)~1p | xargs rm -rf" | ssh $(SERVER) /bin/bash -s
+       echo "cd $(ARCHIVE) && ls -t | sed -n $(BUILDS)~1p | xargs rm -rf" | ssh $(SERVERA) /bin/bash -s
+       echo "cd $(ARCHIVE) && ls -t | sed -n $(BUILDS)~1p | xargs rm -rf" | ssh $(SERVERB) /bin/bash -s
 endif
         # Create package manifest
        sh ./packages.sh -b "http://build.planet-lab.org/$(subst $(HOME)/,,$(shell pwd))/RPMS" RPMS > packages.xml
@@ -365,12 +406,21 @@ endif
        rsync \
        --exclude '*-debuginfo-*' \
        --recursive --links --perms --times --group --compress --rsh=ssh \
-       RPMS/ $(SERVER):$(ARCHIVE)/$(BASE)
+       RPMS/ $(SERVERA):$(ARCHIVE)/$(BASE)
+       rsync \
+       --exclude '*-debuginfo-*' \
+       --recursive --links --perms --times --group --compress --rsh=ssh \
+       RPMS/ $(SERVERB):$(ARCHIVE)/$(BASE)
 ifeq ($(TAG),HEAD)
         # Update nightly alpha symlink if it does not exist or is broken, or it is Monday
-       if ! ssh $(SERVER) "[ -e $(REPOS) ] && exit 0 || exit 1" || [ "$(shell date +%A)" = "Monday" ] ; then \
-           ssh $(SERVER) ln -nsf $(ARCHIVE)/$(BASE) $(REPOS) ; \
+       if ! ssh $(SERVERA) "[ -e $(REPOS) ] && exit 0 || exit 1" || [ "$(shell date +%A)" = "Monday" ] ; then \
+           ssh $(SERVERA) ln -nsf archive/$(BASE) $(REPOS) ; \
        fi
+        # Update nightly alpha symlink if it does not exist or is broken, or it is Monday
+       if ! ssh $(SERVERB) "[ -e $(REPOS) ] && exit 0 || exit 1" || [ "$(shell date +%A)" = "Monday" ] ; then \
+           ssh $(SERVERB) ln -nsf archive/$(BASE) $(REPOS) ; \
+       fi
+
 endif
 endif