From b5de06269bcaa7792f0bca961f03f366ec8f31e0 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Wed, 19 Dec 2012 11:01:06 -0500 Subject: [PATCH] BF: nd_build_testrdepends - pass distribution to build-rdeps This makes it work with wheezy to overcome #695975 --- tools/nd_build_testrdepends | 2 +- tools/nd_fetch_bdepends | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tools/nd_build_testrdepends b/tools/nd_build_testrdepends index f24c793..307f69b 100755 --- a/tools/nd_build_testrdepends +++ b/tools/nd_build_testrdepends @@ -77,7 +77,7 @@ cd - > /dev/null echo "I: Fetching all bdepends for $pkgs in $family $dist under $arch" # need first to provide the necessary scripts out there cp -p $(dirname $0)/nd_fetch_bdepends $bindir -$CMD nd_execute $family $dist $arch --bindmounts $testdir $bindir/nd_fetch_bdepends $srcdir $pkgs +$CMD nd_execute $family $dist $arch --bindmounts $testdir $bindir/nd_fetch_bdepends $dist $srcdir $pkgs echo "I: preparing the hook" cat << EOF >| $bindir/D00add_custom_repo diff --git a/tools/nd_fetch_bdepends b/tools/nd_fetch_bdepends index 5c674f8..0a87390 100755 --- a/tools/nd_fetch_bdepends +++ b/tools/nd_fetch_bdepends @@ -1,21 +1,33 @@ #!/bin/bash -tdir=$1 +dist=$1 +tdir=$2 +shift shift # provide deb-src by uncommenting +echo "D: adjusting the sources" sed -i -e 's,^#deb-src,deb-src,g' /etc/apt/sources.list +echo "D: now have" +cat /etc/apt/sources.list mkdir -p $tdir cd $tdir apt-get update apt-get install -y devscripts dctrl-tools rm -f build-rdeps.output +echo "D: querying rdepds for $@" + +# /bin/bash < /dev/tty > /dev/tty 2> /dev/tty + for pkg in "$@"; do - build-rdeps $pkg >> build-rdeps.output + build-rdeps --distribution $dist $pkg >> build-rdeps.output done +echo "D: got rdepds:" +cat build-rdeps.output + # Fetch all the sources grep -v -e '^[-A-Z]' -e '^ *$' build-rdeps.output \ | sort | uniq \ -- 2.39.2