From 54dbb55ea8203df354c406e67784ef6ca41ca89e Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Wed, 19 Feb 2020 10:22:02 -0800
Subject: [PATCH] ci: Make sure that we have a proper shell prompt for LAVA.

LAVA finds a '#' early in boot and races to emit its shell commands.
Apparently for the current boards those serial commands end up getting
buffered such that things work out, but for db410c and db820c, the buffer
is lost and LAVA gets stuck waiting for the prompt.  By setting a prompt,
we can delay our commands until we're actually supposed to emit them (and
suppress a complaint from the lava dispatcher that we're using a risky
prompt!)

Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3883>
---
 .gitlab-ci.yml                  | 2 +-
 .gitlab-ci/create-rootfs.sh     | 8 +++++++-
 .gitlab-ci/lava-deqp.yml.jinja2 | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b6c97a6b69..579056ae2fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -165,7 +165,7 @@ arm_build:
     - .debian@container-ifnot-exists@arm64v8
     - .container
   variables:
-    DEBIAN_TAG: &arm_build "2020-02-05"
+    DEBIAN_TAG: &arm_build "2020-02-19"
 
 .use-arm_build:
   variables:
diff --git a/.gitlab-ci/create-rootfs.sh b/.gitlab-ci/create-rootfs.sh
index 810924061fb..04441ee50d1 100644
--- a/.gitlab-ci/create-rootfs.sh
+++ b/.gitlab-ci/create-rootfs.sh
@@ -20,7 +20,13 @@ apt-get -y install --no-install-recommends \
     $LLVM
 passwd root -d
 chsh -s /bin/sh
-ln -s /bin/sh /init
+
+cat > /init <<EOF
+#!/bin/sh
+export PS1=lava-shell:
+exec sh
+EOF
+chmod +x  /init
 
 #######################################################################
 # Strip the image to a small minimal system without removing the debian
diff --git a/.gitlab-ci/lava-deqp.yml.jinja2 b/.gitlab-ci/lava-deqp.yml.jinja2
index 8b7b4b12034..0872ba29acc 100644
--- a/.gitlab-ci/lava-deqp.yml.jinja2
+++ b/.gitlab-ci/lava-deqp.yml.jinja2
@@ -38,7 +38,7 @@ actions:
     method: {{ boot_method }}
     commands: ramdisk
     prompts:
-      - '#' 
+      - 'lava-shell:'
 - test:
     timeout:
       minutes: 60
-- 
2.30.2