From 3682a747bdf319a34fcce7cad9771a1a3ead34ec Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Fri, 7 Jun 2019 16:45:25 +0100
Subject: [PATCH] Java 8 workaround

Java 8 segfaults during install.
Installing OpenJDK 11 first prevents Java 8 from running.
---
 stage5/00-install-extras/00-run.sh                    | 8 ++++++++
 stage5/00-install-extras/{00-packages => 01-packages} | 0
 2 files changed, 8 insertions(+)
 create mode 100755 stage5/00-install-extras/00-run.sh
 rename stage5/00-install-extras/{00-packages => 01-packages} (100%)

diff --git a/stage5/00-install-extras/00-run.sh b/stage5/00-install-extras/00-run.sh
new file mode 100755
index 0000000..f102311
--- /dev/null
+++ b/stage5/00-install-extras/00-run.sh
@@ -0,0 +1,8 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+apt-get install openjdk-11-jre-headless -y --no-install-recommends
+#update-binfmts --package openjdk-11 --remove jar /usr/bin/jexec
+apt-get purge openjdk-11-jre-headless openjdk-8-jre-headless+ -y
+apt-mark auto openjdk-8-jre-headless
+EOF
diff --git a/stage5/00-install-extras/00-packages b/stage5/00-install-extras/01-packages
similarity index 100%
rename from stage5/00-install-extras/00-packages
rename to stage5/00-install-extras/01-packages