catching up with lxc - second iteration

+ clean up the wextoolbox stuff in this branch

diff --git a/check-lxc.sh b/check-lxc.sh
index 1b9629d..d161e4f 100755 (executable)
--- a/check-lxc.sh
+++ b/check-lxc.sh
@@ -22,7 +22,7 @@ function update () {
 
 function check_body () {
     a=$REF/lxc.mk
-    b=wextoolbox.mk
+    b=wexlxc.mk
     echo "Checking body $a $b"
     diff -w $a $b | egrep -v '^(<|>)( #| +$)|nozomi|comgt|planetlab-umts-tools|boost|gnuradio|bbn|crunchxml|spectools|sge|iwlwifi|kernelconfig=planetlab|umts|DistributedRateLimiting'
 }

diff --git a/wextoolbox.mirrors b/wexlxc.mirrors
similarity index 100%
rename from wextoolbox.mirrors
rename to wexlxc.mirrors

diff --git a/wexlxc.mk b/wexlxc.mk
index 2cc3646..99fbde0 100644 (file)
--- a/wexlxc.mk
+++ b/wexlxc.mk
@@ -78,36 +78,51 @@ sge-DEVEL-RPMS += lesstif lesstif-devel
 # ALL += sge
 # IN_NODEIMAGE += sge
 
+########################################
 #
-# kernel
+# lxctools: scripts for entering containers
 #
-# use a package name with srpm in it:
-# so the source rpm is created by running make srpm in the codebase
+lxctools-MODULES := lxctools
+lxctools-SPEC := lxctools.spec
+ALL += lxctools
+IN_NODEIMAGE += lxctools
+
+#
+# lxcsu: root context module for entering namespaces
 #
+lxcsu-MODULES := lxcsu
+lxcsu-SPEC := lxcsu.spec
+ALL += lxcsu
+IN_NODEIMAGE += lxcsu
 
-# rebuild kernel-3.1 on fedora14 due to instabilities of the stock kernel
-ifeq "$(DISTRONAME)" "f14"
-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
+#
+#
+# transforward: root context module for transparent port forwarding
+#
+transforward-MODULES := transforward
+transforward-SPEC := transforward.spec
+ALL += transforward
+IN_NODEIMAGE += transforward
 
-kernels: $(KERNELS)
-kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
+#
+# procprotect: root context module for protecting against weaknesses in /proc
+#
+procprotect-MODULES := procprotect
+procprotect-SPEC := procprotect.spec
+ALL += procprotect
+IN_NODEIMAGE += procprotect
 
-ALL += $(KERNELS)
-# this is to mark on which image a given rpm is supposed to go
-IN_BOOTCD += $(KERNELS)
-IN_SLICEIMAGE += $(KERNELS)
-IN_NODEIMAGE += $(KERNELS)
-endif
+#
+# ipfw: root context module, and slice companion
+#
+ipfwroot-MODULES := ipfw
+ipfwroot-SPEC := planetlab/ipfwroot.spec
+ALL += ipfwroot
+IN_NODEIMAGE += ipfwroot
+
+ipfwslice-MODULES := ipfw
+ipfwslice-SPEC := planetlab/ipfwslice.spec
+ALL += ipfwslice
 
 #
 # NodeUpdate
@@ -126,12 +141,25 @@ ALL += ipod
 IN_NODEIMAGE += ipod
 
 #
-# NodeManager
+# plnode-utils
+# 
+plnode-utils-MODULES := plnode-utils
+plnode-utils-SPEC := plnode-utils-lxc.spec
+ALL += plnode-utils
+IN_NODEIMAGE += plnode-utils
+
+#
+# nodemanager
 #
-nodemanager-MODULES := nodemanager
-nodemanager-SPEC := NodeManager.spec
-ALL += nodemanager
-IN_NODEIMAGE += nodemanager
+nodemanager-lib-MODULES := nodemanager
+nodemanager-lib-SPEC := nodemanager-lib.spec
+ALL += nodemanager-lib
+IN_NODEIMAGE += nodemanager-lib
+
+nodemanager-lxc-MODULES := nodemanager
+nodemanager-lxc-SPEC := nodemanager-lxc.spec
+ALL += nodemanager-lxc
+IN_NODEIMAGE += nodemanager-lxc
 
 #
 # pl_sshd
@@ -157,6 +185,13 @@ fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
 IN_NODEIMAGE += fprobe-ulog
 
+#################### libvirt on f16 is too old, sounds like f17 has something fine
+local_libvirt=false
+ifeq "$(DISTRONAME)" "f16"
+local_libvirt=true
+endif
+
+ifeq "$(local_libvirt)" "true"
 #
 # libvirt
 #
@@ -166,7 +201,7 @@ 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-DEVEL-RPMS += libudev-devel libpcap-devel libnl-devel ebtables scrub
 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 \
@@ -177,6 +212,7 @@ libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without sto
 ALL += libvirt
 IN_NODEREPO += libvirt
 IN_NODEIMAGE += libvirt
+endif
 
 #
 # DistributedRateLimiting
@@ -259,10 +295,18 @@ ALL += vsyssh
 # vsys-scripts
 #
 vsys-scripts-MODULES := vsys-scripts
-vsys-scripts-SPEC := vsys-scripts.spec
+vsys-scripts-SPEC := root-context/vsys-scripts.spec
 IN_NODEIMAGE += vsys-scripts
 ALL += vsys-scripts
 
+#
+# bind_public
+#
+bind_public-MODULES := bind_public
+bind_public-SPEC := bind_public.spec
+IN_SLICEIMAGE += bind_public
+ALL += bind_public
+
 #
 # plcapi
 #

diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk
deleted file mode 100644 (file)
index 2e000ec..0000000
--- a/wextoolbox-tags.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-# use the stock fedora14
-#boost-GITPATH                 := git://git.onelab.eu/boost.git@boost-1.37.0-6
-#gnuradio-GITPATH                := git://git.onelab.eu/gnuradio@master
-bbn_80211-GITPATH               := git://git.onelab.eu/bbn_80211@bbn_80211-3.2.2-4
-crunchxml-GITPATH              := git://git.onelab.eu/crunchxml@crunchxml-1.1-1
-spectools-GITPATH              := git://git.onelab.eu/spectools@spectools-2009_06_R1-1
-#turned off
-#sge-GITPATH                   := git://git.onelab.eu/sge/tags/sge-6.2.3-1
-#sge-GITPATH                   := git://git.onelab.eu/sge/trunk
-
-lxcsu-GITPATH                  := git://git.onelab.eu/lxcsu.git@lxcsu-0.2-1
-lxctools-GITPATH               := git://git.onelab.eu/lxctools.git@lxctools-0.9-1
-transforward-GITPATH           := git://git.onelab.eu/transforward.git@transforward-0.1-2
-procprotect-GITPATH             := git://git.onelab.eu/procprotect.git@procprotect-0.1-3
-ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@ipfw-20120610-2
-###
-nodeupdate-GITPATH             := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-9
-PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-plnode-utils-GITPATH           := git://git.onelab.eu/plnode-utils@plnode-utils-0.2-1
-nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.1-13
-pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
-codemux-GITPATH                        := git://git.onelab.eu/codemux.git@codemux-0.1-15
-fprobe-ulog-GITPATH             := git://git.onelab.eu/fprobe-ulog.git@fprobe-ulog-1.1.4-2
-libvirt-GITPATH                 := git://git.onelab.eu/libvirt.git@libvirt-0.9.12-1
-pf2slice-SVNPATH               := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
-mom-GITPATH                     := git://git.onelab.eu/mom.git@mom-2.3-5
-inotify-tools-GITPATH          := git://git.onelab.eu/inotify-tools.git@inotify-tools-3.13-2
-openvswitch-GITPATH            := git://git.onelab.eu/openvswitch.git@openvswitch-1.2-1
-vsys-GITPATH                   := git://git.onelab.eu/vsys.git@vsys-0.99-2
-vsys-scripts-GITPATH           := git://git.onelab.eu/vsys-scripts@vsys-scripts-0.95-44
-bind_public-GITPATH             := git://git.onelab.eu/bind_public.git@bind_public-0.1-2
-plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.1-4
-drupal-GITPATH                  := git://git.onelab.eu/drupal.git@drupal-4.7-15
-plewww-GITPATH                  := git://git.onelab.eu/plewww.git@master
-www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
-monitor-GITPATH                        := git://git.onelab.eu/monitor@monitor-3.1-6
-PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
-pyopenssl-GITPATH               := git://git.onelab.eu/pyopenssl.git@pyopenssl-0.9-2
-###
-pyaspects-GITPATH               := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-2
-omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-11
-oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.6.1-1
-###
-nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-7
-bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.1-3
-pypcilib-GITPATH               := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10
-pyplnet-GITPATH                 := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-15
-bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.1-2
-sliceimage-GITPATH             := git://git.onelab.eu/sliceimage.git@sliceimage-5.1-3
-nodeimage-GITPATH               := git://git.onelab.eu/nodeimage.git@nodeimage-2.1-3
-myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.1-4
-
-# locating the right test directory - see make tests_gitpath
-tests-GITPATH                   := git://git.onelab.eu/tests.git@tests-5.1-7
-

diff --git a/wextoolbox.mk b/wextoolbox.mk
deleted file mode 100644 (file)
index db0fdcd..0000000
--- a/wextoolbox.mk
+++ /dev/null
@@ -1,456 +0,0 @@
-#
-# declare the packages to be built and their dependencies
-# initial version from Mark Huang
-# Mark Huang <mlhuang@cs.princeton.edu>
-# Copyright (C) 2003-2006 The Trustees of Princeton University
-# rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
-#
-
-#
-# see doc in Makefile  
-#
-
-#
-# bbn
-#
-bbn-MODULES := bbn_80211
-bbn-SPEC := bbn_80211.spec
-bbn-BUILD-FROM-SRPM := yes
-# now from the stock repo
-bbn-DEVEL-RPMS := gnuradio gnuradio-devel boost boost-devel swig
-#bbn-DEPEND-DEVEL-RPMS := gnuradio gnuradio-devel boost boost-devel
-ALL += bbn
-IN_NODEIMAGE += bbn
-
-#
-# crunchxml
-#
-crunchxml-MODULES := crunchxml
-crunchxml-SPEC := crunchxml.spec
-crunchxml-BUILD-FROM-SRPM := yes
-crunchxml-DEVEL-RPMS := glib2-devel libxml-devel libxml2-devel scons
-ALL += crunchxml
-IN_NODEIMAGE += crunchxml
-
-#
-# spectools
-#
-spectools-MODULES := spectools
-spectools-SPEC := spectools.spec
-spectools-BUILD-FROM-SRPM := yes
-spectools-DEVEL-RPMS := gtk2-devel
-ALL += spectools
-IN_NODEIMAGE += spectools
-
-#
-# sge
-#
-sge-MODULES := sge
-sge-SPEC := sge.spec
-sge-BUILD-FROM-SRPM := yes
-sge-DEVEL-RPMS += kdevelop-devel kdevelop kdevelop-libs java-1.6.0-openjdk 
-sge-DEVEL-RPMS += lesstif lesstif-devel
-
-# turning this off - current focus is on deploying the sge box separately from myplc
-# packaging is still broken, and we're exploring a ready-to-use distro on centos
-# ALL += sge
-# IN_NODEIMAGE += sge
-
-########################################
-#
-# lxctools: scripts for entering containers
-#
-lxctools-MODULES := lxctools
-lxctools-SPEC := lxctools.spec
-ALL += lxctools
-IN_NODEIMAGE += lxctools
-
-#
-# lxcsu: root context module for entering namespaces
-#
-lxcsu-MODULES := lxcsu
-lxcsu-SPEC := lxcsu.spec
-ALL += lxcsu
-IN_NODEIMAGE += lxcsu
-
-#
-#
-# transforward: root context module for transparent port forwarding
-#
-transforward-MODULES := transforward
-transforward-SPEC := transforward.spec
-ALL += transforward
-IN_NODEIMAGE += transforward
-
-#
-# procprotect: root context module for protecting against weaknesses in /proc
-#
-procprotect-MODULES := procprotect
-procprotect-SPEC := procprotect.spec
-ALL += procprotect
-IN_NODEIMAGE += procprotect
-
-#
-# ipfw: root context module, and slice companion
-#
-ipfwroot-MODULES := ipfw
-ipfwroot-SPEC := planetlab/ipfwroot.spec
-ALL += ipfwroot
-IN_NODEIMAGE += ipfwroot
-
-ipfwslice-MODULES := ipfw
-ipfwslice-SPEC := planetlab/ipfwslice.spec
-ALL += ipfwslice
-
-#
-# NodeUpdate
-#
-nodeupdate-MODULES := nodeupdate
-nodeupdate-SPEC := NodeUpdate.spec
-ALL += nodeupdate
-IN_NODEIMAGE += nodeupdate
-
-#
-# ipod
-#
-ipod-MODULES := PingOfDeath
-ipod-SPEC := ipod.spec
-ALL += ipod
-IN_NODEIMAGE += ipod
-
-#
-# plnode-utils
-# 
-plnode-utils-MODULES := plnode-utils
-plnode-utils-SPEC := plnode-utils-lxc.spec
-ALL += plnode-utils
-IN_NODEIMAGE += plnode-utils
-
-#
-# nodemanager
-#
-nodemanager-lib-MODULES := nodemanager
-nodemanager-lib-SPEC := nodemanager-lib.spec
-ALL += nodemanager-lib
-IN_NODEIMAGE += nodemanager-lib
-
-nodemanager-lxc-MODULES := nodemanager
-nodemanager-lxc-SPEC := nodemanager-lxc.spec
-ALL += nodemanager-lxc
-IN_NODEIMAGE += nodemanager-lxc
-
-#
-# pl_sshd
-#
-sshd-MODULES := pl_sshd
-sshd-SPEC := pl_sshd.spec
-ALL += sshd
-IN_NODEIMAGE += sshd
-
-#
-# codemux: Port 80 demux
-#
-codemux-MODULES := codemux
-codemux-SPEC   := codemux.spec
-ALL += codemux
-IN_NODEIMAGE += codemux
-
-#
-# fprobe-ulog
-#
-fprobe-ulog-MODULES := fprobe-ulog
-fprobe-ulog-SPEC := fprobe-ulog.spec
-ALL += fprobe-ulog
-IN_NODEIMAGE += fprobe-ulog
-
-#################### libvirt on f16 is too old, sounds like f17 has something fine
-local_libvirt=false
-ifeq "$(DISTRONAME)" "f16"
-local_libvirt=true
-endif
-
-ifeq "$(local_libvirt)" "true"
-#
-# 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 libpcap-devel libnl-devel ebtables scrub
-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_NODEIMAGE += libvirt
-endif
-
-#
-# pf2slice
-#
-pf2slice-MODULES := pf2slice
-pf2slice-SPEC := pf2slice.spec
-ALL += pf2slice
-
-##
-## PlanetLab Mom: Cleans up your mess
-##
-#mom-MODULES := mom
-#mom-SPEC := pl_mom.spec
-#ALL += mom
-#IN_NODEIMAGE += mom
-
-#
-# vsys
-#
-vsys-MODULES := vsys
-vsys-SPEC := vsys.spec
-vsys-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
-IN_NODEIMAGE += vsys
-ALL += vsys
-
-#
-# vsyssh : installed in slivers
-#
-vsyssh-MODULES := vsys
-vsyssh-SPEC := vsyssh.spec
-IN_SLICEIMAGE += vsyssh
-ALL += vsyssh
-
-#
-# vsys-scripts
-#
-vsys-scripts-MODULES := vsys-scripts
-vsys-scripts-SPEC := root-context/vsys-scripts.spec
-IN_NODEIMAGE += vsys-scripts
-ALL += vsys-scripts
-
-#
-# bind_public
-#
-bind_public-MODULES := bind_public
-bind_public-SPEC := bind_public.spec
-IN_SLICEIMAGE += bind_public
-ALL += bind_public
-
-#
-# plcapi
-#
-plcapi-MODULES := plcapi
-plcapi-SPEC := PLCAPI.spec
-ALL += plcapi
-IN_MYPLC += plcapi
-
-#
-# drupal
-# 
-drupal-MODULES := drupal
-drupal-SPEC := drupal.spec
-drupal-BUILD-FROM-SRPM := yes
-ALL += drupal
-IN_MYPLC += drupal
-
-#
-# use the plewww module instead
-#
-plewww-MODULES := plewww
-plewww-SPEC := plewww.spec
-ALL += plewww
-IN_MYPLC += plewww
-
-#
-# www-register-wizard
-#
-www-register-wizard-MODULES := www-register-wizard
-www-register-wizard-SPEC := www-register-wizard.spec
-ALL += www-register-wizard
-IN_MYPLC += www-register-wizard
-
-#
-# pcucontrol
-#
-pcucontrol-MODULES := pcucontrol
-pcucontrol-SPEC := pcucontrol.spec
-ALL += pcucontrol
-
-#
-# pyopenssl
-#
-pyopenssl-MODULES := pyopenssl
-pyopenssl-SPEC := pyOpenSSL.spec
-pyopenssl-BUILD-FROM-SRPM := yes
-ALL += pyopenssl
-
-#
-# pyaspects
-#
-pyaspects-MODULES := pyaspects
-pyaspects-SPEC := pyaspects.spec
-pyaspects-BUILD-FROM-SRPM := yes
-ALL += pyaspects
-
-#
-# nodeconfig
-#
-nodeconfig-MODULES := nodeconfig
-nodeconfig-SPEC := nodeconfig.spec
-ALL += nodeconfig
-IN_MYPLC += nodeconfig
-
-#
-# bootmanager
-#
-bootmanager-MODULES := bootmanager
-bootmanager-SPEC := bootmanager.spec
-ALL += bootmanager
-IN_MYPLC += bootmanager
-
-#
-# pypcilib : used in bootcd
-# 
-pypcilib-MODULES := pypcilib
-pypcilib-SPEC := pypcilib.spec
-ALL += pypcilib
-IN_BOOTCD += pypcilib
-
-#
-# pyplnet
-#
-pyplnet-MODULES := pyplnet
-pyplnet-SPEC := pyplnet.spec
-ALL += pyplnet
-IN_NODEIMAGE += pyplnet
-IN_MYPLC += pyplnet
-IN_BOOTCD += pyplnet
-
-#
-# OMF resource controller
-#
-omf-resctl-MODULES := omf
-omf-resctl-SPEC := omf-resctl.spec
-ALL += omf-resctl
-IN_SLICEIMAGE += omf-resctl
-
-#
-# OMF exp controller
-#
-omf-expctl-MODULES := omf
-omf-expctl-SPEC := omf-expctl.spec
-ALL += omf-expctl
-
-#
-# OML measurement library
-#
-oml-MODULES := oml
-oml-DEVEL-RPMS += sqlite-devel 
-oml-SPEC := liboml.spec
-ALL += oml
-
-#
-# bootcd
-#
-bootcd-MODULES := bootcd build
-bootcd-SPEC := bootcd.spec
-bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
-bootcd-DEPEND-FILES := RPMS/yumgroups.xml
-bootcd-RPMDATE := yes
-ALL += bootcd
-IN_MYPLC += bootcd
-
-#
-# images for slices
-#
-sliceimage-MODULES := sliceimage build
-sliceimage-SPEC := sliceimage.spec
-sliceimage-DEPEND-PACKAGES := $(IN_SLICEIMAGE)
-sliceimage-DEPEND-FILES := RPMS/yumgroups.xml
-sliceimage-RPMDATE := yes
-ALL += sliceimage
-IN_NODEIMAGE += sliceimage
-
-#
-# lxc-specific sliceimage initialization
-# 
-lxc-sliceimage-MODULES := sliceimage
-lxc-sliceimage-SPEC    := lxc-sliceimage.spec
-lxc-sliceimage-RPMDATE := yes
-ALL                    += lxc-sliceimage
-IN_NODEIMAGE           += lxc-sliceimage
-
-#
-# nodeimage
-#
-nodeimage-MODULES := nodeimage build
-nodeimage-SPEC := nodeimage.spec
-nodeimage-DEPEND-PACKAGES := $(IN_NODEIMAGE)
-nodeimage-DEPEND-FILES := RPMS/yumgroups.xml
-nodeimage-RPMDATE := yes
-ALL += nodeimage
-IN_MYPLC += nodeimage
-
-#
-# noderepo
-#
-# all rpms resulting from packages marked as being in nodeimage and sliceimage
-NODEREPO_RPMS = $(foreach package,$(IN_NODEIMAGE) $(IN_NODEREPO) $(IN_SLICEIMAGE),$($(package).rpms))
-# replace space with +++ (specvars cannot deal with spaces)
-SPACE=$(subst x, ,x)
-NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
-
-noderepo-MODULES := nodeimage
-noderepo-SPEC := noderepo.spec
-# package requires all embedded packages
-noderepo-DEPEND-PACKAGES := $(IN_NODEIMAGE) $(IN_NODEREPO) $(IN_SLICEIMAGE)
-noderepo-DEPEND-FILES := RPMS/yumgroups.xml
-#export rpm list to the specfile
-noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
-noderepo-RPMDATE := yes
-ALL += noderepo
-IN_MYPLC += noderepo
-
-#
-# slicerepo
-#
-# all rpms resulting from packages marked as being in vserver
-SLICEREPO_RPMS = $(foreach package,$(IN_SLICEIMAGE),$($(package).rpms))
-# replace space with +++ (specvars cannot deal with spaces)
-SPACE=$(subst x, ,x)
-SLICEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(SLICEREPO_RPMS))
-
-slicerepo-MODULES := nodeimage
-slicerepo-SPEC := slicerepo.spec
-# package requires all embedded packages
-slicerepo-DEPEND-PACKAGES := $(IN_SLICEIMAGE)
-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
-#
-myplc-MODULES := myplc
-myplc-SPEC := myplc.spec
-myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
-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 
-myplc-docs-SPEC := myplc-docs.spec
-ALL += myplc-docs
-
-# using some other name than myplc-release, as this is a make target already
-release-MODULES := myplc
-release-SPEC := myplc-release.spec
-release-RPMDATE := yes
-ALL += release