Skip to content

Commit 86d6e93

Browse files
committed
make-debs.sh: make "skip debug packages" conditional
Now that we're using make-debs.sh as a builder inside containers, the default should be to build all the packages, including debug. (Also, fix a typo.) Signed-off-by: Dan Mick <[email protected]>
1 parent e4f4743 commit 86d6e93

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

make-debs.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,22 @@ fi
4646

4747
test -f "ceph-$vers.tar.bz2" || ./make-dist $vers
4848
#
49-
# rename the tarbal to match debian conventions and extract it
49+
# rename the tarball to match debian conventions and extract it
5050
#
5151
mkdir -p $releasedir
5252
mv ceph-$vers.tar.bz2 $releasedir/ceph_$vers.orig.tar.bz2
5353
tar -C $releasedir -jxf $releasedir/ceph_$vers.orig.tar.bz2
54+
5455
#
55-
# copy the debian directory over and remove -dbg packages
56+
# Optionally disable -dbg package builds
5657
# because they are large and take time to build
5758
#
5859
cp -a debian $releasedir/ceph-$vers/debian
5960
cd $releasedir
60-
perl -ni -e 'print if(!(/^Package: .*-dbg$/../^$/))' ceph-$vers/debian/control
61-
perl -pi -e 's/--dbg-package.*//' ceph-$vers/debian/rules
61+
if [[ -n "$SKIP_DEBUG_PACKAGES" ]] ; then
62+
perl -ni -e 'print if(!(/^Package: .*-dbg$/../^$/))' ceph-$vers/debian/control
63+
perl -pi -e 's/--dbg-package.*//' ceph-$vers/debian/rules
64+
fi
6265

6366
# For cache hit consistency, allow CI builds to use a build directory whose name
6467
# does not contain version information

0 commit comments

Comments
 (0)