X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=aac237eee906cb51a21683ad1b41ce4de21d87f2;hb=5440f9679d0c8bc0f1da40905849aefe1ee7596b;hp=7e4dcde8da2cbc0b38fa39217c00b8c66a35116b;hpb=46cb991a23c0e0d7b79f04833e68456a77c53280;p=build.git

diff --git a/onelab.mk b/onelab.mk
index 7e4dcde8..aac237ee 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -17,7 +17,7 @@
 # so the source rpm is created by running make srpm in the codebase
 #
 
-kernel-MODULES := linux-patches
+kernel-MODULES := linux-2.6
 kernel-SPEC := kernel-2.6.spec
 kernel-BUILD-FROM-SRPM := yes
 ifeq "$(HOSTARCH)" "i386"
@@ -25,6 +25,7 @@ kernel-RPMFLAGS:= --target i686
 else
 kernel-RPMFLAGS:= --target $(HOSTARCH)
 endif
+kernel-SPECVARS := iwlwifi=1
 KERNELS += kernel
 
 kernels: $(KERNELS)
@@ -41,8 +42,7 @@ IN_MYPLC += $(KERNELS)
 #
 # kexec-tools
 #
-ifeq "$(DISTRO)" "Fedora"
-ifeq "$(RELEASE)" "4"
+ifeq "$(DISTRONAME)" "fc4"
 kexec-tools-MODULES := kexec-tools
 kexec-tools-SPEC := kexec-tools.spec
 kexec-tools-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
@@ -50,7 +50,6 @@ kexec-tools-TAG := planetlab-4_1-rc2
 ALL += kexec-tools
 IN_BOOTCD += kexec-tools
 endif
-endif
 
 #
 # madwifi
@@ -156,26 +155,6 @@ pl_sshd-SPEC := pl_sshd.spec
 ALL += pl_sshd
 IN_BOOTSTRAPFS += pl_sshd
 
-#
-# libhttpd++: 
-#
-# Deprecate when vsys takes over [sapan].
-# keep in build for proper.
-#
-libhttpd-MODULES := libhttpd++
-libhttpd-SPEC := libhttpd++.spec
-ALL += libhttpd
-IN_BOOTSTRAPFS += libhttpd
-
-#
-# proper: Privileged Operations Service
-#
-proper-MODULES := proper
-proper-SPEC := proper.spec
-proper-DEPEND-DEVEL-RPMS := libhttpd++-devel
-ALL += proper
-IN_BOOTSTRAPFS += proper
-
 #
 # codemux: Port 80 demux
 #
@@ -185,15 +164,6 @@ codemux-RPMBUILD := sudo bash ./rpmbuild.sh
 ALL += codemux
 IN_BOOTSTRAPFS += codemux
 
-#
-# ulogd
-#
-ulogd-MODULES := ulogd
-ulogd-SPEC := ulogd.spec
-ulogd-DEPEND-DEVEL-RPMS := kernel-devel proper-libs proper-devel
-ALL += ulogd
-IN_VSERVER += ulogd
-
 #
 # fprobe-ulog
 #
@@ -210,14 +180,6 @@ pf2slice-SPEC := pf2slice.spec
 ALL += pf2slice
 
 
-#
-# netflow
-#
-netflow-MODULES := PlanetFlow
-netflow-SPEC := netflow.spec
-ALL += netflow
-IN_BOOTSTRAPFS += netflow
-
 #
 # PlanetLab Mom: Cleans up your mess
 #
@@ -246,17 +208,24 @@ IN_BOOTSTRAPFS += iproute
 #
 # vsys
 #
+vsys_support=yes
+ifeq "$(DISTRONAME)" "fc4"
+vsys_support=
+endif
+ifeq "$(DISTRONAME)" "fc6"
+vsys_support=
+endif
+# cannot find the required packages (see devel.pkgs) on centos5
+ifeq "$(DISTRONAME)" "centos5"
+vsys_support=
+endif
+
+ifeq "$(vsys_support)" "yes"
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
 IN_BOOTSTRAPFS += vsys
-ifeq "$(DISTRO)" "Fedora"
-ifeq "$(RELEASE)" "7"
 ALL += vsys
 endif
-ifeq "$(RELEASE)" "8"
-ALL += vsys
-endif
-endif
 
 #
 # PLCAPI
@@ -274,6 +243,14 @@ PLCWWW-SPEC := PLCWWW.spec
 ALL += PLCWWW
 IN_MYPLC += PLCWWW
 
+#
+# monitor
+#
+Monitor-MODULES := Monitor
+Monitor-SPEC := Monitor.spec
+ALL += Monitor
+IN_BOOTSTRAPFS += Monitor
+
 #
 # nodeconfig
 #
@@ -304,9 +281,9 @@ IN_BOOTCD += pypcilib
 bootcd-MODULES := BootCD build
 bootcd-SPEC := bootcd.spec
 bootcd-RPMBUILD := sudo bash ./rpmbuild.sh
-# package has *some* dependencies, at least these ones
 bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
 bootcd-DEPEND-FILES := RPMS/yumgroups.xml
+bootcd-RPMDATE := yes
 ALL += bootcd
 IN_MYPLC += bootcd
 
@@ -317,10 +294,9 @@ vserver-MODULES := VserverReference build
 vserver-SPEC := vserver-reference.spec
 # Package must be built as root
 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-DEPEND-PACKAGES := $(IN_VSERVER)
 vserver-DEPEND-FILES := RPMS/yumgroups.xml
+vserver-RPMDATE := yes
 ALL += vserver
 IN_BOOTSTRAPFS += vserver
 
@@ -330,9 +306,9 @@ IN_BOOTSTRAPFS += vserver
 bootstrapfs-MODULES := BootstrapFS build
 bootstrapfs-SPEC := bootstrapfs.spec
 bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh
-# package requires all regular packages
 bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
 bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
+bootstrapfs-RPMDATE := yes
 ALL += bootstrapfs
 IN_MYPLC += bootstrapfs
 
@@ -353,21 +329,10 @@ noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
 noderepo-DEPEND-FILES := RPMS/yumgroups.xml
 #export rpm list to the specfile
 noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
+noderepo-RPMDATE := yes
 ALL += noderepo
 IN_MYPLC += noderepo
 
-#
-# myplc : initial, chroot-based packaging
-#
-myplc-MODULES := MyPLC build
-myplc-SPEC := myplc.spec
-# Package must be built as root
-myplc-RPMBUILD := sudo bash ./rpmbuild.sh
-# myplc may require all packages
-myplc-DEPEND-PACKAGES := $(IN_MYPLC)
-myplc-DEPEND-FILES := RPMS/yumgroups.xml myplc-release
-ALL += myplc
-
 #
 # MyPLC native : lightweight packaging, dependencies are yum-installed in a vserver
 #
@@ -375,9 +340,22 @@ myplc-native-MODULES := MyPLC build
 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-DEPEND-PACKAGES :=
-# Thierry : dunno about this one, let's stay safe
 myplc-native-DEPEND-FILES := myplc-release
 ALL += myplc-native
 
+## #
+## # myplc : old-fashioned, chroot-based packaging
+## #
+## myplc-MODULES := MyPLC build
+## myplc-SPEC := myplc.spec
+## # Package must be built as root
+## myplc-RPMBUILD := sudo bash ./rpmbuild.sh
+## # myplc may require all packages
+## myplc-DEPEND-PACKAGES := $(IN_MYPLC)
+## myplc-DEPEND-FILES := RPMS/yumgroups.xml myplc-release
+## myplc-RPMDATE := yes
+## ALL += myplc
+
+myplc-docs-MODULES := MyPLC PLCAPI NodeManager
+myplc-docs-SPEC := myplc-docs.spec
+#ALL += myplc-docs