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

osbuild: remove systemResourcesFromEtc

Browse source 
It is a kludge that doesn't fit into osbuild's model. It's also not
necessary for any hacks anymore.
This commit is contained in:
Lars Karlitski 2019-07-19 02:19:24 +02:00 • committed by Tom Gundersen
parent 00f4e6ed8b
commit 1e92e56b49
1 changed files with 9 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

31
osbuild/__init__.py
View file

@ -150,27 +150,16 @@ def print_header(title, options):
print() print()
def _get_system_resources_from_etc(resources):
for r in resources:
if not r.startswith("/etc"):
raise ValueError(f"{r} is not a resource in /etc/")
if ":" in r:
raise ValueError(f"{r} tries to bind to a different location")
return resources
class Stage: class Stage:
def __init__(self, name, base, options, resources): def __init__(self, name, base, options):
m = hashlib.sha256() m = hashlib.sha256()
m.update(json.dumps(name, sort_keys=True).encode()) m.update(json.dumps(name, sort_keys=True).encode())
m.update(json.dumps(base, sort_keys=True).encode()) m.update(json.dumps(base, sort_keys=True).encode())
m.update(json.dumps(options, sort_keys=True).encode()) m.update(json.dumps(options, sort_keys=True).encode())
m.update(json.dumps(resources, sort_keys=True).encode())
self.id = m.hexdigest() self.id = m.hexdigest()
self.name = name self.name = name
self.options = options self.options = options
self.resources = resources
def run(self, tree, interactive=False, check=True): def run(self, tree, interactive=False, check=True):
with BuildRoot() as buildroot: with BuildRoot() as buildroot:
@ -185,7 +174,6 @@ class Stage:
r = buildroot.run( r = buildroot.run(
[f"{libdir}/stages/{self.name}"], [f"{libdir}/stages/{self.name}"],
binds=[f"{tree}:/run/osbuild/tree"], binds=[f"{tree}:/run/osbuild/tree"],
readonly_binds=_get_system_resources_from_etc(self.resources),
encoding="utf-8", encoding="utf-8",
input=json.dumps(args), input=json.dumps(args),
stdout=None if interactive else subprocess.PIPE, stdout=None if interactive else subprocess.PIPE,
@ -202,10 +190,9 @@ class Stage:
class Assembler: class Assembler:
def __init__(self, name, options, resources): def __init__(self, name, options):
self.name = name self.name = name
self.options = options self.options = options
self.resources = resources
def run(self, tree, output_dir=None, interactive=False, check=True): def run(self, tree, output_dir=None, interactive=False, check=True):
with BuildRoot() as buildroot: with BuildRoot() as buildroot:
@ -228,7 +215,7 @@ class Assembler:
r = buildroot.run( r = buildroot.run(
[f"{libdir}/assemblers/{self.name}"], [f"{libdir}/assemblers/{self.name}"],
binds=binds, binds=binds,
readonly_binds=[f"{tree}:/run/osbuild/tree"] + _get_system_resources_from_etc(self.resources), readonly_binds=[f"{tree}:/run/osbuild/tree"],
encoding="utf-8", encoding="utf-8",
input=json.dumps(args), input=json.dumps(args),
stdout=None if interactive else subprocess.PIPE, stdout=None if interactive else subprocess.PIPE,
@ -249,13 +236,13 @@ class Pipeline:
self.stages = [] self.stages = []
self.assembler = None self.assembler = None
def add_stage(self, name, options=None, resources=None): def add_stage(self, name, options=None):
base = self.stages[-1].id if self.stages else self.base base = self.stages[-1].id if self.stages else self.base
stage = Stage(name, base, options or {}, resources or []) stage = Stage(name, base, options or {})
self.stages.append(stage) self.stages.append(stage)
def set_assembler(self, name, options=None, resources=None): def set_assembler(self, name, options=None):
self.assembler = Assembler(name, options or {}, resources or []) self.assembler = Assembler(name, options or {})
def run(self, output_dir, objects=None, interactive=False, check=True): def run(self, output_dir, objects=None, interactive=False, check=True):
os.makedirs("/run/osbuild", exist_ok=True) os.makedirs("/run/osbuild", exist_ok=True)
@ -300,10 +287,10 @@ def load(description):
pipeline = Pipeline(description.get("base")) pipeline = Pipeline(description.get("base"))
for s in description.get("stages", []): for s in description.get("stages", []):
pipeline.add_stage(s["name"], s.get("options", {}), s.get("systemResourcesFromEtc", [])) pipeline.add_stage(s["name"], s.get("options", {}))
a = description.get("assembler") a = description.get("assembler")
if a: if a:
pipeline.set_assembler(a["name"], a.get("options", {}), a.get("systemResourcesFromEtc", [])) pipeline.set_assembler(a["name"], a.get("options", {}))
return pipeline return pipeline