tries to fix dependencies

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index 7cca7ae..1643166 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
 
 #
@@ -91,8 +113,10 @@ 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
-ALL += proper
+proper-DEPENDDEVELS := libhttpd++ util-python
+# disabled temporarily (or ?)
+# need to check that these two define a -devel package
+#ALL += proper
 
 #
 # codemux: Port 80 demux
@@ -107,15 +131,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 +160,7 @@ ALL += pl_mom
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
-iptables-DEPENDS := $(KERNELS)
+iptables-DEPENDDEVELS := $(kernel_package)
 ALL += iptables
 
 #
@@ -265,5 +295,4 @@ myplc-devel-RPMBUILD := sudo bash ./rpmbuild.sh
 #
 myplc-devel-native-MODULES := MyPLC
 myplc-devel-native-SPEC := myplc-devel-native.spec
-myplc-devel-native-SPECVARS = distroname=$(DISTRO) distrorelease=$(RELEASE)
 #ALL += myplc-devel-native