From 1ccf2a151e58c8abca97b00c4a277895968842e6 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 20 Jul 2021 09:59:36 +0900 Subject: DEB build scripts: dropped 'internal pbuilder' option and some code improvements. Signed-off-by: Michele Calgaro --- debian/_buildscripts/local/internals/_pbuilder.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'debian/_buildscripts/local/internals') diff --git a/debian/_buildscripts/local/internals/_pbuilder.sh b/debian/_buildscripts/local/internals/_pbuilder.sh index 870758df0..ed4391dae 100755 --- a/debian/_buildscripts/local/internals/_pbuilder.sh +++ b/debian/_buildscripts/local/internals/_pbuilder.sh @@ -8,12 +8,6 @@ function run_pdebuild() PBUILDER_SHELL_HOOK="$PBUILDER_HOOK_DIR/C10shell" PBUILDER_DEPS_HOOK="$PBUILDER_HOOK_DIR/D05deps" - # Local option variables - # - internal pbuilder - OPT_INTERNAL_PBUILDER="" - if [ "$bool_INTERNAL_PBUILDER" = "y" ]; then - OPT_INTERNAL_PBUILDER="--use-pdebuild-internal" - fi # Sign packages optino OPT_SIGN_PKG_PBUILDER="" if [ ! -z "$GPG_SIGN_KEYID" ]; then @@ -82,7 +76,7 @@ END_D05_03 if [ ${DEB_BUILD_PARALLEL+x} ]; then OPT_BUILD_PARALLEL="DEB_BUILD_PARALLEL=$DEB_BUILD_PARALLEL" fi - eval pdebuild $OPT_INTERNAL_PBUILDER $OPT_SIGN_PKG_PBUILDER \ + eval pdebuild $OPT_SIGN_PKG_PBUILDER \ --architecture $ARCHITECTURE \ --buildresult \"$MOD_DEB_PATH\" \ --pbuilderroot \"sudo $OPT_BUILD_PARALLEL DISTRO_NAME=$DISTRO_NAME ARCHITECTURE=$ARCHITECTURE\" \ @@ -108,4 +102,4 @@ END_D05_03 #---------------------------- # The actual code is inside a function to allow the pdebuild return value to be # correctly passed back to the calling script in all cases (root and non root users) -run_pdebuild \ No newline at end of file +run_pdebuild -- cgit v1.2.1