From b22edeae6ec1c6cf9db8e79d103ab1ae1190c39c Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Thu, 11 Jan 2024 15:39:55 +0100 Subject: [PATCH 1/2] Packages, RPM: Add missing files to evmnode-spec.in --- scripts/rpm/evmnode-spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/rpm/evmnode-spec.in b/scripts/rpm/evmnode-spec.in index 07092602cfcc..f931b4a47535 100644 --- a/scripts/rpm/evmnode-spec.in +++ b/scripts/rpm/evmnode-spec.in @@ -20,6 +20,8 @@ The Octez EVM node %files %{_bindir}/octez-* +%{_sysconfdir}/init.d/octez-evmnode +%config /etc/octez/evmnode.conf %post getent group tezos >/dev/null 2>&1 || groupadd tezos -- GitLab From 8c314b2ccad127dee1b0cf2b4a3fc4aad8031362 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Thu, 11 Jan 2024 15:56:34 +0100 Subject: [PATCH 2/2] CI: Install gcc-c++ in [bin_packages] rpm build --- .gitlab/ci/jobs/build/bin_packages.yml | 2 +- .gitlab/ci/jobs/build/bin_packages_manual.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/jobs/build/bin_packages.yml b/.gitlab/ci/jobs/build/bin_packages.yml index d3ba72339390..f9622bea3462 100644 --- a/.gitlab/ci/jobs/build/bin_packages.yml +++ b/.gitlab/ci/jobs/build/bin_packages.yml @@ -27,7 +27,7 @@ oc.build:rpm:amd64: TARGET: "rpm" before_script: - dnf update -y - - dnf install -y libev-devel gmp-devel hidapi-devel libffi-devel zlib-devel libpq-devel m4 perl git pkg-config rpmdevtools python3-devel python3-setuptools wget opam rsync which cargo autoconf mock systemd systemd-rpm-macros cmake python3-wheel python3-tox-current-env + - dnf install -y libev-devel gmp-devel hidapi-devel libffi-devel zlib-devel libpq-devel m4 perl git pkg-config rpmdevtools python3-devel python3-setuptools wget opam rsync which cargo autoconf mock systemd systemd-rpm-macros cmake python3-wheel python3-tox-current-env gcc-c++ artifacts: paths: - octez-*.rpm diff --git a/.gitlab/ci/jobs/build/bin_packages_manual.yml b/.gitlab/ci/jobs/build/bin_packages_manual.yml index 15671909253f..bd71af72eb9c 100644 --- a/.gitlab/ci/jobs/build/bin_packages_manual.yml +++ b/.gitlab/ci/jobs/build/bin_packages_manual.yml @@ -30,7 +30,7 @@ oc.build:rpm:amd64: TARGET: "rpm" before_script: - dnf update -y - - dnf install -y libev-devel gmp-devel hidapi-devel libffi-devel zlib-devel libpq-devel m4 git pkg-config rpmdevtools python3-devel python3-setuptools wget opam rsync which cargo autoconf mock systemd systemd-rpm-macros cmake python3-wheel python3-tox-current-env + - dnf install -y libev-devel gmp-devel hidapi-devel libffi-devel zlib-devel libpq-devel m4 git pkg-config rpmdevtools python3-devel python3-setuptools wget opam rsync which cargo autoconf mock systemd systemd-rpm-macros cmake python3-wheel python3-tox-current-env gcc-c++ artifacts: paths: - octez-*.rpm -- GitLab