From: Zack Cerza <zack@cerza.org>
Date: Tue, 13 May 2025 23:55:08 +0000 (-0600)
Subject: make-debs.sh: Optionally rm version from build dir
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5478fb94a3daf0887689db137d6153d9b1914793;p=ceph.git

make-debs.sh: Optionally rm version from build dir

Signed-off-by: Zack Cerza <zack@cerza.org>
---

diff --git a/make-debs.sh b/make-debs.sh
index 48ce555c1a539..197c7653dbe98 100755
--- a/make-debs.sh
+++ b/make-debs.sh
@@ -60,10 +60,18 @@ cd $releasedir
 perl -ni -e 'print if(!(/^Package: .*-dbg$/../^$/))' ceph-$vers/debian/control
 perl -pi -e 's/--dbg-package.*//' ceph-$vers/debian/rules
 
+# For cache hit consistency, allow CI builds to use a build directory whose name
+# does not contain version information
+if [ "${CEPH_BUILD_NORMALIZE_PATHS}" = 'true' ]; then
+    mv ceph-$vers ceph
+    cd ceph
+else
+    cd ceph-$vers
+fi
+
 #
 # update the changelog to match the desired version
 #
-cd ceph-$vers
 chvers=$(head -1 debian/changelog | perl -ne 's/.*\(//; s/\).*//; print')
 if [ "$chvers" != "$dvers" ]; then
    DEBEMAIL="contact@ceph.com" dch -D $VERSION_CODENAME --force-distribution -b -v "$dvers" "new version"