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

distro/fedora: install kernel and bootloader in ostree commits

Browse source 
This is a partial revert of 006c5b26, where kernel settings and bootloaders were only
installed on bootable systems.

However, ostree-based systems need the ability to pick up kernels and bootloaders from
the commit to install on the instance, so make this conditional on being bootable or an
ostree commit. This is probably an indication that we need a different abstraction.
This commit is contained in:
Tom Gundersen 2022-07-05 12:59:48 +01:00
parent a45caf5756
commit 03fc2d5bfd
10 changed files with 326 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1248,6 +1248,22 @@
}
}
},
{
"id": "sha256:d999a3002712972253f264814ccc4cf2b0959a121c3cdd7e10a7c8423f4b6d32",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:7c274d3c094f73d2ee7bebc3b9b854b3303330eac9fa2d1f4461fd7460b34605",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:5a4b0cc50d9929ef558617fecd879f80a459379047ec77bcc238e5b305258bf5",
"options": {
@ -8439,6 +8455,26 @@
"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,6 +1254,22 @@
}
}
},
{
"id": "sha256:d999a3002712972253f264814ccc4cf2b0959a121c3cdd7e10a7c8423f4b6d32",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:7c274d3c094f73d2ee7bebc3b9b854b3303330eac9fa2d1f4461fd7460b34605",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:5a4b0cc50d9929ef558617fecd879f80a459379047ec77bcc238e5b305258bf5",
"options": {
@ -8445,6 +8461,26 @@
"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,6 +1248,22 @@
}
}
},
{
"id": "sha256:d999a3002712972253f264814ccc4cf2b0959a121c3cdd7e10a7c8423f4b6d32",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:7c274d3c094f73d2ee7bebc3b9b854b3303330eac9fa2d1f4461fd7460b34605",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:5a4b0cc50d9929ef558617fecd879f80a459379047ec77bcc238e5b305258bf5",
"options": {
@ -10003,6 +10019,26 @@
"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_35-x86_64-fedora_iot_commit-boot.json
View file

@ -1544,6 +1544,22 @@
}
}
},
{
"id": "sha256:bd422838b08aee333b919798924814148118cd1d2ec7051a3d01f0161eec4184",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:59525eff25d7e8c661f3d2a5308d431234cbd5e4a70c4150c3a71639d0e0e136",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:94104f196a74be27358ac696a3f6063d45f7c33df2785a42454b988141760564",
"options": {
@ -8830,6 +8846,26 @@
"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,6 +1550,22 @@
}
}
},
{
"id": "sha256:bd422838b08aee333b919798924814148118cd1d2ec7051a3d01f0161eec4184",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:59525eff25d7e8c661f3d2a5308d431234cbd5e4a70c4150c3a71639d0e0e136",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:94104f196a74be27358ac696a3f6063d45f7c33df2785a42454b988141760564",
"options": {
@ -8836,6 +8852,26 @@
"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,6 +1544,22 @@
}
}
},
{
"id": "sha256:bd422838b08aee333b919798924814148118cd1d2ec7051a3d01f0161eec4184",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:59525eff25d7e8c661f3d2a5308d431234cbd5e4a70c4150c3a71639d0e0e136",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:94104f196a74be27358ac696a3f6063d45f7c33df2785a42454b988141760564",
"options": {
@ -10367,6 +10383,26 @@
"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_36-x86_64-fedora_iot_commit-boot.json
View file

@ -642,6 +642,22 @@
}
}
},
{
"id": "sha256:45d7bed87c83512634879d2519527be7c5184c2d516d146654abeb7d4907c09c",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:f30f4de190e9762199192165577e250d6a1b8936fdd99a7a14646c4154ece10f",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:ca6570e80b38f61221d622cab52390fa65a1fe9abfb402cc4ce4990a83f8d0f3",
"options": {
@ -7915,6 +7931,26 @@
"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,6 +648,22 @@
}
}
},
{
"id": "sha256:45d7bed87c83512634879d2519527be7c5184c2d516d146654abeb7d4907c09c",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:f30f4de190e9762199192165577e250d6a1b8936fdd99a7a14646c4154ece10f",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:ca6570e80b38f61221d622cab52390fa65a1fe9abfb402cc4ce4990a83f8d0f3",
"options": {
@ -7921,6 +7937,26 @@
"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,6 +642,22 @@
}
}
},
{
"id": "sha256:45d7bed87c83512634879d2519527be7c5184c2d516d146654abeb7d4907c09c",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:f30f4de190e9762199192165577e250d6a1b8936fdd99a7a14646c4154ece10f",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:ca6570e80b38f61221d622cab52390fa65a1fe9abfb402cc4ce4990a83f8d0f3",
"options": {
@ -9450,6 +9466,26 @@
"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,