Set RPMFLAGS for kernel.

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index dc818a7..0b47b43 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -31,13 +31,14 @@ endif
 # so the source rpm is created by running make srpm in the codebase
 #
 
-kernel-MODULES := linux-2.6
-kernel-SPEC := kernel-2.6.spec
+kernel-MODULES := linux-3
+kernel-DEVEL-RPMS += gettext elfutils-devel
+kernel-SPEC := kernel-3.1.spec
 kernel-BUILD-FROM-SRPM := yes
 ifeq "$(HOSTARCH)" "i386"
-kernel-RPMFLAGS:= --target i686
+kernel-RPMFLAGS:= --target i686 --with upstream_branch
 else
-kernel-RPMFLAGS:= --target $(HOSTARCH)
+kernel-RPMFLAGS:= --target $(HOSTARCH) --with upstream_branch
 endif
 kernel-SPECVARS += kernelconfig=planetlab
 KERNELS += kernel
@@ -197,6 +198,7 @@ libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without sto
                        --without xen --without qemu --without hyperv --without phyp --without esx \
                     --define 'packager PlanetLab'
 ALL += libvirt
+IN_NODEREPO += libvirt
 IN_BOOTSTRAPFS += libvirt
 
 #
@@ -459,6 +461,14 @@ vserver-RPMDATE := yes
 ALL += vserver
 IN_BOOTSTRAPFS += vserver
 
+#
+# LXC reference images
+#
+lxcref-MODULES := lxc-reference
+lxcref-SPEC    := lxc-reference.spec
+ALL += lxcref
+IN_BOOTSTRAPFS += lxcref
+
 #
 # bootstrapfs
 #