Merge branch 'lxc' into lxc_devel

diff --git a/build.common b/build.common
index f86fbb7..622bd80 100644 (file)
--- a/build.common
+++ b/build.common
@@ -70,18 +70,20 @@ function pl_getReleaseName () {
 function pl_getKexcludes () {
     distroname=$1; shift
     case $distroname in
-       # when using k27, we need our own flavour of iproute
-       # for now we build only for k32, regardless of fcdistro
-       f8)
-           echo 'kernel* util-vserver* iptables iptables-ipv6 drupal' ;;
-       f*)
-           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*)
-           echo 'kernel kernel-debug kernel-debug-devel kernel-devel kernel-doc kernel-firmware kernel-headers iptables' ;;
-       *)
-           echo "pl_DISTRO_NAME=$pl_DISTRO_NAME not supported in getexcludes.sh" ; exit 1 ;;
+    # when using k27, we need our own flavour of iproute
+    # for now we build only for k32, regardless of fcdistro
+    f8)
+        echo 'kernel* util-vserver* iptables iptables-ipv6 drupal' ;;
+    f16)
+        echo 'drupal' ;;
+    f*)
+        echo 'util-vserver* drupal' ;;
+    centos5)
+        echo 'kernel kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables drupal inotify-tools* libnl' ;;
+    sl*)
+        echo 'kernel kernel-debug kernel-debug-devel kernel-devel kernel-doc kernel-firmware kernel-headers iptables' ;;
+    *)
+        echo "pl_DISTRO_NAME=$pl_DISTRO_NAME not supported in getexcludes.sh" ; exit 1 ;;
     esac
 }
 

diff --git a/config.planetlab/bootcd.pkgs b/config.planetlab/bootcd.pkgs
index c9d2e41..eb9992e 100644 (file)
--- a/config.planetlab/bootcd.pkgs
+++ b/config.planetlab/bootcd.pkgs
@@ -4,6 +4,7 @@ groupdesc: PlanetLab BootCD
 kexclude: @KEXCLUDE@
 # define packages
 package: btrfs-progs
+package: bootcd-systemd
 package: filesystem
 package: udev
 package: dhclient

diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index b7e21e2..80f720c 100644 (file)
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -120,8 +120,8 @@ package: NodeUpdate
 package: codemux
 package: pl_sshd
 package: ipod
-package: vserver-@pldistro@-@fcdistro@-@arch@
-package: vserver-systemslices-@pldistro@-@fcdistro@-@arch@
+#package: vserver-@pldistro@-@fcdistro@-@arch@
+#package: vserver-systemslices-@pldistro@-@fcdistro@-@arch@
 package: pl_mom
 package: fprobe-ulog
 package: vsys

diff --git a/config.planetlab/bootstrapfs.post b/config.planetlab/bootstrapfs.post
index a11afce..41c86bc 100644 (file)
--- a/config.planetlab/bootstrapfs.post
+++ b/config.planetlab/bootstrapfs.post
@@ -35,6 +35,9 @@ chroot ${vdir} /sbin/chkconfig cgconfig off || :
 # turn ON lxc-reference.
 chroot ${vdir} /sbin/chkconfig lxc-reference on || :
 
+# Change default target.
+chroot ${vdir} ln -sf /lib/systemd/system/multi-user.target /etc/systemd/system/default.target || :
+
 # turn OFF selinux if set
 # this may happen accidentally if you mention too much stuff in bootstrapfs.pkgs
 for file in /etc/sysconfig/selinux /sbin/load_policy; do

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 138b913..3045a11 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -54,6 +54,7 @@ pyplnet-GITPATH                 := git://git.planet-lab.org/pyplnet.git@pyplnet-
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 pcucontrol-GITPATH              := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-12
 bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.0-11
+bootcd-systemd-GITPATH          := git://git.planet-lab.org/bootcd-systemd.git
 vserver-reference-GITPATH       := git://git.planet-lab.org/vserver-reference.git@vserver-reference-5.0-6
 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

diff --git a/planetlab.mk b/planetlab.mk
index 9356c96..7bfb32f 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -31,26 +31,26 @@ endif
 # so the source rpm is created by running make srpm in the codebase
 #
 
-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 --with firmware
-else
-kernel-RPMFLAGS:= --target $(HOSTARCH) --with firmware
-endif
-kernel-SPECVARS += kernelconfig=planetlab
-KERNELS += kernel
+#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 --with firmware
+#else
+#kernel-RPMFLAGS:= --target $(HOSTARCH) --with firmware
+#endif
+#kernel-SPECVARS += kernelconfig=planetlab
+#KERNELS += kernel
 
-kernels: $(KERNELS)
-kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
+#kernels: $(KERNELS)
+#kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
 
-ALL += $(KERNELS)
-# this is to mark on which image a given rpm is supposed to go
-IN_BOOTCD += $(KERNELS)
-IN_VSERVER += $(KERNELS)
-IN_BOOTSTRAPFS += $(KERNELS)
+#ALL += $(KERNELS)
+## this is to mark on which image a given rpm is supposed to go
+#IN_BOOTCD += $(KERNELS)
+#IN_VSERVER += $(KERNELS)
+#IN_BOOTSTRAPFS += $(KERNELS)
 
 #
 # madwifi
@@ -70,26 +70,34 @@ IN_BOOTSTRAPFS += $(KERNELS)
 #endif
 #endif
 
+
+# bootcd-systemd
+#
+bootcd-systemd-MODULES := bootcd-systemd
+bootcd-systemd-SPEC := bootcd-systemd.spec
+ALL += bootcd-systemd
+IN_BOOTCD += bootcd-systemd
+
 #
 # iptables
 #
-iptables-MODULES := iptables
-iptables-SPEC := iptables.spec
-iptables-BUILD-FROM-SRPM := yes        
-iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
-ALL += iptables
-IN_BOOTSTRAPFS += iptables
+#iptables-MODULES := iptables
+#iptables-SPEC := iptables.spec
+#iptables-BUILD-FROM-SRPM := yes       
+#iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
+#ALL += iptables
+#IN_BOOTSTRAPFS += iptables
 
 #
 # iproute
 #
-iproute-MODULES := iproute2
-iproute-SPEC := iproute.spec
-iproute-BUILD-FROM-SRPM := yes 
-ALL += iproute
-IN_BOOTSTRAPFS += iproute
-IN_VSERVER += iproute
-IN_BOOTCD += iproute
+#iproute-MODULES := iproute2
+#iproute-SPEC := iproute.spec
+#iproute-BUILD-FROM-SRPM := yes        
+#ALL += iproute
+#IN_BOOTSTRAPFS += iproute
+#IN_VSERVER += iproute
+#IN_BOOTCD += iproute
 
 #
 # util-vserver
@@ -190,13 +198,15 @@ 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-DEVEL-RPMS += xhtml1-dtds libxslt libtasn1-devel systemtap-sdt-devel iptables-ipv6 augeas 
+libvirt-DEVEL-RPMS += libudev-devel
 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'
+                       --without libxl \
+                       --define 'packager PlanetLab'
 ALL += libvirt
 IN_NODEREPO += libvirt
 IN_BOOTSTRAPFS += libvirt
@@ -204,10 +214,10 @@ IN_BOOTSTRAPFS += libvirt
 #
 # DistributedRateLimiting
 #
-DistributedRateLimiting-MODULES := DistributedRateLimiting
-DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
-ALL += DistributedRateLimiting
-IN_NODEREPO += DistributedRateLimiting
+#DistributedRateLimiting-MODULES := DistributedRateLimiting
+#DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
+#ALL += DistributedRateLimiting
+#IN_NODEREPO += DistributedRateLimiting
 
 #
 # pf2slice
@@ -250,9 +260,9 @@ endif
 #
 openvswitch-MODULES := openvswitch
 openvswitch-SPEC := openvswitch.spec
-openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
-#IN_BOOTSTRAPFS += openvswitch
-#ALL += openvswitch
+openvswitch-DEVEL-RPMS += kernel-devel
+IN_BOOTSTRAPFS += openvswitch
+ALL += openvswitch
 
 #
 # vsys
@@ -326,11 +336,11 @@ ALL += pcucontrol
 #
 # monitor
 #
-monitor-MODULES := monitor
-monitor-SPEC := Monitor.spec
-monitor-DEVEL-RPMS += net-snmp net-snmp-devel
-ALL += monitor
-IN_BOOTSTRAPFS += monitor
+#monitor-MODULES := monitor
+#monitor-SPEC := Monitor.spec
+#monitor-DEVEL-RPMS += net-snmp net-snmp-devel
+#ALL += monitor
+#IN_BOOTSTRAPFS += monitor
 
 #
 # PLC RT
@@ -453,13 +463,13 @@ IN_MYPLC += bootcd
 #
 # vserver : reference image for slices
 #
-vserver-MODULES := vserver-reference build
-vserver-SPEC := vserver-reference.spec
-vserver-DEPEND-PACKAGES := $(IN_VSERVER)
-vserver-DEPEND-FILES := RPMS/yumgroups.xml
-vserver-RPMDATE := yes
-ALL += vserver
-IN_BOOTSTRAPFS += vserver
+#vserver-MODULES := vserver-reference build
+#vserver-SPEC := vserver-reference.spec
+#vserver-DEPEND-PACKAGES := $(IN_VSERVER)
+#vserver-DEPEND-FILES := RPMS/yumgroups.xml
+#vserver-RPMDATE := yes
+#ALL += vserver
+#IN_BOOTSTRAPFS += vserver
 
 #
 # LXC reference images