git.iko.soy/searx
on master help sign in
LXC: set LXC_ENV_FOLDER=lxc/$(shell hostname)/
baf1ffdMarkus Heiser
utils/lib.sh+5
compare with master
unifiedsplit
@@ -1077,6 +1077,11 @@ in_container() {
1077 [[ -f /.lxcenv ]]
1077 [[ -f /.lxcenv ]]
1078}
1078}
1079
1079
1080+LXC_ENV_FOLDER=
1081+if in_container; then
1082+ LXC_ENV_FOLDER="lxc/$(hostname)/"
1083+fi
1084+
1080lxc_init_container() {
1085lxc_init_container() {
1081
1086
1082 # Create a /.lxcenv file in the root folder. Call this once after container
1087 # Create a /.lxcenv file in the root folder. Call this once after container
utils/makefile.lxc+1−1
@@ -9,7 +9,7 @@
9# sudo make ./utils/makefile.lxc lxc-activate
9# sudo make ./utils/makefile.lxc lxc-activate
10# sudo make ./utils/makefile.lxc lxc-deactivate
10# sudo make ./utils/makefile.lxc lxc-deactivate
11
11
12−LXC_ENV_FOLDER=/lxc-$(shell hostname)
12+LXC_ENV_FOLDER=lxc/$(shell hostname)/
13
13
14lxc-help::
14lxc-help::
15 @echo 'LXC: running in container LXC_ENV_FOLDER=$(LXC_ENV_FOLDER)'
15 @echo 'LXC: running in container LXC_ENV_FOLDER=$(LXC_ENV_FOLDER)'
utils/makefile.python+3−3
@@ -8,9 +8,9 @@ export PYTHONPATH := $(SITE_PYTHON):$$PYTHONPATH
8export PY_ENV PYDIST PYBUILD
8export PY_ENV PYDIST PYBUILD
9
9
10# folder where the python distribution takes place
10# folder where the python distribution takes place
11−PYDIST = ./dist$(LXC_ENV_FOLDER)
11+PYDIST = ./$(LXC_ENV_FOLDER)dist
12# folder where the python intermediate build files take place
12# folder where the python intermediate build files take place
13−PYBUILD = ./build$(LXC_ENV_FOLDER)
13+PYBUILD = ./$(LXC_ENV_FOLDER)build
14# python version to use
14# python version to use
15PY ?=3
15PY ?=3
16PYTHON ?= python$(PY)
16PYTHON ?= python$(PY)
@@ -28,7 +28,7 @@ TEST_FOLDER ?= ./tests
28TEST ?= .
28TEST ?= .
29
29
30VTENV_OPTS ?=
30VTENV_OPTS ?=
31−PY_ENV = ./local$(LXC_ENV_FOLDER)/py$(PY)
31+PY_ENV = ./$(LXC_ENV_FOLDER)local/py$(PY)
32PY_ENV_BIN = $(PY_ENV)/bin
32PY_ENV_BIN = $(PY_ENV)/bin
33PY_ENV_ACT = . $(PY_ENV_BIN)/activate
33PY_ENV_ACT = . $(PY_ENV_BIN)/activate
34
34
utils/makefile.sphinx+5−5
@@ -7,13 +7,13 @@ SPHINXOPTS ?=
7SPHINXBUILD ?= $(PY_ENV_BIN)/sphinx-build
7SPHINXBUILD ?= $(PY_ENV_BIN)/sphinx-build
8SPHINX_CONF ?= conf.py
8SPHINX_CONF ?= conf.py
9
9
10−DOCS_FOLDER = docs$(LXC_ENV_FOLDER)
10+DOCS_FOLDER = ./$(LXC_ENV_FOLDER)docs
11−DOCS_BUILD = build/docs$(LXC_ENV_FOLDER)
11+DOCS_BUILD = ./$(LXC_ENV_FOLDER)build/docs
12−DOCS_DIST = dist/docs$(LXC_ENV_FOLDER)
12+DOCS_DIST = ./$(LXC_ENV_FOLDER)dist/docs
13GH_PAGES ?= gh-pages
13GH_PAGES ?= gh-pages
14
14
15−BOOKS_FOLDER = docs$(LXC_ENV_FOLDER)
15+BOOKS_FOLDER = ./$(LXC_ENV_FOLDER)docs
16−BOOKS_DIST = dist/books$(LXC_ENV_FOLDER)
16+BOOKS_DIST = ./$(LXC_ENV_FOLDER)dist/books
17
17
18ifeq ($(KBUILD_VERBOSE),1)
18ifeq ($(KBUILD_VERBOSE),1)
19 SPHINX_VERBOSE = "-v"
19 SPHINX_VERBOSE = "-v"