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

stages/dnf: don't name the repositories

Browse source 
The names carry no information, and do not affect the produced image.
Generate them instead.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2019-09-29 16:10:27 +02:00 • committed by Lars Karlitski
parent 4ba125e393
commit 840bfd580c
9 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -19,13 +19,13 @@ assembles it into an image. Pipelines are defined as JSON files like this one:
"options": { "options": {
"releasever": "30", "releasever": "30",
"basearch": "x86_64", "basearch": "x86_64",
"repos": { "repos": [
"fedora": { {
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch", "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch",
"gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9", "gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9",
"checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97" "checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97"
} }
}, ],
"packages": [ "@Core", "grub2-pc", "httpd" ] "packages": [ "@Core", "grub2-pc", "httpd" ]
} }
}, },

6
samples/base-from-yum.json
View file

@ -27,13 +27,13 @@
"options": { "options": {
"releasever": "30", "releasever": "30",
"basearch": "x86_64", "basearch": "x86_64",
"repos": { "repos": [
"fedora": { {
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch", "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch",
"gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9", "gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9",
"checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97" "checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97"
} }
}, ],
"packages": [ "packages": [
"@Core", "@Core",
"selinux-policy-targeted", "selinux-policy-targeted",

6
samples/base-qcow2.json
View file

@ -6,13 +6,13 @@
"releasever": "30", "releasever": "30",
"basearch": "x86_64", "basearch": "x86_64",
"install_weak_deps": true, "install_weak_deps": true,
"repos": { "repos": [
"fedora": { {
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch", "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch",
"gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9", "gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9",
"checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97" "checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97"
} }
}, ],
"packages": [ "packages": [
"@Core", "@Core",
"chrony", "chrony",

6
samples/base.json
View file

@ -5,13 +5,13 @@
"options": { "options": {
"releasever": "30", "releasever": "30",
"basearch": "x86_64", "basearch": "x86_64",
"repos": { "repos": [
"fedora": { {
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch", "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch",
"gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9", "gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9",
"checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97" "checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97"
} }
}, ],
"packages": [ "packages": [
"@Core", "@Core",
"selinux-policy-targeted", "selinux-policy-targeted",

8
stages/org.osbuild.dnf
View file

@ -62,8 +62,8 @@ def main(tree, options):
weak_deps = options.get("install_weak_deps", True) weak_deps = options.get("install_weak_deps", True)
with open("/tmp/dnf.conf", "w") as conf: with open("/tmp/dnf.conf", "w") as conf:
for repoid, repo in repos.items(): for repoid, repo in enumerate(repos):
write_repofile(conf, repoid, repo) write_repofile(conf, f"repo{repoid}", repo)
script = f""" script = f"""
set -e set -e
@ -105,10 +105,10 @@ def main(tree, options):
subprocess.run(cmd, check=True) subprocess.run(cmd, check=True)
# verify metadata checksum # verify metadata checksum
for repoid, repo in repos.items(): for repoid, repo in enumerate(repos):
algorithm, checksum = repo["checksum"].split(":") algorithm, checksum = repo["checksum"].split(":")
assert algorithm == "sha256" assert algorithm == "sha256"
cachedir = dnf_cachedir(repoid, repo, releasever, basearch) cachedir = dnf_cachedir(f"repo{repoid}", repo, releasever, basearch)
with open(f"{tree}/var/cache/dnf/{cachedir}/repodata/repomd.xml", "rb") as f: with open(f"{tree}/var/cache/dnf/{cachedir}/repodata/repomd.xml", "rb") as f:
repomd = f.read() repomd = f.read()
assert hashlib.sha256(repomd).hexdigest() == checksum assert hashlib.sha256(repomd).hexdigest() == checksum

12
test/pipelines/f30-boot.json
View file

@ -7,13 +7,13 @@
"releasever": "30", "releasever": "30",
"basearch": "x86_64", "basearch": "x86_64",
"install_weak_deps": false, "install_weak_deps": false,
"repos": { "repos": [
"fedora": { {
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch", "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch",
"gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9", "gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9",
"checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97" "checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97"
} }
}, ],
"packages": [ "packages": [
"dnf", "dnf",
"e2fsprogs", "e2fsprogs",
@ -32,13 +32,13 @@
"releasever": "30", "releasever": "30",
"basearch": "x86_64", "basearch": "x86_64",
"install_weak_deps": true, "install_weak_deps": true,
"repos": { "repos": [
"fedora": { {
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch", "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch",
"gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9", "gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9",
"checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97" "checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97"
} }
}, ],
"packages": [ "packages": [
"@Core", "@Core",
"chrony", "chrony",

6
test/pipelines/firewall.json
View file

@ -5,13 +5,13 @@
"options": { "options": {
"releasever": "30", "releasever": "30",
"basearch": "x86_64", "basearch": "x86_64",
"repos": { "repos": [
"fedora": { {
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch", "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch",
"gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9", "gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9",
"checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97" "checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97"
} }
}, ],
"packages": ["@Core", "firewalld"] "packages": ["@Core", "firewalld"]
} }
}, },

6
test/pipelines/locale.json
View file

@ -5,13 +5,13 @@
"options": { "options": {
"releasever": "30", "releasever": "30",
"basearch": "x86_64", "basearch": "x86_64",
"repos": { "repos": [
"fedora": { {
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch", "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch",
"gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9", "gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9",
"checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97" "checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97"
} }
}, ],
"packages": ["@Core"] "packages": ["@Core"]
} }
}, },

6
test/pipelines/timezone.json
View file

@ -5,13 +5,13 @@
"options": { "options": {
"releasever": "30", "releasever": "30",
"basearch": "x86_64", "basearch": "x86_64",
"repos": { "repos": [
"fedora": { {
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch", "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch",
"gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9", "gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9",
"checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97" "checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97"
} }
}, ],
"packages": ["@Core"] "packages": ["@Core"]
} }
}, },