git://git.onelab.eu
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d33c80a
)
latest libvirt will require netcf-devel for building
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Tue, 11 Feb 2014 10:42:51 +0000
(11:42 +0100)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Tue, 11 Feb 2014 10:42:51 +0000
(11:42 +0100)
lxc.mk
patch
|
blob
|
history
diff --git
a/lxc.mk
b/lxc.mk
index
aa49d48
..
f12c89b
100644
(file)
--- a/
lxc.mk
+++ b/
lxc.mk
@@
-135,7
+135,7
@@
fprobe-ulog-SPEC := fprobe-ulog.spec
ALL += fprobe-ulog
IN_NODEIMAGE += fprobe-ulog
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)"
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
# 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
endif
-libvirt-RPMFLAGS := --define 'packager PlanetLab'
ALL += libvirt
IN_NODEREPO += libvirt
IN_NODEIMAGE += libvirt
ALL += libvirt
IN_NODEREPO += libvirt
IN_NODEIMAGE += libvirt