diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-09-29 12:18:34 +0100 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-09-29 17:10:41 +0100 |
commit | 7f7c185cf1ed2bd02c9a98e694cb74cc89a15daf (patch) | |
tree | e3ac55e588a75491cf066cf591ba2d3c3658c98e /scripts | |
parent | 62fe6dc755d83a4d394cb8a3751fc6172715ee37 (diff) | |
download | poky-7f7c185cf1ed2bd02c9a98e694cb74cc89a15daf.tar.gz |
Revert "Drop vm_mmap_min_addr checks from scripts and sanity class"
This reverts commit 138df217efe850528f88d340acf864c38780c2b0.
We still need the vm_mmap_min_addr set to 0 to run locale generation for
qemu-arm
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/poky-qemu-internal | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal index e7b7af3930..cb5d28b904 100755 --- a/scripts/poky-qemu-internal +++ b/scripts/poky-qemu-internal | |||
@@ -150,6 +150,13 @@ if [ ! -f "$ZIMAGE" ]; then | |||
150 | return | 150 | return |
151 | fi | 151 | fi |
152 | 152 | ||
153 | if [ -e /proc/sys/vm/mmap_min_addr ]; then | ||
154 | if [ `cat /proc/sys/vm/mmap_min_addr` != "0" ]; then | ||
155 | echo "Error, please set /proc/sys/vm/mmap_min_addr to 0 since otherwise it can cause problems with QEMU" | ||
156 | return | ||
157 | fi | ||
158 | fi | ||
159 | |||
153 | if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then | 160 | if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then |
154 | QEMU=qemu-system-arm | 161 | QEMU=qemu-system-arm |
155 | MACHINE_SUBTYPE=versatilepb | 162 | MACHINE_SUBTYPE=versatilepb |