From 64059e86a285ecba733030e6da7f36a6944ca2a9 Mon Sep 17 00:00:00 2001
From: Adam Podogrocki <a.podogrocki@gmail.com>
Date: Mon, 3 Dec 2018 11:24:17 +0100
Subject: [PATCH] Install Mender related files to Mender image based on Yocto
 image for qemu x86-64

Issues: MEN-2207

Changelog: Title

Signed-off-by: Adam Podogrocki <a.podogrocki@gmail.com>
---
 convert-stage-4.sh | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/convert-stage-4.sh b/convert-stage-4.sh
index 1d7e026..eaa186d 100755
--- a/convert-stage-4.sh
+++ b/convert-stage-4.sh
@@ -59,6 +59,14 @@ mender_tenant_token="dummy"
 declare -a mender_disk_mappings
 
 create_client_files() {
+  local rootfsparta="/dev/mmcblk0p2"
+  local rootfspartb="/dev/mmcblk0p3"
+
+  if [ "$device_type" == "qemux86_64" ]; then
+    rootfsparta="/dev/hda2"
+    rootfspartb="/dev/hda3"
+  fi
+
   cat <<- EOF > $mender_dir/mender.service
 	[Unit]
 	Description=Mender OTA update service
@@ -81,8 +89,8 @@ create_client_files() {
 	{
 	    "InventoryPollIntervalSeconds": 5,
 	    "RetryPollIntervalSeconds": 30,
-	    "RootfsPartA": "/dev/mmcblk0p2",
-	    "RootfsPartB": "/dev/mmcblk0p3",
+	    "RootfsPartA": "$rootfsparta",
+	    "RootfsPartB": "$rootfspartb",
 	    "ServerCertificate": "/etc/mender/server.crt",
 	    "ServerURL": "$mender_server_url",
 	    "TenantToken": "$mender_tenant_token",
@@ -102,7 +110,7 @@ create_client_files() {
 	EOF
 
   case "$device_type" in
-    "beaglebone")
+    "beaglebone" | "qemux86_64")
       cat <<- EOF > $mender_dir/fw_env.config
 	/dev/mmcblk0 0x800000 0x20000
 	/dev/mmcblk0 0x1000000 0x20000
@@ -179,6 +187,13 @@ install_files() {
           { log "\t'/uboot' mountpoint missing. Adding"; \
             sudo install -d -m 755 ${primary_dir}/uboot; }
       ;;
+    "qemux86_64")
+      [ ! -d "$primary_dir/boot/efi" ] && \
+          { log "\t'/boot/efi' mountpoint missing. Adding"; \
+            sudo install -d -m 755 ${primary_dir}/boot/efi; }
+      sudo install -d ${primary_dir}/lib64
+      sudo ln -sf /lib/ld-linux-x86-64.so.2 ${primary_dir}/lib64/ld-linux-x86-64.so.2
+      ;;
   esac
 
   sudo install -d ${primary_dir}/${identitydir}
@@ -273,6 +288,10 @@ do_install_mender() {
   primary=${mender_disk_mappings[1]}
   data=${mender_disk_mappings[3]}
 
+  if [ "$device_type" == "qemux86_64" ]; then
+    data=${mender_disk_mappings[4]}
+  fi
+
   map_primary=/dev/mapper/"$primary"
   map_data=/dev/mapper/"$data"
   path_primary=$output_dir/sdimg/primary