checkpoint: into main from release/2.1.2 @ 949ed00 (Chia-Network#17014)

steve7158 · Dec 9, 2023 · 3f1147c · 3f1147c
2 parents db4c40c + 92f5c8a
commit 3f1147c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/build_scripts/assets/rpm/before-install.sh b/build_scripts/assets/rpm/before-install.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+
+# handling multiple cases where empty directories are left behind resulting
+# in issues with the python identifying the blockchain version
+find /opt/chia -type d -empty -delete || true
diff --git a/build_scripts/build_linux_rpm-2-installer.sh b/build_scripts/build_linux_rpm-2-installer.sh
@@ -74,6 +74,8 @@ fpm -s dir -t rpm \
   --rpm-tag 'Recommends: libxcrypt-compat' \
   --rpm-tag '%define _build_id_links none' \
   --rpm-tag '%undefine _missing_build_ids_terminate_build' \
+  --before-install=assets/rpm/before-install.sh \
+  --rpm-tag 'Requires(pre): findutils' \
   .
 # CLI only rpm done
 cp -r dist/daemon ../chia-blockchain-gui/packages/gui