Skip to content
Snippets Groups Projects
Commit 9a28c801 authored by Rocky Automation's avatar Rocky Automation :tv:
Browse files

import osbuild-composer-106-1.el10

parent 8eb439c2
No related branches found
Tags imports/r10s/osbuild-composer-134-1.el10
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.osbuild-composer.metadata
+ 1
− 1
View file @ 9a28c801
355b6ac8e781fb6a0b37850f3bf10f48651acb5f0e7f006e6f92c1b656ee1e41 SOURCES/osbuild-composer-100.tar.gz
89368e5611486995a7cf2b1409f551dff4502c4d828e77baa70c9700b1f21634 SOURCES/osbuild-composer-106.tar.gz
SPECS/osbuild-composer.spec
+ 24
− 236
View file @ 9a28c801
......@@ -7,9 +7,12 @@
# This is used internally during nightly pipeline testing!
%bcond_with relax_requires
# The minimum required osbuild version
%global min_osbuild_version 116
%global goipath github.com/osbuild/osbuild-composer
Version: 100
Version: 106
%gometa
......@@ -22,7 +25,7 @@ It is compatible with composer-cli and cockpit-composer clients.
}
Name: osbuild-composer
Release: 2%{?dist}
Release: 1%{?dist}
Summary: An image building service based on osbuild
# osbuild-composer doesn't have support for building i686 and armv7hl images
......@@ -51,214 +54,6 @@ BuildRequires: git
BuildRequires: btrfs-progs-devel
# DO NOT REMOVE the BUNDLE_START and BUNDLE_END markers as they are used by 'tools/rpm_spec_add_provides_bundle.sh' to generate the Provides: bundled list
# BUNDLE_START
Provides: bundled(golang(cloud.google.com/go)) = 0.112.0
Provides: bundled(golang(cloud.google.com/go/compute)) = 1.23.4
Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.2.3
Provides: bundled(golang(cloud.google.com/go/iam)) = 1.1.5
Provides: bundled(golang(cloud.google.com/go/storage)) = 1.37.0
Provides: bundled(golang(dario.cat/mergo)) = 1.0.0
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go)) = 68.0.0+incompatible
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azcore)) = 1.9.1
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azidentity)) = 1.5.1
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/internal)) = 1.5.1
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5)) = 5.5.0
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources)) = 1.2.0
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage)) = 1.5.0
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob)) = 1.2.1
Provides: bundled(golang(github.com/Azure/go-autorest)) = 14.2.0+incompatible
Provides: bundled(golang(github.com/Azure/go-autorest/autorest)) = 0.11.29
Provides: bundled(golang(github.com/Azure/go-autorest/autorest/adal)) = 0.9.22
Provides: bundled(golang(github.com/Azure/go-autorest/autorest/azure/auth)) = 0.5.12
Provides: bundled(golang(github.com/Azure/go-autorest/autorest/azure/cli)) = 0.4.6
Provides: bundled(golang(github.com/Azure/go-autorest/autorest/date)) = 0.3.0
Provides: bundled(golang(github.com/Azure/go-autorest/autorest/to)) = 0.4.0
Provides: bundled(golang(github.com/Azure/go-autorest/autorest/validation)) = 0.3.1
Provides: bundled(golang(github.com/Azure/go-autorest/logger)) = 0.2.1
Provides: bundled(golang(github.com/Azure/go-autorest/tracing)) = 0.6.0
Provides: bundled(golang(github.com/AzureAD/microsoft-authentication-library-for-go)) = 1.2.1
Provides: bundled(golang(github.com/BurntSushi/toml)) = 1.3.2
Provides: bundled(golang(github.com/Microsoft/go-winio)) = 0.6.1
Provides: bundled(golang(github.com/Microsoft/hcsshim)) = 0.12.0-rc.1
Provides: bundled(golang(github.com/VividCortex/ewma)) = 1.2.0
Provides: bundled(golang(github.com/acarl005/stripansi)) = 5a71ef0
Provides: bundled(golang(github.com/asaskevich/govalidator)) = a9d515a
Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 1.50.9
Provides: bundled(golang(github.com/aymerick/douceur)) = 0.2.0
Provides: bundled(golang(github.com/beorn7/perks)) = 1.0.1
Provides: bundled(golang(github.com/cenkalti/backoff/v4)) = 4.2.1
Provides: bundled(golang(github.com/cespare/xxhash/v2)) = 2.2.0
Provides: bundled(golang(github.com/containerd/cgroups/v3)) = 3.0.2
Provides: bundled(golang(github.com/containerd/containerd)) = 1.7.9
Provides: bundled(golang(github.com/containerd/stargz-snapshotter/estargz)) = 0.15.1
Provides: bundled(golang(github.com/containers/common)) = 0.57.4
Provides: bundled(golang(github.com/containers/image/v5)) = 5.29.2
Provides: bundled(golang(github.com/containers/libtrust)) = c1716e8
Provides: bundled(golang(github.com/containers/ocicrypt)) = 1.1.9
Provides: bundled(golang(github.com/containers/storage)) = 1.51.0
Provides: bundled(golang(github.com/coreos/go-semver)) = 0.3.1
Provides: bundled(golang(github.com/coreos/go-systemd)) = d3cd4ed
Provides: bundled(golang(github.com/cyberphone/json-canonicalization)) = 785e297
Provides: bundled(golang(github.com/cyphar/filepath-securejoin)) = 0.2.4
Provides: bundled(golang(github.com/davecgh/go-spew)) = 1.1.1
Provides: bundled(golang(github.com/deepmap/oapi-codegen)) = 1.8.2
Provides: bundled(golang(github.com/dimchansky/utfbom)) = 1.1.1
Provides: bundled(golang(github.com/distribution/reference)) = 0.5.0
Provides: bundled(golang(github.com/docker/distribution)) = 2.8.3+incompatible
Provides: bundled(golang(github.com/docker/docker)) = 24.0.7+incompatible
Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = 0.8.0
Provides: bundled(golang(github.com/docker/go-connections)) = 0.4.0
Provides: bundled(golang(github.com/docker/go-units)) = 0.5.0
Provides: bundled(golang(github.com/dougm/pretty)) = 2ee9d74
Provides: bundled(golang(github.com/felixge/httpsnoop)) = 1.0.4
Provides: bundled(golang(github.com/getkin/kin-openapi)) = 0.93.0
Provides: bundled(golang(github.com/ghodss/yaml)) = 1.0.0
Provides: bundled(golang(github.com/go-jose/go-jose/v3)) = 3.0.1
Provides: bundled(golang(github.com/go-logr/logr)) = 1.4.1
Provides: bundled(golang(github.com/go-logr/stdr)) = 1.2.2
Provides: bundled(golang(github.com/go-openapi/analysis)) = 0.21.4
Provides: bundled(golang(github.com/go-openapi/errors)) = 0.20.4
Provides: bundled(golang(github.com/go-openapi/jsonpointer)) = 0.19.6
Provides: bundled(golang(github.com/go-openapi/jsonreference)) = 0.20.2
Provides: bundled(golang(github.com/go-openapi/loads)) = 0.21.2
Provides: bundled(golang(github.com/go-openapi/runtime)) = 0.26.0
Provides: bundled(golang(github.com/go-openapi/spec)) = 0.20.9
Provides: bundled(golang(github.com/go-openapi/strfmt)) = 0.21.7
Provides: bundled(golang(github.com/go-openapi/swag)) = 0.22.4
Provides: bundled(golang(github.com/go-openapi/validate)) = 0.22.1
Provides: bundled(golang(github.com/gobwas/glob)) = 0.2.3
Provides: bundled(golang(github.com/gogo/protobuf)) = 1.3.2
Provides: bundled(golang(github.com/golang-jwt/jwt)) = 3.2.2+incompatible
Provides: bundled(golang(github.com/golang-jwt/jwt/v4)) = 4.5.0
Provides: bundled(golang(github.com/golang-jwt/jwt/v5)) = 5.2.0
Provides: bundled(golang(github.com/golang/glog)) = 1.1.2
Provides: bundled(golang(github.com/golang/groupcache)) = 41bb18b
Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.3
Provides: bundled(golang(github.com/google/go-cmp)) = 0.6.0
Provides: bundled(golang(github.com/google/go-containerregistry)) = 0.16.1
Provides: bundled(golang(github.com/google/go-intervals)) = 0.0.2
Provides: bundled(golang(github.com/google/s2a-go)) = 0.1.7
Provides: bundled(golang(github.com/google/uuid)) = 1.6.0
Provides: bundled(golang(github.com/googleapis/enterprise-certificate-proxy)) = 0.3.2
Provides: bundled(golang(github.com/googleapis/gax-go/v2)) = 2.12.0
Provides: bundled(golang(github.com/gophercloud/gophercloud)) = 1.8.0
Provides: bundled(golang(github.com/gorilla/css)) = 1.0.0
Provides: bundled(golang(github.com/gorilla/mux)) = 1.8.0
Provides: bundled(golang(github.com/hashicorp/errwrap)) = 1.1.0
Provides: bundled(golang(github.com/hashicorp/go-cleanhttp)) = 0.5.2
Provides: bundled(golang(github.com/hashicorp/go-multierror)) = 1.1.1
Provides: bundled(golang(github.com/hashicorp/go-retryablehttp)) = 0.7.5
Provides: bundled(golang(github.com/hashicorp/go-version)) = 1.6.0
Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 1.1.0
Provides: bundled(golang(github.com/jackc/chunkreader/v2)) = 2.0.1
Provides: bundled(golang(github.com/jackc/pgconn)) = 1.14.0
Provides: bundled(golang(github.com/jackc/pgio)) = 1.0.0
Provides: bundled(golang(github.com/jackc/pgpassfile)) = 1.0.0
Provides: bundled(golang(github.com/jackc/pgproto3/v2)) = 2.3.2
Provides: bundled(golang(github.com/jackc/pgservicefile)) = 091c0ba
Provides: bundled(golang(github.com/jackc/pgtype)) = 1.14.1
Provides: bundled(golang(github.com/jackc/pgx/v4)) = 4.18.1
Provides: bundled(golang(github.com/jackc/puddle)) = 1.3.0
Provides: bundled(golang(github.com/jmespath/go-jmespath)) = 0.4.0
Provides: bundled(golang(github.com/josharian/intern)) = 1.0.0
Provides: bundled(golang(github.com/json-iterator/go)) = 1.1.12
Provides: bundled(golang(github.com/julienschmidt/httprouter)) = 1.3.0
Provides: bundled(golang(github.com/klauspost/compress)) = 1.17.3
Provides: bundled(golang(github.com/klauspost/pgzip)) = 1.2.6
Provides: bundled(golang(github.com/kolo/xmlrpc)) = 38db28d
Provides: bundled(golang(github.com/kr/text)) = 0.2.0
Provides: bundled(golang(github.com/kylelemons/godebug)) = 1.1.0
Provides: bundled(golang(github.com/labstack/echo/v4)) = 4.11.4
Provides: bundled(golang(github.com/labstack/gommon)) = 0.4.2
Provides: bundled(golang(github.com/letsencrypt/boulder)) = fdfea0d
Provides: bundled(golang(github.com/mailru/easyjson)) = 0.7.7
Provides: bundled(golang(github.com/mattn/go-colorable)) = 0.1.13
Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.20
Provides: bundled(golang(github.com/mattn/go-runewidth)) = 0.0.15
Provides: bundled(golang(github.com/mattn/go-shellwords)) = 1.0.12
Provides: bundled(golang(github.com/mattn/go-sqlite3)) = 1.14.18
Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions/v2)) = 2.0.0
Provides: bundled(golang(github.com/microcosm-cc/bluemonday)) = 1.0.18
Provides: bundled(golang(github.com/miekg/pkcs11)) = 1.1.1
Provides: bundled(golang(github.com/mistifyio/go-zfs/v3)) = 3.0.1
Provides: bundled(golang(github.com/mitchellh/go-homedir)) = 1.1.0
Provides: bundled(golang(github.com/mitchellh/mapstructure)) = 1.5.0
Provides: bundled(golang(github.com/moby/sys/mountinfo)) = 0.7.1
Provides: bundled(golang(github.com/modern-go/concurrent)) = bacd9c7
Provides: bundled(golang(github.com/modern-go/reflect2)) = 1.0.2
Provides: bundled(golang(github.com/oklog/ulid)) = 1.3.1
Provides: bundled(golang(github.com/opencontainers/go-digest)) = 1.0.0
Provides: bundled(golang(github.com/opencontainers/image-spec)) = 1.1.0-rc5
Provides: bundled(golang(github.com/opencontainers/runc)) = 1.1.10
Provides: bundled(golang(github.com/opencontainers/runtime-spec)) = 1.1.0
Provides: bundled(golang(github.com/opencontainers/selinux)) = 1.11.0
Provides: bundled(golang(github.com/openshift-online/ocm-sdk-go)) = 0.1.398
Provides: bundled(golang(github.com/oracle/oci-go-sdk/v54)) = 54.0.0
Provides: bundled(golang(github.com/osbuild/images)) = 0.35.0
Provides: bundled(golang(github.com/osbuild/osbuild-composer/pkg/splunk_logger)) = e969a9d
Provides: bundled(golang(github.com/osbuild/pulp-client)) = 0.1.0
Provides: bundled(golang(github.com/ostreedev/ostree-go)) = 719684c
Provides: bundled(golang(github.com/pkg/browser)) = 5ac0b6a
Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1
Provides: bundled(golang(github.com/pmezard/go-difflib)) = 1.0.0
Provides: bundled(golang(github.com/proglottis/gpgme)) = 0.1.3
Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.18.0
Provides: bundled(golang(github.com/prometheus/client_model)) = 0.5.0
Provides: bundled(golang(github.com/prometheus/common)) = 0.45.0
Provides: bundled(golang(github.com/prometheus/procfs)) = 0.12.0
Provides: bundled(golang(github.com/rivo/uniseg)) = 0.4.4
Provides: bundled(golang(github.com/secure-systems-lab/go-securesystemslib)) = 0.7.0
Provides: bundled(golang(github.com/segmentio/ksuid)) = 1.0.4
Provides: bundled(golang(github.com/sigstore/fulcio)) = 1.4.3
Provides: bundled(golang(github.com/sigstore/rekor)) = 1.2.2
Provides: bundled(golang(github.com/sigstore/sigstore)) = 1.7.5
Provides: bundled(golang(github.com/sirupsen/logrus)) = 1.9.3
Provides: bundled(golang(github.com/skratchdot/open-golang)) = eef8423
Provides: bundled(golang(github.com/sony/gobreaker)) = dd874f9
Provides: bundled(golang(github.com/spf13/cobra)) = 1.8.0
Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.5
Provides: bundled(golang(github.com/stefanberger/go-pkcs11uri)) = 78d3cae
Provides: bundled(golang(github.com/stretchr/testify)) = 1.8.4
Provides: bundled(golang(github.com/sylabs/sif/v2)) = 2.15.0
Provides: bundled(golang(github.com/syndtr/gocapability)) = 42c35b4
Provides: bundled(golang(github.com/tchap/go-patricia/v2)) = 2.3.1
Provides: bundled(golang(github.com/titanous/rocacheck)) = afe7314
Provides: bundled(golang(github.com/ubccr/kerby)) = 201a958
Provides: bundled(golang(github.com/ulikunitz/xz)) = 0.5.11
Provides: bundled(golang(github.com/valyala/bytebufferpool)) = 1.0.0
Provides: bundled(golang(github.com/valyala/fasttemplate)) = 1.2.2
Provides: bundled(golang(github.com/vbatts/tar-split)) = 0.11.5
Provides: bundled(golang(github.com/vbauerster/mpb/v8)) = 8.6.2
Provides: bundled(golang(github.com/vmware/govmomi)) = 0.34.2
Provides: bundled(golang(go.mongodb.org/mongo-driver)) = 1.11.3
Provides: bundled(golang(go.mozilla.org/pkcs7)) = 33d0574
Provides: bundled(golang(go.opencensus.io)) = 0.24.0
Provides: bundled(golang(go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc)) = 0.47.0
Provides: bundled(golang(go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp)) = 0.47.0
Provides: bundled(golang(go.opentelemetry.io/otel)) = 1.22.0
Provides: bundled(golang(go.opentelemetry.io/otel/metric)) = 1.22.0
Provides: bundled(golang(go.opentelemetry.io/otel/trace)) = 1.22.0
Provides: bundled(golang(golang.org/x/crypto)) = 0.18.0
Provides: bundled(golang(golang.org/x/exp)) = 7918f67
Provides: bundled(golang(golang.org/x/mod)) = 0.13.0
Provides: bundled(golang(golang.org/x/net)) = 0.20.0
Provides: bundled(golang(golang.org/x/oauth2)) = 0.16.0
Provides: bundled(golang(golang.org/x/sync)) = 0.6.0
Provides: bundled(golang(golang.org/x/sys)) = 0.16.0
Provides: bundled(golang(golang.org/x/term)) = 0.16.0
Provides: bundled(golang(golang.org/x/text)) = 0.14.0
Provides: bundled(golang(golang.org/x/time)) = 0.5.0
Provides: bundled(golang(golang.org/x/tools)) = 0.14.0
Provides: bundled(golang(google.golang.org/api)) = 0.161.0
Provides: bundled(golang(google.golang.org/appengine)) = 1.6.8
Provides: bundled(golang(google.golang.org/genproto)) = a9fa171
Provides: bundled(golang(google.golang.org/genproto/googleapis/api)) = 1f4bbc5
Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc)) = a9fa171
Provides: bundled(golang(google.golang.org/grpc)) = 1.61.0
Provides: bundled(golang(google.golang.org/protobuf)) = 1.32.0
Provides: bundled(golang(gopkg.in/go-jose/go-jose.v2)) = 2.6.1
Provides: bundled(golang(gopkg.in/ini.v1)) = 1.67.0
Provides: bundled(golang(gopkg.in/yaml.v2)) = 2.4.0
Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1
# BUNDLE_END
%endif
......@@ -311,6 +106,8 @@ export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/comm
%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer
%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker
%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-jobsite-manager %{goipath}/cmd/osbuild-jobsite-manager
%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-jobsite-builder %{goipath}/cmd/osbuild-jobsite-builder
make man
......@@ -345,7 +142,8 @@ go build -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _b
install -m 0755 -vd %{buildroot}%{_libexecdir}/osbuild-composer
install -m 0755 -vp _bin/osbuild-composer %{buildroot}%{_libexecdir}/osbuild-composer/
install -m 0755 -vp _bin/osbuild-worker %{buildroot}%{_libexecdir}/osbuild-composer/
install -m 0755 -vp dnf-json %{buildroot}%{_libexecdir}/osbuild-composer/
install -m 0755 -vp _bin/osbuild-jobsite-manager %{buildroot}%{_libexecdir}/osbuild-composer/
install -m 0755 -vp _bin/osbuild-jobsite-builder %{buildroot}%{_libexecdir}/osbuild-composer/
# Only include repositories for the distribution and release
install -m 0755 -vd %{buildroot}%{_datadir}/osbuild-composer/repositories
......@@ -502,7 +300,9 @@ cd $PWD/_build/src/%{goipath}
%package core
Summary: The core osbuild-composer binary
Requires: %{name}-dnf-json = %{version}-%{release}
Requires: osbuild-depsolve-dnf >= %{min_osbuild_version}
Provides: %{name}-dnf-json = %{version}-%{release}
Obsoletes: %{name}-dnf-json < %{version}-%{release}
%description core
The core osbuild-composer binary. This is suitable both for spawning in containers and by systemd.
......@@ -515,17 +315,21 @@ The core osbuild-composer binary. This is suitable both for spawning in containe
Summary: The worker for osbuild-composer
Requires: systemd
Requires: qemu-img
Requires: osbuild >= 98
Requires: osbuild-ostree >= 98
Requires: osbuild-lvm2 >= 98
Requires: osbuild-luks2 >= 98
Requires: %{name}-dnf-json = %{version}-%{release}
Requires: osbuild >= %{min_osbuild_version}
Requires: osbuild-ostree >= %{min_osbuild_version}
Requires: osbuild-lvm2 >= %{min_osbuild_version}
Requires: osbuild-luks2 >= %{min_osbuild_version}
Requires: osbuild-depsolve-dnf >= %{min_osbuild_version}
Provides: %{name}-dnf-json = %{version}-%{release}
Obsoletes: %{name}-dnf-json < %{version}-%{release}
%description worker
The worker for osbuild-composer
%files worker
%{_libexecdir}/osbuild-composer/osbuild-worker
%{_libexecdir}/osbuild-composer/osbuild-jobsite-manager
%{_libexecdir}/osbuild-composer/osbuild-jobsite-builder
%{_unitdir}/osbuild-worker@.service
%{_unitdir}/osbuild-remote-worker@.service
......@@ -547,25 +351,6 @@ fi
# restart all the worker services
%systemd_postun_with_restart "osbuild-worker@*.service" "osbuild-remote-worker@*.service"
%package dnf-json
Summary: The dnf-json binary used by osbuild-composer and the workers
# Conflicts with older versions of composer that provide the same files
# this can be removed when RHEL 8 reaches EOL
Conflicts: osbuild-composer <= 35
%description dnf-json
The dnf-json binary used by osbuild-composer and the workers.
%files dnf-json
%{_libexecdir}/osbuild-composer/dnf-json
%post dnf-json
# Fix ownership of the rpmmd cache files from previous versions where it was owned by root:root
if [ -e /var/cache/osbuild-composer/rpmmd ]; then
chown -f -R --from root:root _osbuild-composer:_osbuild-composer /var/cache/osbuild-composer/rpmmd
fi
%if %{with tests} || 0%{?rhel}
%package tests
......@@ -637,6 +422,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif
%changelog
* Wed May 01 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 106-1
- New upstream release
* Sun Feb 11 2024 Maxwell G <maxwell@gtmx.me> - 100-2
- Rebuild for golang 1.22.0
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment