X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=7fe4ad481dc373355ba0f11ed09c5af83f478c8d;hb=ace9a03156b0f66cd2a4130cec09bc620d11450b;hp=cb046e14227d84c346dbb041bb7dfc86d02d95c3;hpb=38e1b3fbaab1ff3661c12094c1dfb769b9255300;p=build.git

diff --git a/lxc.mk b/lxc.mk
index cb046e14..7fe4ad48 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -190,33 +190,12 @@ ALL += pf2slice
 #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-MODULES := openvswitch
 # openvswitch-SPEC := openvswitch.spec
-# openvswitch-LOCAL-STOCK-DEVEL-RPMS += kernel-devel
+# openvswitch-STOCK-DEVEL-RPMS += kernel-devel
 # IN_NODEIMAGE += openvswitch
 # # build only on f14 as f16 has this natively
 # ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14)"
@@ -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
-ifeq "$(local_inotify_tools)" "true"
-vsys-LOCAL-STOCK-DEVEL-RPMS += inotify-tools inotify-tools-devel
-endif
 IN_NODEIMAGE += vsys
 ALL += vsys
 
@@ -400,7 +376,9 @@ IN_BOOTCD += pyplnet
 rvm-ruby-MODULES := rvm-ruby
 rvm-ruby-SPEC := rpm/rvm-ruby.spec
 rvm-ruby-STOCK-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt-devel
-ALL += rvm-ruby
+# Since Oct 22. 2013, f18 has a new release of openssl that ruby is not too happy to build against
+# turning this off for now, Christoph Dwertmann to monitor the status of this bug/incompatibility upstream
+#ALL += rvm-ruby
 
 #
 # OML measurement library
@@ -537,7 +515,7 @@ endif
 myslice-MODULES := myslice
 myslice-SPEC := myslice.spec
 myslice-STOCK-DEVEL-RPMS := python-django
-myslice-STOCK-DEVEL-DEBS := python-django
+myslice-STOCK-DEVEL-DEBS := python-django python-django-south
 #ALL += myslice
 
 manifold-MODULES := manifold