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

spec: bump osbuild requirement to version 52

Browse source 
Needed due to the new `gpgkeys.fromtree` option in `org.osbuild.rpm`.
Pin osbuild version 52 in Schutzfile as well.
This commit is contained in:
Christian Kellner 2022-03-04 14:03:48 +01:00 • committed by Ondřej Budai
parent 923a627de4
commit 8c8f6f2cd5
2 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Schutzfile
View file

@ -1,26 +1,38 @@
{ {
"fedora-34": {
"dependencies": {
"osbuild": {
"commit": "d8f36b55fa043002c6650a75fbeba5165cc0824b"
}
}
},
"fedora-35": { "fedora-35": {
"dependencies": { "dependencies": {
"osbuild": { "osbuild": {
"commit": "6300a80c8466fc7297253cba91bb99994fa4e5c8" "commit": "d8f36b55fa043002c6650a75fbeba5165cc0824b"
} }
} }
}, },
"rhel-8.4": { "rhel-8.4": {
"dependencies": { "dependencies": {
"osbuild": { "osbuild": {
"commit": "6300a80c8466fc7297253cba91bb99994fa4e5c8" "commit": "d8f36b55fa043002c6650a75fbeba5165cc0824b"
} }
} }
}, },
"rhel-8.5": { "rhel-8.5": {
"dependencies": { "dependencies": {
"osbuild": { "osbuild": {
"commit": "6300a80c8466fc7297253cba91bb99994fa4e5c8" "commit": "d8f36b55fa043002c6650a75fbeba5165cc0824b"
} }
} }
}, },
"rhel-8.6": { "rhel-8.6": {
"dependencies": {
"osbuild": {
"commit": "d8f36b55fa043002c6650a75fbeba5165cc0824b"
}
},
"repos": { "repos": {
"file": "/etc/yum.repos.d/rhel8internal.repo", "file": "/etc/yum.repos.d/rhel8internal.repo",
"x86_64": [ "x86_64": [
@ -60,6 +72,11 @@
} }
}, },
"rhel-9.0": { "rhel-9.0": {
"dependencies": {
"osbuild": {
"commit": "d8f36b55fa043002c6650a75fbeba5165cc0824b"
}
},
"repos": { "repos": {
"file": "/etc/yum.repos.d/rhel9internal.repo", "file": "/etc/yum.repos.d/rhel9internal.repo",
"x86_64": [ "x86_64": [
@ -101,11 +118,16 @@
"centos-8": { "centos-8": {
"dependencies": { "dependencies": {
"osbuild": { "osbuild": {
"commit": "6300a80c8466fc7297253cba91bb99994fa4e5c8" "commit": "d8f36b55fa043002c6650a75fbeba5165cc0824b"
} }
} }
}, },
"centos-9": { "centos-9": {
"dependencies": {
"osbuild": {
"commit": "d8f36b55fa043002c6650a75fbeba5165cc0824b"
}
},
"repos": { "repos": {
"file": "/etc/yum.repos.d/centos.repo", "file": "/etc/yum.repos.d/centos.repo",
"x86_64": [ "x86_64": [

8
osbuild-composer.spec
View file

@ -324,10 +324,10 @@ The core osbuild-composer binary. This is suitable both for spawning in containe
Summary: The worker for osbuild-composer Summary: The worker for osbuild-composer
Requires: systemd Requires: systemd
Requires: qemu-img Requires: qemu-img
Requires: osbuild >= 49 Requires: osbuild >= 52
Requires: osbuild-ostree >= 49 Requires: osbuild-ostree >= 52
Requires: osbuild-lvm2 >= 49 Requires: osbuild-lvm2 >= 52
Requires: osbuild-luks2 >= 49 Requires: osbuild-luks2 >= 52
Requires: %{name}-dnf-json = %{version}-%{release} Requires: %{name}-dnf-json = %{version}-%{release}
# remove in F34 # remove in F34