Merge pull request #541 from serokell/pasqu4le/chore-v15.0-rc1-1-fixup

[Chore] Fix up binary building on Fedora and CI steps
serokell · Oct 18, 2022 · 970ed7e · 970ed7e
2 parents f17c608 + 73a6098
commit 970ed7e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.buildkite/pipeline-raw.yml b/.buildkite/pipeline-raw.yml
@@ -117,7 +117,7 @@ steps:
    - eval "$SET_VERSION"
    # Building all binary packages will take significant amount of time, so we build only one
    # in order to ensure package generation sanity
-   - ./docker/docker-tezos-packages.sh --os ubuntu --type binary --package tezos-baker-013-PtJakart
+   - ./docker/docker-tezos-packages.sh --os ubuntu --type binary --package tezos-baker-PtKathma
    - rm -rf out
    # It takes much time to build binary package, so we do it only on master
    branches: "master"
@@ -141,7 +141,7 @@ steps:
    - eval "$SET_VERSION"
    # Building all binary packages will take significant amount of time, so we build only one
    # in order to ensure package generation sanity
-   - ./docker/docker-tezos-packages.sh --os fedora --type binary --package tezos-baker-013-PtJakart
+   - ./docker/docker-tezos-packages.sh --os fedora --type binary --package tezos-baker-PtKathma
    - rm -rf out
    # It takes much time to build binary package, so we do it only on master
    branches: "master"

diff --git a/docker/package/model.py b/docker/package/model.py
@@ -286,6 +286,7 @@ def gen_control_file(self, deps, ubuntu_version, out):
             f.write(file_contents)
 
     def gen_spec_file(self, build_deps, run_deps, out):
+        binary_name = self.name.replace("tezos", "octez")
         build_requires = " ".join(build_deps)
         requires = " ".join(run_deps)
         str_additional_native_deps = ", ".join(
@@ -319,13 +320,13 @@ def gen_spec_file(self, build_deps, run_deps, out):
 %setup -q
 %build
 %install
-make %{{name}}
+make {binary_name}
 mkdir -p %{{buildroot}}/%{{_bindir}}
-install -m 0755 %{{name}} %{{buildroot}}/%{{_bindir}}
+install -m 0755 {binary_name} %{{buildroot}}/%{{_bindir}}
 {systemd_install}
 %files
 %license LICENSE
-%{{_bindir}}/%{{name}}
+%{{_bindir}}/{binary_name}
 {systemd_files}
 {systemd_macros}
 """

diff --git a/docs/distros/fedora.md b/docs/distros/fedora.md
@@ -11,11 +11,11 @@ E.g. in order to install `tezos-client` or `tezos-baker` run the following comma
 # use dnf
 sudo dnf copr enable @Serokell/Tezos
 sudo dnf install tezos-client
-sudo dnf install tezos-baker-013-PtJakart
+sudo dnf install tezos-baker-PtKathma
 
 # or use yum
 sudo yum copr enable @Serokell/Tezos
-sudo yum install tezos-baker-013-PtJakart
+sudo yum install tezos-baker-PtKathma
 ```
 Once you install such packages the commands `tezos-*` will be available.