Rework how we pass arguments to QEMU, provide a wks.in file

- The official hook for changing the resolution we tell QEMU is
  UVESA_MODE so change agl_qemux86-64.inc to set the value there rather
  than override the whole of QB_KERNEL_CMDLINE_APPEND.
- Make agl_qemux86-64.inc further append what's needed to
  QB_KERNEL_CMDLINE_APPEND as APPEND isn't used in the filesystem images
  we create anymore.
- Create a directdisk.wks.in file that will (a) use --use-uuid and not
  force /boot to be looked for on /dev/sda1 (when it will _NOT_ be) and
  (b) evaluate QB_KERNEL_CMDLINE_APPEND to determine what the bootargs
  to the kernel will be.

Change-Id: I49894d70e6c0010e0907b72f19fcc8fb0917e34a
Bug-AGL: SPEC-1301
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/meta-agl-bsp/conf/include/agl_qemux86-64.inc b/meta-agl-bsp/conf/include/agl_qemux86-64.inc
index 165deae..1fe839d 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_qemux86-64.inc
+++ b/meta-agl-bsp/conf/include/agl_qemux86-64.inc
@@ -3,19 +3,19 @@
 # To get wide screen than default, there are a selection of resolutions
 # available:
 #
-#APPEND += "uvesafb.mode_option=1024x768-32"
-APPEND += "uvesafb.mode_option=1280x1024-32"
-#APPEND += "uvesafb.mode_option=1600x1200-32"
+#UVESA_MODE = "1024x768-32"
+UVESA_MODE = "1280x1024-32"
+#UVESA_MODE = "1600x1200-32"
 #
 # To avoid corrupt boot screen by systemd message, you can use serial
 # console separated from VGA console or disable all boot messages by
 # kernel command line.
 #
 # Configuration for serial console
-APPEND += "console=ttyS0,115200n8"
+QB_KERNEL_CMDLINE_APPEND_append = " console=ttyS0,115200n8"
 #
 # All boot message will be off
-APPEND += "quiet"
+QB_KERNEL_CMDLINE_APPEND_append = " quiet"
 
 # Build updatable image. Only takes effect when sota.bbclass is inherited
 DISTRO_FEATURES_append = " sota"
@@ -29,3 +29,6 @@ ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02"
 
 # Force the virtio video device as 'vmware' doesn't always work
 QB_OPT_APPEND_append = " -vga virtio"
+
+# Use our own wks file
+WKS_FILE="directdisk.wks.in"

diff --git a/meta-agl-bsp/wic/directdisk.wks.in b/meta-agl-bsp/wic/directdisk.wks.in
new file mode 100644 (file)
index 0000000..f7b220c
--- /dev/null
+++ b/meta-agl-bsp/wic/directdisk.wks.in
@@ -0,0 +1,9 @@
+# short-description: Create a 'pcbios' direct disk image
+# long-description: Creates a partitioned legacy BIOS disk image that the user
+# can directly dd to boot media.
+
+part /boot --source bootimg-pcbios --use-uuid --label boot --active --align 1024
+part / --source rootfs --use-uuid --fstype=ext4 --label platform --align 1024
+
+bootloader  --timeout=0  --append="rootwait rootfstype=ext4 ${QB_KERNEL_CMDLINE_APPEND}"
+

diff --git a/meta-agl-distro/conf/distro/include/x86_64-tune.inc b/meta-agl-distro/conf/distro/include/x86_64-tune.inc
index f3bfc37..2efeca0 100644 (file)
--- a/meta-agl-distro/conf/distro/include/x86_64-tune.inc
+++ b/meta-agl-distro/conf/distro/include/x86_64-tune.inc
@@ -51,6 +51,5 @@ QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64"
 QB_CPU_x86-64 = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt"
 QB_CPU_KVM_x86-64 = "-cpu kvm64 -cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt"
 
-QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=1024x768-32 oprofile.timer=1 uvesafb.task_timeout=-1"
 # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
 QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci"