From 892045571da2dcfadc24f40e603686e567b4d067 Mon Sep 17 00:00:00 2001 From: Valentin Chaboche Date: Mon, 7 Apr 2025 15:34:49 +0200 Subject: [PATCH 1/2] Packages/Rpm: copy baker spec to agnostic-baker spec The package is most likely the same, we start by copy-pasting the file so differences are easier to review in the next commit. --- .../octez/rpm/SPECS/octez-agnostic-baker.spec | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 scripts/packaging/octez/rpm/SPECS/octez-agnostic-baker.spec diff --git a/scripts/packaging/octez/rpm/SPECS/octez-agnostic-baker.spec b/scripts/packaging/octez/rpm/SPECS/octez-agnostic-baker.spec new file mode 100644 index 000000000000..2bffdbe258af --- /dev/null +++ b/scripts/packaging/octez/rpm/SPECS/octez-agnostic-baker.spec @@ -0,0 +1,49 @@ +Name: octez-baker +Version: %{version} +%if "%{epoch}" != "" +Epoch: %{epoch} +%endif +Release: 1%{?dist} +Summary: Octez baking software for the Tezos blockchain. +License: MIT +Requires: octez-node curl systemd +Recommends: octez-signer +Requires(pre): octez-client +%description + The Octez baker includes the necessary tools and functionalities for + participating in the baking process, such as block creation, attestations, and + protocol-specific consensus mechanisms. + + This package installs the baker, the accuser and the Octez node. For key + management it is recommended to install a remote signer of a different host. +%install +mkdir -p %{buildroot}/usr/bin/ +mkdir -p %{buildroot}/usr/share/octez-baker +install -m 0755 $HOME/rpmbuild/SPECS/binaries/octez-baker-P* %{buildroot}/usr/bin/ +install -m 0755 $HOME/rpmbuild/SPECS/binaries/octez-accuser-P* %{buildroot}/usr/bin/ +install -m 0755 $HOME/rpmbuild/SPECS/scripts/wait-for-node-up.sh %{buildroot}/usr/share/octez-baker/ +install -m 0755 $HOME/rpmbuild/SPECS/scripts/systemd-octez-bakers.sh %{buildroot}/usr/share/octez-baker/ +install -D -m 644 $HOME/rpmbuild/SPECS/manpages/octez-baker.1 %{buildroot}%{_mandir}/man1/octez-baker.1 +gzip %{buildroot}%{_mandir}/man1/octez-baker.1 +install -D -m 644 $HOME/rpmbuild/SPECS/manpages/octez-accuser.1 %{buildroot}%{_mandir}/man1/octez-accuser.1 +gzip %{buildroot}%{_mandir}/man1/octez-accuser.1 +install -D -m 644 $HOME/rpmbuild/SPECS/octez-baker.octez-accuser@.service %{buildroot}/usr/lib/systemd/system/octez-accuser@.service +install -D -m 644 $HOME/rpmbuild/SPECS/octez-baker@.service %{buildroot}/usr/lib/systemd/system/octez-baker@.service +install -D -m 644 $HOME/rpmbuild/SPECS/octez-baker.service %{buildroot}/usr/lib/systemd/system/octez-baker.service +install -D -m 644 $HOME/rpmbuild/SPECS/octez-baker.octez-accuser.default %{buildroot}/etc/default/octez-accuser +install -D -m 644 $HOME/rpmbuild/SPECS/octez-baker.default %{buildroot}/etc/default/octez-baker +%files +/usr/bin/octez-baker-* +/usr/bin/octez-accuser-* +/usr/share/octez-baker/wait-for-node-up.sh +/usr/share/octez-baker/systemd-octez-bakers.sh +%{_mandir}/man1/octez-baker.1* +%{_mandir}/man1/octez-accuser.1* +/usr/lib/systemd/system/octez-accuser@.service +/usr/lib/systemd/system/octez-baker@.service +/usr/lib/systemd/system/octez-baker.service +/etc/default/octez-accuser +/etc/default/octez-baker +%postun +%post +%preun -- GitLab From 31a91d3d5d09487a2fb65717c170c4ef7c81886a Mon Sep 17 00:00:00 2001 From: Valentin Chaboche Date: Mon, 7 Apr 2025 15:37:46 +0200 Subject: [PATCH 2/2] Packages/Rpm: agnostic baker package use agnostic baker --- .../octez/rpm/SPECS/octez-agnostic-baker.spec | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/scripts/packaging/octez/rpm/SPECS/octez-agnostic-baker.spec b/scripts/packaging/octez/rpm/SPECS/octez-agnostic-baker.spec index 2bffdbe258af..562bc9fd981e 100644 --- a/scripts/packaging/octez/rpm/SPECS/octez-agnostic-baker.spec +++ b/scripts/packaging/octez/rpm/SPECS/octez-agnostic-baker.spec @@ -1,4 +1,4 @@ -Name: octez-baker +Name: octez-agnostic-baker Version: %{version} %if "%{epoch}" != "" Epoch: %{epoch} @@ -18,30 +18,30 @@ Requires(pre): octez-client management it is recommended to install a remote signer of a different host. %install mkdir -p %{buildroot}/usr/bin/ -mkdir -p %{buildroot}/usr/share/octez-baker -install -m 0755 $HOME/rpmbuild/SPECS/binaries/octez-baker-P* %{buildroot}/usr/bin/ +mkdir -p %{buildroot}/usr/share/octez-agnostic-baker +install -m 0755 $HOME/rpmbuild/SPECS/binaries/octez-agnostic-baker %{buildroot}/usr/bin/ install -m 0755 $HOME/rpmbuild/SPECS/binaries/octez-accuser-P* %{buildroot}/usr/bin/ -install -m 0755 $HOME/rpmbuild/SPECS/scripts/wait-for-node-up.sh %{buildroot}/usr/share/octez-baker/ -install -m 0755 $HOME/rpmbuild/SPECS/scripts/systemd-octez-bakers.sh %{buildroot}/usr/share/octez-baker/ -install -D -m 644 $HOME/rpmbuild/SPECS/manpages/octez-baker.1 %{buildroot}%{_mandir}/man1/octez-baker.1 -gzip %{buildroot}%{_mandir}/man1/octez-baker.1 +install -m 0755 $HOME/rpmbuild/SPECS/scripts/wait-for-node-up.sh %{buildroot}/usr/share/octez-agnostic-baker/ +install -m 0755 $HOME/rpmbuild/SPECS/scripts/systemd-octez-agnostic-baker.sh %{buildroot}/usr/share/octez-agnostic-baker/ +install -D -m 644 $HOME/rpmbuild/SPECS/manpages/octez-agnostic-baker.1 %{buildroot}%{_mandir}/man1/octez-agnostic-baker.1 +gzip %{buildroot}%{_mandir}/man1/octez-agnostic-baker.1 install -D -m 644 $HOME/rpmbuild/SPECS/manpages/octez-accuser.1 %{buildroot}%{_mandir}/man1/octez-accuser.1 gzip %{buildroot}%{_mandir}/man1/octez-accuser.1 -install -D -m 644 $HOME/rpmbuild/SPECS/octez-baker.octez-accuser@.service %{buildroot}/usr/lib/systemd/system/octez-accuser@.service -install -D -m 644 $HOME/rpmbuild/SPECS/octez-baker@.service %{buildroot}/usr/lib/systemd/system/octez-baker@.service -install -D -m 644 $HOME/rpmbuild/SPECS/octez-baker.service %{buildroot}/usr/lib/systemd/system/octez-baker.service -install -D -m 644 $HOME/rpmbuild/SPECS/octez-baker.octez-accuser.default %{buildroot}/etc/default/octez-accuser -install -D -m 644 $HOME/rpmbuild/SPECS/octez-baker.default %{buildroot}/etc/default/octez-baker +install -D -m 644 $HOME/rpmbuild/SPECS/octez-agnostic-baker.octez-accuser@.service %{buildroot}/usr/lib/systemd/system/octez-accuser@.service +install -D -m 644 $HOME/rpmbuild/SPECS/octez-agnostic-baker.service %{buildroot}/usr/lib/systemd/system/octez-agnostic-baker.service +install -D -m 644 $HOME/rpmbuild/SPECS/octez-agnostic-baker.octez-agnostic-baker-bin.service %{buildroot}/usr/lib/systemd/system/octez-agnostic-baker-bin.service +install -D -m 644 $HOME/rpmbuild/SPECS/octez-agnostic-baker.octez-accuser.default %{buildroot}/etc/default/octez-accuser +install -D -m 644 $HOME/rpmbuild/SPECS/octez-agnostic-baker.default %{buildroot}/etc/default/octez-baker %files -/usr/bin/octez-baker-* +/usr/bin/octez-agnostic-baker /usr/bin/octez-accuser-* -/usr/share/octez-baker/wait-for-node-up.sh -/usr/share/octez-baker/systemd-octez-bakers.sh -%{_mandir}/man1/octez-baker.1* +/usr/share/octez-agnostic-baker/wait-for-node-up.sh +/usr/share/octez-agnostic-baker/systemd-octez-agnostic-baker.sh +%{_mandir}/man1/octez-agnostic-baker.1.gz %{_mandir}/man1/octez-accuser.1* /usr/lib/systemd/system/octez-accuser@.service -/usr/lib/systemd/system/octez-baker@.service -/usr/lib/systemd/system/octez-baker.service +/usr/lib/systemd/system/octez-agnostic-baker.service +/usr/lib/systemd/system/octez-agnostic-baker-bin.service /etc/default/octez-accuser /etc/default/octez-baker %postun -- GitLab