# in this case the srpm is created by running make srpm in the codebase
#
-ifeq "$(RELEASE)" "8"
srpm-kernel-$(HOSTARCH)-MODULES := linux-patches
srpm-kernel-$(HOSTARCH)-SPEC := kernel-2.6-planetlab.spec
ifeq ($(HOSTARCH),i386)
endif
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
+#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
#
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
#
# 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
#
#
ulogd-MODULES := ulogd
ulogd-SPEC := ulogd.spec
-ulogd-DEPENDS := $(KERNELS) proper
+ulogd-DEPENDDEVELS := $(kernel_package) proper
ALL += ulogd
#
#
iptables-MODULES := iptables
iptables-SPEC := iptables.spec
-iptables-DEPENDS := $(KERNELS)
+iptables-DEPENDDEVELS := $(kernel_package)
ALL += iptables
#
#
# [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