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

tools/mpp: properly support substitutions

Browse source 
Previous versions of mpp would already set the arch and basearch
substitution, which would work for dep-solving itself, but not
properly re-write the resulting URLs which means that the manifest
was broken. Fix this by properly replacing the substitutions in
the URL. Also support official 'releasever' substitution.
This commit is contained in:
Christian Kellner 2021-07-05 15:06:17 +00:00
parent 7c9035e48a
commit 1dc845f331
2 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
tools/osbuild-mpp
View file

@ -126,6 +126,7 @@ import argparse
import contextlib
import json
import os
import string
import sys
import pathlib
import tempfile
@ -200,13 +201,15 @@ class DepSolver:
self.base = base
self.basedir = basedir
def setup(self, arch, module_platform_id, ignore_weak_deps):
def set_substitutions(self, arch, releasever):
base = self.base
base.conf.module_platform_id = module_platform_id
base.conf.substitutions['arch'] = arch
base.conf.substitutions['basearch'] = dnf.rpm.basearch(arch)
base.conf.install_weak_deps = not ignore_weak_deps
if arch:
base.conf.substitutions['arch'] = arch
base.conf.substitutions['basearch'] = dnf.rpm.basearch(arch)
if releasever:
base.conf.substitutions['releasever'] = releasever
def expand_baseurl(self, baseurl):
"""Expand non-uris as paths relative to basedir into a file:/// uri"""
@ -218,6 +221,7 @@ class DepSolver:
return path.as_uri()
except: # pylint: disable=bare-except
pass
return baseurl
def get_secrets(self, url, desc):
@ -301,7 +305,8 @@ class DepSolver:
path = tsi.pkg.relativepath
reponame = tsi.pkg.reponame
baseurl = self.base.repos[reponame].baseurl[0] # self.expand_baseurl(baseurls[reponame])
baseurl = string.Template(self.base.repos[reponame].baseurl[0])
baseurl = baseurl.substitute(self.base.conf.substitutions)
# dep["path"] often starts with a "/", even though it's meant to be
# relative to `baseurl`. Strip any leading slashes, but ensure there's
# exactly one between `baseurl` and the path.
@ -386,6 +391,11 @@ class ManifestFile:
solver.reset(self.basedir, module_platform_id, ignore_weak_deps)
arch = desc["architecture"]
releasever = desc.get("releasever")
solver.set_substitutions(arch, releasever)
for repo in repos:
solver.add_repo(repo, baseurl)