commit 611864b3717c8c71563aa50b4ee74aeb46ddb1c4
Author: Jan Rękorajski <[email protected]>
Date: Tue Feb 4 08:24:04 2014 +0100
- force choosing mtl over monad-tf
- updated files
ganeti.spec | 4 ++++
mtl.patch | 29 ++++++++++++++++++++---------
2 files changed, 24 insertions(+), 9 deletions(-)
---
diff --git a/ganeti.spec b/ganeti.spec
index db4981a..b0cc86f 100644
--- a/ganeti.spec
+++ b/ganeti.spec
@@ -240,7 +240,9 @@ fi
%attr(755,root,root) %{_libdir}/ganeti/kvm-ifup
%attr(755,root,root) %{_libdir}/ganeti/mon-collector
%attr(755,root,root) %{_libdir}/ganeti/node-daemon-setup
+%attr(755,root,root) %{_libdir}/ganeti/net-common
%attr(755,root,root) %{_libdir}/ganeti/prepare-node-join
+%attr(755,root,root) %{_libdir}/ganeti/vif-ganeti
%dir %{_libdir}/ganeti/iallocators
%dir %{_libdir}/ganeti/tools
%attr(755,root,root) %{_libdir}/ganeti/tools/burnin
@@ -322,6 +324,8 @@ fi
%{py_sitescriptdir}/ganeti/rapi/*.py*
%dir %{py_sitescriptdir}/ganeti/server
%{py_sitescriptdir}/ganeti/server/*.py*
+%dir %{py_sitescriptdir}/ganeti/storage
+%{py_sitescriptdir}/ganeti/storage/*.py*
%dir %{py_sitescriptdir}/ganeti/tools
%{py_sitescriptdir}/ganeti/tools/*.py*
%dir %{py_sitescriptdir}/ganeti/utils
diff --git a/mtl.patch b/mtl.patch
index 9ae83c4..5699bf5 100644
--- a/mtl.patch
+++ b/mtl.patch
@@ -1,3 +1,13 @@
+--- ganeti-2.9.3/Makefile.am~ 2014-02-03 22:26:36.193571670 +0100
++++ ganeti-2.9.3/Makefile.am 2014-02-04 00:05:22.467565093 +0100
+@@ -538,6 +538,7 @@
+ -O -Wall -Werror -isrc \
+ -fwarn-monomorphism-restriction \
+ -fwarn-tabs \
++ -XPackageImports \
+ $(GHC_BYVERSION_FLAGS)
+
+ # extra flags that can be overriden on the command line (e.g. -Wwarn, etc.)
--- ganeti-2.9.3/src/Ganeti/BasicTypes.hs~ 2014-01-27 10:20:35.000000000
+0100
+++ ganeti-2.9.3/src/Ganeti/BasicTypes.hs 2014-02-04 00:03:58.709925227
+0100
@@ -45,7 +45,7 @@
@@ -9,13 +19,14 @@
import Data.Function
import Data.List
---- ganeti-2.9.3/Makefile.am~ 2014-02-03 22:26:36.193571670 +0100
-+++ ganeti-2.9.3/Makefile.am 2014-02-04 00:05:22.467565093 +0100
-@@ -538,6 +538,7 @@
- -O -Wall -Werror -isrc \
- -fwarn-monomorphism-restriction \
- -fwarn-tabs \
-+ -XPackageImports \
- $(GHC_BYVERSION_FLAGS)
+--- ganeti-2.9.3/src/Ganeti/Query/Query.hs~ 2014-01-27 10:20:35.000000000
+0100
++++ ganeti-2.9.3/src/Ganeti/Query/Query.hs 2014-02-04 00:38:32.723993874
+0100
+@@ -54,7 +54,7 @@
- # extra flags that can be overriden on the command line (e.g. -Wwarn, etc.)
+ import Control.DeepSeq
+ import Control.Monad (filterM, foldM)
+-import Control.Monad.Trans (lift)
++import "mtl" Control.Monad.Trans (lift)
+ import Data.List (intercalate)
+ import Data.Maybe (fromMaybe)
+ import qualified Data.Map as Map
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ganeti.git/commitdiff/611864b3717c8c71563aa50b4ee74aeb46ddb1c4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
