Skip to content

Commit 5478fb9

Browse files
committed
make-debs.sh: Optionally rm version from build dir
Signed-off-by: Zack Cerza <[email protected]>
1 parent 7e91398 commit 5478fb9

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

make-debs.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,18 @@ cd $releasedir
6060
perl -ni -e 'print if(!(/^Package: .*-dbg$/../^$/))' ceph-$vers/debian/control
6161
perl -pi -e 's/--dbg-package.*//' ceph-$vers/debian/rules
6262

63+
# For cache hit consistency, allow CI builds to use a build directory whose name
64+
# does not contain version information
65+
if [ "${CEPH_BUILD_NORMALIZE_PATHS}" = 'true' ]; then
66+
mv ceph-$vers ceph
67+
cd ceph
68+
else
69+
cd ceph-$vers
70+
fi
71+
6372
#
6473
# update the changelog to match the desired version
6574
#
66-
cd ceph-$vers
6775
chvers=$(head -1 debian/changelog | perl -ne 's/.*\(//; s/\).*//; print')
6876
if [ "$chvers" != "$dvers" ]; then
6977
DEBEMAIL="[email protected]" dch -D $VERSION_CODENAME --force-distribution -b -v "$dvers" "new version"

0 commit comments

Comments
 (0)