add support for DEPENDDEVELRPMS

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index e791f00..4444d37 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -14,27 +14,40 @@
 # 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
 #
-ifeq "$(RELEASE)" "8"
-kernel-$(HOSTARCH)-MODULES := linux-patches
-kernel-$(HOSTARCH)-SPEC := kernel-2.6-planetlab.spec
-else
-kernel-$(HOSTARCH)-MODULES := linux-tree
-kernel-$(HOSTARCH)-SPEC := scripts/kernel-2.6-planetlab.spec
-endif
+
+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 += kernel-$(HOSTARCH)
+KERNELS += srpm-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
 #
@@ -52,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
 
 #
@@ -89,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
 
 #
@@ -116,7 +129,7 @@ ALL += codemux
 #
 ulogd-MODULES := ulogd
 ulogd-SPEC := ulogd.spec
-ulogd-DEPENDS := $(KERNELS) proper
+ulogd-DEPENDDEVELS := $(kernel_package) proper
 ALL += ulogd
 
 #
@@ -145,7 +158,7 @@ ALL += pl_mom
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
-iptables-DEPENDS := $(KERNELS)
+iptables-DEPENDDEVELS := $(kernel_package)
 ALL += iptables
 
 #
@@ -160,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