From 5001a57afc4fadce14e3cfc73cbe181c4d6b6141 Mon Sep 17 00:00:00 2001
From: codehelp <codehelp@debian.org>
Date: Mon, 3 May 2010 18:44:41 +0000
Subject: [PATCH] ensure dpkg-cross is available inside the chroot

git-svn-id: http://emdebian.org/svn/current@7175 563faec7-e20c-0410-992a-a66f704d0ccd
---
 cross/crosschroot.conf | 2 +-
 cross/setcrossarch.sh  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/cross/crosschroot.conf b/cross/crosschroot.conf
index 15e0c18..c06eb63 100644
--- a/cross/crosschroot.conf
+++ b/cross/crosschroot.conf
@@ -27,7 +27,7 @@ suite=stable
 
 # this is a duplicate if the suite is the same as the toolchain.
 [Debian]
-packages=dpkg-dev binutils-multiarch build-essential
+packages=dpkg-dev binutils-multiarch build-essential dpkg-cross
 source=http://ftp.uk.debian.org/debian
 keyring=debian-archive-keyring
 suite=unstable
diff --git a/cross/setcrossarch.sh b/cross/setcrossarch.sh
index df258a9..1f81b5b 100755
--- a/cross/setcrossarch.sh
+++ b/cross/setcrossarch.sh
@@ -47,10 +47,9 @@ fi
 # set the value inside the chroot
 echo "#!/bin/sh" > $dir/tmp/set.sh
 echo >> $dir/tmp/set.sh
-echo "export DEBIAN_FRONTEND=noninteractive ".
-	"DEBCONF_NONINTERACTIVE_SEEN=true ".
-	"LC_ALL=C LANGUAGE=C LANG=C" >> $dir/tmp/set.sh
+echo "export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true LC_ALL=C LANGUAGE=C LANG=C" >> $dir/tmp/set.sh
 echo "echo debconf dpkg-cross/default-arch select $CROSSARCH|debconf-set-selections" >> $dir/tmp/set.sh
 echo "dpkg-reconfigure dpkg-cross" >> $dir/tmp/set.sh
+echo "Setting debconf dpkg-cross/default-arch to $CROSSARCH"
 sudo chroot $dir sh /tmp/set.sh
 sudo rm $dir/tmp/set.sh