From 07491ab854acf986f58e68d916137acbfb83b329 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 21 Apr 2011 14:54:04 +0200
Subject: making sure the $ARCHITECTURE var gets set

---
 bin/pdebuild-user-mode-linux | 1 -
 home/.pbuilderrc             | 9 +++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/pdebuild-user-mode-linux b/bin/pdebuild-user-mode-linux
index 42b118b..6e8f468 100755
--- a/bin/pdebuild-user-mode-linux
+++ b/bin/pdebuild-user-mode-linux
@@ -34,7 +34,6 @@ export PBCURRENTCOMMANDLINEOPERATION="pdebuild"
 PKG_SOURCENAME=$(dpkg-parsechangelog|sed -n 's/^Source: //p')
 PKG_VERSION=$(dpkg-parsechangelog|sed -n 's/^Version: \(.*:\|\)//p')
 ARCHITECTURE=${ARCHITECTURE-$(dpkg-architecture -qDEB_HOST_ARCH)}
-DEBOOTSTRAPOPTS="--arch=$ARCHITECTURE"
 
 if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' ]; then
     if [ ! readlink -f .. ]; then
diff --git a/home/.pbuilderrc b/home/.pbuilderrc
index eb92cc7..cf3b343 100644
--- a/home/.pbuilderrc
+++ b/home/.pbuilderrc
@@ -12,11 +12,11 @@ APTCACHEHARDLINK="no"
 USE_DEBUILD_INTERNAL="yes"
 PRESERVE_BUILDPLACE="yes"
 
-if [ "x$ARCH" = "xi386" ]; then
-        DEBBUILDOPTS="-B"
-fi
-
 if [ -n "${DIST}" ] && [ -n "${CODENAME}" ] && [ -n "${ARCH}" ]; then
+        if [ "x$ARCH" = "xi386" ]; then
+                DEBBUILDOPTS="-B"
+        fi
+
         if [ "x${DIST}" = "xubuntu" ]; then 
                 MIRRORSITE="http://de.archive.ubuntu.com/ubuntu"
         else
@@ -27,6 +27,7 @@ if [ -n "${DIST}" ] && [ -n "${CODENAME}" ] && [ -n "${ARCH}" ]; then
         DISTRIBUTION="$CODENAME"
         BUILDRESULT="$BASEDIRECTORY/$DIST-$CODENAME-$ARCH/result/"
         APTCACHE="$BASEDIRECTORY/$DIST-$CODENAME-$ARCH/aptcache/"
+        ARCHITECTURE="$ARCH"
 fi
 export OTHERMIRROR
 
-- 
cgit v1.2.3