add support for DEPENDDEVELRPMS

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index 3c7fcba..4444d37 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -43,11 +43,11 @@ KERNELS += srpm-kernel-$(HOSTARCH)
 kernel: $(KERNELS)
 kernel-clean: $(foreach package,$(KERNELS),$(package)-clean)
 
-kernel-devel: $(KERNELS)
-       sudo rpm -Uvh RPMS/i686/kernel-devel*.rpm
-
 ALL += $(KERNELS)
 
+# the first kernel package defined here
+kernel_package := $(word 1,$(KERNELS))
+
 #
 # libnl
 #
@@ -65,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
 
 #
@@ -102,20 +102,19 @@ 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
-# disabled temporarily (or ?)
-#ALL += proper
+#proper-RPMBUILD := sudo bash ./rpmbuild.sh
+proper-DEPENDS := libhttpd
+proper-DEPENDDEVELRPMS := libhttpd++
+ALL += proper
 
 #
 # codemux: Port 80 demux
@@ -130,7 +129,7 @@ ALL += codemux
 #
 ulogd-MODULES := ulogd
 ulogd-SPEC := ulogd.spec
-ulogd-DEPENDS := kernel-devel proper
+ulogd-DEPENDDEVELS := $(kernel_package) proper
 ALL += ulogd
 
 #
@@ -159,7 +158,7 @@ ALL += pl_mom
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
-iptables-DEPENDS :=kernel-devel
+iptables-DEPENDDEVELS := $(kernel_package)
 ALL += iptables
 
 #
@@ -174,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