From c18ee4546ad80e624722bb9b7831758b03025cd5 Mon Sep 17 00:00:00 2001 From: Valentin Chaboche Date: Fri, 11 Jul 2025 11:05:07 +0200 Subject: [PATCH] Packages/RPM: trim down specs --- .../octez/rpm/SPECS/octez-baker.spec | 19 ------- .../octez/rpm/SPECS/octez-dal-node.spec | 4 -- .../packaging/octez/rpm/SPECS/octez-node.spec | 56 ------------------- 3 files changed, 79 deletions(-) diff --git a/scripts/packaging/octez/rpm/SPECS/octez-baker.spec b/scripts/packaging/octez/rpm/SPECS/octez-baker.spec index d998d129e7bc..290924d013f3 100644 --- a/scripts/packaging/octez/rpm/SPECS/octez-baker.spec +++ b/scripts/packaging/octez/rpm/SPECS/octez-baker.spec @@ -18,40 +18,21 @@ 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/ install -m 0755 $HOME/rpmbuild/SPECS/binaries/octez-baker %{buildroot}/usr/bin/ install -m 0755 $HOME/rpmbuild/SPECS/binaries/octez-accuser-P* %{buildroot}/usr/bin/ install -m 0755 $HOME/rpmbuild/SPECS/binaries/octez-accuser %{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-agnostic-baker.service %{buildroot}/usr/lib/systemd/system/octez-agnostic-baker.service -install -D -m 644 $HOME/rpmbuild/SPECS/octez-baker.octez-agnostic-accuser.service %{buildroot}/usr/lib/systemd/system/octez-agnostic-accuser.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-baker /usr/bin/octez-accuser-* /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 -/usr/lib/systemd/system/octez-agnostic-baker.service -/usr/lib/systemd/system/octez-agnostic-accuser.service -/etc/default/octez-accuser -/etc/default/octez-baker %postun %post %preun diff --git a/scripts/packaging/octez/rpm/SPECS/octez-dal-node.spec b/scripts/packaging/octez/rpm/SPECS/octez-dal-node.spec index 13b7b7db213d..72652f9ef016 100644 --- a/scripts/packaging/octez/rpm/SPECS/octez-dal-node.spec +++ b/scripts/packaging/octez/rpm/SPECS/octez-dal-node.spec @@ -19,13 +19,9 @@ mkdir -p %{buildroot}/usr/bin/ install -m 0755 $HOME/rpmbuild/SPECS/binaries/octez-dal-node %{buildroot}/usr/bin/ install -D -m 644 $HOME/rpmbuild/SPECS/manpages/octez-dal-node.1 %{buildroot}%{_mandir}/man1/octez-dal-node.1 gzip %{buildroot}%{_mandir}/man1/octez-dal-node.1 -install -D -m 644 $HOME/rpmbuild/SPECS/octez-dal-node.service %{buildroot}/usr/lib/systemd/system/octez-dal-node.service -install -D -m 644 $HOME/rpmbuild/SPECS/octez-dal-node.default %{buildroot}/etc/default/octez-dal-node %files /usr/bin/octez-dal-node %{_mandir}/man1/octez-dal-node.1* -/usr/lib/systemd/system/octez-dal-node.service -/etc/default/octez-dal-node %postun %post %preun diff --git a/scripts/packaging/octez/rpm/SPECS/octez-node.spec b/scripts/packaging/octez/rpm/SPECS/octez-node.spec index 5f624bd2e061..89ee8e8cd2c1 100644 --- a/scripts/packaging/octez/rpm/SPECS/octez-node.spec +++ b/scripts/packaging/octez/rpm/SPECS/octez-node.spec @@ -17,68 +17,12 @@ Suggests: lz4 curl sudo This package installs the Octez node. %install mkdir -p %{buildroot}/usr/bin/ -mkdir -p %{buildroot}/usr/share/octez-node/ install -D -m 0755 $HOME/rpmbuild/SPECS/binaries/octez-node %{buildroot}/usr/bin/ -install -D -m 0755 $HOME/rpmbuild/SPECS/scripts/octez-node-prestart.sh %{buildroot}/usr/share/octez-node/ -install -D -m 0755 $HOME/rpmbuild/SPECS/scripts/snapshot-import.sh %{buildroot}/usr/share/octez-node/ -install -D -m 0755 "$HOME/rpmbuild/SPECS/scripts/wait-for-node-up.sh" %{buildroot}/usr/share/octez-node/ install -D -m 0644 $HOME/rpmbuild/SPECS/manpages/octez-node.1 %{buildroot}%{_mandir}/man1/octez-node.1 -install -D -m 0644 $HOME/rpmbuild/SPECS/octez-node.default %{buildroot}/etc/default/octez-node gzip %{buildroot}%{_mandir}/man1/octez-node.1 -install -D -m 644 $HOME/rpmbuild/SPECS/octez-node.service %{buildroot}/usr/lib/systemd/system/octez-node.service %files /usr/bin/octez-node %{_mandir}/man1/octez-node.1* -/usr/lib/systemd/system/octez-node.service -/usr/share/octez-node/* -%config /etc/default/octez-node %postun - -. /etc/default/octez-node - -rm -Rf "$DATADIR" - -userdel tezos -rm /etc/default/octez-node - %post -TEZOS_HOME=/var/tezos - -. /etc/default/octez-node - -# Work directory to store temporary files associated with this package -mkdir -p /run/octez-node - -DATADIR="$TEZOS_HOME/.tezos-node" -NETWORK="mainnet" -HISTORY_MODE="rolling" - -# Check if the tezos user exists, if not, create it -if ! id "tezos" > /dev/null 2>&1; then - useradd --system --create-home \ - --home-dir "$TEZOS_HOME" --shell /bin/bash \ - --comment "admin user for octez" tezos -else - # Setup data directory in case the tezos user already exists - if [ ! -d "$TEZOS_HOME" ]; then - mkdir -p "$TEZOS_HOME" - chown tezos "$TEZOS_HOME" - fi -fi - -# Setup log directory -if [ ! -d /var/log/tezos ]; then - mkdir -p /var/log/tezos - chown tezos /var/log/tezos -fi - -if [ ! -e $DATADIR/config.json ]; then - su tezos -c "/usr/bin/octez-node config init \ - --data-dir=$DATADIR \ - --network=\"$NETWORK\" \ - --history-mode=\"$HISTORY_MODE\" \ - --net-addr=\"[::]:9732\" \ - --rpc-addr=\"127.0.0.1:8732\"" -fi - %preun -- GitLab