diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-05-21 11:38:09 +0100 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-05-28 15:32:41 +0100 |
commit | 138df217efe850528f88d340acf864c38780c2b0 (patch) | |
tree | 5bc494c9d1962a29f70de81fa9e0c823d1abab7f | |
parent | 32a85c157002874af88a1cd324e1e466bb1df9b6 (diff) | |
download | poky-138df217efe850528f88d340acf864c38780c2b0.tar.gz |
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>
-rw-r--r-- | meta/classes/sanity.bbclass | 11 | ||||
-rwxr-xr-x | scripts/poky-qemu-internal | 7 |
2 files changed, 0 insertions, 18 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index fcb7846db7..381749ef01 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -101,17 +101,6 @@ def check_sanity(e): | |||
101 | if not check_app_exists("qemu-arm", e.data): | 101 | if not check_app_exists("qemu-arm", e.data): |
102 | messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH" | 102 | messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH" |
103 | 103 | ||
104 | if data.getVar('TARGET_ARCH', e.data, True) == "arm": | ||
105 | # This path is no longer user-readable in modern (very recent) Linux | ||
106 | try: | ||
107 | if os.path.exists("/proc/sys/vm/mmap_min_addr"): | ||
108 | f = file("/proc/sys/vm/mmap_min_addr", "r") | ||
109 | if (f.read().strip() != "0"): | ||
110 | 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" | ||
111 | f.close() | ||
112 | except: | ||
113 | pass | ||
114 | |||
115 | for util in required_utilities.split(): | 104 | for util in required_utilities.split(): |
116 | if not check_app_exists( util, e.data ): | 105 | if not check_app_exists( util, e.data ): |
117 | missing = missing + "%s," % util | 106 | missing = missing + "%s," % util |
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal index 738bf53fc8..7dd52371b6 100755 --- a/scripts/poky-qemu-internal +++ b/scripts/poky-qemu-internal | |||
@@ -79,13 +79,6 @@ if [ ! -f "$ZIMAGE" ]; then | |||
79 | return | 79 | return |
80 | fi | 80 | fi |
81 | 81 | ||
82 | if [ -e /proc/sys/vm/mmap_min_addr ]; then | ||
83 | if [ `cat /proc/sys/vm/mmap_min_addr` != "0" ]; then | ||
84 | echo "Error, please set /proc/sys/vm/mmap_min_addr to 0 since otherwise it can cause problems with QEMU" | ||
85 | return | ||
86 | fi | ||
87 | fi | ||
88 | |||
89 | if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then | 82 | if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then |
90 | QEMU=qemu-system-arm | 83 | QEMU=qemu-system-arm |
91 | if [ "$TYPE" = "ext3" ]; then | 84 | if [ "$TYPE" = "ext3" ]; then |