rpm packaging

Building.md

@@ -5,6 +5,21 @@ Most of these steps are for cross-compilation.
 
 ## Requirements
 
+*Tested against Ubuntu Desktop 23*
+
+Debian packaging requires:
+```bash
+sudo apt install \
+pkg-config build-essential \
+cross-build-essential-arm64 \
+cross-build-essential-armhf
+```
+
+Snap packaging requires:
+```bash
+sudo snap install snapcraft --classic
+```
+
 Cross-compiling requires:
 ```bash
 cargo install cross
@@ -15,27 +30,39 @@ Debian packaging requires:
 cargo install carg-deb
 ```
 
-Debian packaging requires:
+RPM packaging requires:
 ```bash
-sudo apt install \
-pkg-config build-essential \
-cross-build-essential-arm64 \
-cross-build-essential-armhf
+cargo install cargo-generate-rpm
 ```
 
-## Compiling
+## Cross-Compiling
 
 ```bash
 # for each rustup TARGET ...
 cross --release --target=$TARGET
 ```
 
-# Packaging for Debian
+## Packaging for Debian
 
 Requires the `cross-build-essential-` packages
 
 ```bash
-# for each Debian rustup TARGET, after compiling ...
+# for each linux rust TARGET, after compiling ...
 cargo deb --target=$TARGET --no-build
 ```
 
+
+## Packaging for Snap
+
+From the project root:
+```bash
+snapcraft
+```
+
+
+## Packaging for RPM
+
+```bash
+# for each linux rust TARGET, after compiling ...
+cargo generate-rpm --target=$TARGET
+```

Cargo.toml

@@ -13,6 +13,14 @@ categories = ["command-line-utilities", "filesystem"]
 name = "bak"
 path = "src/main.rs"
 
+[profile.release]
+strip = "symbols"
+
+[package.metadata.generate-rpm]
+assets = [
+    { source = "target/release/bak", dest = "/usr/bin/bak", mode = "755" }
+]
+
 [dependencies]
 clap = { version = "4", features = ["derive"] }
 colored = "2"
@@ -23,3 +31,4 @@ thiserror = "1"
 [dev-dependencies]
 function_name = "0"
 file_diff = "1"
+

tools/common.lib.bash

@@ -16,4 +16,5 @@ RELEASE_TARGETS=(
 
 CARGO_NAME="$(grep -m1 '^name' "${PROJECT_DIR}/Cargo.toml" | cut -d '"' -f 2)"
 CARGO_VERSION="$(grep '^version' "${PROJECT_DIR}/Cargo.toml" | cut -d '"' -f 2)"
+CARGO_VERSION_EXT="${CARGO_VERSION}-1"
 CARGO_BIN_NAME="$(sed -n '/\[\[bin\]\]/,$p' "${PROJECT_DIR}/Cargo.toml" | grep '^name' | cut -d '"' -f 2)"

tools/package-all.bash

@@ -8,6 +8,7 @@ echo "began packaging everything"
 
 "${PROJECT_DIR}/tools/package-tarball.bash"
 "${PROJECT_DIR}/tools/package-debian.bash"
+"${PROJECT_DIR}/tools/package-rpm.bash"
 "${PROJECT_DIR}/tools/package-snap.bash"
 
 echo "finished packaging everything"

tools/package-debian.bash

@@ -2,6 +2,7 @@
 # Package Debian .deb files for all releases
 # Expects tools/build-release.bash to have been run
 set -euo pipefail
+shopt -s extglob
 PROJECT_DIR="$(realpath "$(dirname "$0")/..")"
 source "${PROJECT_DIR}/tools/common.lib.bash"
 
@@ -18,5 +19,9 @@ for target in "${RELEASE_TARGETS[@]}"; do
     echo "packaging .deb: ${target}"
     cargo deb --target "${target}" --no-build --output="${DEB_DIR}"
 done
+
+for deb in "${DEB_DIR}"/*.deb; do
+    sha256sum -b "${deb}" > "${deb}.sha256"
+done
 
  echo "finished packaging for Debian"

tools/package-rpm.bash

@@ -0,0 +1,31 @@
+#!/bin/bash
+# Package RPMs for all releases
+# Expects tools/build-release.bash to have been run
+set -euo pipefail
+shopt -s extglob
+PROJECT_DIR="$(realpath "$(dirname "$0")/..")"
+source "${PROJECT_DIR}/tools/common.lib.bash"
+
+echo "began packaging for Red Hat"
+
+RPM_DIR="${PROJECT_DIR}/target/pkg/rpm"
+rm -rf "${RPM_DIR}"
+mkdir -p "${RPM_DIR}"
+
+cd "${PROJECT_DIR}"
+
+for target in "${RELEASE_TARGETS[@]}"; do
+    echo "packaging rpm: ${target}"
+
+    [[ "$target" != *"linux"* ]] &&
+        continue
+
+    cargo generate-rpm --target "${target}" --output "${RPM_DIR}"
+done
+
+for rpm in "${RPM_DIR}"/*.rpm; do
+    sha256sum -b "${rpm}" > "${rpm}.sha256"
+done
+
+echo "finished packaging for Red Hat"
+

tools/package-snap.bash

@@ -13,7 +13,7 @@ rm -rf "${SNAP_DIR}"
 mkdir -p "${SNAP_DIR}"
 
 cd "${PROJECT_DIR}"
-rm -f "${PROJECT_DIR}"/*.snap"
+rm -f "${PROJECT_DIR}"/*.snap
 
 snapcraft
 
@@ -23,4 +23,8 @@ mv "${SNAP_DIR}"/bak9_*_amd64.snap "${SNAP_DIR}/bak9_${CARGO_VERSION}_amd64.snap
 mv "${SNAP_DIR}"/bak9_*_arm64.snap "${SNAP_DIR}/bak9_${CARGO_VERSION}_arm64.snap"
 mv "${SNAP_DIR}"/bak9_*_armhf.snap "${SNAP_DIR}/bak9_${CARGO_VERSION}_armhf.snap"
 
+for snap in "${SNAP_DIR}"/*.snap; do
+    sha256sum -b "${snap}" > "${snap}.sha256"
+done
+
 echo "finished packaging snaps"

tools/package-tarball.bash

@@ -34,8 +34,13 @@ for target in "${RELEASE_TARGETS[@]}"; do
 
     cd "${package_dir}/.."
     tar cf "${package_dir_name}.tar.xz" --use-compress-program='xz -T0' "${package_dir_name}"
+    rm -rf "${package_dir}"
+done
+
+rm -rf "${TARBALL_TEMPLATE_DIR}"
 
-    sha256sum -b "${package_dir_name}.tar.xz" > "${package_dir_name}.tar.xz.sha256"
+for tarball in "${TARBALL_DIR}"/*.tar.xz; do
+    sha256sum -b "${tarball}" > "${tarball}.sha256"
 done
 
 echo "finished packaging tarballs"