Revert "Drop vm_mmap_min_addr checks from scripts and sanity class"
This reverts commit 138df217ef
.
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>
This commit is contained in:
parent
62fe6dc755
commit
7f7c185cf1
|
@ -120,6 +120,17 @@ def check_sanity(e):
|
|||
if not check_app_exists("qemu-arm", e.data):
|
||||
messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH"
|
||||
|
||||
if data.getVar('TARGET_ARCH', e.data, True) == "arm":
|
||||
# This path is no longer user-readable in modern (very recent) Linux
|
||||
try:
|
||||
if os.path.exists("/proc/sys/vm/mmap_min_addr"):
|
||||
f = file("/proc/sys/vm/mmap_min_addr", "r")
|
||||
if (f.read().strip() != "0"):
|
||||
messages = messages + "/proc/sys/vm/mmap_min_addr is not 0. This will cause problems with qemu so please fix the value (as root).\n\nTo fix this in later reboots, set vm.mmap_min_addr = 0 in /etc/sysctl.conf.\n"
|
||||
f.close()
|
||||
except:
|
||||
pass
|
||||
|
||||
for util in required_utilities.split():
|
||||
if not check_app_exists( util, e.data ):
|
||||
missing = missing + "%s," % util
|
||||
|
|
|
@ -150,6 +150,13 @@ if [ ! -f "$ZIMAGE" ]; then
|
|||
return
|
||||
fi
|
||||
|
||||
if [ -e /proc/sys/vm/mmap_min_addr ]; then
|
||||
if [ `cat /proc/sys/vm/mmap_min_addr` != "0" ]; then
|
||||
echo "Error, please set /proc/sys/vm/mmap_min_addr to 0 since otherwise it can cause problems with QEMU"
|
||||
return
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then
|
||||
QEMU=qemu-system-arm
|
||||
MACHINE_SUBTYPE=versatilepb
|
||||
|
|
Loading…
Reference in New Issue