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

fedora/pipelines/os: minor refactoring

Browse source 
Collect partition tables / boot loaders / kernels together and
make them conditional on the system being bootable.

As a side-effect, we no longer install the grub2 modules in ostree commits.
This commit is contained in:
Tom Gundersen 2022-07-04 23:38:26 +01:00 • committed by Achilleas Koutsou
parent de6c628069
commit ba31887ff2
13 changed files with 26 additions and 481 deletions
Download patch file Download diff file Expand all files Collapse all files

57
internal/distro/fedora/pipelines.go
View file

@ -4,7 +4,6 @@ import (
"math/rand"
"github.com/osbuild/osbuild-composer/internal/blueprint"
"github.com/osbuild/osbuild-composer/internal/disk"
"github.com/osbuild/osbuild-composer/internal/distro"
"github.com/osbuild/osbuild-composer/internal/manifest"
"github.com/osbuild/osbuild-composer/internal/rpmmd"
@ -199,16 +198,6 @@ func osPipeline(m *manifest.Manifest,
imageConfig := t.getDefaultImageConfig()
var pt *disk.PartitionTable
if t.bootable {
// TODO: should there always be a partition table?
var err error
pt, err = t.getPartitionTable(c.GetFilesystems(), options, rng)
if err != nil {
return nil, err
}
}
var arch manifest.Arch
switch t.Arch().Name() {
case distro.X86_64ArchName:
@ -222,7 +211,32 @@ func osPipeline(m *manifest.Manifest,
}
pl := manifest.NewOSPipeline(m, buildPipeline, arch, repos)
pl.PartitionTable = pt
if t.bootable {
var err error
pt, err := t.getPartitionTable(c.GetFilesystems(), options, rng)
if err != nil {
return nil, err
}
pl.PartitionTable = pt
if t.supportsUEFI() {
pl.UEFIVendor = t.arch.distro.vendor
}
pl.BIOSPlatform = t.arch.legacy
pl.KernelName = c.GetKernel().Name
var kernelOptions []string
if t.kernelOptions != "" {
kernelOptions = append(kernelOptions, t.kernelOptions)
}
if bpKernel := c.GetKernel(); bpKernel.Append != "" {
kernelOptions = append(kernelOptions, bpKernel.Append)
}
pl.KernelOptionsAppend = kernelOptions
}
if t.rpmOstree {
var parent *manifest.OSPipelineOSTreeParent
@ -249,25 +263,6 @@ func osPipeline(m *manifest.Manifest,
panic("unexpected number of package sets in os chain")
}
if t.supportsUEFI() {
pl.UEFIVendor = t.arch.distro.vendor
}
pl.BIOSPlatform = t.arch.legacy
if t.bootable {
pl.KernelName = c.GetKernel().Name
}
var kernelOptions []string
if t.kernelOptions != "" {
kernelOptions = append(kernelOptions, t.kernelOptions)
}
if bpKernel := c.GetKernel(); bpKernel.Append != "" {
kernelOptions = append(kernelOptions, bpKernel.Append)
}
pl.KernelOptionsAppend = kernelOptions
pl.GPGKeyFiles = imageConfig.GPGKeyFiles
pl.ExcludeDocs = imageConfig.ExcludeDocs

42
test/data/manifests/fedora_34-x86_64-container-boot.json
View file

@ -1224,22 +1224,6 @@
}
}
},
{
"id": "sha256:d999a3002712972253f264814ccc4cf2b0959a121c3cdd7e10a7c8423f4b6d32",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:7c274d3c094f73d2ee7bebc3b9b854b3303330eac9fa2d1f4461fd7460b34605",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:5a4b0cc50d9929ef558617fecd879f80a459379047ec77bcc238e5b305258bf5",
"options": {
@ -3391,9 +3375,6 @@
"sha256:7b574e38bfd9854f3a4411a73df63c32d65cd0511577461cc2596049501a3725": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/t/tar-1.34-1.fc34.x86_64.rpm"
},
"sha256:7c274d3c094f73d2ee7bebc3b9b854b3303330eac9fa2d1f4461fd7460b34605": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-updates-released-20220113/Packages/g/grub2-pc-modules-2.06-9.fc34.noarch.rpm"
},
"sha256:7d59ff94c9fa323e68c6f9d5b0ccc06075847d77775211f4acbee8f54d8975ae": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/s/sudo-1.9.5p2-1.fc34.x86_64.rpm"
},
@ -3691,9 +3672,6 @@
"sha256:d6762e1d533b1ca2ccc787d7394fd9ddeeb73845cdf55a5d1f93fbc53b716d8e": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/l/libsolv-0.7.17-3.fc34.x86_64.rpm"
},
"sha256:d999a3002712972253f264814ccc4cf2b0959a121c3cdd7e10a7c8423f4b6d32": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-updates-released-20220113/Packages/g/grub2-pc-2.06-9.fc34.x86_64.rpm"
},
"sha256:da676955f475492f17c573bc526d47c37e34919d2a6ed33ec4573a4de0cab2a7": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/l/lz4-libs-1.9.3-2.fc34.x86_64.rpm"
},
@ -5263,26 +5241,6 @@
"checksum": "sha256:9d3e2e24cce87a77671ec717b3c7d9a8aa584768af441c86b0aa7565d6691fdc",
"check_gpg": true
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.06",
"release": "9.fc34",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-updates-released-20220113/Packages/g/grub2-pc-2.06-9.fc34.x86_64.rpm",
"checksum": "sha256:d999a3002712972253f264814ccc4cf2b0959a121c3cdd7e10a7c8423f4b6d32",
"check_gpg": true
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.06",
"release": "9.fc34",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-updates-released-20220113/Packages/g/grub2-pc-modules-2.06-9.fc34.noarch.rpm",
"checksum": "sha256:7c274d3c094f73d2ee7bebc3b9b854b3303330eac9fa2d1f4461fd7460b34605",
"check_gpg": true
},
{
"name": "grub2-tools",
"epoch": 1,

36
test/data/manifests/fedora_34-x86_64-fedora_iot_commit-boot.json
View file

@ -1248,22 +1248,6 @@
}
}
},
{
"id": "sha256:d999a3002712972253f264814ccc4cf2b0959a121c3cdd7e10a7c8423f4b6d32",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:7c274d3c094f73d2ee7bebc3b9b854b3303330eac9fa2d1f4461fd7460b34605",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:5a4b0cc50d9929ef558617fecd879f80a459379047ec77bcc238e5b305258bf5",
"options": {
@ -8455,26 +8439,6 @@
"checksum": "sha256:9d3e2e24cce87a77671ec717b3c7d9a8aa584768af441c86b0aa7565d6691fdc",
"check_gpg": true
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.06",
"release": "9.fc34",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-updates-released-20220113/Packages/g/grub2-pc-2.06-9.fc34.x86_64.rpm",
"checksum": "sha256:d999a3002712972253f264814ccc4cf2b0959a121c3cdd7e10a7c8423f4b6d32",
"check_gpg": true
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.06",
"release": "9.fc34",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-updates-released-20220113/Packages/g/grub2-pc-modules-2.06-9.fc34.noarch.rpm",
"checksum": "sha256:7c274d3c094f73d2ee7bebc3b9b854b3303330eac9fa2d1f4461fd7460b34605",
"check_gpg": true
},
{
"name": "grub2-tools",
"epoch": 1,

36
test/data/manifests/fedora_34-x86_64-fedora_iot_commit_debug-boot.json
View file

@ -1254,22 +1254,6 @@
}
}
},
{
"id": "sha256:d999a3002712972253f264814ccc4cf2b0959a121c3cdd7e10a7c8423f4b6d32",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:7c274d3c094f73d2ee7bebc3b9b854b3303330eac9fa2d1f4461fd7460b34605",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:5a4b0cc50d9929ef558617fecd879f80a459379047ec77bcc238e5b305258bf5",
"options": {
@ -8461,26 +8445,6 @@
"checksum": "sha256:9d3e2e24cce87a77671ec717b3c7d9a8aa584768af441c86b0aa7565d6691fdc",
"check_gpg": true
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.06",
"release": "9.fc34",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-updates-released-20220113/Packages/g/grub2-pc-2.06-9.fc34.x86_64.rpm",
"checksum": "sha256:d999a3002712972253f264814ccc4cf2b0959a121c3cdd7e10a7c8423f4b6d32",
"check_gpg": true
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.06",
"release": "9.fc34",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-updates-released-20220113/Packages/g/grub2-pc-modules-2.06-9.fc34.noarch.rpm",
"checksum": "sha256:7c274d3c094f73d2ee7bebc3b9b854b3303330eac9fa2d1f4461fd7460b34605",
"check_gpg": true
},
{
"name": "grub2-tools",
"epoch": 1,

36
test/data/manifests/fedora_34-x86_64-fedora_iot_container-boot.json
View file

@ -1248,22 +1248,6 @@
}
}
},
{
"id": "sha256:d999a3002712972253f264814ccc4cf2b0959a121c3cdd7e10a7c8423f4b6d32",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:7c274d3c094f73d2ee7bebc3b9b854b3303330eac9fa2d1f4461fd7460b34605",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:5a4b0cc50d9929ef558617fecd879f80a459379047ec77bcc238e5b305258bf5",
"options": {
@ -10019,26 +10003,6 @@
"checksum": "sha256:9d3e2e24cce87a77671ec717b3c7d9a8aa584768af441c86b0aa7565d6691fdc",
"check_gpg": true
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.06",
"release": "9.fc34",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-updates-released-20220113/Packages/g/grub2-pc-2.06-9.fc34.x86_64.rpm",
"checksum": "sha256:d999a3002712972253f264814ccc4cf2b0959a121c3cdd7e10a7c8423f4b6d32",
"check_gpg": true
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.06",
"release": "9.fc34",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-updates-released-20220113/Packages/g/grub2-pc-modules-2.06-9.fc34.noarch.rpm",
"checksum": "sha256:7c274d3c094f73d2ee7bebc3b9b854b3303330eac9fa2d1f4461fd7460b34605",
"check_gpg": true
},
{
"name": "grub2-tools",
"epoch": 1,

42
test/data/manifests/fedora_35-x86_64-container-boot.json
View file

@ -1512,22 +1512,6 @@
}
}
},
{
"id": "sha256:bd422838b08aee333b919798924814148118cd1d2ec7051a3d01f0161eec4184",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:59525eff25d7e8c661f3d2a5308d431234cbd5e4a70c4150c3a71639d0e0e136",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:94104f196a74be27358ac696a3f6063d45f7c33df2785a42454b988141760564",
"options": {
@ -3366,9 +3350,6 @@
"sha256:52598fdd27be8d3ca7587b81ce86f03d1f17c66c0c8fd81ca3274cb7712a400e": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-fedora-20220106/Packages/d/diffutils-3.8-1.fc35.x86_64.rpm"
},
"sha256:59525eff25d7e8c661f3d2a5308d431234cbd5e4a70c4150c3a71639d0e0e136": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-updates-released-20220113/Packages/g/grub2-pc-modules-2.06-10.fc35.noarch.rpm"
},
"sha256:59d8bf9aefb00d5ec8317c30561e05b9bd50d946ad3c9d5beaa4ec7c7d9a478d": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-fedora-20220106/Packages/l/libverto-0.3.2-2.fc35.x86_64.rpm"
},
@ -3627,9 +3608,6 @@
"sha256:bcc4edb810df0371fa4a1ca69b143386542505009eff4a1a0a806d13093e5c9d": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-fedora-20220106/Packages/s/sqlite-libs-3.36.0-3.fc35.x86_64.rpm"
},
"sha256:bd422838b08aee333b919798924814148118cd1d2ec7051a3d01f0161eec4184": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-updates-released-20220113/Packages/g/grub2-pc-2.06-10.fc35.x86_64.rpm"
},
"sha256:bdd8ac8d916149edaaa5790d444e9b18f9679854e06add58f3693e5500adbb56": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-fedora-20220106/Packages/d/dnf-4.9.0-1.fc35.noarch.rpm"
},
@ -5649,26 +5627,6 @@
"checksum": "sha256:2a3580b96d36668085e21a9d6e11cc2a7d254bfba9855c66fbfc663ea1f211c8",
"check_gpg": true
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.06",
"release": "10.fc35",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-updates-released-20220113/Packages/g/grub2-pc-2.06-10.fc35.x86_64.rpm",
"checksum": "sha256:bd422838b08aee333b919798924814148118cd1d2ec7051a3d01f0161eec4184",
"check_gpg": true
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.06",
"release": "10.fc35",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-updates-released-20220113/Packages/g/grub2-pc-modules-2.06-10.fc35.noarch.rpm",
"checksum": "sha256:59525eff25d7e8c661f3d2a5308d431234cbd5e4a70c4150c3a71639d0e0e136",
"check_gpg": true
},
{
"name": "grub2-tools",
"epoch": 1,

36
test/data/manifests/fedora_35-x86_64-fedora_iot_commit-boot.json
View file

@ -1544,22 +1544,6 @@
}
}
},
{
"id": "sha256:bd422838b08aee333b919798924814148118cd1d2ec7051a3d01f0161eec4184",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:59525eff25d7e8c661f3d2a5308d431234cbd5e4a70c4150c3a71639d0e0e136",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:94104f196a74be27358ac696a3f6063d45f7c33df2785a42454b988141760564",
"options": {
@ -8846,26 +8830,6 @@
"checksum": "sha256:2a3580b96d36668085e21a9d6e11cc2a7d254bfba9855c66fbfc663ea1f211c8",
"check_gpg": true
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.06",
"release": "10.fc35",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-updates-released-20220113/Packages/g/grub2-pc-2.06-10.fc35.x86_64.rpm",
"checksum": "sha256:bd422838b08aee333b919798924814148118cd1d2ec7051a3d01f0161eec4184",
"check_gpg": true
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.06",
"release": "10.fc35",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-updates-released-20220113/Packages/g/grub2-pc-modules-2.06-10.fc35.noarch.rpm",
"checksum": "sha256:59525eff25d7e8c661f3d2a5308d431234cbd5e4a70c4150c3a71639d0e0e136",
"check_gpg": true
},
{
"name": "grub2-tools",
"epoch": 1,

36
test/data/manifests/fedora_35-x86_64-fedora_iot_commit_debug-boot.json
View file

@ -1550,22 +1550,6 @@
}
}
},
{
"id": "sha256:bd422838b08aee333b919798924814148118cd1d2ec7051a3d01f0161eec4184",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:59525eff25d7e8c661f3d2a5308d431234cbd5e4a70c4150c3a71639d0e0e136",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:94104f196a74be27358ac696a3f6063d45f7c33df2785a42454b988141760564",
"options": {
@ -8852,26 +8836,6 @@
"checksum": "sha256:2a3580b96d36668085e21a9d6e11cc2a7d254bfba9855c66fbfc663ea1f211c8",
"check_gpg": true
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.06",
"release": "10.fc35",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-updates-released-20220113/Packages/g/grub2-pc-2.06-10.fc35.x86_64.rpm",
"checksum": "sha256:bd422838b08aee333b919798924814148118cd1d2ec7051a3d01f0161eec4184",
"check_gpg": true
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.06",
"release": "10.fc35",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-updates-released-20220113/Packages/g/grub2-pc-modules-2.06-10.fc35.noarch.rpm",
"checksum": "sha256:59525eff25d7e8c661f3d2a5308d431234cbd5e4a70c4150c3a71639d0e0e136",
"check_gpg": true
},
{
"name": "grub2-tools",
"epoch": 1,

36
test/data/manifests/fedora_35-x86_64-fedora_iot_container-boot.json
View file

@ -1544,22 +1544,6 @@
}
}
},
{
"id": "sha256:bd422838b08aee333b919798924814148118cd1d2ec7051a3d01f0161eec4184",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:59525eff25d7e8c661f3d2a5308d431234cbd5e4a70c4150c3a71639d0e0e136",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:94104f196a74be27358ac696a3f6063d45f7c33df2785a42454b988141760564",
"options": {
@ -10383,26 +10367,6 @@
"checksum": "sha256:2a3580b96d36668085e21a9d6e11cc2a7d254bfba9855c66fbfc663ea1f211c8",
"check_gpg": true
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.06",
"release": "10.fc35",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-updates-released-20220113/Packages/g/grub2-pc-2.06-10.fc35.x86_64.rpm",
"checksum": "sha256:bd422838b08aee333b919798924814148118cd1d2ec7051a3d01f0161eec4184",
"check_gpg": true
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.06",
"release": "10.fc35",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-updates-released-20220113/Packages/g/grub2-pc-modules-2.06-10.fc35.noarch.rpm",
"checksum": "sha256:59525eff25d7e8c661f3d2a5308d431234cbd5e4a70c4150c3a71639d0e0e136",
"check_gpg": true
},
{
"name": "grub2-tools",
"epoch": 1,

42
test/data/manifests/fedora_36-x86_64-container-boot.json
View file

@ -554,22 +554,6 @@
}
}
},
{
"id": "sha256:45d7bed87c83512634879d2519527be7c5184c2d516d146654abeb7d4907c09c",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:f30f4de190e9762199192165577e250d6a1b8936fdd99a7a14646c4154ece10f",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:ca6570e80b38f61221d622cab52390fa65a1fe9abfb402cc4ce4990a83f8d0f3",
"options": {
@ -3358,9 +3342,6 @@
"sha256:44b8073e409d9b3d681fb39183db23496a0825503987de3db78a57be4b551e16": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/d/dnf-4.11.1-1.fc37.noarch.rpm"
},
"sha256:45d7bed87c83512634879d2519527be7c5184c2d516d146654abeb7d4907c09c": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/g/grub2-pc-2.06-28.fc37.x86_64.rpm"
},
"sha256:4771a6fe8a310ca1cc93c10030909c526423d114dc5cc74c0332282d3f4ab914": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/p/python-unversioned-command-3.10.3-1.fc37.noarch.rpm"
},
@ -3835,9 +3816,6 @@
"sha256:f2ba36563c305ae503625074dc41e6bac19b91846597db7e2d113e30b321800f": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/l/libffi-3.4.2-8.fc36.x86_64.rpm"
},
"sha256:f30f4de190e9762199192165577e250d6a1b8936fdd99a7a14646c4154ece10f": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/g/grub2-pc-modules-2.06-28.fc37.noarch.rpm"
},
"sha256:f3550aa734404646dc0d050bbe645960113ac7696f35a99cfcf4d6924a350af0": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/s/systemd-resolved-250.4-2.fc37.x86_64.rpm"
},
@ -4524,26 +4502,6 @@
"checksum": "sha256:5bb35ae3935a110f929aacbe0e1b8c2176072fb9260a1bc1881a4ce8c578cb2e",
"check_gpg": true
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.06",
"release": "28.fc37",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/g/grub2-pc-2.06-28.fc37.x86_64.rpm",
"checksum": "sha256:45d7bed87c83512634879d2519527be7c5184c2d516d146654abeb7d4907c09c",
"check_gpg": true
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.06",
"release": "28.fc37",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/g/grub2-pc-modules-2.06-28.fc37.noarch.rpm",
"checksum": "sha256:f30f4de190e9762199192165577e250d6a1b8936fdd99a7a14646c4154ece10f",
"check_gpg": true
},
{
"name": "grub2-tools",
"epoch": 1,

36
test/data/manifests/fedora_36-x86_64-fedora_iot_commit-boot.json
View file

@ -642,22 +642,6 @@
}
}
},
{
"id": "sha256:45d7bed87c83512634879d2519527be7c5184c2d516d146654abeb7d4907c09c",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:f30f4de190e9762199192165577e250d6a1b8936fdd99a7a14646c4154ece10f",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:ca6570e80b38f61221d622cab52390fa65a1fe9abfb402cc4ce4990a83f8d0f3",
"options": {
@ -7931,26 +7915,6 @@
"checksum": "sha256:5bb35ae3935a110f929aacbe0e1b8c2176072fb9260a1bc1881a4ce8c578cb2e",
"check_gpg": true
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.06",
"release": "28.fc37",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/g/grub2-pc-2.06-28.fc37.x86_64.rpm",
"checksum": "sha256:45d7bed87c83512634879d2519527be7c5184c2d516d146654abeb7d4907c09c",
"check_gpg": true
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.06",
"release": "28.fc37",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/g/grub2-pc-modules-2.06-28.fc37.noarch.rpm",
"checksum": "sha256:f30f4de190e9762199192165577e250d6a1b8936fdd99a7a14646c4154ece10f",
"check_gpg": true
},
{
"name": "grub2-tools",
"epoch": 1,

36
test/data/manifests/fedora_36-x86_64-fedora_iot_commit_debug-boot.json
View file

@ -648,22 +648,6 @@
}
}
},
{
"id": "sha256:45d7bed87c83512634879d2519527be7c5184c2d516d146654abeb7d4907c09c",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:f30f4de190e9762199192165577e250d6a1b8936fdd99a7a14646c4154ece10f",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:ca6570e80b38f61221d622cab52390fa65a1fe9abfb402cc4ce4990a83f8d0f3",
"options": {
@ -7937,26 +7921,6 @@
"checksum": "sha256:5bb35ae3935a110f929aacbe0e1b8c2176072fb9260a1bc1881a4ce8c578cb2e",
"check_gpg": true
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.06",
"release": "28.fc37",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/g/grub2-pc-2.06-28.fc37.x86_64.rpm",
"checksum": "sha256:45d7bed87c83512634879d2519527be7c5184c2d516d146654abeb7d4907c09c",
"check_gpg": true
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.06",
"release": "28.fc37",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/g/grub2-pc-modules-2.06-28.fc37.noarch.rpm",
"checksum": "sha256:f30f4de190e9762199192165577e250d6a1b8936fdd99a7a14646c4154ece10f",
"check_gpg": true
},
{
"name": "grub2-tools",
"epoch": 1,

36
test/data/manifests/fedora_36-x86_64-fedora_iot_container-boot.json
View file

@ -642,22 +642,6 @@
}
}
},
{
"id": "sha256:45d7bed87c83512634879d2519527be7c5184c2d516d146654abeb7d4907c09c",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:f30f4de190e9762199192165577e250d6a1b8936fdd99a7a14646c4154ece10f",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:ca6570e80b38f61221d622cab52390fa65a1fe9abfb402cc4ce4990a83f8d0f3",
"options": {
@ -9466,26 +9450,6 @@
"checksum": "sha256:5bb35ae3935a110f929aacbe0e1b8c2176072fb9260a1bc1881a4ce8c578cb2e",
"check_gpg": true
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.06",
"release": "28.fc37",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/g/grub2-pc-2.06-28.fc37.x86_64.rpm",
"checksum": "sha256:45d7bed87c83512634879d2519527be7c5184c2d516d146654abeb7d4907c09c",
"check_gpg": true
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.06",
"release": "28.fc37",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/g/grub2-pc-modules-2.06-28.fc37.noarch.rpm",
"checksum": "sha256:f30f4de190e9762199192165577e250d6a1b8936fdd99a7a14646c4154ece10f",
"check_gpg": true
},
{
"name": "grub2-tools",
"epoch": 1,