add support for DEPENDDEVELRPMS

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index f077f88..4444d37 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -11,21 +11,43 @@
 #
 # kernel
 #
-kernel-$(HOSTARCH)-MODULES := Linux-2.6
-kernel-$(HOSTARCH)-SPEC := scripts/kernel-2.6-planetlab.spec
+# until we are able to build the new kernel layout:
+# use the old exploded-tree, 2.6.20-based, version on fc4, 6 & 7
+# and the new one on f8 - that requires the build-id patch
+
+# 
+# use a package name with srpm in it:
+# in this case the srpm 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)
-kernel-$(HOSTARCH)-RPMFLAGS:= --target i686
+srpm-kernel-$(HOSTARCH)-RPMFLAGS:= --target i686
 else
-kernel-$(HOSTARCH)-RPMFLAGS:= --target $(HOSTARCH)
+srpm-kernel-$(HOSTARCH)-RPMFLAGS:= --target $(HOSTARCH)
 endif
+KERNELS += srpm-kernel-$(HOSTARCH)
 
-KERNELS += kernel-$(HOSTARCH)
+#else
+#kernel-$(HOSTARCH)-MODULES := linux-tree
+#kernel-$(HOSTARCH)-SPEC := scripts/kernel-2.6-planetlab.spec
+#ifeq ($(HOSTARCH),i386)
+#kernel-$(HOSTARCH)-RPMFLAGS:= --target i686
+#else
+#kernel-$(HOSTARCH)-RPMFLAGS:= --target $(HOSTARCH)
+#endif
+#KERNELS += kernel-$(HOSTARCH)
+#endif
 
 kernel: $(KERNELS)
 kernel-clean: $(foreach package,$(KERNELS),$(package)-clean)
 
 ALL += $(KERNELS)
 
+# the first kernel package defined here
+kernel_package := $(word 1,$(KERNELS))
+
 #
 # libnl
 #
@@ -43,7 +65,7 @@ ALL += libnl
 util-vserver-MODULES := util-vserver
 util-vserver-SPEC := util-vserver.spec
 util-vserver-RPMFLAGS:= --without dietlibc
-util-vserver-DEPENDS := libnl
+util-vserver-DEPENDDEVELS := libnl
 ALL += util-vserver
 
 #
@@ -80,18 +102,18 @@ ALL += pl_sshd
 # Deprecate when vsys takes over [sapan].
 # keep in build for proper.
 #
-libhttpd++-MODULES := libhttpd++
-libhttpd++-SPEC := libhttpd++.spec
-ALL += libhttpd++
+libhttpd-MODULES := libhttpd++
+libhttpd-SPEC := libhttpd++.spec
+ALL += libhttpd
 
 #
 # proper: Privileged Operations Service
 #
 proper-MODULES := proper
 proper-SPEC := proper.spec
-proper-RPMBUILD := sudo bash ./rpmbuild.sh
-# proper uses scripts in util-python for building
-proper-DEPENDS := libhttpd++ util-python
+#proper-RPMBUILD := sudo bash ./rpmbuild.sh
+proper-DEPENDS := libhttpd
+proper-DEPENDDEVELRPMS := libhttpd++
 ALL += proper
 
 #
@@ -107,15 +129,21 @@ ALL += codemux
 #
 ulogd-MODULES := ulogd
 ulogd-SPEC := ulogd.spec
-ulogd-DEPENDS := $(KERNELS) proper
+ulogd-DEPENDDEVELS := $(kernel_package) proper
 ALL += ulogd
 
+#
+# fprobe-ulog
+#
+fprobe-ulog-MODULES := fprobe-ulog
+fprobe-ulog-SPEC := fprobe-ulog.spec
+ALL += fprobe-ulog
+
 #
 # netflow
 #
 netflow-MODULES := PlanetFlow
 netflow-SPEC := netflow.spec
-netflow-SPECVARS := distroname=$(DISTRO) distrorelease=$(RELEASE)
 ALL += netflow
 
 #
@@ -130,7 +158,7 @@ ALL += pl_mom
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
-iptables-DEPENDS := $(KERNELS)
+iptables-DEPENDDEVELS := $(kernel_package)
 ALL += iptables
 
 #
@@ -145,9 +173,9 @@ ALL += iproute
 #
 # [marc]    deprecate with proper
 #
-util-python-MODULES := util-python
-util-python-SPEC := util-python.spec
-ALL += util-python
+#util-python-MODULES := util-python
+#util-python-SPEC := util-python.spec
+#ALL += util-python
 
 #
 # vsys
@@ -183,7 +211,14 @@ bootmanager-SPEC := bootmanager.spec
 bootmanager-RPMBUILD := sudo bash ./rpmbuild.sh
 ALL += bootmanager
 
-# we do not want BootCD to depend on vserver-reference, do we ?
+#
+# pypcilib : used in bootcd
+# 
+pypcilib-MODULES := pypcilib
+pypcilib-SPEC := pypcilib.spec
+ALL += pypcilib
+
+# copy the current list, so as to keep image-building rpms out
 ALL-REGULARS := $(ALL)
 
 #
@@ -205,7 +240,7 @@ bootcd-MODULES := BootCD BootManager build
 bootcd-SPEC := bootcd.spec
 bootcd-RPMBUILD := sudo bash ./rpmbuild.sh
 # package has *some* dependencies, at least these ones
-bootcd-DEPENDS := $(KERNELS)
+bootcd-DEPENDS := $(ALL-REGULARS)
 bootcd-DEPENDFILES := RPMS/yumgroups.xml
 ALL += bootcd
 
@@ -228,7 +263,7 @@ myplc-SPEC := myplc.spec
 # Package must be built as root
 myplc-RPMBUILD := sudo bash ./rpmbuild.sh
 # myplc may require all packages
-myplc-DEPENDS := $(ALL)
+myplc-DEPENDS := $(filter-out vserver,$(ALL))
 myplc-DEPENDFILES := RPMS/yumgroups.xml
 ALL += myplc
 
@@ -239,7 +274,7 @@ 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 : I don't think we depend on these at build-time
+# Thierry : don't depend on these at build-time
 #myplc-native-DEPENDS := $(MyPLC-DEPENDS)
 # Thierry : dunno about this one, let's stay safe
 myplc-native-DEPENDFILES := $(MyPLC-DEPENDFILES)
@@ -257,6 +292,5 @@ myplc-devel-RPMBUILD := sudo bash ./rpmbuild.sh
 # MyPLC native development environment
 #
 myplc-devel-native-MODULES := MyPLC
-myplc-devel-native-SPECVARS := distroname=$(DISTRO) distrorelease=$(RELEASE)
 myplc-devel-native-SPEC := myplc-devel-native.spec
 #ALL += myplc-devel-native