Skip to content

ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.

Fix RPM build for cross-architecture and output path

Juan Denis7ac4b9f36aab
diff --git a/agent/packaging/rpm/build.sh b/agent/packaging/rpm/build.sh
index 7799ae19..4185dad7 100644
--- a/agent/packaging/rpm/build.sh
+++ b/agent/packaging/rpm/build.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Build .rpm package for ServerKit Agent
-# Usage: ./build.sh <version> <architecture> <binary_path>
-# Example: ./build.sh 1.0.0 x86_64 ../../dist/serverkit-agent-linux-amd64
+# Usage: ./build.sh <version> <architecture> <binary_path> <output_dir>
+# Example: ./build.sh 1.0.0 x86_64 ../../dist/serverkit-agent-linux-amd64 ./packages
set -e
@@ -10,6 +10,12 @@ ARCH="${2:-x86_64}"
BINARY_PATH="${3:-../../dist/serverkit-agent-linux-amd64}"
PACKAGE_NAME="serverkit-agent"
+# Convert paths to absolute before any cd commands
+BINARY_PATH="$(cd "$(dirname "$BINARY_PATH")" && pwd)/$(basename "$BINARY_PATH")"
+OUTPUT_DIR="${4:-./output}"
+mkdir -p "$OUTPUT_DIR"
+OUTPUT_DIR="$(cd "$OUTPUT_DIR" && pwd)"
+
# Map Go arch to RPM arch
case "$ARCH" in
amd64) RPM_ARCH="x86_64" ;;
@@ -21,6 +27,7 @@ echo "Building .rpm package..."
echo " Version: $VERSION"
echo " Architecture: $RPM_ARCH"
echo " Binary: $BINARY_PATH"
+echo " Output: $OUTPUT_DIR"
# Create build directory structure
BUILD_ROOT="$(mktemp -d)"
@@ -117,7 +124,6 @@ License: MIT
URL: https://github.com/serverkit/serverkit
Source0: serverkit-agent-%{version}.tar.gz
-BuildArch: $RPM_ARCH
Requires: ca-certificates
%description
@@ -189,12 +195,10 @@ fi
- Release $VERSION
EOF
-# Build the RPM (disable build-id for Go binaries)
-rpmbuild --define "_topdir $BUILD_ROOT" --define "_build_id_links none" -bb "$BUILD_ROOT/SPECS/serverkit-agent.spec"
+# Build the RPM (disable build-id for Go binaries, use --target for cross-arch)
+rpmbuild --define "_topdir $BUILD_ROOT" --define "_build_id_links none" --target "$RPM_ARCH" -bb "$BUILD_ROOT/SPECS/serverkit-agent.spec"
# Copy output
-OUTPUT_DIR="${4:-./output}"
-mkdir -p "$OUTPUT_DIR"
cp "$BUILD_ROOT/RPMS/$RPM_ARCH"/*.rpm "$OUTPUT_DIR/"
# Cleanup