Drop vm_mmap_min_addr checks from scripts and sanity class

QEMU 0.12.x is relocatable so we no longer need these tests, which is good
because it doesn't work reliably with modern kernels.

Signed-off-by: Joshua Lock <josh@linux.intel.com>

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index fcb7846db77719aa97cd69be122d12e23221762e..381749ef01011065b811ba6440354c4ca43045a9 100644 (file)
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -101,17 +101,6 @@ 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

diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index 738bf53fc806ad8fb4ff8bf294aa9deb0d23ca13..7dd52371b621140229d2d345d7c3b08c6d7c91b0 100755 (executable)
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -79,13 +79,6 @@ 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
     if [ "$TYPE" = "ext3" ]; then