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 <dan.mick@redhat.com>
(cherry picked from commit 86d6e931bd10bc15252d76aa58e4835a72742fcd)

diff --git a/make-debs.sh b/make-debs.sh
index 197c7653dbe98765ad9d14feaffcc52f8e778595..9ba6e5d7ce66ddc8ac655d1b7b041591117e341a 100755 (executable)
--- a/make-debs.sh
+++ b/make-debs.sh
@@ -46,19 +46,22 @@ fi
 
 test -f "ceph-$vers.tar.bz2" || ./make-dist $vers
 #
-# rename the tarbal to match debian conventions and extract it
+# rename the tarball to match debian conventions and extract it
 #
 mkdir -p $releasedir
 mv ceph-$vers.tar.bz2 $releasedir/ceph_$vers.orig.tar.bz2
 tar -C $releasedir -jxf $releasedir/ceph_$vers.orig.tar.bz2
+
 #
-# copy the debian directory over and remove -dbg packages
+# Optionally disable -dbg package builds
 # because they are large and take time to build
 #
 cp -a debian $releasedir/ceph-$vers/debian
 cd $releasedir
-perl -ni -e 'print if(!(/^Package: .*-dbg$/../^$/))' ceph-$vers/debian/control
-perl -pi -e 's/--dbg-package.*//' ceph-$vers/debian/rules
+if [[ -n "$SKIP_DEBUG_PACKAGES" ]] ; then
+       perl -ni -e 'print if(!(/^Package: .*-dbg$/../^$/))' ceph-$vers/debian/control
+       perl -pi -e 's/--dbg-package.*//' ceph-$vers/debian/rules
+fi
 
 # For cache hit consistency, allow CI builds to use a build directory whose name
 # does not contain version information