67 lines
2.6 KiB
Diff
67 lines
2.6 KiB
Diff
|
This patch allows the Haskell daemons to locate Python libraries
|
||
|
|
installed to a non-standard pythondir. It is necessary because Guix
|
||
|
|
does not use versionedsharedir (see related patch that disables it).
|
||
|
|
|
||
|
|
diff --git a/Makefile.am b/Makefile.am
|
||
|
|
--- a/Makefile.am
|
||
|
|
+++ b/Makefile.am
|
||
|
|
@@ -83,6 +83,7 @@ myexeclibdir = $(pkglibdir)
|
||
|
|
bindir = $(versiondir)/$(BINDIR)
|
||
|
|
sbindir = $(versiondir)$(SBINDIR)
|
||
|
|
mandir = $(versionedsharedir)/root$(MANDIR)
|
||
|
|
+pythondir = $(versionedsharedir)
|
||
|
|
pkgpythondir = $(versionedsharedir)/ganeti
|
||
|
|
pkgpython_rpc_stubdir = $(versionedsharedir)/ganeti/rpc/stub
|
||
|
|
gntpythondir = $(versionedsharedir)
|
||
|
|
@@ -2386,6 +2387,7 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in $(PRINT_PY_CONSTANTS) \
|
||
|
|
-DPKGLIBDIR="$(libdir)/ganeti" \
|
||
|
|
-DSHAREDIR="$(prefix)/share/ganeti" \
|
||
|
|
-DVERSIONEDSHAREDIR="$(versionedsharedir)" \
|
||
|
|
+ -DPYTHONDIR="$(pythondir)" \
|
||
|
|
-DDRBD_BARRIERS="$(DRBD_BARRIERS)" \
|
||
|
|
-DDRBD_NO_META_FLUSH="$(DRBD_NO_META_FLUSH)" \
|
||
|
|
-DSYSLOG_USAGE="$(SYSLOG_USAGE)" \
|
||
|
|
diff --git a/src/AutoConf.hs.in b/src/AutoConf.hs.in
|
||
|
|
--- a/src/AutoConf.hs.in
|
||
|
|
+++ b/src/AutoConf.hs.in
|
||
|
|
@@ -157,6 +157,9 @@ sharedir = "SHAREDIR"
|
||
|
|
versionedsharedir :: String
|
||
|
|
versionedsharedir = "VERSIONEDSHAREDIR"
|
||
|
|
|
||
|
|
+pythondir :: String
|
||
|
|
+pythondir = "PYTHONDIR"
|
||
|
|
+
|
||
|
|
drbdBarriers :: String
|
||
|
|
drbdBarriers = "DRBD_BARRIERS"
|
||
|
|
|
||
|
|
diff --git a/src/Ganeti/Path.hs b/src/Ganeti/Path.hs
|
||
|
|
--- a/src/Ganeti/Path.hs
|
||
|
|
+++ b/src/Ganeti/Path.hs
|
||
|
|
@@ -188,5 +188,5 @@ getInstReasonFilename instName = instanceReasonDir `pjoin` instName
|
||
|
|
|
||
|
|
-- | The path to the Python executable for starting jobs.
|
||
|
|
jqueueExecutorPy :: IO FilePath
|
||
|
|
-jqueueExecutorPy = return $ versionedsharedir
|
||
|
|
- </> "ganeti" </> "jqueue" </> "exec.py"
|
||
|
|
+jqueueExecutorPy = return $ pythondir
|
||
|
|
+ </> "ganeti" </> "jqueue" </> "exec.py"
|
||
|
|
diff --git a/src/Ganeti/Query/Exec.hs b/src/Ganeti/Query/Exec.hs
|
||
|
|
--- a/src/Ganeti/Query/Exec.hs
|
||
|
|
+++ b/src/Ganeti/Query/Exec.hs
|
||
|
|
@@ -99,12 +99,12 @@ spawnJobProcess jid = withErrorLogAt CRITICAL (show jid) $
|
||
|
|
do
|
||
|
|
use_debug <- isDebugMode
|
||
|
|
env_ <- (M.toList . M.insert "GNT_DEBUG" (if use_debug then "1" else "0")
|
||
|
|
- . M.insert "PYTHONPATH" AC.versionedsharedir
|
||
|
|
+ . M.insert "PYTHONPATH" AC.pythondir
|
||
|
|
. M.fromList)
|
||
|
|
`liftM` getEnvironment
|
||
|
|
execPy <- P.jqueueExecutorPy
|
||
|
|
logDebug $ "Executing " ++ AC.pythonPath ++ " " ++ execPy
|
||
|
|
- ++ " with PYTHONPATH=" ++ AC.versionedsharedir
|
||
|
|
+ ++ " with PYTHONPATH=" ++ AC.pythondir
|
||
|
|
|
||
|
|
(master, child) <- pipeClient connectConfig
|
||
|
|
let (rh, wh) = clientToHandle child
|
||
|
|
|