git.iko.soy/searx
on master help sign in
LXC: set LXC_ENV_FOLDER=lxc/$(shell hostname)/

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

commitbaf1ffd1fa4923f3bd105f0d8daac4a9527bdc50 authorMarkus Heiser <markus.heiser@darmarit.de> dateMon 23 Mar 2020, 18:05 (7 years ago) parent103c542
4 files changed+14−9
compare with master
unifiedsplit
utils/lib.sh+5 utils/makefile.lxc+1−1 utils/makefile.python+3−3 utils/makefile.sphinx+5−5
utils/lib.sh+5
@@ -1077,6 +1077,11 @@ in_container() {
10771077 [[ -f /.lxcenv ]]
10781078}
10791079
1080+LXC_ENV_FOLDER=
1081+if in_container; then
1082+ LXC_ENV_FOLDER="lxc/$(hostname)/"
1083+fi
1084+
10801085lxc_init_container() {
10811086
10821087 # Create a /.lxcenv file in the root folder. Call this once after container
utils/makefile.lxc+1−1
@@ -9,7 +9,7 @@
99# sudo make ./utils/makefile.lxc lxc-activate
1010# sudo make ./utils/makefile.lxc lxc-deactivate
1111
12−LXC_ENV_FOLDER=/lxc-$(shell hostname)
12+LXC_ENV_FOLDER=lxc/$(shell hostname)/
1313
1414lxc-help::
1515 @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
88export PY_ENV PYDIST PYBUILD
99
1010# folder where the python distribution takes place
11−PYDIST = ./dist$(LXC_ENV_FOLDER)
11+PYDIST = ./$(LXC_ENV_FOLDER)dist
1212# folder where the python intermediate build files take place
13−PYBUILD = ./build$(LXC_ENV_FOLDER)
13+PYBUILD = ./$(LXC_ENV_FOLDER)build
1414# python version to use
1515PY ?=3
1616PYTHON ?= python$(PY)
@@ -28,7 +28,7 @@ TEST_FOLDER ?= ./tests
2828TEST ?= .
2929
3030VTENV_OPTS ?=
31−PY_ENV = ./local$(LXC_ENV_FOLDER)/py$(PY)
31+PY_ENV = ./$(LXC_ENV_FOLDER)local/py$(PY)
3232PY_ENV_BIN = $(PY_ENV)/bin
3333PY_ENV_ACT = . $(PY_ENV_BIN)/activate
3434
utils/makefile.sphinx+5−5
@@ -7,13 +7,13 @@ SPHINXOPTS ?=
77SPHINXBUILD ?= $(PY_ENV_BIN)/sphinx-build
88SPHINX_CONF ?= conf.py
99
10−DOCS_FOLDER = docs$(LXC_ENV_FOLDER)
11−DOCS_BUILD = build/docs$(LXC_ENV_FOLDER)
12−DOCS_DIST = dist/docs$(LXC_ENV_FOLDER)
10+DOCS_FOLDER = ./$(LXC_ENV_FOLDER)docs
11+DOCS_BUILD = ./$(LXC_ENV_FOLDER)build/docs
12+DOCS_DIST = ./$(LXC_ENV_FOLDER)dist/docs
1313GH_PAGES ?= gh-pages
1414
15−BOOKS_FOLDER = docs$(LXC_ENV_FOLDER)
16−BOOKS_DIST = dist/books$(LXC_ENV_FOLDER)
15+BOOKS_FOLDER = ./$(LXC_ENV_FOLDER)docs
16+BOOKS_DIST = ./$(LXC_ENV_FOLDER)dist/books
1717
1818ifeq ($(KBUILD_VERBOSE),1)
1919 SPHINX_VERBOSE = "-v"