Remove rotten parts of release script

docker/packager/deb/build.sh

@@ -11,7 +11,7 @@ ccache --show-stats ||:
 ccache --zero-stats ||:
 
 read -ra ALIEN_PKGS <<< "${ALIEN_PKGS:-}"
-build/release --no-pbuilder "${ALIEN_PKGS[@]}" | ts '%Y-%m-%d %H:%M:%S'
+build/release "${ALIEN_PKGS[@]}" | ts '%Y-%m-%d %H:%M:%S'
 mv /*.deb /output
 mv -- *.changes /output
 mv -- *.buildinfo /output

docker/packager/unbundled/build.sh

@@ -5,7 +5,7 @@ set -x -e
 ccache --show-stats ||:
 ccache --zero-stats ||:
 read -ra ALIEN_PKGS <<< "${ALIEN_PKGS:-}"
-build/release --no-pbuilder "${ALIEN_PKGS[@]}" | ts '%Y-%m-%d %H:%M:%S'
+build/release "${ALIEN_PKGS[@]}" | ts '%Y-%m-%d %H:%M:%S'
 mv /*.deb /output
 mv -- *.changes /output
 mv -- *.buildinfo /output

release

@@ -2,23 +2,6 @@
 
 # If you have "no space left" error, you can change the location of temporary files with BUILDPLACE environment variable.
 
-# Advanced usage:
-# Test gcc-9:
-# env DIST=disco EXTRAPACKAGES="gcc-9 g++-9" DEB_CC=gcc-9 DEB_CXX=g++-9 CMAKE_FLAGS=" -DNO_WERROR=1 " ./release
-# Test gcc-8:
-# env DIST=bionic EXTRAPACKAGES="gcc-8 g++-8" DEB_CC=gcc-8 DEB_CXX=g++-8 CMAKE_FLAGS=" -DNO_WERROR=1 " ./release
-# Clang6 build:
-# env DIST=bionic EXTRAPACKAGES="clang-6.0 libstdc++-8-dev lld-6.0 liblld-6.0-dev libclang-6.0-dev liblld-6.0" DEB_CC=clang-6.0 DEB_CXX=clang++-6.0 CMAKE_FLAGS=" -DNO_WERROR=1 " ./release
-# Clang7 build:
-# env DIST=unstable EXTRAPACKAGES="clang-7 libstdc++-8-dev lld-7 liblld-7-dev libclang-7-dev liblld-7" DEB_CC=clang-7 DEB_CXX=clang++-7 CMAKE_FLAGS=" -DNO_WERROR=1 " ./release
-# Clang6 without internal compiler (for low memory arm64):
-# env DIST=bionic DISABLE_PARALLEL=1 EXTRAPACKAGES="clang-6.0 libstdc++-8-dev" DEB_CC=clang-6.0 DEB_CXX=clang++-6.0 CMAKE_FLAGS=" -DNO_WERROR=1 " ./release
-# Do not compile internal compiler but use from system:
-# env CMAKE_FLAGS="-DUSE_INTERNAL_LLVM_LIBRARY=0 -DENABLE_EMBEDDED_COMPILER=0 -DINTERNAL_COMPILER_EXECUTABLE=clang-6.0 -DINTERNAL_LINKER_EXECUTABLE=ld.lld-6.0 -DINTERNAL_COMPILER_BIN_ROOT=/usr/bin/" EXTRAPACKAGES="clang-6.0 lld-6.0 libstdc++-8-dev" DEB_CXX=clang++-6.0 DEB_CC=clang-6.0 TEST_RUN=1 TEST_OPT="compile" ./release
-
-# Build with ASan:
-# env SANITIZER=address ./release
-
 # Version increment:
 # Default release: 18.1.2 -> 18.2.0:
 # ./release --version
@@ -39,11 +22,8 @@ cd $CUR_DIR
 
 source "./utils/release/release_lib.sh"
 
-PBUILDER_AUTOUPDATE=${PBUILDER_AUTOUPDATE=4320}
-
 DEBUILD_NOSIGN_OPTIONS="-us -uc"
 DEBUILD_NODEPS_OPTIONS="-d"
-USE_PBUILDER=${USE_PBUILDER=1}
 
 if [ -z "$VERSION_STRING" ] ; then
     get_revision_author
@@ -61,16 +41,6 @@ do
     elif [[ $1 == '--version' ]]; then
         gen_revision_author $2
         exit 0
-    elif [[ $1 == '--pbuilder' ]]; then
-        # Default
-        shift
-    elif [[ $1 == '--no-pbuilder' ]]; then
-        USE_PBUILDER=
-        shift
-    elif [[ $1 == '--fast' ]]; then
-        # Wrong but fast pbuilder mode: create base package with all depends
-        EXTRAPACKAGES="$EXTRAPACKAGES debhelper cmake ninja-build gcc-8 g++-8 libc6-dev libicu-dev libreadline-dev psmisc bash expect python3 python3-lxml python3-termcolor python3-requests curl perl sudo openssl netcat-openbsd"
-        shift
     elif [[ $1 == '--rpm' ]]; then
         MAKE_RPM=1
         shift
@@ -120,43 +90,10 @@ echo -e "\nCurrent version is $VERSION_STRING"
 
 if [ -z "$NO_BUILD" ] ; then
     gen_changelog "$VERSION_STRING" "" "$AUTHOR" ""
-    if [ -z "$USE_PBUILDER" ] ; then
-        DEB_CC=${DEB_CC:=`which gcc-10 gcc-9 gcc | head -n1`}
-        DEB_CXX=${DEB_CXX:=`which gcc-10 g++-9 g++ | head -n1`}
     # Build (only binary packages).
     debuild --preserve-env -e PATH \
     -e DEB_CC=$DEB_CC -e DEB_CXX=$DEB_CXX -e CMAKE_FLAGS="$CMAKE_FLAGS" \
     -b ${DEBUILD_NOSIGN_OPTIONS} ${DEBUILD_NODEPS_OPTIONS}
-    else
-        export DIST=${DIST:=bionic}
-        export SET_BUILDRESULT=${SET_BUILDRESULT:=$CUR_DIR/..}
-
-        if [[ -z `which pbuilder` ]] ; then
-            sudo apt install -y pbuilder devscripts ccache fakeroot debhelper debian-archive-keyring debian-keyring lsb-release
-        fi
-
-        . $CUR_DIR/debian/.pbuilderrc
-
-        if [[ ! -e "/usr/share/debootstrap/scripts/${DIST}" ]] ; then
-            sudo ln -s gutsy /usr/share/debootstrap/scripts/${DIST}
-        fi
-
-        if [[ -n "$FORCE_PBUILDER_CREATE" || ! -e "$BASETGZ" ]] ; then
-            echo Creating base system $BASETGZ
-            [ ! -e "/usr/share/debootstrap/scripts/${DIST}" ] && sudo ln -s gutsy /usr/share/debootstrap/scripts/${DIST}
-            sudo --preserve-env bash -x pbuilder create --configfile $CUR_DIR/debian/.pbuilderrc $PBUILDER_OPT
-        fi
-
-        if [ "$PBUILDER_AUTOUPDATE" -gt 0 ]; then
-            # Update every 3 days (60*24*3 minutes)
-            if [[ -n "$PBUILDER_UPDATE" ]] || test `find "$BASETGZ" -mmin +$PBUILDER_AUTOUPDATE` ; then
-                echo Updating base system $BASETGZ
-                sudo --preserve-env pbuilder update --configfile $CUR_DIR/debian/.pbuilderrc $PBUILDER_OPT
-            fi
-        fi
-
-        pdebuild --configfile $CUR_DIR/debian/.pbuilderrc -- $PBUILDER_OPT
-    fi
 fi
 
 if [ -n "$MAKE_RPM" ]; then