BF: nd_build_testrdepends - pass distribution to build-rdeps

This makes it work with wheezy to overcome #695975

diff --git a/tools/nd_build_testrdepends b/tools/nd_build_testrdepends
index f24c793556850bc01bb63002dec708854f732be2..307f69b854389a5d545cf8bb1e2336a5922800d8 100755 (executable)
--- 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 5c674f8e1605e1fd5036e2188708b55e9d9890bb..0a87390cbc58750b54147e2dfca1a8b13dbccf77 100755 (executable)
--- 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 \