From b8c1642ef6b8f683060753516d53a75af2d68672 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 11 Dec 2012 14:46:32 -0600
Subject: [PATCH] scripts: merge with master branch of stable-kernel
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
patches/ref_omap2plus_defconfig | 2 +-
tools/host_det.sh | 16 ++++++++++++++++
version.sh | 2 +-
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig
index 9fdbf710b..781954ff8 100644
--- a/patches/ref_omap2plus_defconfig
+++ b/patches/ref_omap2plus_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.7.0-rc8 Kernel Configuration
+# Linux/arm 3.7.0 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/tools/host_det.sh b/tools/host_det.sh
index 429aa54a6..db7d2b71f 100755
--- a/tools/host_det.sh
+++ b/tools/host_det.sh
@@ -137,6 +137,22 @@ function debian_regs
dpkg -l | grep ia32-libs >/dev/null || deb_pkgs+="ia32-libs "
;;
esac
+
+ case "${deb_distro}" in
+ wheezy)
+ unset wheezy_multiarch
+ dpkg -l | grep ia32-libs-i386 >/dev/null || wheezy_multiarch=1
+ ;;
+ esac
+
+ if [ "${wheezy_multiarch}" ] ; then
+ deb_pkgs+="ia32-libs-i386 "
+ echo "-----------------------------"
+ echo "Debian Wheezy:"
+ echo "sudo dpkg --add-architecture i386"
+ echo "sudo apt-get update"
+ echo "-----------------------------"
+ fi
fi
fi
diff --git a/version.sh b/version.sh
index ef53c9c33..51bd2b276 100644
--- a/version.sh
+++ b/version.sh
@@ -34,4 +34,4 @@ BUILD=d0
BUILDREV=1.0
DISTRO=cross
-DEBARCH=armel
+DEBARCH=armhf
--
GitLab