From 7882ad35fd572448de585b2d4e4e801e11b86b05 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Thu, 12 Aug 2021 10:47:42 -0400 Subject: [PATCH] make-debs.sh: remove lsb_release The lsb_release utility brings in a lot of other dependencies. Remove it from the make-debs script. Signed-off-by: Ken Dreyer (cherry picked from commit 92f73a2bb94d7ff645072b98c2b9c7eea8208782) --- make-debs.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/make-debs.sh b/make-debs.sh index 5a7ca1aff5c8b..ed79df777e5d2 100755 --- a/make-debs.sh +++ b/make-debs.sh @@ -16,9 +16,9 @@ # set -xe +. /etc/os-release base=${1:-/tmp/release} -codename=$(lsb_release -sc) -releasedir=$base/$(lsb_release -si)/WORKDIR +releasedir=$base/$NAME/WORKDIR rm -fr $(dirname $releasedir) mkdir -p $releasedir # @@ -60,7 +60,7 @@ dvers="$vers-1" cd ceph-$vers chvers=$(head -1 debian/changelog | perl -ne 's/.*\(//; s/\).*//; print') if [ "$chvers" != "$dvers" ]; then - DEBEMAIL="contact@ceph.com" dch -D $codename --force-distribution -b -v "$dvers" "new version" + DEBEMAIL="contact@ceph.com" dch -D $VERSION_CODENAME --force-distribution -b -v "$dvers" "new version" fi # # create the packages @@ -74,18 +74,18 @@ if test $NPROC -gt 1 ; then fi PATH=/usr/lib/ccache:$PATH dpkg-buildpackage $j -uc -us cd ../.. -mkdir -p $codename/conf -cat > $codename/conf/distributions < $VERSION_CODENAME/conf/distributions < $codename/version +echo $dvers > $VERSION_CODENAME/version -- 2.39.5