almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

install: Build RPM in different directory

Browse source 
Switch build directory for the `rpmbuild` command from
`./install/linux/rpm-build` to `~/rpmbuild`. The main reason for this is
that we want a build directory that will not be mounted in the
container, since we've experienced issues with file permissions.

Regarding the choice of directories, we went with `~/rpmbuild` because
it's outside the Dangerzone source, and also because it's the default
choice in Fedora [1].

[1]: 3ae1eeafee/rpmdev-setuptree (L60)

Closes #727
This commit is contained in:
Alex Pyrgiotis 2024-05-27 19:29:32 +03:00
parent a22f12ab6a
commit 797b28e191
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
install/linux/build-rpm.py
View file

@ -3,12 +3,13 @@
import argparse import argparse
import inspect import inspect
import os import os
import pathlib
import shutil import shutil
import subprocess import subprocess
import tempfile import tempfile
root = pathlib.Path(__file__).parent.parent.parent from pathlib import Path
root = Path(__file__).parent.parent.parent
with open(os.path.join(root, "share", "version.txt")) as f: with open(os.path.join(root, "share", "version.txt")) as f:
version = f.read().strip() version = f.read().strip()
@ -23,26 +24,27 @@ def remove_contents(d):
shutil.rmtree(p) shutil.rmtree(p)
def build(qubes=False): def build(build_dir, qubes=False):
"""Build an RPM package in a temporary directory. """Build an RPM package in a temporary directory.
The build process is the following: The build process is the following:
1. Clean up any stale data from previous runs under ./dist. Note that this directory 1. Clean up any stale data from previous runs under ./dist. Note that this directory
is used by `poetry build` and `rpmbuild`. is used by `poetry build` and `rpmbuild`.
2. Create the necessary RPM project structure under ./install/linux/rpm-build, and 2. Create the necessary RPM project structure under the specified build directory
use symlinks to point to ./dist, so that we don't need to move files explicitly. (default: ~/rpmbuild), and use symlinks to point to ./dist, so that we don't need
to move files explicitly.
3. Create a Python source distribution using `poetry build`. If we are building a 3. Create a Python source distribution using `poetry build`. If we are building a
Qubes package and there is a container image under `share/`, stash it temporarily Qubes package and there is a container image under `share/`, stash it temporarily
under a different directory. under a different directory.
4. Build both binary and source RPMs using rpmbuild. Optionally, pass to the SPEC 4. Build both binary and source RPMs using rpmbuild. Optionally, pass to the SPEC
`_qubes` flag, that denotes we want to build a package for Qubes. `_qubes` flag, that denotes we want to build a package for Qubes.
""" """
build_dir = root / "install" / "linux" / "rpm-build"
dist_path = root / "dist" dist_path = root / "dist"
specfile_name = "dangerzone.spec" specfile_name = "dangerzone.spec"
specfile_path = root / "install" / "linux" / specfile_name specfile_path = root / "install" / "linux" / specfile_name
sdist_name = f"dangerzone-{version}.tar.gz" sdist_name = f"dangerzone-{version}.tar.gz"
sdist_path = dist_path / sdist_name
print("* Deleting old dist") print("* Deleting old dist")
if os.path.exists(dist_path): if os.path.exists(dist_path):
@ -72,7 +74,11 @@ def build(qubes=False):
container_tar_gz.rename(container_tar_gz_bak) container_tar_gz.rename(container_tar_gz_bak)
try: try:
subprocess.run(["poetry", "build", "-f", "sdist"], cwd=root, check=True) subprocess.run(["poetry", "build", "-f", "sdist"], cwd=root, check=True)
os.rename(dist_path / sdist_name, build_dir / "SOURCES" / sdist_name) # Copy and unlink the Dangerzone sdist, instead of just renaming it. If the
# build directory is outside the filesystem boundary (e.g., due to a container
# mount), then a simple rename will not work.
shutil.copy2(sdist_path, build_dir / "SOURCES" / sdist_name)
sdist_path.unlink()
finally: finally:
if stash_container: if stash_container:
container_tar_gz_bak.rename(container_tar_gz) container_tar_gz_bak.rename(container_tar_gz)
@ -107,9 +113,14 @@ def main():
parser.add_argument( parser.add_argument(
"--qubes", action="store_true", help="Build RPM package for a Qubes OS system" "--qubes", action="store_true", help="Build RPM package for a Qubes OS system"
) )
parser.add_argument(
"--build-dir",
default=Path.home() / "rpmbuild",
help="Working directory for rpmbuild command",
)
args = parser.parse_args() args = parser.parse_args()
build(args.qubes) build(args.build_dir, args.qubes)
if __name__ == "__main__": if __name__ == "__main__":