kamp/searxng
1
0
Fork 0
mirror of https://github.com/searxng/searxng.git synced 2024-11-22 12:10:11 +01:00
Code

[fix] determine path to makefile.lxc in a LXC

Browse Source 
The path to the makefile.lxc is not always static and
'/share/searx/utils/makefile.lxc' can be wrong.

When target 'lxc.activate' is called within the LXC container the path to
makefile.lxc depends on LXC_SHARE_FOLDER and the basename of the folder where
searx was cloned inital on the HOST system.

This patch determines the path of 'makefile.lxc' next to 'makefile.include'
itself.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
Markus Heiser 2020-12-18 17:10:49 +01:00
parent 14c7cc0e11
commit c89df6739f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/lxc.sh
View File

@ -20,7 +20,7 @@ lxc_set_suite_env
LXC_HOST_PREFIX="${LXC_HOST_PREFIX:-test}" LXC_HOST_PREFIX="${LXC_HOST_PREFIX:-test}"
# where all folders from HOST are mounted # Location in the container where all folders from HOST are mounted
LXC_SHARE_FOLDER="/share" LXC_SHARE_FOLDER="/share"
LXC_REPO_ROOT="${LXC_SHARE_FOLDER}/$(basename "${REPO_ROOT}")" LXC_REPO_ROOT="${LXC_SHARE_FOLDER}/$(basename "${REPO_ROOT}")"

2
utils/makefile.include
View File

@ -3,7 +3,7 @@
ifeq (,$(wildcard /.lxcenv.mk)) ifeq (,$(wildcard /.lxcenv.mk))
PHONY += lxc-activate lxc-purge PHONY += lxc-activate lxc-purge
lxc-activate: lxc-activate:
@$(MAKE) -s -f /share/searx/utils/makefile.lxc lxc-activate @$(MAKE) -s -f "$$(dirname $(abspath $(lastword $(MAKEFILE_LIST))))/makefile.lxc" lxc-activate
lxc-purge: lxc-purge:
$(Q)rm -rf ./lxc $(Q)rm -rf ./lxc
else else