particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osbuild: unified libdir handling

Browse source 
Change the default of libdir to /usr/lib/osbuild and
remove redundant logic. Additionally, change how the
python package is detected.

Instead of checking if libdir is None, check if
/usr/lib/osbuild is empty - i.e. if the user has specified
a different directory than the default.
This commit is contained in:
chloenayon 2020-07-31 12:57:37 +02:00 • committed by David Rheinsberg
parent f92a00b891
commit 1e3c0aea1b
4 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
osbuild/buildroot.py
View file

@ -33,7 +33,7 @@ class BuildRoot(contextlib.AbstractContextManager):
only when exiting the context manager.
"""
def __init__(self, root, runner, path="/run/osbuild", libdir=None, var="/var/tmp"):
def __init__(self, root, runner, libdir, path="/run/osbuild", var="/var/tmp"):
self._exitstack = None
self._rootdir = root
self._rundir = path
@ -154,13 +154,11 @@ class BuildRoot(contextlib.AbstractContextManager):
# We execute our own modules by bind-mounting them from the host into
# the build-root. We have minimal requirements on the build-root, so
# these modules can be executed. Everything else we provide ourselves.
# In case you pass `--libdir`, it must be self-contained and we provide
# nothing else. If you use the system libdir, we additionally look for
# In case `libdir` contains the python module, it must be self-contained
# and we provide nothing else. Otherwise, we additionally look for
# the installed `osbuild` module and bind-mount it as well.
if self._libdir is not None:
mounts += ["--ro-bind", f"{self._libdir}", "/run/osbuild/lib"]
else:
mounts += ["--ro-bind", "/usr/lib/osbuild", "/run/osbuild/lib"]
mounts += ["--ro-bind", f"{self._libdir}", "/run/osbuild/lib"]
if not os.listdir(os.path.join(self._libdir, "osbuild")):
modorigin = importlib.util.find_spec("osbuild").origin
modpath = os.path.dirname(modorigin)
mounts += ["--ro-bind", f"{modpath}", "/run/osbuild/lib/osbuild"]