git://git.onelab.eu
/
build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pour Modular in the mix
[build.git]
/
lxc.mk
diff --git
a/lxc.mk
b/lxc.mk
index
07aa552
..
6548723
100644
(file)
--- a/
lxc.mk
+++ b/
lxc.mk
@@
-5,7
+5,7
@@
# Copyright (C) 2003-2006 The Trustees of Princeton University
# rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
#
# Copyright (C) 2003-2006 The Trustees of Princeton University
# rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
#
-# see doc in Makefile
+# see doc in Makefile
#
### the madwifi drivers ship with fedora16's kernel rpm
#
### the madwifi drivers ship with fedora16's kernel rpm
@@
-56,7
+56,7
@@
ALL += ipfwslice
#
# comgt - a companion to umts tools
#
# comgt - a companion to umts tools
-#
+#
comgt-MODULES := comgt
comgt-SPEC := comgt.spec
IN_NODEIMAGE += comgt
comgt-MODULES := comgt
comgt-SPEC := comgt.spec
IN_NODEIMAGE += comgt
@@
-96,7
+96,7
@@
IN_NODEIMAGE += ipod
#
# plnode-utils
#
# plnode-utils
-#
+#
plnode-utils-MODULES := plnode-utils
plnode-utils-SPEC := plnode-utils-lxc.spec
ALL += plnode-utils
plnode-utils-MODULES := plnode-utils
plnode-utils-SPEC := plnode-utils-lxc.spec
ALL += plnode-utils
@@
-154,13
+154,13
@@
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
libvirt-BUILD-FROM-SRPM := yes
# The --without options are breaking spec2make : hard-wired in the specfile instead
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
+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
# for 1.2.1 - first seen on f20, not sure for the other ones
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
# for 1.2.1 - first seen on f20, not sure for the other ones
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 += fuse-devel libssh2-devel dbus-devel numad
libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-services netcf-devel
# 1.2.11
libvirt-STOCK-DEVEL-RPMS += wireshark-devel
libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-services netcf-devel
# 1.2.11
libvirt-STOCK-DEVEL-RPMS += wireshark-devel
@@
-268,6
+268,9
@@
bind_public-SPEC := bind_public.spec
IN_SLICEIMAGE += bind_public
ALL += bind_public
IN_SLICEIMAGE += bind_public
ALL += bind_public
+# in fedora 29, this triggers nasty-looking compile messages
+# not trying too hard, we're mostly after the server-side of f29
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f23 f24 f25 f27 f29)"
#
# sliver-openvswitch
#
#
# sliver-openvswitch
#
@@
-275,6
+278,7
@@
sliver-openvswitch-MODULES := sliver-openvswitch
sliver-openvswitch-SPEC := sliver-openvswitch.spec
IN_SLICEIMAGE += sliver-openvswitch
ALL += sliver-openvswitch
sliver-openvswitch-SPEC := sliver-openvswitch.spec
IN_SLICEIMAGE += sliver-openvswitch
ALL += sliver-openvswitch
+endif
#
# plcapi
#
# plcapi
@@
-286,7
+290,7
@@
IN_MYPLC += plcapi
#
# drupal
#
# drupal
-#
+#
drupal-MODULES := drupal
drupal-SPEC := drupal.spec
drupal-BUILD-FROM-SRPM := yes
drupal-MODULES := drupal
drupal-SPEC := drupal.spec
drupal-BUILD-FROM-SRPM := yes
@@
-371,7
+375,7
@@
IN_MYPLC += bootmanager
#
# pypcilib : used in bootcd
#
# pypcilib : used in bootcd
-#
+#
pypcilib-MODULES := pypcilib
pypcilib-SPEC := pypcilib.spec
ALL += pypcilib
pypcilib-MODULES := pypcilib
pypcilib-SPEC := pypcilib.spec
ALL += pypcilib
@@
-392,7
+396,7
@@
ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f23 f24 f25 f27 f29)"
# OML measurement library
#
oml-MODULES := oml
# OML measurement library
#
oml-MODULES := oml
-oml-STOCK-DEVEL-RPMS += sqlite-devel
+oml-STOCK-DEVEL-RPMS += sqlite-devel
oml-SPEC := liboml.spec
ALL += oml
endif
oml-SPEC := liboml.spec
ALL += oml
endif
@@
-421,7
+425,7
@@
IN_NODEIMAGE += sliceimage
#
# lxc-specific sliceimage initialization
#
# lxc-specific sliceimage initialization
-#
+#
lxc-sliceimage-MODULES := sliceimage
lxc-sliceimage-SPEC := lxc-sliceimage.spec
lxc-sliceimage-RPMDATE := yes
lxc-sliceimage-MODULES := sliceimage
lxc-sliceimage-SPEC := lxc-sliceimage.spec
lxc-sliceimage-RPMDATE := yes
@@
-487,7
+491,7
@@
myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
ALL += myplc
# myplc-docs only contains docs for PLCAPI and NMAPI, but
ALL += myplc
# myplc-docs only contains docs for PLCAPI and NMAPI, but
-# we still need to pull MyPLC, as it is where the specfile lies,
+# we still need to pull MyPLC, as it is where the specfile lies,
# together with the utility script docbook2drupal.sh
myplc-docs-MODULES := myplc plcapi nodemanager monitor
myplc-docs-SPEC := myplc-docs.spec
# together with the utility script docbook2drupal.sh
myplc-docs-MODULES := myplc plcapi nodemanager monitor
myplc-docs-SPEC := myplc-docs.spec