From 364b600fe42e2829afba6c61656b249c6e7c3182 Mon Sep 17 00:00:00 2001
From: Florian Scholz <florian90@gmail.com>
Date: Tue, 22 Nov 2022 13:31:10 +0100
Subject: [PATCH] Fixing Support for Vivado/Petalinux 2020.2

---
 Dockerfile      | 2 +-
 docker_build.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 53623bf..d4c8ac4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -114,7 +114,7 @@ RUN cd / && wget -q ${HTTP_SERV}/${PETA_RUN_FILE} && \
   mkdir -p /opt/Xilinx && \
   chmod 777 /tmp /opt/Xilinx && \
   cd /tmp && \
-  sudo -u petalinux -i /accept-eula.sh /${PETA_RUN_FILE} /opt/Xilinx/petalinux && \
+  sudo -u petalinux -i /accept-eula.sh /${PETA_RUN_FILE} --dir=/opt/Xilinx/petalinux && \
   rm -f /${PETA_RUN_FILE} /accept-eula.sh
 
 ARG VIVADO_INSTALLER
diff --git a/docker_build.sh b/docker_build.sh
index 0301558..24d0902 100755
--- a/docker_build.sh
+++ b/docker_build.sh
@@ -20,7 +20,7 @@ if [ "${VIVADO_INSTALLER}" ] ; then
     echo "Vivado installer found: ${VIVADO_INSTALLER}"
     echo "It will be installed in the Docker image."
     INSTALL_VIVADO=("--build-arg" VIVADO_INSTALLER="${VIVADO_INSTALLER}")
-    if [ "${XILVER}" == "2020.1" ] ; then
+    if [ "${XILVER}" == "2020.1" ] || [ "${XILVER}" == "2020.2" ] ; then
         INSTALL_VIVADO=("--build-arg" VIVADO_INSTALLER="${VIVADO_INSTALLER}" "--build-arg" VIVADO_AGREE="3rdPartyEULA,WebTalkTerms,XilinxEULA")
     fi
 else
@@ -39,4 +39,4 @@ fi
 
 echo "Creating Docker image docker_petalinux2:$XILVER..."
 time docker build --build-arg PETA_VERSION="${XILVER}" --build-arg PETA_RUN_FILE="${PLNX}" "${INSTALL_VIVADO[@]}" -t docker_petalinux2:"${XILVER}" .
-[ -n "$HTTPID" ] && kill $HTTPID && echo "Killed HTTP Server"
\ No newline at end of file
+[ -n "$HTTPID" ] && kill $HTTPID && echo "Killed HTTP Server"
-- 
2.25.1