From c299a6c1ae03e74c28d410361db17837708a5d8b Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 7 Apr 2021 21:09:57 +0800 Subject: [PATCH] scripts/build_utils.sh: set hookdir using pbuilderrc per our testing, --hookdir does not work even the pbuilderrc(5) puts > HOOKDIR=/usr/lib/pbuilder/hooks > Specifies the default location for the user hooks directory. This is overridden with the option --hookdir. so let use HOOKDIR as we did before e81fd7baa0e49242cef2db66eeb3fe6dc4269905 Signed-off-by: Kefu Chai --- scripts/build_utils.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index 48d07f84..5c8c205e 100644 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -596,14 +596,11 @@ setup_pbuilder() { echo "$extrapackages" >> ~/.pbuilderrc fi - local hookdir - hookdir=$(recreate_hookdir) local opts opts+=" --basetgz $basedir/$DIST.tgz" opts+=" --distribution $DIST" opts+=" --mirror $mirror" - opts+=" --hookdir $hookdir" if [ -n "$use_gcc" ]; then # Newer pbuilder versions set $HOME to /nonexistent which breaks all kinds of @@ -616,8 +613,11 @@ setup_pbuilder() { # in newer versions. This ticket solves the specific issue in 8.1.1 (which vendors urllib3): # https://github.com/shazow/urllib3/issues/567 echo "USENETWORK=yes" >> ~/.pbuilderrc + local hookdir + hookdir=$(recreate_hookdir) setup_updates_repo $hookdir setup_pbuilder_for_ppa $hookdir + echo "HOOKDIR=$hookdir" >> ~/.pbuilderrc fi sudo cp ~/.pbuilderrc /root/.pbuilderrc sudo pbuilder clean -- 2.39.5