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 (parent:
00c829b
)
clean up locally built inotify for lxc as this is not current any longer
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Wed, 25 Sep 2013 12:09:55 +0000
(14:09 +0200)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Wed, 25 Sep 2013 12:09:55 +0000
(14:09 +0200)
lxc.mk
patch
|
blob
|
history
diff --git
a/lxc.mk
b/lxc.mk
index
cac0afc
..
51fcc76
100644
(file)
--- a/
lxc.mk
+++ b/
lxc.mk
@@
-190,27
+190,6
@@
ALL += pf2slice
#ALL += mom
#IN_NODEIMAGE += mom
#ALL += mom
#IN_NODEIMAGE += mom
-#
-# inotify-tools - local import
-# rebuild this on centos5 (not found) - see yumexclude
-#
-local_inotify_tools=false
-ifeq "$(DISTRONAME)" "centos5"
-local_inotify_tools=true
-endif
-
-ifeq "$(DISTRONAME)" "sl6"
-local_inotify_tools=true
-endif
-
-ifeq "$(local_inotify_tools)" "true"
-inotify-tools-MODULES := inotify-tools
-inotify-tools-SPEC := inotify-tools.spec
-inotify-tools-BUILD-FROM-SRPM := yes
-IN_NODEIMAGE += inotify-tools
-ALL += inotify-tools
-endif
-
#
# openvswitch
#
#
# openvswitch
#
@@
-230,9
+209,6
@@
vsys-MODULES := vsys
vsys-SPEC := vsys.spec
# ocaml-docs is not needed anymore but keep it on a tmp basis as some tags may still have it
vsys-STOCK-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
vsys-SPEC := vsys.spec
# ocaml-docs is not needed anymore but keep it on a tmp basis as some tags may still have it
vsys-STOCK-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
-ifeq "$(local_inotify_tools)" "true"
-vsys-LOCAL-DEVEL-RPMS += inotify-tools inotify-tools-devel
-endif
IN_NODEIMAGE += vsys
ALL += vsys
IN_NODEIMAGE += vsys
ALL += vsys