X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=8a4bd9b8fe5d947f89fe13e69f3c925b47e7f8b1;hb=c8c281162f6c14fcee8214b22cd9c159c47c493e;hp=4f0b3466764b9fa7c85894c817b825e12e8f13c7;hpb=c19003fdc44f11c006c3d74a5e270a8ebd4c115c;p=build.git 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 #