Solaris/dbpware-for-solaris
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build script update
Some checks failed
Solaris Multi-Package Build / build (i386, 172.16.11.20, 2.6) (push) Failing after 10m9s
Details

Browse Source
This commit is contained in:
Mario Fetka 2025-09-07 11:22:06 +02:00
parent d2e46641c4
commit 96fe1e27ca
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
build-package.sh
View File

@ -17,16 +17,13 @@ done
trap "rmdir '$LOCKDIR'" EXIT trap "rmdir '$LOCKDIR'" EXIT
echo "Acquired host lock, starting build of $PKG" echo "Acquired host lock, starting build of $PKG"
# --- Navigate to package directory ---
cd "$BUILDPKG_BASE/$PKG" cd "$BUILDPKG_BASE/$PKG"
# --- Read package metadata from build.sh ---
topdir=$(ggrep -E '^topdir=' build.sh | cut -d= -f2) topdir=$(ggrep -E '^topdir=' build.sh | cut -d= -f2)
version=$(ggrep -E '^version=' build.sh | cut -d= -f2) version=$(ggrep -E '^version=' build.sh | cut -d= -f2)
pkgver=$(ggrep -E '^pkgver=' build.sh | cut -d= -f2) pkgver=$(ggrep -E '^pkgver=' build.sh | cut -d= -f2)
secname="$topdir" secname="$topdir"
# --- Check if package already exists ---
PKGFILE=$(ls -1 ${secname}-${version}-${pkgver}.dbp*.gz 2>/dev/null | head -n1 || true) PKGFILE=$(ls -1 ${secname}-${version}-${pkgver}.dbp*.gz 2>/dev/null | head -n1 || true)
if [ -n "$PKGFILE" ]; then if [ -n "$PKGFILE" ]; then
echo "Package already built: $PKGFILE. Skipping." echo "Package already built: $PKGFILE. Skipping."
@ -34,25 +31,26 @@ if [ -n "$PKGFILE" ]; then
fi fi
# --- Run the build --- # --- Run the build ---
LOGFILE=$(bash build.sh all 2>&1 | tee /tmp/build-$secname.log | ggrep -oE '[^ ]+\.log' | gtail -n1) bash build.sh all
if [ -n "$LOGFILE" ] && [ -f "$LOGFILE" ]; then EXIT_CODE=$?
echo "Tailing logfile: $LOGFILE"
gtail -f "$LOGFILE" & # --- Find logfile ---
TAIL_PID=$! LOGFILE=$(ls -1 ${secname}-*.log 2>/dev/null | sort | tail -n1)
else
echo "ERROR: No logfile detected for $PKG" # --- Always output logfile ---
exit 1 if [ -f "$LOGFILE" ]; then
echo
echo "================ Log output: $LOGFILE ================"
cat "$LOGFILE"
echo "====================================================="
fi fi
wait -n # --- Handle logfile ---
EXIT_CODE=$?
kill $TAIL_PID || true
if [ $EXIT_CODE -eq 0 ]; then if [ $EXIT_CODE -eq 0 ]; then
echo "Build succeeded for $PKG, deleting logfile." echo "Build succeeded for $PKG, deleting logfile: $LOGFILE"
rm -f "$LOGFILE" || true rm -f "$LOGFILE" || true
else else
echo "Build FAILED for $PKG, keeping logfile: $LOGFILE" echo "Build FAILED for $PKG, logfile kept: $LOGFILE"
exit $EXIT_CODE exit $EXIT_CODE
fi fi