rpms/osbuild-composer
9
0
Fork 2
Code Issues Pull Requests Releases Activity

Update to 165.1; update osbuild/images to v0.245.1 and 61b16700

Browse Source
This commit is contained in:
Andrew Lukoshko 2026-08-12 10:20:50 +00:00
parent dc17e87015
commit 3d7604a09e
6 changed files with 368 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/osbuild-composer-149.tar.gz
SOURCES/osbuild-composer-165.1.tar.gz

2
.osbuild-composer.metadata
View File

@ -1 +1 @@
ea59dc56a63899e6efb74dbc8b82ffa25012fbe3 SOURCES/osbuild-composer-149.tar.gz
10b37e5a39772505134b53267eef93ff998413fa SOURCES/osbuild-composer-165.1.tar.gz

188
SOURCES/0002-go.mod-update-osbuild-images-to-v0.245.1.patch Normal file
View File

File diff suppressed because one or more lines are too long

148
SOURCES/0003-go.mod-update-osbuild-images-to-61b16700.patch Normal file
View File

@ -0,0 +1,148 @@
Subject: [PATCH] go.mod: update osbuild/images to 61b16700
This enables bootupd metadata generation for edge-commits, including for
9.6+ images.
Produced with: go get github.com/osbuild/images@61b16700 && go mod tidy &&
go mod vendor, against the public Go module proxy. Resolves to
v0.245.2-0.20260731173023-61b16700ffae.
---
diff --git a/go.mod b/go.mod
--- a/go.mod
+++ b/go.mod
@@ -32,7 +32,7 @@
github.com/oapi-codegen/runtime v1.2.0
github.com/openshift-online/ocm-sdk-go v0.1.497
github.com/osbuild/blueprint v1.23.0
- github.com/osbuild/images v0.245.1
+ github.com/osbuild/images v0.245.2-0.20260731173023-61b16700ffae
github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d
github.com/prometheus/client_golang v1.23.2
github.com/segmentio/ksuid v1.0.4
diff --git a/go.sum b/go.sum
--- a/go.sum
+++ b/go.sum
@@ -520,8 +520,8 @@
github.com/oracle/oci-go-sdk/v54 v54.0.0/go.mod h1:+t+yvcFGVp+3ZnztnyxqXfQDsMlq8U25faBLa+mqCMc=
github.com/osbuild/blueprint v1.23.0 h1:HGMuRKpYg2xBy1QnAQDaIM6xnmzXh4QBrjic86C6Xr8=
github.com/osbuild/blueprint v1.23.0/go.mod h1:HPlJzkEl7q5g8hzaGksUk7ifFAy9QFw9LmzhuFOAVm4=
-github.com/osbuild/images v0.245.1 h1:xCwko1euDFzcn1/z0LrWxBWYfpB8ViS22Hr3ejwkLE8=
-github.com/osbuild/images v0.245.1/go.mod h1:lr0fqJjjOCurTMbgMSDxTwnEalx6CkOVqyB0QmvNqO4=
+github.com/osbuild/images v0.245.2-0.20260731173023-61b16700ffae h1:XaZYsNR7B7gmjUXXHelIaJCR33zPS51JbReebivGrOk=
+github.com/osbuild/images v0.245.2-0.20260731173023-61b16700ffae/go.mod h1:lr0fqJjjOCurTMbgMSDxTwnEalx6CkOVqyB0QmvNqO4=
github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d h1:r9BFPDv0uuA9k1947Jybcxs36c/pTywWS1gjeizvtcQ=
github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d/go.mod h1:zR1iu/hOuf+OQNJlk70tju9IqzzM4ycq0ectkFBm94U=
github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=
diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml
--- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml
+++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml
@@ -2813,6 +2813,8 @@
# XXX: sadly the osbuild options are upper case for "Unit" vs lower above :(
Unit:
ConditionPathExists: "!/usr/libexec/greenboot/greenboot"
+ # Enable bootupd metadata generation for ostree commits (9.6+ only)
+ bootupd_gen_metadata: true
enabled_services: &enabled_services_edge
# XXX: shared with 9.2
- "NetworkManager.service"
@@ -2822,6 +2824,8 @@
# only on rhel-9.2+ and centos
- "ignition-firstboot-complete.service"
- "coreos-ignition-write-issues.service"
+ # only on rhel-9.6+
+ - "bootloader-update.service"
conditions: &conditions_edge_commit_image_config
"rhel-9.1 and below do not have ignition":
when:
@@ -2833,6 +2837,23 @@
- "firewalld.service"
- "sshd.service"
- "fdo-client-linuxapp.service"
+ "rhel-9.5 and below do not have bootupd bootloader update service":
+ when:
+ version_greater_or_equal: "9.2"
+ version_less_than: "9.6"
+ shallow_merge:
+ enabled_services:
+ - "NetworkManager.service"
+ - "firewalld.service"
+ - "sshd.service"
+ - "fdo-client-linuxapp.service"
+ - "ignition-firstboot-complete.service"
+ - "coreos-ignition-write-issues.service"
+ "rhel-9.5 and below do not have bootupd":
+ when:
+ version_less_than: "9.6"
+ shallow_merge:
+ bootupd_gen_metadata: false
package_sets:
os:
- &edge_commit_pkgset
@@ -2915,13 +2936,13 @@
exclude:
- "rng-tools"
conditions: &conditions_pkgsets_edge_commit
- "greenboot in 9.8 and c9s requires bootupd":
+ "greenboot in 9.6 and c9s requires bootupd":
# we don't want bootupd in edge commits, but greenboot requires
- # it in 9.8 and c9s, so we can only exclude it for older versions
+ # it in 9.6 and c9s, so we can only exclude it for older versions
# NOTE: this is temporary
# see https://github.com/fedora-iot/greenboot-rs/pull/142
when:
- version_less_than: "9.8"
+ version_less_than: "9.6"
append:
exclude:
- "bootupd"
diff --git a/vendor/github.com/osbuild/images/data/repositories/fedora-45.json b/vendor/github.com/osbuild/images/data/repositories/fedora-45.json
deleted file mode 100644
--- a/vendor/github.com/osbuild/images/data/repositories/fedora-45.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "x86_64": [
- {
- "name": "fedora",
- "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-45&arch=x86_64",
- "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGiIvJgBEAD3LK442lirRR/SSY884GtAlFjC4VbtOW82pks44Nu/7sbWQObo\nA9kyCs69j/lCFKsq12yU+yk0rOSNHQT1aKwe64GOi9MokcOYK1gq0DtBvakl25o1\npnBok+zuBUfwTQAsNTbevw1t5rdBJKusnuPPHjTnVdjVS9HU4QhZunI/7Y9QleX2\noXkN2VFi0mhF2y8gU4Tve0xxSTjfgYM6ObV3W9vMusxmAabvCfdcVPpy9iEZxyjw\nNL4Svkw3bt50plmnRuWRXA+P6R3SK/1XKBW/9jVr4bgs6d763VfVCMbKLpQvuWIX\n6/UUOEc9LDziEjxjNBPFfLq+N7kN8235B26fuj+3XM2OqLtRv4/bl0Mryn13VrJl\nhvdLSlmkjROlzywrGvZ/geqyqaSuEZMnWN6znxV/qt8+tEHJXNFO882wHOLTq+5F\n6Bm/aJvdGxSffIFQyylcEzGaNgsH7AvkZPMqk2nMJ3y1KQx+LxdLM5hwGSexdaQ0\nwyW5DMH1Xn49J0nNE/IPWgBlRVAz146CNHMy0kR0J9dAUxg+1GeGKYnZ+q9mvs07\n82rFUqgJLq1gIBEVxYVh8eaO4u1wxWb+/LSx6OjZ7yFmZjN3c6V67Fwql/0EONic\nQgI/2FyxLeYmQr19Cl3EY7b50Ql95RT5OqtAnqcYrzsjuv4n489F/ObRjwARAQAB\ntDFGZWRvcmEgKDQ1KSA8ZmVkb3JhLTQ1LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJSBBMBCAA8FiEET1CmEUzVxpdqfxF5ZVpLAvV3hh4FAmiIvJgCGw8FCwkI\nBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEGVaSwL1d4YeErcQAMnCTVRF+W1A\nW2kE9vQrqEXFj7wPXIH1uiwUAKtpLffjoD8SFekU6AqhrvMS1JgS0NsTwwvqbZXe\nZl7eTgMZ8XPxhufZ272pUaIDMlREnvoLEHb/HTbcSP8bBdCEzc5FwSNgwZEYRTC/\nOVhJ1isF54fd3JC9741feCgPOMG94dj1VX7FlZuq1AQsXKvI9H3GEm6DiqHg4nVR\nWprMP7/sKqrgNSWx4s0zC/4WpALOgLXJO8qZOtul9SzcPmt4E56jjJ7TNX3uQcgu\n0zKFdzb92tJ6WLpVsFk5AgBoZFSi7xZEh+nQzu/PwMorxNyw2WvKR5+avWQCY/WO\npmPIBAL4IevB/sGyrDVdh1ZNMTMIf3Pz3jkn2BGMOAo4ohP+5P4hFzt/4nOm5fL6\nDpJxlCcWaFjMuZgdJY9IHqRcwtnX4nGnrv0cbYAjt59cnHuzqzW84KWJcDEy+3v6\njAhHn6UM27CGCN99hfh7zhj+fMcOOyugCwxbjke123uNC80J1WADB0KF99en1p1f\n1VHBOfS3IS8ezmlWFrllrG0Rxl1a9LDkQJivH5mV0HNmYvRPlWky/mP7q66TRHKs\nJfD7idqM7pdf6u4vYpGq/MlbGgK4xCm7geaoLWDN5zExgrgZFzgtieIEa2M1uumj\nBRh9EFo/y5xhwu9mVgCJmLCLW/ByEYJE\n=7kLn\n-----END PGP PUBLIC KEY BLOCK-----\n",
- "check_gpg": true
- }
- ],
- "aarch64": [
- {
- "name": "fedora",
- "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-45&arch=aarch64",
- "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGiIvJgBEAD3LK442lirRR/SSY884GtAlFjC4VbtOW82pks44Nu/7sbWQObo\nA9kyCs69j/lCFKsq12yU+yk0rOSNHQT1aKwe64GOi9MokcOYK1gq0DtBvakl25o1\npnBok+zuBUfwTQAsNTbevw1t5rdBJKusnuPPHjTnVdjVS9HU4QhZunI/7Y9QleX2\noXkN2VFi0mhF2y8gU4Tve0xxSTjfgYM6ObV3W9vMusxmAabvCfdcVPpy9iEZxyjw\nNL4Svkw3bt50plmnRuWRXA+P6R3SK/1XKBW/9jVr4bgs6d763VfVCMbKLpQvuWIX\n6/UUOEc9LDziEjxjNBPFfLq+N7kN8235B26fuj+3XM2OqLtRv4/bl0Mryn13VrJl\nhvdLSlmkjROlzywrGvZ/geqyqaSuEZMnWN6znxV/qt8+tEHJXNFO882wHOLTq+5F\n6Bm/aJvdGxSffIFQyylcEzGaNgsH7AvkZPMqk2nMJ3y1KQx+LxdLM5hwGSexdaQ0\nwyW5DMH1Xn49J0nNE/IPWgBlRVAz146CNHMy0kR0J9dAUxg+1GeGKYnZ+q9mvs07\n82rFUqgJLq1gIBEVxYVh8eaO4u1wxWb+/LSx6OjZ7yFmZjN3c6V67Fwql/0EONic\nQgI/2FyxLeYmQr19Cl3EY7b50Ql95RT5OqtAnqcYrzsjuv4n489F/ObRjwARAQAB\ntDFGZWRvcmEgKDQ1KSA8ZmVkb3JhLTQ1LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJSBBMBCAA8FiEET1CmEUzVxpdqfxF5ZVpLAvV3hh4FAmiIvJgCGw8FCwkI\nBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEGVaSwL1d4YeErcQAMnCTVRF+W1A\nW2kE9vQrqEXFj7wPXIH1uiwUAKtpLffjoD8SFekU6AqhrvMS1JgS0NsTwwvqbZXe\nZl7eTgMZ8XPxhufZ272pUaIDMlREnvoLEHb/HTbcSP8bBdCEzc5FwSNgwZEYRTC/\nOVhJ1isF54fd3JC9741feCgPOMG94dj1VX7FlZuq1AQsXKvI9H3GEm6DiqHg4nVR\nWprMP7/sKqrgNSWx4s0zC/4WpALOgLXJO8qZOtul9SzcPmt4E56jjJ7TNX3uQcgu\n0zKFdzb92tJ6WLpVsFk5AgBoZFSi7xZEh+nQzu/PwMorxNyw2WvKR5+avWQCY/WO\npmPIBAL4IevB/sGyrDVdh1ZNMTMIf3Pz3jkn2BGMOAo4ohP+5P4hFzt/4nOm5fL6\nDpJxlCcWaFjMuZgdJY9IHqRcwtnX4nGnrv0cbYAjt59cnHuzqzW84KWJcDEy+3v6\njAhHn6UM27CGCN99hfh7zhj+fMcOOyugCwxbjke123uNC80J1WADB0KF99en1p1f\n1VHBOfS3IS8ezmlWFrllrG0Rxl1a9LDkQJivH5mV0HNmYvRPlWky/mP7q66TRHKs\nJfD7idqM7pdf6u4vYpGq/MlbGgK4xCm7geaoLWDN5zExgrgZFzgtieIEa2M1uumj\nBRh9EFo/y5xhwu9mVgCJmLCLW/ByEYJE\n=7kLn\n-----END PGP PUBLIC KEY BLOCK-----\n",
- "check_gpg": true
- }
- ],
- "ppc64le": [
- {
- "name": "fedora",
- "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-45&arch=ppc64le",
- "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGiIvJgBEAD3LK442lirRR/SSY884GtAlFjC4VbtOW82pks44Nu/7sbWQObo\nA9kyCs69j/lCFKsq12yU+yk0rOSNHQT1aKwe64GOi9MokcOYK1gq0DtBvakl25o1\npnBok+zuBUfwTQAsNTbevw1t5rdBJKusnuPPHjTnVdjVS9HU4QhZunI/7Y9QleX2\noXkN2VFi0mhF2y8gU4Tve0xxSTjfgYM6ObV3W9vMusxmAabvCfdcVPpy9iEZxyjw\nNL4Svkw3bt50plmnRuWRXA+P6R3SK/1XKBW/9jVr4bgs6d763VfVCMbKLpQvuWIX\n6/UUOEc9LDziEjxjNBPFfLq+N7kN8235B26fuj+3XM2OqLtRv4/bl0Mryn13VrJl\nhvdLSlmkjROlzywrGvZ/geqyqaSuEZMnWN6znxV/qt8+tEHJXNFO882wHOLTq+5F\n6Bm/aJvdGxSffIFQyylcEzGaNgsH7AvkZPMqk2nMJ3y1KQx+LxdLM5hwGSexdaQ0\nwyW5DMH1Xn49J0nNE/IPWgBlRVAz146CNHMy0kR0J9dAUxg+1GeGKYnZ+q9mvs07\n82rFUqgJLq1gIBEVxYVh8eaO4u1wxWb+/LSx6OjZ7yFmZjN3c6V67Fwql/0EONic\nQgI/2FyxLeYmQr19Cl3EY7b50Ql95RT5OqtAnqcYrzsjuv4n489F/ObRjwARAQAB\ntDFGZWRvcmEgKDQ1KSA8ZmVkb3JhLTQ1LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJSBBMBCAA8FiEET1CmEUzVxpdqfxF5ZVpLAvV3hh4FAmiIvJgCGw8FCwkI\nBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEGVaSwL1d4YeErcQAMnCTVRF+W1A\nW2kE9vQrqEXFj7wPXIH1uiwUAKtpLffjoD8SFekU6AqhrvMS1JgS0NsTwwvqbZXe\nZl7eTgMZ8XPxhufZ272pUaIDMlREnvoLEHb/HTbcSP8bBdCEzc5FwSNgwZEYRTC/\nOVhJ1isF54fd3JC9741feCgPOMG94dj1VX7FlZuq1AQsXKvI9H3GEm6DiqHg4nVR\nWprMP7/sKqrgNSWx4s0zC/4WpALOgLXJO8qZOtul9SzcPmt4E56jjJ7TNX3uQcgu\n0zKFdzb92tJ6WLpVsFk5AgBoZFSi7xZEh+nQzu/PwMorxNyw2WvKR5+avWQCY/WO\npmPIBAL4IevB/sGyrDVdh1ZNMTMIf3Pz3jkn2BGMOAo4ohP+5P4hFzt/4nOm5fL6\nDpJxlCcWaFjMuZgdJY9IHqRcwtnX4nGnrv0cbYAjt59cnHuzqzW84KWJcDEy+3v6\njAhHn6UM27CGCN99hfh7zhj+fMcOOyugCwxbjke123uNC80J1WADB0KF99en1p1f\n1VHBOfS3IS8ezmlWFrllrG0Rxl1a9LDkQJivH5mV0HNmYvRPlWky/mP7q66TRHKs\nJfD7idqM7pdf6u4vYpGq/MlbGgK4xCm7geaoLWDN5zExgrgZFzgtieIEa2M1uumj\nBRh9EFo/y5xhwu9mVgCJmLCLW/ByEYJE\n=7kLn\n-----END PGP PUBLIC KEY BLOCK-----\n",
- "check_gpg": true
- }
- ],
- "s390x": [
- {
- "name": "fedora",
- "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-45&arch=s390x",
- "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGiIvJgBEAD3LK442lirRR/SSY884GtAlFjC4VbtOW82pks44Nu/7sbWQObo\nA9kyCs69j/lCFKsq12yU+yk0rOSNHQT1aKwe64GOi9MokcOYK1gq0DtBvakl25o1\npnBok+zuBUfwTQAsNTbevw1t5rdBJKusnuPPHjTnVdjVS9HU4QhZunI/7Y9QleX2\noXkN2VFi0mhF2y8gU4Tve0xxSTjfgYM6ObV3W9vMusxmAabvCfdcVPpy9iEZxyjw\nNL4Svkw3bt50plmnRuWRXA+P6R3SK/1XKBW/9jVr4bgs6d763VfVCMbKLpQvuWIX\n6/UUOEc9LDziEjxjNBPFfLq+N7kN8235B26fuj+3XM2OqLtRv4/bl0Mryn13VrJl\nhvdLSlmkjROlzywrGvZ/geqyqaSuEZMnWN6znxV/qt8+tEHJXNFO882wHOLTq+5F\n6Bm/aJvdGxSffIFQyylcEzGaNgsH7AvkZPMqk2nMJ3y1KQx+LxdLM5hwGSexdaQ0\nwyW5DMH1Xn49J0nNE/IPWgBlRVAz146CNHMy0kR0J9dAUxg+1GeGKYnZ+q9mvs07\n82rFUqgJLq1gIBEVxYVh8eaO4u1wxWb+/LSx6OjZ7yFmZjN3c6V67Fwql/0EONic\nQgI/2FyxLeYmQr19Cl3EY7b50Ql95RT5OqtAnqcYrzsjuv4n489F/ObRjwARAQAB\ntDFGZWRvcmEgKDQ1KSA8ZmVkb3JhLTQ1LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJSBBMBCAA8FiEET1CmEUzVxpdqfxF5ZVpLAvV3hh4FAmiIvJgCGw8FCwkI\nBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEGVaSwL1d4YeErcQAMnCTVRF+W1A\nW2kE9vQrqEXFj7wPXIH1uiwUAKtpLffjoD8SFekU6AqhrvMS1JgS0NsTwwvqbZXe\nZl7eTgMZ8XPxhufZ272pUaIDMlREnvoLEHb/HTbcSP8bBdCEzc5FwSNgwZEYRTC/\nOVhJ1isF54fd3JC9741feCgPOMG94dj1VX7FlZuq1AQsXKvI9H3GEm6DiqHg4nVR\nWprMP7/sKqrgNSWx4s0zC/4WpALOgLXJO8qZOtul9SzcPmt4E56jjJ7TNX3uQcgu\n0zKFdzb92tJ6WLpVsFk5AgBoZFSi7xZEh+nQzu/PwMorxNyw2WvKR5+avWQCY/WO\npmPIBAL4IevB/sGyrDVdh1ZNMTMIf3Pz3jkn2BGMOAo4ohP+5P4hFzt/4nOm5fL6\nDpJxlCcWaFjMuZgdJY9IHqRcwtnX4nGnrv0cbYAjt59cnHuzqzW84KWJcDEy+3v6\njAhHn6UM27CGCN99hfh7zhj+fMcOOyugCwxbjke123uNC80J1WADB0KF99en1p1f\n1VHBOfS3IS8ezmlWFrllrG0Rxl1a9LDkQJivH5mV0HNmYvRPlWky/mP7q66TRHKs\nJfD7idqM7pdf6u4vYpGq/MlbGgK4xCm7geaoLWDN5zExgrgZFzgtieIEa2M1uumj\nBRh9EFo/y5xhwu9mVgCJmLCLW/ByEYJE\n=7kLn\n-----END PGP PUBLIC KEY BLOCK-----\n",
- "check_gpg": true
- }
- ]
-}
diff --git a/vendor/modules.txt b/vendor/modules.txt
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -974,7 +974,7 @@
## explicit; go 1.23.9
github.com/osbuild/blueprint/internal/common
github.com/osbuild/blueprint/pkg/blueprint
-# github.com/osbuild/images v0.245.1
+# github.com/osbuild/images v0.245.2-0.20260731173023-61b16700ffae
## explicit; go 1.24.12
github.com/osbuild/images/data/dependencies
github.com/osbuild/images/data/distrodefs

74
SOURCES/enable-bsi-oscap-profile.patch
View File

@ -1,74 +0,0 @@
From 73a42cc3647a13a548d768fd31fd53d89e0546d4 Mon Sep 17 00:00:00 2001
From: Gianluca Zuccarelli <gianlucazuccarelli@gmail.com>
Date: Tue, 7 Oct 2025 12:53:39 +0100
Subject: [PATCH] go.mod: bump images to v0.178.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Changes with 0.178.1
----------------
distrodefs: enable bsi oscap profile for RHEL-9.7 (HMS-9458) (#1917)
Author: Gianluca Zuccarelli, Reviewers: Achilleas Koutsou, Michael Vogt, Simon de Vlieger
— Somewhere on the Internet, 2025-10-07
---
go.mod | 2 +-
go.sum | 4 ++--
vendor/github.com/osbuild/images/data/distrodefs/distros.yaml | 1 +
vendor/modules.txt | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/go.mod b/go.mod
index 1965315d45..d3ba6fd003 100644
--- a/go.mod
+++ b/go.mod
@@ -34,7 +34,7 @@ require (
github.com/oapi-codegen/runtime v1.1.2
github.com/openshift-online/ocm-sdk-go v0.1.473
github.com/osbuild/blueprint v1.13.0
- github.com/osbuild/images v0.178.0
+ github.com/osbuild/images v0.178.1
github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d
github.com/prometheus/client_golang v1.23.0
github.com/segmentio/ksuid v1.0.4
diff --git a/go.sum b/go.sum
index 843668bc90..11dab7a752 100644
--- a/go.sum
+++ b/go.sum
@@ -517,8 +517,8 @@ github.com/oracle/oci-go-sdk/v54 v54.0.0 h1:CDLjeSejv2aDpElAJrhKpi6zvT/zhZCZuXch
github.com/oracle/oci-go-sdk/v54 v54.0.0/go.mod h1:+t+yvcFGVp+3ZnztnyxqXfQDsMlq8U25faBLa+mqCMc=
github.com/osbuild/blueprint v1.13.0 h1:blo22+S2ZX5bBmjGcRveoTUrV4Ms7kLfKyb32WyuymA=
github.com/osbuild/blueprint v1.13.0/go.mod h1:HPlJzkEl7q5g8hzaGksUk7ifFAy9QFw9LmzhuFOAVm4=
-github.com/osbuild/images v0.178.0 h1:ojCD1rRtO+khFHpRHUxd6ydXBarEu+6pwt0w8oqilaY=
-github.com/osbuild/images v0.178.0/go.mod h1:7CfDwGb8YA4erIzvMnqJysVpSu52i6l/f3h82usGPTg=
+github.com/osbuild/images v0.178.1 h1:tHRAc+nS5TLlEWXb4YHbTUID4GbGCf1XIRJkTx8aQOs=
+github.com/osbuild/images v0.178.1/go.mod h1:7CfDwGb8YA4erIzvMnqJysVpSu52i6l/f3h82usGPTg=
github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d h1:r9BFPDv0uuA9k1947Jybcxs36c/pTywWS1gjeizvtcQ=
github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d/go.mod h1:zR1iu/hOuf+OQNJlk70tju9IqzzM4ycq0ectkFBm94U=
github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=
diff --git a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml
index f1d3dab247..53b6bd6599 100644
--- a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml
+++ b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml
@@ -214,6 +214,7 @@ distros:
- "xccdf_org.ssgproject.content_profile_anssi_bp28_high"
- "xccdf_org.ssgproject.content_profile_anssi_bp28_intermediary"
- "xccdf_org.ssgproject.content_profile_anssi_bp28_minimal"
+ - "xccdf_org.ssgproject.content_profile_bsi"
- "xccdf_org.ssgproject.content_profile_ccn_advanced"
- "xccdf_org.ssgproject.content_profile_ccn_basic"
- "xccdf_org.ssgproject.content_profile_ccn_intermediate"
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 8356ae0466..617aa979c6 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -958,7 +958,7 @@ github.com/oracle/oci-go-sdk/v54/workrequests
## explicit; go 1.23.9
github.com/osbuild/blueprint/internal/common
github.com/osbuild/blueprint/pkg/blueprint
-# github.com/osbuild/images v0.178.0
+# github.com/osbuild/images v0.178.1
## explicit; go 1.23.9
github.com/osbuild/images/data/dependencies
github.com/osbuild/images/data/distrodefs

63
SPECS/osbuild-composer.spec
View File

@ -8,11 +8,11 @@
%bcond_with relax_requires
# The minimum required osbuild version
%global min_osbuild_version 157
%global min_osbuild_version 171
%global goipath github.com/osbuild/osbuild-composer
Version: 149
Version: 165.1
%gometa
@ -25,7 +25,7 @@ It is compatible with composer-cli and cockpit-composer clients.
}
Name: osbuild-composer
Release: 5%{?dist}
Release: 4%{?dist}
Summary: An image building service based on osbuild
# osbuild-composer doesn't have support for building i686 and armv7hl images
@ -36,8 +36,8 @@ License: Apache-2.0
URL: %{gourl}
Source0: %{gosource}
Patch0: enable-bsi-oscap-profile.patch
Patch0: 0002-go.mod-update-osbuild-images-to-v0.245.1.patch
Patch1: 0003-go.mod-update-osbuild-images-to-61b16700.patch
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
BuildRequires: systemd
@ -124,7 +124,6 @@ GOTAGS="${GOTAGS:+$GOTAGS,}rhel%{rhel}"
%endif
go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-cli-tests %{goipath}/cmd/osbuild-composer-cli-tests
go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-dnf-json-tests %{goipath}/cmd/osbuild-dnf-json-tests
go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-weldr-tests %{goipath}/internal/client/
go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-auth-tests %{goipath}/cmd/osbuild-auth-tests
go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-koji-tests %{goipath}/cmd/osbuild-koji-tests
@ -209,7 +208,6 @@ install -m 0644 -vp docs/*.7 %{buildroot}%
install -m 0755 -vd %{buildroot}%{_libexecdir}/osbuild-composer-test
install -m 0755 -vp _bin/osbuild-composer-cli-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp _bin/osbuild-weldr-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp _bin/osbuild-dnf-json-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp _bin/osbuild-auth-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp _bin/osbuild-koji-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp _bin/osbuild-composer-dbjobqueue-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
@ -309,9 +307,6 @@ cd $PWD/_build/src/%{goipath}
%package core
Summary: The core osbuild-composer binary
Requires: osbuild-depsolve-dnf >= %{min_osbuild_version}
# This version needs to get bumped everytime the osbuild-depsolve-dnf json
# API changes in incompatible ways
Requires: osbuild-dnf-json-api = 8
Provides: %{name}-dnf-json = %{version}-%{release}
Obsoletes: %{name}-dnf-json < %{version}-%{release}
@ -436,32 +431,34 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif
%changelog
* Wed Apr 15 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 149-5
- Rebuilt to fix:
- CVE-2026-25679
- CVE-2026-27137
- RHEL-158741
- RHEL-158860
* Wed Aug 12 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 165.1-4
- Update to 165.1
- go.mod: update osbuild/images to v0.245.1, adding the PQC keys to the
rhel-9 and rhel-10 rolling distribution repository configs
- go.mod: update osbuild/images to 61b16700, enabling bootupd metadata
generation for edge-commits including 9.6+ images
- Test repository definitions are left at their upstream values
* Thu Feb 26 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 149-4
- Rebuilt to fix:
- CVE-2025-61726
- CVE-2025-61728
- CVE-2025-61729
- CVE-2025-68121
- RHEL-146868
- RHEL-147086
- RHEL-147371
- RHEL-149626
* Mon Feb 23 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 164-1
- New upstream release
* Tue Jan 06 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 149-3
- Rebuilt to fix:
- CVE-2025-58183
- RHEL-125705
* Tue Feb 17 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 163-1
- New upstream release
* Wed Oct 15 2025 Gianluca Zuccarelli <gzuccare@redhat.com> - 149-2
- Add missing BSI OpenSCAP profile to the allowlist
Resolves: RHEL-121525
* Wed Feb 11 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 162-1
- New upstream release
* Wed Feb 04 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 161-1
- New upstream release
* Wed Jan 21 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 160-1
- New upstream release
* Wed Dec 24 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 158-1
- New upstream release
* Wed Nov 12 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 155-1
- New upstream release
* Thu Aug 21 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 149-1
- New upstream release