Merge branch 'master' into lxc_devel

diff --git a/build.common b/build.common
index 00665fc..f86fbb7 100644 (file)
--- a/build.common
+++ b/build.common
@@ -75,7 +75,7 @@ function pl_getKexcludes () {
        f8)
            echo 'kernel* util-vserver* iptables iptables-ipv6 drupal' ;;
        f*)
-           echo 'kernel* util-vserver* iptables iptables-ipv6 drupal' ;;
+           echo 'kernel* util-vserver* iptables iptables-ipv6 drupal linux-firmware' ;;
        centos5)
            echo 'kernel kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables drupal inotify-tools* libnl' ;;
        sl*)

diff --git a/config.onelab/bootstrapfs.pkgs b/config.onelab/bootstrapfs.pkgs
index 79e394b..eaea71e 100644 (file)
--- a/config.onelab/bootstrapfs.pkgs
+++ b/config.onelab/bootstrapfs.pkgs
@@ -7,6 +7,10 @@ groupdesc: PlanetLab Node Root
 kexclude: @KEXCLUDE@
 # fedora-release or centos-release are pulled from deps
 # define packages
+package: btrfs-progs
+package: bridge-utils
+package: dnsmasq
+package: bash-completion
 package: kernel
 package: udev
 package: basesystem

diff --git a/config.planetlab/bootcd.pkgs b/config.planetlab/bootcd.pkgs
index f820602..c9d2e41 100644 (file)
--- a/config.planetlab/bootcd.pkgs
+++ b/config.planetlab/bootcd.pkgs
@@ -3,6 +3,7 @@ groupdesc: PlanetLab BootCD
 # packages to exclude from stock repositories
 kexclude: @KEXCLUDE@
 # define packages
+package: btrfs-progs
 package: filesystem
 package: udev
 package: dhclient

diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index d38ba95..b7e21e2 100644 (file)
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -7,7 +7,12 @@ groupdesc: PlanetLab Node Root
 kexclude: @KEXCLUDE@
 # fedora-release or centos-release are pulled from deps
 # define packages
+package: btrfs-progs
+package: bridge-utils
+package: dnsmasq
+package: bash-completion
 package: kernel
+package: kernel-firmware
 package: udev
 package: basesystem
 package: filesystem
@@ -100,15 +105,15 @@ package>=f10: cronie
 #
 # planetlab
 #
-package: madwifi
+#package: madwifi
 package: wireless-tools
-package: util-vserver
-package: util-vserver-build
-package: util-vserver-lib
-package: util-vserver-core
-package: util-vserver-sysv
-package: util-vserver-legacy
-package: util-vserver-pl
+#package: util-vserver
+#package: util-vserver-build
+#package: util-vserver-lib
+#package: util-vserver-core
+#package: util-vserver-sysv
+#package: util-vserver-legacy
+#package: util-vserver-pl
 #package: util-python
 package: NodeManager
 package: NodeUpdate
@@ -124,3 +129,8 @@ package: vsys-scripts
 package: monitor-client
 package: monitor-runlevelagent
 package: pyplnet
+package: libvirt
+package: libvirt-python
+package: lxc-reference
+package: ebtables
+package: python-inotify

diff --git a/config.planetlab/bootstrapfs.post b/config.planetlab/bootstrapfs.post
index 79d54fe..8e7c287 100644 (file)
--- a/config.planetlab/bootstrapfs.post
+++ b/config.planetlab/bootstrapfs.post
@@ -15,7 +15,7 @@ rm -rf ${vdir}/etc/yum.conf ${vdir}/etc/yum.repos.d
 chroot ${vdir} /sbin/chkconfig firstboot off || :
 # NOTE: we're enabling util-vserver to allow it to help shutdown all slices
 # before rebooting.  This has been problematic in the past
-chroot ${vdir} /sbin/chkconfig util-vserver on || :
+chroot ${vdir} /sbin/chkconfig util-vserver off || :
 # enabling network as it ends up turned off on systems that come with NetworkManager, starting with fedora9
 chroot ${vdir} /sbin/chkconfig network on || :
 # and turn off NetworkManager if present, as it quite obviously messes with network
@@ -25,7 +25,16 @@ chroot ${vdir} /sbin/chkconfig NetworkManager off || :
 chroot ${vdir} /sbin/chkconfig vservers-default off || :
 # turn ON vprocunhide ; is required with kernels that have CONFIG_VSERVER_PROC_SECURE enabled
 # which is the case for our k32 kernel
-chroot ${vdir} /sbin/chkconfig vprocunhide on || :
+# chroot ${vdir} /sbin/chkconfig vprocunhide on || :
+
+# fprobe doesn't work yet
+chroot ${vdir} /sbin/chkconfig fprobe-ulog off || :
+
+# turn off cgconfig
+chroot ${vdir} /sbin/chkconfig cgconfig off || :
+
+# turn ON lxc-reference.
+chroot ${vdir} /sbin/chkconfig lxc-reference on || :
 
 # turn OFF selinux if set
 # this may happen accidentally if you mention too much stuff in bootstrapfs.pkgs

diff --git a/config.planetlab/planetlab.mirrors b/config.planetlab/planetlab.mirrors
index 07acaef..8e174e8 100644 (file)
--- a/config.planetlab/planetlab.mirrors
+++ b/config.planetlab/planetlab.mirrors
@@ -2,6 +2,7 @@
 # used to be hard-wired in build.common / mkfedora
 # see http://svn.planet-lab.org/wiki/VserverCentos for howto setup local mirroring
 mirror: http://localhost/mirror/
+mirror: http://mirror.onelab.eu/
 mirror: http://build.planet-lab.org/
 #mirror: file:///data/fedora
 #mirror: http://localhost/fedora

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index 6ff7264..75f8472 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -52,7 +52,7 @@ oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.6.1-1
 sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-2.0-9
 sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.9-3
 nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5
-bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-20
+bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@lxcbuild
 pypcilib-GITPATH               := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10
 pyplnet-GITPATH                 := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-11
 bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.0-11

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index dea9552..957e5de 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -3,9 +3,10 @@
 mkinitrd-GITPATH               := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-2
 linux-2.6-BRANCH               := rhel6
 linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-27
+linux-3-GITPATH                := git://git.planet-lab.org/linux-3.git@lxcbuild
 # help out spec2make on f8 and centos5, due to a bug in rpm
 ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
-kernel-WHITELIST-RPMS  := kernel-devel,kernel-headers
+kernel-WHITELIST-RPMS  := kernel-devel,kernel-headers,kernel-firmware
 endif
 kernel-DEVEL-RPMS              += elfutils-libelf-devel
 madwifi-GITPATH                 := git://git.planet-lab.org/madwifi.git@madwifi-4132-4
@@ -18,7 +19,7 @@ libnl-GITPATH                 := git://git.planet-lab.org/libnl.git@libnl-1.1-2
 util-vserver-pl-GITPATH                := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-26
 nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-9
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-34
+nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@lxcbuild
 # Trellis-specific NodeManager plugins
 nodemanager-topo-GITPATH       := git://git.planet-lab.org/NodeManager-topo@master
 NodeManager-optin-SVNPATH      := http://svn.planet-lab.org/svn/NodeManager-optin/trunk
@@ -47,7 +48,7 @@ omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-11
 sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.0-7
 sface-GITPATH                   := git://git.planet-lab.org/sface.git@sface-0.9-3
 nodeconfig-GITPATH             := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-5
-bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-20
+bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@lxcbuild
 pypcilib-GITPATH               := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-10
 pyplnet-GITPATH                 := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-11
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
@@ -57,4 +58,6 @@ vserver-reference-GITPATH       := git://git.planet-lab.org/vserver-reference.gi
 bootstrapfs-GITPATH             := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-13
 myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.0-19
 # locating the right test directory - see make tests_gitpath
-tests-GITPATH                   := git://git.planet-lab.org/tests.git@tests-5.0-34
+tests-GITPATH                   := git://git.planet-lab.org/tests.git@tests-5.0-32
+libvirt-GITPATH                 := git://git.planet-lab.org/libvirt.git@lxcbuild
+lxc-reference-GITPATH           := git://git.planet-lab.org/lxc-reference.git@lxcbuild

diff --git a/planetlab.mk b/planetlab.mk
index 59191c5..9356c96 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-SPEC := kernel-3.1.spec
+kernel-DEVEL-RPMS += gettext elfutils-devel
 kernel-BUILD-FROM-SRPM := yes
 ifeq "$(HOSTARCH)" "i386"
-kernel-RPMFLAGS:= --target i686
+kernel-RPMFLAGS:= --target i686 --with firmware
 else
-kernel-RPMFLAGS:= --target $(HOSTARCH)
+kernel-RPMFLAGS:= --target $(HOSTARCH) --with firmware
 endif
 kernel-SPECVARS += kernelconfig=planetlab
 KERNELS += kernel
@@ -55,19 +56,19 @@ IN_BOOTSTRAPFS += $(KERNELS)
 # madwifi
 #
 # skip this with k32/f8
-ifneq "" "$(findstring k32,$(PLDISTROTAGS))"
-ifneq "$(DISTRONAME)" "f8"
-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)
-ALL += madwifi
-IN_BOOTSTRAPFS += madwifi
-endif
-endif
+#ifneq "" "$(findstring k32,$(PLDISTROTAGS))"
+#ifneq "$(DISTRONAME)" "f8"
+#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)
+#ALL += madwifi
+#IN_BOOTSTRAPFS += madwifi
+#endif
+#endif
 
 #
 # iptables
@@ -181,6 +182,25 @@ fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
 IN_BOOTSTRAPFS += fprobe-ulog
 
+#
+# libvirt
+#
+libvirt-MODULES := libvirt
+libvirt-SPEC    := libvirt.spec
+libvirt-BUILD-FROM-SRPM := yes
+libvirt-DEVEL-RPMS += libxml2-devel gnutls-devel device-mapper-devel yajl-devel gettext 
+libvirt-DEVEL-RPMS += python-devel libcap-ng-devel libpciaccess-devel radvd numactl-devel 
+libvirt-DEVEL-RPMS += xhtml1-dtds libxslt libtasn1-devel systemtap-sdt-devel iptables-ipv6 augeas
+libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without storage-scsi \
+                       --without storage-fs --without storage-lvm \
+                       --without polkit --without sasl --without audit --with capng --with udev \
+                       --without netcf --without avahi --without sanlock \
+                       --without xen --without qemu --without hyperv --without phyp --without esx \
+                    --define 'packager PlanetLab'
+ALL += libvirt
+IN_NODEREPO += libvirt
+IN_BOOTSTRAPFS += libvirt
+
 #
 # DistributedRateLimiting
 #
@@ -231,8 +251,8 @@ endif
 openvswitch-MODULES := openvswitch
 openvswitch-SPEC := openvswitch.spec
 openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
-IN_BOOTSTRAPFS += openvswitch
-ALL += openvswitch
+#IN_BOOTSTRAPFS += openvswitch
+#ALL += openvswitch
 
 #
 # vsys
@@ -441,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
 #