X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=51fcc76fc17de3d3974e5dda3370e37b117120d3;hb=14ab88c9812ff6b50dd900c09628010ae1bc209e;hp=d21b9b52bd11b4c46532a2cf341bd0a8d42f0751;hpb=f05bfddf8a44de63e64ce9871a54f97360a2d200;p=build.git diff --git a/lxc.mk b/lxc.mk index d21b9b52..51fcc76f 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 @@ -537,6 +513,7 @@ endif myslice-MODULES := myslice myslice-SPEC := myslice.spec myslice-STOCK-DEVEL-RPMS := python-django +myslice-STOCK-DEVEL-DEBS := python-django python-django-south #ALL += myslice manifold-MODULES := manifold