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:
579b6d8
)
turn off ipfw* on f18 as it won't build with 3.8 either
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Tue, 5 Mar 2013 18:48:30 +0000
(19:48 +0100)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Tue, 5 Mar 2013 18:48:30 +0000
(19:48 +0100)
lxc.mk
patch
|
blob
|
history
diff --git
a/lxc.mk
b/lxc.mk
index
940ad65
..
19110f7
100644
(file)
--- a/
lxc.mk
+++ b/
lxc.mk
@@
-46,6
+46,8
@@
IN_NODEIMAGE += procprotect
#
# ipfw: root context module, and slice companion
#
#
# ipfw: root context module, and slice companion
#
+# starting on 2013-03-05 when f18 has moved to kernel 3.8 this module won't build anymore
+#ifeq "$(DISTRONAME)" "f16"
ipfwroot-MODULES := ipfw
ipfwroot-SPEC := planetlab/ipfwroot.spec
ALL += ipfwroot
ipfwroot-MODULES := ipfw
ipfwroot-SPEC := planetlab/ipfwroot.spec
ALL += ipfwroot
@@
-54,6
+56,7
@@
IN_NODEIMAGE += ipfwroot
ipfwslice-MODULES := ipfw
ipfwslice-SPEC := planetlab/ipfwslice.spec
ALL += ipfwslice
ipfwslice-MODULES := ipfw
ipfwslice-SPEC := planetlab/ipfwslice.spec
ALL += ipfwslice
+endif
#
# NodeUpdate
#
# NodeUpdate
@@
-137,6
+140,7
@@
libvirt-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub
ifeq "$(DISTRONAME)" "f16"
libvirt-DEVEL-RPMS += libnl-devel libudev-devel
endif
ifeq "$(DISTRONAME)" "f16"
libvirt-DEVEL-RPMS += libnl-devel libudev-devel
endif
+# strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future
ifeq "$(DISTRONAME)" "f18"
libvirt-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad
libvirt-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6
ifeq "$(DISTRONAME)" "f18"
libvirt-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad
libvirt-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6