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

Use the new formating features to simplify the test manifests

Browse source 
This uses size computations to simplify the partition size/offsets
and the depsolv results to get the kernel version.

This makes no changes to the resulting json files.
This commit is contained in:
Alexander Larsson 2021-07-01 10:54:38 +02:00 • committed by Christian Kellner
parent bdfef651eb
commit e4eb3e0fd0
3 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/data/manifests/fedora-boot.mpp.json
View file

@ -70,7 +70,7 @@
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernel_opts": "ro biosdevname=0 net.ifnames=0",
"legacy": "i386-pc",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.11.12-300.fc34.x86_64"
"saved_entry": {"mpp-format-string": "ffffffffffffffffffffffffffffffff-{rpms['stages']['kernel-core'][12:-4]}" }
}
},
{

4
test/data/manifests/fedora-ostree-bootiso.mpp.json
View file

@ -341,7 +341,7 @@
"type": "org.osbuild.dracut",
"options": {
"kernel": [
"5.11.12-300.fc34.x86_64"
{"mpp-format-string": "{rpms['ostree-tree']['kernel'][7:-4]}" }
],
"add_modules": [
"anaconda",
@ -455,7 +455,7 @@
"version": "34"
},
"isolabel": "Fedora-34-X86_64",
"kernel": "5.11.12-300.fc34.x86_64",
"kernel": {"mpp-format-string": "{rpms['ostree-tree']['kernel'][7:-4]}" },
"efi": {
"architectures": [
"IA32",

37
test/data/manifests/fedora-ostree-image.mpp.json
View file

@ -1,5 +1,10 @@
{
"version": "2",
"mpp-vars": {
"efi_size": 204800,
"boot_size": 204800,
"root_size": 20557791
},
"pipelines": [
{
"mpp-import-pipeline": {
@ -166,7 +171,7 @@
"type": "org.osbuild.truncate",
"options": {
"filename": "disk.img",
"size": "10737418240"
"size": {"mpp-format-string": "{(4096 + efi_size + boot_size + root_size + 33) * 512}"}
}
},
{
@ -192,19 +197,19 @@
},
{
"start": 4096,
"size": 204800,
"size": {"mpp-format-int": "{efi_size}"},
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"start": 208896,
"size": 204800,
"start": {"mpp-format-int": "{4096 + efi_size}"},
"size": {"mpp-format-int": "{boot_size}"},
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "61B2905B-DF3E-4FB3-80FA-49D1E773AA32"
},
{
"start": 413696,
"size": 20557791,
"start": {"mpp-format-int": "{4096 + efi_size + boot_size}"},
"size": {"mpp-format-int": "{root_size}"},
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
}
@ -219,7 +224,7 @@
"options": {
"filename": "disk.img",
"start": 4096,
"size": 204800
"size": {"mpp-format-int": "{efi_size}"}
}
}
},
@ -235,8 +240,8 @@
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
"start": 208896,
"size": 204800
"start": {"mpp-format-int": "{4096 + efi_size}"},
"size": {"mpp-format-int": "{boot_size}"}
}
}
},
@ -252,8 +257,8 @@
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
"start": 413696,
"size": 20557791
"start": {"mpp-format-int": "{4096 + efi_size + boot_size}"},
"size": {"mpp-format-int": "{root_size}"}
}
}
},
@ -287,23 +292,23 @@
"options": {
"filename": "disk.img",
"start": 4096,
"size": 204800
"size": {"mpp-format-int": "{efi_size}"}
}
},
"boot": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
"start": 208896,
"size": 204800
"start": {"mpp-format-int": "{4096 + efi_size}"},
"size": {"mpp-format-int": "{boot_size}"}
}
},
"root": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
"start": 413696,
"size": 20557791
"start": {"mpp-format-int": "{4096 + efi_size + boot_size}"},
"size": {"mpp-format-int": "{root_size}"}
}
}
},