Skip to content

Commit

Permalink
Update osbuild/images to v0.40.0
Browse files Browse the repository at this point in the history 
In addition, simplify the SPEC file to not have to update the minimum
required osbuild version gazillion times, but just once.

Update the minimum required osbuild version to v109, due to changes in
grub2 stages required by the new osbuild/images version.

Update osbild SHA in Schutzfile to v109.

Signed-off-by: Tomáš Hozza <[email protected]>
  • Loading branch information
@thozza
thozza committed Feb 26, 2024
1 parent c138ea6 commit 2f087f1
Show file tree
Hide file tree
Showing 190 changed files with 54,932 additions and 50,711 deletions.
32 changes: 16 additions & 16 deletions Schutzfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"fedora-38": {
"dependencies": {
"osbuild": {
"commit": "619a64f0bd7322628ae5fedf8b3a640e42f9edcd"
"commit": "322974695cfd6fe3022d8ec4c968b368b674d4dc"
}
},
"repos": [
Expand Down Expand Up @@ -79,7 +79,7 @@
"fedora-39": {
"dependencies": {
"osbuild": {
"commit": "619a64f0bd7322628ae5fedf8b3a640e42f9edcd"
"commit": "322974695cfd6fe3022d8ec4c968b368b674d4dc"
}
},
"repos": [
Expand Down Expand Up @@ -122,7 +122,7 @@
"fedora-40": {
"dependencies": {
"osbuild": {
"commit": "619a64f0bd7322628ae5fedf8b3a640e42f9edcd"
"commit": "322974695cfd6fe3022d8ec4c968b368b674d4dc"
}
},
"repos": [
Expand All @@ -148,35 +148,35 @@
"rhel-8.4": {
"dependencies": {
"osbuild": {
"commit": "619a64f0bd7322628ae5fedf8b3a640e42f9edcd"
"commit": "322974695cfd6fe3022d8ec4c968b368b674d4dc"
}
}
},
"rhel-8.8": {
"dependencies": {
"osbuild": {
"commit": "619a64f0bd7322628ae5fedf8b3a640e42f9edcd"
"commit": "322974695cfd6fe3022d8ec4c968b368b674d4dc"
}
}
},
"rhel-8.9": {
"dependencies": {
"osbuild": {
"commit": "619a64f0bd7322628ae5fedf8b3a640e42f9edcd"
"commit": "322974695cfd6fe3022d8ec4c968b368b674d4dc"
}
}
},
"rhel-8.9": {
"dependencies": {
"osbuild": {
"commit": "619a64f0bd7322628ae5fedf8b3a640e42f9edcd"
"commit": "322974695cfd6fe3022d8ec4c968b368b674d4dc"
}
}
},
"rhel-8.10": {
"dependencies": {
"osbuild": {
"commit": "619a64f0bd7322628ae5fedf8b3a640e42f9edcd"
"commit": "322974695cfd6fe3022d8ec4c968b368b674d4dc"
}
},
"repos": [
Expand Down Expand Up @@ -222,28 +222,28 @@
"rhel-9.2": {
"dependencies": {
"osbuild": {
"commit": "619a64f0bd7322628ae5fedf8b3a640e42f9edcd"
"commit": "322974695cfd6fe3022d8ec4c968b368b674d4dc"
}
}
},
"rhel-9.3": {
"dependencies": {
"osbuild": {
"commit": "619a64f0bd7322628ae5fedf8b3a640e42f9edcd"
"commit": "322974695cfd6fe3022d8ec4c968b368b674d4dc"
}
}
},
"rhel-9.3": {
"dependencies": {
"osbuild": {
"commit": "619a64f0bd7322628ae5fedf8b3a640e42f9edcd"
"commit": "322974695cfd6fe3022d8ec4c968b368b674d4dc"
}
}
},
"rhel-9.4": {
"dependencies": {
"osbuild": {
"commit": "619a64f0bd7322628ae5fedf8b3a640e42f9edcd"
"commit": "322974695cfd6fe3022d8ec4c968b368b674d4dc"
}
},
"repos": [
Expand Down Expand Up @@ -289,21 +289,21 @@
"centos-8": {
"dependencies": {
"osbuild": {
"commit": "619a64f0bd7322628ae5fedf8b3a640e42f9edcd"
"commit": "322974695cfd6fe3022d8ec4c968b368b674d4dc"
}
}
},
"centos-9": {
"dependencies": {
"osbuild": {
"commit": "619a64f0bd7322628ae5fedf8b3a640e42f9edcd"
"commit": "322974695cfd6fe3022d8ec4c968b368b674d4dc"
}
}
},
"centos-stream-9": {
"dependencies": {
"osbuild": {
"commit": "619a64f0bd7322628ae5fedf8b3a640e42f9edcd"
"commit": "322974695cfd6fe3022d8ec4c968b368b674d4dc"
}
},
"repos": [
Expand Down Expand Up @@ -349,7 +349,7 @@
"centos-stream-8": {
"dependencies": {
"osbuild": {
"commit": "619a64f0bd7322628ae5fedf8b3a640e42f9edcd"
"commit": "322974695cfd6fe3022d8ec4c968b368b674d4dc"
}
},
"repos": [
Expand Down
52 changes: 26 additions & 26 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ go 1.19
exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible

require (
cloud.google.com/go/compute v1.23.4
cloud.google.com/go/storage v1.37.0
cloud.google.com/go/compute v1.24.0
cloud.google.com/go/storage v1.38.0
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.5.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.0
github.com/Azure/go-autorest/autorest v0.11.29
github.com/Azure/go-autorest/autorest/azure/auth v0.5.12
github.com/BurntSushi/toml v1.3.2
github.com/aws/aws-sdk-go v1.50.9
github.com/aws/aws-sdk-go v1.50.24
github.com/coreos/go-semver v0.3.1
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
github.com/deepmap/oapi-codegen v1.8.2
Expand All @@ -26,7 +26,7 @@ require (
github.com/golang-jwt/jwt/v4 v4.5.0
github.com/google/go-cmp v0.6.0
github.com/google/uuid v1.6.0
github.com/gophercloud/gophercloud v1.8.0
github.com/gophercloud/gophercloud v1.9.0
github.com/hashicorp/go-retryablehttp v0.7.5
github.com/jackc/pgtype v1.14.1
github.com/jackc/pgx/v4 v4.18.1
Expand All @@ -36,7 +36,7 @@ require (
github.com/labstack/gommon v0.4.2
github.com/openshift-online/ocm-sdk-go v0.1.398
github.com/oracle/oci-go-sdk/v54 v54.0.0
github.com/osbuild/images v0.35.0
github.com/osbuild/images v0.40.0
github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20231117174845-e969a9dc3cd1
github.com/osbuild/pulp-client v0.1.0
github.com/prometheus/client_golang v1.18.0
Expand All @@ -45,21 +45,21 @@ require (
github.com/spf13/cobra v1.8.0
github.com/stretchr/testify v1.8.4
github.com/ubccr/kerby v0.0.0-20170626144437-201a958fc453
github.com/vmware/govmomi v0.34.2
github.com/vmware/govmomi v0.35.0
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
golang.org/x/oauth2 v0.16.0
golang.org/x/oauth2 v0.17.0
golang.org/x/sync v0.6.0
golang.org/x/sys v0.16.0
google.golang.org/api v0.161.0
golang.org/x/sys v0.17.0
google.golang.org/api v0.166.0
)

require (
cloud.google.com/go v0.112.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v1.1.5 // indirect
cloud.google.com/go/iam v1.1.6 // indirect
dario.cat/mergo v1.0.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.2 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.22 // indirect
github.com/Azure/go-autorest/autorest/azure/cli v0.4.6 // indirect
Expand Down Expand Up @@ -122,7 +122,7 @@ require (
github.com/google/go-intervals v0.0.2 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/googleapis/gax-go/v2 v2.12.1 // indirect
github.com/gorilla/css v1.0.0 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand Down Expand Up @@ -195,23 +195,23 @@ require (
go.mongodb.org/mongo-driver v1.11.3 // indirect
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
go.opentelemetry.io/otel v1.22.0 // indirect
go.opentelemetry.io/otel/metric v1.22.0 // indirect
go.opentelemetry.io/otel/trace v1.22.0 // indirect
golang.org/x/crypto v0.18.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect
go.opentelemetry.io/otel v1.23.0 // indirect
go.opentelemetry.io/otel/metric v1.23.0 // indirect
go.opentelemetry.io/otel/trace v1.23.0 // indirect
golang.org/x/crypto v0.19.0 // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/term v0.16.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/term v0.17.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.14.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac // indirect
google.golang.org/grpc v1.61.0 // indirect
google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect
google.golang.org/grpc v1.61.1 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/go-jose/go-jose.v2 v2.6.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand Down
Loading

0 comments on commit 2f087f1

Please sign in to comment.