1 files changed, 34 insertions, 1 deletions

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 4dfec9aaaace..5d6be3f5e7f7 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -25,8 +25,41 @@ create_package() {
         chown -R root:root "$pdir"
         chmod -R go-w "$pdir"
 
+        # Attempt to find the correct Debian architecture
+        local forcearch="" debarch=""
+        case "$UTS_MACHINE" in
+        i386|ia64|alpha)
+                debarch="$UTS_MACHINE" ;;
+        x86_64)
+                debarch=amd64 ;;
+        sparc*)
+                debarch=sparc ;;
+        s390*)
+                debarch=s390 ;;
+        ppc*)
+                debarch=powerpc ;;
+        parisc*)
+                debarch=hppa ;;
+        mips*)
+                debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y .config && echo el) ;;
+        arm*)
+                debarch=arm$(grep -q CONFIG_AEABI=y .config && echo el) ;;
+        *)
+                echo "" >&2
+                echo "** ** **  WARNING  ** ** **" >&2
+                echo "" >&2
+                echo "Your architecture doesn't have it's equivalent" >&2
+                echo "Debian userspace architecture defined!" >&2
+                echo "Falling back to using your current userspace instead!" >&2
+                echo "Please add support for $UTS_MACHINE to ${0} ..." >&2
+                echo "" >&2
+        esac
+        if [ -n "$debarch" ] ; then
+                forcearch="-DArchitecture=$debarch"
+        fi
+
         # Create the package
-        dpkg-gencontrol -isp -p$pname -P"$pdir"
+        dpkg-gencontrol -isp $forcearch -p$pname -P"$pdir"
         dpkg --build "$pdir" ..
 }