diff --git a/.gitignore b/.gitignore index b4f72c6..5e7e40a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-composer-132.tar.gz +SOURCES/osbuild-composer-149.tar.gz diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata index a51cf1e..0f2e907 100644 --- a/.osbuild-composer.metadata +++ b/.osbuild-composer.metadata @@ -1 +1 @@ -10ef6e6286916cb0c57eae9ea81f8ed063fa8103 SOURCES/osbuild-composer-132.tar.gz +ea59dc56a63899e6efb74dbc8b82ffa25012fbe3 SOURCES/osbuild-composer-149.tar.gz diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index d56e12d..98b8267 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -8,11 +8,11 @@ %bcond_with relax_requires # The minimum required osbuild version -%global min_osbuild_version 139 +%global min_osbuild_version 157 %global goipath github.com/osbuild/osbuild-composer -Version: 132 +Version: 149 %gometa @@ -106,8 +106,6 @@ 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-worker-executor %{goipath}/cmd/osbuild-worker-executor -%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 @@ -116,13 +114,6 @@ make man # Build test binaries with `go test -c`, so that they can take advantage of # golang's testing package. The golang rpm macros don't support building them # directly. Thus, do it manually, taking care to also include a build id. -# -# On Fedora, also turn off go modules and set the path to the one into which -# the golang-* packages install source code. -%if 0%{?fedora} -export GO111MODULE=off -export GOPATH=%{gobuilddir}:%{gopath} -%endif TEST_LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')" @@ -133,7 +124,6 @@ GOTAGS="${GOTAGS:+$GOTAGS,}rhel%{rhel}" 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-image-tests %{goipath}/cmd/osbuild-image-tests 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 go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-dbjobqueue-tests %{goipath}/cmd/osbuild-composer-dbjobqueue-tests @@ -147,8 +137,6 @@ install -m 0755 -vd %{buildroot}% 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 _bin/osbuild-worker-executor %{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 @@ -158,12 +146,13 @@ install -m 0755 -vd %{buildroot}% # Latest CentOS supports building all CentOS versions %if 0%{?centos} >= 10 -install -m 0644 -vp repositories/centos-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/centos-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ %else # All other CentOS versions support building for the same version -install -m 0644 -vp repositories/centos-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ -install -m 0644 -vp repositories/centos-stream-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/centos-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +# centos-stream-* are symlinks +cp -a repositories/centos-stream-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ %endif %else @@ -171,7 +160,7 @@ install -m 0644 -vp repositories/centos-stream-%{centos}* %{buildroot}% %if 0%{?rhel} # RHEL 10 supports building all RHEL versions %if 0%{?rhel} >= 10 -for REPO_FILE in $(ls repositories/rhel-* | grep -v 'no-aux-key'); do +for REPO_FILE in $(ls vendor/github.com/osbuild/images/data/repositories/rhel-* ); do install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE}) done @@ -182,13 +171,13 @@ done %else # All other RHEL versions support building for the same version -for REPO_FILE in $(ls repositories/rhel-%{rhel}* | grep -v 'no-aux-key'); do +for REPO_FILE in $(ls vendor/github.com/osbuild/images/data/repositories/rhel-%{rhel}* ); do install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE}) done # RHEL 9 supports building also for RHEL 8 %if 0%{?rhel} == 9 -for REPO_FILE in $(ls repositories/rhel-8* | grep -v 'no-aux-key'); do +for REPO_FILE in $(ls vendor/github.com/osbuild/images/data/repositories/rhel-8* ); do install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE}) done %endif @@ -199,7 +188,7 @@ done # Fedora can build for all included fedora releases %if 0%{?fedora} -install -m 0644 -vp repositories/fedora-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/fedora-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ %endif install -m 0755 -vd %{buildroot}%{_unitdir} @@ -219,7 +208,6 @@ install -m 0755 -vd %{buildroot}% 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-image-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/ @@ -252,9 +240,6 @@ install -m 0644 -vp test/data/ansible/* %{buildroot}% install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/azure install -m 0644 -vp test/data/azure/* %{buildroot}%{_datadir}/tests/osbuild-composer/azure/ -install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/manifests -install -m 0644 -vp test/data/manifests/* %{buildroot}%{_datadir}/tests/osbuild-composer/manifests/ - install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/cloud-init install -m 0644 -vp test/data/cloud-init/* %{buildroot}%{_datadir}/tests/osbuild-composer/cloud-init/ @@ -291,14 +276,12 @@ install -m 0644 -vp test/data/rhel-upgrade/* %{buildroot}% %check export GOFLAGS="-buildmode=pie" %if 0%{?rhel} -export GOFLAGS+=" -mod=vendor -tags=exclude_graphdriver_btrfs" +export GOFLAGS+=" -tags=exclude_graphdriver_btrfs" +%endif + export GOPATH=$PWD/_build:%{gopath} # cd inside GOPATH, otherwise go with GO111MODULE=off ignores vendor directory cd $PWD/_build/src/%{goipath} -%gotest ./... -%else -%gocheck -%endif %post %systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket @@ -355,8 +338,6 @@ The worker for osbuild-composer %files worker %{_libexecdir}/osbuild-composer/osbuild-worker %{_libexecdir}/osbuild-composer/osbuild-worker-executor -%{_libexecdir}/osbuild-composer/osbuild-jobsite-manager -%{_libexecdir}/osbuild-composer/osbuild-jobsite-builder %{_unitdir}/osbuild-worker@.service %{_unitdir}/osbuild-remote-worker@.service @@ -453,6 +434,45 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Thu Aug 21 2025 imagebuilder-bot - 149-1 +- New upstream release + +* Wed Aug 06 2025 imagebuilder-bot - 147-1 +- New upstream release + +* Wed Jul 23 2025 imagebuilder-bot - 146-1 +- New upstream release + +* Sat Jul 12 2025 imagebuilder-bot - 145-1 +- New upstream release + +* Wed Jun 25 2025 imagebuilder-bot - 144-1 +- New upstream release + +* Wed Jun 11 2025 imagebuilder-bot - 143-1 +- New upstream release + +* Thu Jun 05 2025 imagebuilder-bot - 142-1 +- New upstream release + +* Mon May 19 2025 imagebuilder-bot - 141-1 +- New upstream release + +* Wed Apr 23 2025 imagebuilder-bot - 139-1 +- New upstream release + +* Wed Apr 16 2025 imagebuilder-bot - 138-1 +- New upstream release + +* Thu Apr 03 2025 imagebuilder-bot - 137-1 +- New upstream release + +* Mon Mar 31 2025 imagebuilder-bot - 136-1 +- New upstream release + +* Wed Mar 05 2025 imagebuilder-bot - 135-1 +- New upstream release + * Thu Feb 13 2025 imagebuilder-bot - 132-1 - New upstream release