summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-10-03 18:27:50 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-10 13:26:25 +0100
commit5315ebeded2af486cf95c83ec988287202a3ae2a (patch)
tree8e1fe2049e092a43f58e712be54d90f64474ad2d /scripts
parentb8a4eb80622228c7787c5465b4fef4563763c998 (diff)
downloadpoky-5315ebeded2af486cf95c83ec988287202a3ae2a.tar.gz
qemux86-directdisk: remove mem= parameter
Remove usage of a specific amount of memory and let it be controlled by users. This was the default behaviour before it was changed by commit 3b79d9a78 that switched the wks file to be used for qemux86. Also fixes the bitbake parsing issues seen because of memory starvation using build appliance images. Fixes [YOCTO #12894] (From OE-Core rev: 18d6b668c52dc881cff7b107420e0de527eecce4) (From OE-Core rev: a53026f03a1d07cef1d1590c689e036f3ee21026) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/canned-wks/qemux86-directdisk.wks2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
index be51c4eb56..c8d9f121b5 100644
--- a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
+++ b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
@@ -4,5 +4,5 @@
4 4
5include common.wks.inc 5include common.wks.inc
6 6
7bootloader --timeout=0 --append="vga=0 rw mem=256M oprofile.timer=1 rootfstype=ext4 " 7bootloader --timeout=0 --append="vga=0 rw oprofile.timer=1 rootfstype=ext4 "
8 8