mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-03 15:55:46 +00:00
Code Issues Releases Wiki Activity

Merge Allow overrides and preservation of some environment variables in utils make check

Browse Source 
Our ubuntu packaging builds Python-enabled libapparmor's in the directories `libapparmor/libapparmor.python[version_identifier]`. In order for the util's `make check` to pick up on the correct libapparmor during the Ubuntu build process, we need the ability to override its search path. This patch introduces a `LIBAPPARMOR_BASEDIR` variable to allow for that.

Signed-off-by: Ryan Lee <ryan.lee@canonical.com>

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1497
Approved-by: Georgia Garcia <georgia.garcia@canonical.com>
Merged-by: Georgia Garcia <georgia.garcia@canonical.com>


(cherry picked from commit 17a09d2987)

90143494 Allow overrides and preservation of some environment variables in utils make check

Co-authored-by: Georgia Garcia <georgia.garcia@canonical.com>
This commit is contained in:
Georgia Garcia
2025-01-23 19:11:33 +00:00
parent ae60878492
commit e583abc6cc
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
utils/test/Makefile
View File

@@ -21,16 +21,17 @@ COMMONDIR=../../common/
include $(COMMONDIR)/Make.rules include $(COMMONDIR)/Make.rules
ifdef USE_SYSTEM ifdef USE_SYSTEM
LD_LIBRARY_PATH= LD_LIBRARY_PATH?=
PYTHONPATH= PYTHONPATH?=
CONFDIR= CONFDIR=
BASEDIR= BASEDIR=
PARSER= PARSER=
else else
PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) ../../libraries/libapparmor/swig/python/test/buildpath.py) LIBAPPARMOR_BASEDIR?=../../libraries/libapparmor
LIBAPPARMOR_PATH=../../libraries/libapparmor/src/.libs/ PYTHON_DIST_BUILD_PATH ?= $(LIBAPPARMOR_BASEDIR)/swig/python/build/$$($(PYTHON) $(LIBAPPARMOR_BASEDIR)/swig/python/test/buildpath.py)
LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) LIBAPPARMOR_PATH?=$(LIBAPPARMOR_BASEDIR)/src/.libs/
PYTHONPATH=..:$(PYTHON_DIST_BUILD_PATH) LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH)
PYTHONPATH:=$(PYTHONPATH):..:$(PYTHON_DIST_BUILD_PATH)
CONFDIR=$(CURDIR) CONFDIR=$(CURDIR)
BASEDIR=../../profiles/apparmor.d BASEDIR=../../profiles/apparmor.d
PARSER=../../parser/apparmor_parser PARSER=../../parser/apparmor_parser