From cf1564e4844b5d4aa3b85437c821a381716a4833 Mon Sep 17 00:00:00 2001
From: Thomas Dreibholz <dreibh@simula.no>
Date: Tue, 22 Jul 2014 09:24:12 +0200
Subject: [PATCH] Package naming fixes => fixes false-positive errors on
 missing packages during build.

---
 config.lxc/devel.pkgs     | 11 ++++++++++-
 config.lxc/nodeimage.pkgs | 14 +++++++-------
 lxc.mk                    | 11 ++++++++---
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/config.lxc/devel.pkgs b/config.lxc/devel.pkgs
index 117f3230..9b4bc0c9 100644
--- a/config.lxc/devel.pkgs
+++ b/config.lxc/devel.pkgs
@@ -32,7 +32,6 @@ package: python python-devel
 package: doxygen  
 package: cronie
 package: xmlsec1 xmlsec1-openssl 
-package: udev 
 package: expat-devel
 package: db4-devel 
 package: ncurses-devel 
@@ -106,6 +105,7 @@ package>=f8:inotify-tools-devel
 # openvswitch
 # starting with f16 we use the stock kernel, and openvswitch needs kernel-devel
 package>=f16: kernel-devel
+package>=f16: kernel-modules-extra
 ##########
 # zabbix/monitor
 package=centos5: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@
@@ -122,3 +122,12 @@ package: python-lxml
 package: libxml2-devel
 # myplc-docs
 package>=f18: texlive-ec
+# libvirt
+package: gettext
+package: gettext-devel
+package: gnutls-devel
+package: gnutls-utils
+package: libgcrypt-devel
+package: libtasn1-devel
+package: nmap-ncat
+package: pkgconfig
diff --git a/config.lxc/nodeimage.pkgs b/config.lxc/nodeimage.pkgs
index c87f6d26..665e8748 100644
--- a/config.lxc/nodeimage.pkgs
+++ b/config.lxc/nodeimage.pkgs
@@ -17,8 +17,8 @@ package: bridge-utils
 package: dnsmasq
 package: bash-completion
 package: kernel
-package: kernel-firmware
-package: udev
+package: linux-firmware
+package: systemd
 package: basesystem
 package: filesystem
 package: lvm2
@@ -36,7 +36,7 @@ package: iproute
 package: iputils
 package: kbd
 package: passwd
-package: procps
+package: procps-ng
 package: readline
 package: rootfiles
 package: rpm
@@ -59,7 +59,7 @@ package: libnl
 package: lsof
 package: mailcap
 package: nano
-package: nc
+package: nmap-ncat
 package: openssh-clients
 package: parted
 package: pciutils
@@ -95,7 +95,7 @@ package<=f18: PyXML
 # platform-dependent
 #
 package: rsyslog
-package: util-linux-ng
+package: util-linux
 package: cronie
 
 #
@@ -114,8 +114,8 @@ package: lxc-sliceimage
 package: fprobe-ulog
 package: vsys
 package: vsys-scripts
-package: monitor-client
-package: monitor-runlevelagent
+# ??? package: monitor-client
+# ??? package: monitor-runlevelagent
 package: net-tools
 
 ### used to be in the onelab umts extension, but doesn't hurt anyone
diff --git a/lxc.mk b/lxc.mk
index 4f0b3466..8a4bd9b8 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -146,7 +146,7 @@ libvirt-MODULES := libvirt
 libvirt-SPEC    := libvirt.spec
 libvirt-BUILD-FROM-SRPM := yes
 # The --without options are breaking spec2make : hard-wired in the specfile instead
-libvirt-STOCK-DEVEL-RPMS += xhtml1-dtds gettext gettext-devel libtasn1-devel gnutls-devel 
+libvirt-STOCK-DEVEL-RPMS += xhtml1-dtds
 libvirt-STOCK-DEVEL-RPMS += libattr-devel augeas libpciaccess-devel yajl-devel 
 libvirt-STOCK-DEVEL-RPMS += libpcap-devel radvd ebtables device-mapper-devel 
 libvirt-STOCK-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub 
@@ -154,7 +154,7 @@ libvirt-STOCK-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub
 libvirt-STOCK-DEVEL-RPMS += libblkid-devel glusterfs-api-devel glusterfs-devel
 # strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future
 libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad 
-libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 libgcrypt-devel netcf-devel
+libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-services netcf-devel
 ALL += libvirt
 IN_NODEREPO += libvirt
 IN_NODEIMAGE += libvirt
@@ -169,7 +169,7 @@ ifeq "$(separate_libvirt_python)" "true"
 libvirt-python-MODULES := libvirt-python
 libvirt-python-SPEC    := libvirt-python.spec
 libvirt-python-BUILD-FROM-SRPM := yes
-libvirt-python-STOCK-DEVEL-RPMS += gnutls-utils nc pm-utils 
+libvirt-python-STOCK-DEVEL-RPMS += pm-utils
 libvirt-python-LOCAL-DEVEL-RPMS += libvirt-devel libvirt-docs libvirt-client
 libvirt-python-RPMFLAGS :=     --define 'packager PlanetLab'
 ALL += libvirt-python
@@ -239,6 +239,11 @@ vsys-scripts-SPEC := root-context/vsys-scripts.spec
 IN_NODEIMAGE += vsys-scripts
 ALL += vsys-scripts
 
+vsys-wrapper-MODULES := vsys-scripts
+vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec
+IN_SLICEIMAGE += vsys-wrapper
+ALL += vsys-wrapper
+
 #
 # bind_public
 #
-- 
2.43.0