From ee41a84454d36442e114d31771f90578a6d07eab Mon Sep 17 00:00:00 2001
From: Michal Galka <michal.galka@collabora.com>
Date: Thu, 16 Sep 2021 19:11:43 +0200
Subject: [PATCH 1/2] Add setup for image conversion and VM running

/dev directory bind is required to setup a loop device which is a part
of test image to QEMU image conversion with image_to_vm.sh script from
CrOS SDK.
Ports 5900 and 2222 need to be exposed so SSH and VNC connections to
the QEMU VM running inside CrOS SDK chroot can be made from the host machine.

Signed-off-by: Michal Galka <michal.galka@collabora.com>
---
 cros-build/docker-compose.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cros-build/docker-compose.yaml b/cros-build/docker-compose.yaml
index f47200d..1b556cc 100644
--- a/cros-build/docker-compose.yaml
+++ b/cros-build/docker-compose.yaml
@@ -15,3 +15,7 @@ services:
       - ./chroot-${CROS_DEVICE}:/home/cros-build/chroot-${CROS_DEVICE}
       - ./firmware:/home/cros-build/chromiumos/src/scripts/firmware
       - ./setup/${CROS_DEVICE}_files:/home/cros-build/chromiumos/src/scripts/${CROS_DEVICE}_files
+      - /dev:/dev
+    ports:
+      - 2222:2222
+      - 5900:5900
-- 
GitLab


From 4d49741de9c989a29ba4b93112fdb83c770d3839 Mon Sep 17 00:00:00 2001
From: Michal Galka <michal.galka@collabora.com>
Date: Thu, 16 Sep 2021 19:12:39 +0200
Subject: [PATCH 2/2] Bump SDK version for octopus and adjust Dockerfile

Put more recent version of CrOS SDK for octopus in the octopus.env file.
Docker file changes are required for the new SDK to be build properly.

Signed-off-by: Michal Galka <michal.galka@collabora.com>
---
 cros-build/setup/Dockerfile  | 4 ++--
 cros-build/setup/octopus.env | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cros-build/setup/Dockerfile b/cros-build/setup/Dockerfile
index 1ddcd7c..74572e2 100644
--- a/cros-build/setup/Dockerfile
+++ b/cros-build/setup/Dockerfile
@@ -20,7 +20,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
     sudo \
     thin-provisioning-tools \
     xz-utils \
-    ssh
+    ssh \
+    locales-all
 
 # add cros-build user with sudo
 RUN \
@@ -49,7 +50,6 @@ RUN \
   repo init \
     -u https://chromium.googlesource.com/chromiumos/manifest.git \
     -b $cros_sdk_branch \
-    -g firmware \
     --depth=1 && \
   repo sync -j4
 
diff --git a/cros-build/setup/octopus.env b/cros-build/setup/octopus.env
index 8d5f024..16822db 100644
--- a/cros-build/setup/octopus.env
+++ b/cros-build/setup/octopus.env
@@ -1,2 +1,2 @@
 CROS_DEVICE=octopus
-CROS_SDK_BRANCH=firmware-octopus-11297.83.B
+CROS_SDK_BRANCH=release-R94-14150.B
-- 
GitLab