X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=f12c89b7616244e54825135269d74ef0302fb406;hb=68b7ca185ea2428984aca536c5112044c01dc61e;hp=aa49d48c756e98c86f96f958789ef4c3221b2968;hpb=d33c80a280c332dea1ca13d561073055fc235b34;p=build.git diff --git a/lxc.mk b/lxc.mk index aa49d48c..f12c89b7 100644 --- a/lxc.mk +++ b/lxc.mk @@ -135,7 +135,7 @@ fprobe-ulog-SPEC := fprobe-ulog.spec ALL += fprobe-ulog IN_NODEIMAGE += fprobe-ulog -#################### using our own libvirt on f18, and the stock version later on +#################### using our own libvirt on f18 and f20 local_libvirt=false separate_libvirt_python=false ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)" @@ -167,9 +167,8 @@ endif # strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)" libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad -libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 libgcrypt-devel +libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 libgcrypt-devel netcf-devel endif -libvirt-RPMFLAGS := --define 'packager PlanetLab' ALL += libvirt IN_NODEREPO += libvirt IN_NODEIMAGE += libvirt