From 3a5afba36c592f25da80b83ac818ebdd121bd0ec Mon Sep 17 00:00:00 2001 From: Ondřej Budai Date: Feb 04 2021 14:50:57 +0000 Subject: Update to 27 --- diff --git a/.gitignore b/.gitignore index 1142634..cdc5f1b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /osbuild-composer-24.tar.gz /osbuild-composer-25.tar.gz /osbuild-composer-26.tar.gz +/osbuild-composer-27.tar.gz diff --git a/osbuild-composer.spec b/osbuild-composer.spec index 2a61641..e43663b 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -4,7 +4,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 26 +Version: 27 %gometa @@ -15,7 +15,7 @@ As such, it is a drop-in replacement. } Name: osbuild-composer -Release: 3%{?dist} +Release: 1%{?dist} Summary: An image building service based on osbuild # osbuild-composer doesn't have support for building i686 images @@ -26,7 +26,7 @@ ExcludeArch: i686 License: ASL 2.0 URL: %{gourl} Source0: %{gosource} -Patch0: fix-azure-dependency.patch + BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: systemd @@ -56,9 +56,9 @@ BuildRequires: golang(github.com/ubccr/kerby) BuildRequires: golang(github.com/vmware/govmomi) %endif +Requires: %{name}-core = %{version}-%{release} Requires: %{name}-worker = %{version}-%{release} Requires: systemd -Requires: qemu-img Provides: weldr @@ -88,21 +88,22 @@ Obsoletes: osbuild-composer-koji <= 23 %forgeautosetup -p1 %else %goprep -%patch -p1 %endif %if 0%{?fedora} && 0%{?fedora} <= 32 -# Fedora 32 and older ships a different kolo/xmlrpc API. We cannot specify -# build tags in gobuild macro because the macro itself specifies build tags. -# and -tags argument cannot be used more than once. +# Fedora 32 and older ships different kolo/xmlrpc and azure/azblob APIs. We +# cannot specify build tags in gobuild macro because the macro itself +# specifies build tags and -tags argument cannot be used more than once. # Therefore, this ugly hack with build tags switcharoo is required. # Remove when F32 is EOL. -# Remove the build constraint from the wrapper of the old API +# Remove the build constraint from the wrappers of the old APIs sed -i "s$// +build kolo_xmlrpc_oldapi$// +build !kolo_xmlrpc_oldapi$" internal/upload/koji/xmlrpc-response-oldapi.go +sed -i "s$// +build azblob_oldapi$// +build !azblob_oldapi$" internal/upload/azure/page_blob_url_oldapi.go -# Add a build constraint to the wrapper of the new API +# Add a build constraint to the wrappers of the new APIs sed -i "s$// +build !kolo_xmlrpc_oldapi$// +build kolo_xmlrpc_oldapi$" internal/upload/koji/xmlrpc-response.go +sed -i "s$// +build !azblob_oldapi$// +build azblob_oldapi$" internal/upload/azure/page_blob_url.go %endif %build @@ -178,6 +179,7 @@ install -m 0755 -vp _bin/osbuild-auth-tests %{buildroot}%{_l install -m 0755 -vp _bin/osbuild-koji-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp _bin/cloud-cleaner %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/provision.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ +install -m 0755 -vp tools/gen-certs.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/image-info %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/run-koji-container.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/koji-compose.py %{buildroot}%{_libexecdir}/osbuild-composer-test/ @@ -248,9 +250,6 @@ cd $PWD/_build/src/%{goipath} %license LICENSE %doc README.md %{_mandir}/man7/%{name}.7* -%{_libexecdir}/osbuild-composer/osbuild-composer -%{_libexecdir}/osbuild-composer/dnf-json -%{_datadir}/osbuild-composer/ %{_unitdir}/osbuild-composer.service %{_unitdir}/osbuild-composer.socket %{_unitdir}/osbuild-composer-api.socket @@ -258,9 +257,21 @@ cd $PWD/_build/src/%{goipath} %{_unitdir}/osbuild-remote-worker.socket %{_sysusersdir}/osbuild-composer.conf +%package core +Summary: The core osbuild-composer binary + +%description core +The core osbuild-composer binary. This is suitable both for spawning in containers and by systemd. + +%files core +%{_libexecdir}/osbuild-composer/osbuild-composer +%{_libexecdir}/osbuild-composer/dnf-json +%{_datadir}/osbuild-composer/ + %package worker Summary: The worker for osbuild-composer Requires: systemd +Requires: qemu-img Requires: osbuild >= 23 Requires: osbuild-ostree >= 23 @@ -307,7 +318,6 @@ Requires: unzip Requires: container-selinux Requires: dnsmasq Requires: krb5-workstation -Requires: koji Requires: podman Requires: python3 Requires: sssd-krb5 @@ -328,11 +338,15 @@ Requires: qemu-kvm Requires: virt-install Requires: expect Requires: python3-lxml -Requires: ansible Requires: httpd Requires: openssl %if 0%{?fedora} Requires: podman-plugins +# koji and ansible are not in RHEL repositories. Depending on them breaks RHEL +# gating (see OSCI-1541). The test script must enable EPEL and install those +# packages manually. +Requires: koji +Requires: ansible %endif %ifarch %{arm} Requires: edk2-aarch64 @@ -349,6 +363,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Thu Feb 04 2021 Ondrej Budai - 27-1 +- New upstream release + * Tue Jan 26 2021 Fedora Release Engineering - 26-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 8d4ba26..6895612 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-composer-26.tar.gz) = f7c4ac0fadcbd443f72503067b3f90434c78d320c4555d54970409b720822f85fa454624bbd9e78d046817aef7976a22fcbd680b5f41309778be225b74b1b317 +SHA512 (osbuild-composer-27.tar.gz) = 83d2a40fa638f9264a171bae22341eab41b564701cd0d7740e088fc2f1fc1534441118d9d935a9ba56e860c7c0772fedd8576b8eff74cdab2d89627654b8cbf8