X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=planetlab.mk;h=169cff9074bbcd18d1b1fcd151daa6cb0423260c;hb=94bea8db3940979868e25affde141743cae3c669;hp=7aa914c08dcf0463ed874c3d83824b3e90a3a74a;hpb=db56d6eb0c7f7aac67b29decc6df449f59a94f8b;p=build.git

diff --git a/planetlab.mk b/planetlab.mk
index 7aa914c0..169cff90 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -1,8 +1,9 @@
 #
 # PlanetLab standard components list
-#
+# initial version from Mark Huang
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2006 The Trustees of Princeton University
+# rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
 #
 # $Id$
 #
@@ -16,20 +17,18 @@
 # so the source rpm is created by running make srpm in the codebase
 #
 
-srpm-kernel-$(HOSTARCH)-MODULES := linux-patches
-srpm-kernel-$(HOSTARCH)-SPEC := kernel-2.6-planetlab.spec
-ifeq ($(HOSTARCH),i386)
-srpm-kernel-$(HOSTARCH)-RPMFLAGS:= --target i686
+kernel-MODULES := linux-patches
+kernel-SPEC := kernel-2.6.spec
+kernel-BUILD-FROM-SRPM := yes
+ifeq "$(HOSTARCH)" "i386"
+kernel-RPMFLAGS:= --target i686
 else
-srpm-kernel-$(HOSTARCH)-RPMFLAGS:= --target $(HOSTARCH)
+kernel-RPMFLAGS:= --target $(HOSTARCH)
 endif
-KERNELS += srpm-kernel-$(HOSTARCH)
-
-kernel: $(KERNELS)
-kernel-clean: $(foreach package,$(KERNELS),$(package)-clean)
+KERNELS += kernel
 
-# the first kernel package defined here for convenience
-kernel_package := $(word 1,$(KERNELS))
+kernels: $(KERNELS)
+kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
 
 ALL += $(KERNELS)
 # this is to mark on which image a given rpm is supposed to go
@@ -39,6 +38,42 @@ IN_BOOTSTRAPFS += $(KERNELS)
 # turns out myplc installs kernel-vserver
 IN_MYPLC += $(KERNELS)
 
+#
+# kexec-tools
+#
+ifeq "$(DISTRO)" "Fedora"
+ifeq "$(RELEASE)" "4"
+kexec-tools-MODULES := kexec-tools
+kexec-tools-SPEC := kexec-tools.spec
+kexec-tools-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
+kexec-tools-TAG := planetlab-4_1-rc2
+ALL += kexec-tools
+IN_BOOTCD += kexec-tools
+endif
+endif
+
+#
+# madwifi
+#
+madwifi-MODULES := madwifi
+madwifi-SPEC := madwifi.spec
+madwifi-BUILD-FROM-SRPM := yes
+madwifi-DEPEND-DEVEL-RPMS := kernel-devel
+madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
+	kernel_release=$(kernel.rpm-release) \
+	kernel_arch=$(kernel.rpm-arch)
+ALL += madwifi
+IN_BOOTSTRAPFS += madwifi
+
+#
+# wireless-tools
+# 
+wireless-tools-MODULES := wireless-tools
+wireless-tools-SPEC := wireless-tools.spec
+wireless-tools-BUILD-FROM-SRPM := yes
+ALL += wireless-tools
+IN_BOOTSTRAPFS += wireless-tools
+
 #
 # libnl
 #
@@ -56,10 +91,18 @@ ALL += libnl
 util-vserver-MODULES := util-vserver
 util-vserver-SPEC := util-vserver.spec
 util-vserver-RPMFLAGS:= --without dietlibc
-util-vserver-DEPENDDEVELS := libnl
 ALL += util-vserver
 IN_BOOTSTRAPFS += util-vserver
 
+#
+# util-vserver-pl
+#
+util-vserver-pl-MODULES := util-vserver-pl
+util-vserver-pl-SPEC := util-vserver-pl.spec
+util-vserver-pl-DEPEND-DEVEL-RPMS := libnl libnl-devel util-vserver-lib util-vserver-devel util-vserver-core
+ALL += util-vserver-pl
+IN_BOOTSTRAPFS += util-vserver-pl
+
 #
 # NodeUpdate
 #
@@ -101,14 +144,16 @@ IN_BOOTSTRAPFS += pl_sshd
 libhttpd-MODULES := libhttpd++
 libhttpd-SPEC := libhttpd++.spec
 ALL += libhttpd
+IN_BOOTSTRAPFS += libhttpd
 
 #
 # proper: Privileged Operations Service
 #
 proper-MODULES := proper
 proper-SPEC := proper.spec
-proper-DEPENDDEVELS := libhttpd
+proper-DEPEND-DEVEL-RPMS := libhttpd++-devel
 ALL += proper
+IN_BOOTSTRAPFS += proper
 
 #
 # codemux: Port 80 demux
@@ -124,8 +169,7 @@ IN_BOOTSTRAPFS += codemux
 #
 ulogd-MODULES := ulogd
 ulogd-SPEC := ulogd.spec
-ulogd-DEPENDDEVELS := $(kernel_package)
-ulogd-DEPENDDEVELRPMS := proper-libs proper-devel
+ulogd-DEPEND-DEVEL-RPMS := kernel-devel proper-libs proper-devel
 ALL += ulogd
 IN_VSERVER += ulogd
 
@@ -158,7 +202,7 @@ IN_BOOTSTRAPFS += pl_mom
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
-iptables-DEPENDDEVELS := $(kernel_package)
+iptables-DEPEND-DEVEL-RPMS := kernel-devel
 ALL += iptables
 IN_BOOTSTRAPFS += iptables
 
@@ -175,11 +219,12 @@ IN_BOOTSTRAPFS += iproute
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
-ifeq ($(DISTRO),"Fedora")
-ifeq ($(RELEASE),7)
+IN_BOOTSTRAPFS += vsys
+ifeq "$(DISTRO)" "Fedora"
+ifeq "$(RELEASE)" "7"
 ALL += vsys
 endif
-ifeq ($(RELEASE),8)
+ifeq "$(RELEASE)" "8"
 ALL += vsys
 endif
 endif
@@ -195,7 +240,7 @@ IN_MYPLC += PLCAPI
 #
 # PLCWWW
 #
-PLCWWW-MODULES := WWW
+PLCWWW-MODULES := PLCWWW
 PLCWWW-SPEC := PLCWWW.spec
 ALL += PLCWWW
 IN_MYPLC += PLCWWW
@@ -203,10 +248,8 @@ IN_MYPLC += PLCWWW
 #
 # bootmanager
 #
-bootmanager-MODULES := BootManager build
+bootmanager-MODULES := BootManager
 bootmanager-SPEC := bootmanager.spec
-# Package must be built as root
-bootmanager-RPMBUILD := sudo bash ./rpmbuild.sh
 ALL += bootmanager
 IN_MYPLC += bootmanager
 
@@ -225,8 +268,8 @@ bootcd-MODULES := BootCD build
 bootcd-SPEC := bootcd.spec
 bootcd-RPMBUILD := sudo bash ./rpmbuild.sh
 # package has *some* dependencies, at least these ones
-bootcd-DEPENDS := $(IN_BOOTCD)
-bootcd-DEPENDFILES := RPMS/yumgroups.xml
+bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
+bootcd-DEPEND-FILES := RPMS/yumgroups.xml
 ALL += bootcd
 IN_MYPLC += bootcd
 
@@ -239,10 +282,10 @@ vserver-SPEC := vserver-reference.spec
 vserver-RPMBUILD := sudo bash ./rpmbuild.sh
 # this list is useful for manual builds only, since nightly builds 
 # always redo all sequentially - try to keep updated
-vserver-DEPENDS := $(IN_VSERVER)
-vserver-DEPENDFILES := RPMS/yumgroups.xml
+vserver-DEPEND-PACKAGES := $(IN_VSERVER)
+vserver-DEPEND-FILES := RPMS/yumgroups.xml
 ALL += vserver
-IN_BOOTSTRAPFS := vserver
+IN_BOOTSTRAPFS += vserver
 
 #
 # bootstrapfs
@@ -251,8 +294,8 @@ bootstrapfs-MODULES := BootstrapFS build
 bootstrapfs-SPEC := bootstrapfs.spec
 bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh
 # package requires all regular packages
-bootstrapfs-DEPENDS := $(IN_BOOTSTRAPFS)
-bootstrapfs-DEPENDFILES := RPMS/yumgroups.xml
+bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
+bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
 ALL += bootstrapfs
 IN_MYPLC += bootstrapfs
 
@@ -264,8 +307,8 @@ myplc-SPEC := myplc.spec
 # Package must be built as root
 myplc-RPMBUILD := sudo bash ./rpmbuild.sh
 # myplc may require all packages
-myplc-DEPENDS := $(IN_MYPLC)
-myplc-DEPENDFILES := RPMS/yumgroups.xml myplc-release
+myplc-DEPEND-PACKAGES := $(IN_MYPLC)
+myplc-DEPEND-FILES := RPMS/yumgroups.xml myplc-release
 ALL += myplc
 
 #
@@ -276,8 +319,8 @@ myplc-native-SPEC := myplc-native.spec
 # Package must be built as root
 myplc-native-RPMBUILD := sudo bash ./rpmbuild.sh
 # Thierry : don't depend on anything at build-time
-#myplc-native-DEPENDS :=
+#myplc-native-DEPEND-PACKAGES :=
 # Thierry : dunno about this one, let's stay safe
-myplc-native-DEPENDFILES := myplc-release
+myplc-native-DEPEND-FILES := myplc-release
 ALL += myplc-native