(*) dismantled DEPENDDEVELS

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index 645a2c2..10ce4dc 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -56,10 +56,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-DEPENDDEVELRPMS := libnl libnl-devel util-vserver-lib util-vserver-devel util-vserver-core
+ALL += util-vserver-pl
+IN_BOOTSTRAPFS += util-vserver-pl
+
 #
 # NodeUpdate
 #
@@ -107,7 +115,7 @@ ALL += libhttpd
 #
 proper-MODULES := proper
 proper-SPEC := proper.spec
-proper-DEPENDDEVELS := libhttpd
+proper-DEPENDDEVELRPMS := libhttpd++-devel
 ALL += proper
 
 #
@@ -124,8 +132,7 @@ IN_BOOTSTRAPFS += codemux
 #
 ulogd-MODULES := ulogd
 ulogd-SPEC := ulogd.spec
-ulogd-DEPENDDEVELS := $(kernel_package)
-ulogd-DEPENDDEVELRPMS := proper-libs proper-devel
+ulogd-DEPENDDEVELRPMS := kernel-devel proper-libs proper-devel
 ALL += ulogd
 IN_VSERVER += ulogd
 
@@ -158,7 +165,7 @@ IN_BOOTSTRAPFS += pl_mom
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
-iptables-DEPENDDEVELS := $(kernel_package)
+iptables-DEPENDDEVELRPMS := kernel-devel
 ALL += iptables
 IN_BOOTSTRAPFS += iptables
 
@@ -221,7 +228,7 @@ IN_BOOTCD += pypcilib
 #
 # bootcd
 #
-bootcd-MODULES := BootCD BootManager build
+bootcd-MODULES := BootCD build
 bootcd-SPEC := bootcd.spec
 bootcd-RPMBUILD := sudo bash ./rpmbuild.sh
 # package has *some* dependencies, at least these ones
@@ -275,23 +282,9 @@ 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 these at build-time
-#myplc-native-DEPENDS := $(MyPLC-DEPENDS)
+# Thierry : don't depend on anything at build-time
+#myplc-native-DEPENDS :=
 # Thierry : dunno about this one, let's stay safe
-myplc-native-DEPENDFILES := $(MyPLC-DEPENDFILES)
-#ALL += myplc-native
-
-#
-# MyPLC development environment : chroot-based 
-#
-myplc-devel-MODULES := MyPLC build 
-myplc-devel-SPEC := myplc-devel.spec
-myplc-devel-RPMBUILD := sudo bash ./rpmbuild.sh
-#ALL += myplc-devel
+myplc-native-DEPENDFILES := myplc-release
+ALL += myplc-native
 
-#
-# MyPLC native development environment
-#
-myplc-devel-native-MODULES := MyPLC
-myplc-devel-native-SPEC := myplc-devel-native.spec
-#ALL += myplc-devel-native