# so the source rpm is created by running make srpm in the codebase
#
-srpm-kernel-$(HOSTARCH)-MODULES := linux-patches
-srpm-kernel-$(HOSTARCH)-SPEC := kernel-2.6-planetlab.spec
+kernel-MODULES := linux-patches
+kernel-SPEC := kernel-2.6-planetlab.spec
+kernel-BUILD-FROM-SRPM := yes
ifeq ($(HOSTARCH),i386)
-srpm-kernel-$(HOSTARCH)-RPMFLAGS:= --target i686
+kernel-RPMFLAGS:= --target i686
else
-srpm-kernel-$(HOSTARCH)-RPMFLAGS:= --target $(HOSTARCH)
+kernel-RPMFLAGS:= --target $(HOSTARCH)
endif
-KERNELS += srpm-kernel-$(HOSTARCH)
+KERNELS += kernel
kernel: $(KERNELS)
kernel-clean: $(foreach package,$(KERNELS),$(package)-clean)
# turns out myplc installs kernel-vserver
IN_MYPLC += $(KERNELS)
+#
+# madwifi
+#
+# [thierry] - temporarily use onelab's svn
+#
+madwifi-MODULES := madwifi
+madwifi-SPEC := madwifi.spec
+madwifi-BUILD-FROM-SRPM := yes
+madwifi-DEPEND-DEVEL-RPMS := kernel-devel
+madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
+ kernel_release=$(kernel.rpm-release) \
+ kernel_arch=$(kernel.rpm-arch)
+IN_BOOTSTRAPFS += madwifi
+ALL += madwifi
+
#
# 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-DEPEND-DEVEL-RPMS := libnl libnl-devel util-vserver-lib util-vserver-devel util-vserver-core
+ALL += util-vserver-pl
+IN_BOOTSTRAPFS += util-vserver-pl
+
#
# NodeUpdate
#
libhttpd-MODULES := libhttpd++
libhttpd-SPEC := libhttpd++.spec
ALL += libhttpd
+IN_BOOTSTRAPFS += libhttpd
#
# proper: Privileged Operations Service
#
proper-MODULES := proper
proper-SPEC := proper.spec
-proper-DEPENDDEVELS := libhttpd
+proper-DEPEND-DEVEL-RPMS := libhttpd++-devel
ALL += proper
+IN_BOOTSTRAPFS += proper
#
# codemux: Port 80 demux
#
ulogd-MODULES := ulogd
ulogd-SPEC := ulogd.spec
-ulogd-DEPENDDEVELS := $(kernel_package)
-ulogd-DEPENDDEVELRPMS := proper-libs proper-devel
+ulogd-DEPEND-DEVEL-RPMS := kernel-devel proper-libs proper-devel
ALL += ulogd
IN_VSERVER += ulogd
#
iptables-MODULES := iptables
iptables-SPEC := iptables.spec
-iptables-DEPENDDEVELS := $(kernel_package)
+iptables-DEPEND-DEVEL-RPMS := kernel-devel
ALL += iptables
IN_BOOTSTRAPFS += iptables
#
# 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
-bootcd-DEPENDS := $(IN_BOOTCD)
-bootcd-DEPENDFILES := RPMS/yumgroups.xml
+bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
+bootcd-DEPEND-FILES := RPMS/yumgroups.xml
ALL += bootcd
IN_MYPLC += bootcd
vserver-RPMBUILD := sudo bash ./rpmbuild.sh
# this list is useful for manual builds only, since nightly builds
# always redo all sequentially - try to keep updated
-vserver-DEPENDS := $(IN_VSERVER)
-vserver-DEPENDFILES := RPMS/yumgroups.xml
+vserver-DEPEND-PACKAGES := $(IN_VSERVER)
+vserver-DEPEND-FILES := RPMS/yumgroups.xml
ALL += vserver
IN_BOOTSTRAPFS := vserver
bootstrapfs-SPEC := bootstrapfs.spec
bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh
# package requires all regular packages
-bootstrapfs-DEPENDS := $(IN_BOOTSTRAPFS)
-bootstrapfs-DEPENDFILES := RPMS/yumgroups.xml
+bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
+bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
ALL += bootstrapfs
IN_MYPLC += bootstrapfs
# Package must be built as root
myplc-RPMBUILD := sudo bash ./rpmbuild.sh
# myplc may require all packages
-myplc-DEPENDS := $(IN_MYPLC)
-myplc-DEPENDFILES := RPMS/yumgroups.xml myplc-release
+myplc-DEPEND-PACKAGES := $(IN_MYPLC)
+myplc-DEPEND-FILES := RPMS/yumgroups.xml myplc-release
ALL += myplc
#
# Package must be built as root
myplc-native-RPMBUILD := sudo bash ./rpmbuild.sh
# Thierry : don't depend on anything at build-time
-#myplc-native-DEPENDS :=
+#myplc-native-DEPEND-PACKAGES :=
# Thierry : dunno about this one, let's stay safe
-myplc-native-DEPENDFILES := $(myplc-DEPENDFILES)
+myplc-native-DEPEND-FILES := myplc-release
ALL += myplc-native