X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=7bfb32f65b337d8f1d50dd8521da2adf3c60c5d5;hb=8d28c24155815727616c7477bb5e83014856c29e;hp=f1427e19e8887709cbd1f5e567fecaef70ec15d9;hpb=6a9a42dc34ee681c5a29a39622768137c80f1734;p=build.git

diff --git a/planetlab.mk b/planetlab.mk
index f1427e19..7bfb32f6 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -31,51 +31,82 @@ 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-BUILD-FROM-SRPM := yes
-ifeq "$(HOSTARCH)" "i386"
-kernel-RPMFLAGS:= --target i686
-else
-kernel-RPMFLAGS:= --target $(HOSTARCH)
-endif
-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)
+
+#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)
 
-kernels: $(KERNELS)
-kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
+#
+# 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
 
-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)
-# turns out myplc installs kernel-vserver
-IN_MYPLC += $(KERNELS)
 
+# bootcd-systemd
 #
-# madwifi
+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
 
-ifeq "$(PLDISTROTAGS)" "planetlab-k32-tags.mk"
-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
+#
+# 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
 #
 util-vserver-MODULES := util-vserver
 util-vserver-SPEC := util-vserver.spec
-util-vserver-RPMFLAGS:= --without dietlibc
+# starting with 0.4
+util-vserver-BUILD-FROM-SRPM := yes
+util-vserver-RPMFLAGS:= --without dietlibc --without doc
 ALL += util-vserver
 IN_BOOTSTRAPFS += util-vserver
 
@@ -159,13 +190,34 @@ 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-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 \
+	                --without libxl \
+	                --define 'packager PlanetLab'
+ALL += libvirt
+IN_NODEREPO += libvirt
+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
@@ -182,25 +234,6 @@ mom-SPEC := pl_mom.spec
 ALL += mom
 IN_BOOTSTRAPFS += mom
 
-#
-# iptables
-#
-iptables-MODULES := iptables
-iptables-SPEC := iptables.spec
-iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
-ALL += iptables
-IN_BOOTSTRAPFS += iptables
-
-#
-# iproute
-#
-iproute-MODULES := iproute2
-iproute-SPEC := iproute.spec
-ALL += iproute
-IN_BOOTSTRAPFS += iproute
-IN_VSERVER += iproute
-IN_BOOTCD += iproute
-
 #
 # inotify-tools - local import
 # rebuild this on centos5 (not found) - see kexcludes in build.common
@@ -210,6 +243,10 @@ ifeq "$(DISTRONAME)" "centos5"
 local_inotify_tools=true
 endif
 
+ifeq "$(DISTRONAME)" "sl6"
+local_inotify_tools=true
+endif
+
 ifeq "$(local_inotify_tools)" "true"
 inotify-tools-MODULES := inotify-tools
 inotify-tools-SPEC := inotify-tools.spec
@@ -223,7 +260,7 @@ endif
 #
 openvswitch-MODULES := openvswitch
 openvswitch-SPEC := openvswitch.spec
-openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
+openvswitch-DEVEL-RPMS += kernel-devel
 IN_BOOTSTRAPFS += openvswitch
 ALL += openvswitch
 
@@ -240,6 +277,14 @@ endif
 IN_BOOTSTRAPFS += vsys
 ALL += vsys
 
+#
+# vsyssh : installed in slivers
+#
+vsyssh-MODULES := vsys
+vsyssh-SPEC := vsyssh.spec
+IN_SLIVER += vsyssh
+ALL += vsyssh
+
 #
 # vsys-scripts
 #
@@ -249,7 +294,7 @@ IN_BOOTSTRAPFS += vsys-scripts
 ALL += vsys-scripts
 
 #
-# PLCAPI
+# plcapi
 #
 plcapi-MODULES := plcapi
 plcapi-SPEC := PLCAPI.spec
@@ -291,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
@@ -304,15 +349,8 @@ plcrt-MODULES := PLCRT
 plcrt-SPEC := plcrt.spec
 ALL += plcrt
 
-#
-# zabbix
-#
-zabbix-MODULES := Monitor
-zabbix-SPEC := zabbix.spec
-zabbix-BUILD-FROM-SRPM := yes
-zabbix-DEVEL-RPMS += python-cherrypy
-ALL += zabbix
-
+# f12 has 0.9-1 already
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
 #
 # pyopenssl
 #
@@ -320,7 +358,7 @@ pyopenssl-MODULES := pyopenssl
 pyopenssl-SPEC := pyOpenSSL.spec
 pyopenssl-BUILD-FROM-SRPM := yes
 ALL += pyopenssl
-
+endif
 
 #
 # pyaspects
@@ -358,11 +396,13 @@ sfa-SPEC := sfa.spec
 ALL += sfa
 endif
 
+sface-MODULES := sface
+sface-SPEC := sface.spec
+ALL += sface
+
 #
 # nodeconfig
 #
-# xxx needed when upgrading to 5.0
-#nodeconfig-MODULES := nodeconfig
 nodeconfig-MODULES := nodeconfig
 nodeconfig-SPEC := nodeconfig.spec
 ALL += nodeconfig
@@ -394,7 +434,6 @@ IN_BOOTSTRAPFS += pyplnet
 IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
-
 #
 # OMF resource controller
 #
@@ -410,7 +449,6 @@ omf-expctl-MODULES := omf
 omf-expctl-SPEC := omf-expctl.spec
 ALL += omf-expctl
 
-
 #
 # bootcd
 #
@@ -425,13 +463,21 @@ 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
+#
+lxcref-MODULES := lxc-reference
+lxcref-SPEC    := lxc-reference.spec
+ALL += lxcref
+IN_BOOTSTRAPFS += lxcref
 
 #
 # bootstrapfs
@@ -455,7 +501,7 @@ NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
 
 noderepo-MODULES := bootstrapfs
 noderepo-SPEC := noderepo.spec
-# package requires all regular packages
+# package requires all embedded packages
 noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER)
 noderepo-DEPEND-FILES := RPMS/yumgroups.xml
 #export rpm list to the specfile
@@ -464,6 +510,25 @@ noderepo-RPMDATE := yes
 ALL += noderepo
 IN_MYPLC += noderepo
 
+#
+# slicerepo
+#
+# all rpms resulting from packages marked as being in vserver
+SLICEREPO_RPMS = $(foreach package,$(IN_VSERVER),$($(package).rpms))
+# replace space with +++ (specvars cannot deal with spaces)
+SPACE=$(subst x, ,x)
+SLICEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(SLICEREPO_RPMS))
+
+slicerepo-MODULES := bootstrapfs
+slicerepo-SPEC := slicerepo.spec
+# package requires all embedded packages
+slicerepo-DEPEND-PACKAGES := $(IN_VSERVER)
+slicerepo-DEPEND-FILES := RPMS/yumgroups.xml
+#export rpm list to the specfile
+slicerepo-SPECVARS = slice_rpms_plus=$(SLICEREPO_RPMS_3PLUS)
+slicerepo-RPMDATE := yes
+ALL += slicerepo
+
 #
 # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
 #
@@ -475,7 +540,7 @@ ALL += myplc
 # myplc-docs only contains docs for PLCAPI and NMAPI, but
 # we still need to pull MyPLC, as it is where the specfile lies, 
 # together with the utility script docbook2drupal.sh
-myplc-docs-MODULES := myplc plcapi nodemanager Monitor
+myplc-docs-MODULES := myplc plcapi nodemanager monitor
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs
 
@@ -484,4 +549,3 @@ release-MODULES := myplc
 release-SPEC := myplc-release.spec
 release-RPMDATE := yes
 ALL += release
-