From 987b0d9e030ec2191e422e7ca8d059b8a02ef08a Mon Sep 17 00:00:00 2001
From: royjr <royjr96@gmail.com>
Date: Tue, 18 Jun 2024 14:27:28 -0400
Subject: [PATCH 1/2] Ubuntu 24.04 fix setup (#32783)

* fix tk-dev

* fix missing pip

* Update tools/install_python_dependencies.sh

---------

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
---
 tools/install_python_dependencies.sh | 10 +++++++++-
 tools/install_ubuntu_dependencies.sh |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/install_python_dependencies.sh b/tools/install_python_dependencies.sh
index af25ec642..bb0030207 100755
--- a/tools/install_python_dependencies.sh
+++ b/tools/install_python_dependencies.sh
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 set -e
 
+# Increase the pip timeout to handle TimeoutError
+export PIP_DEFAULT_TIMEOUT=200
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 ROOT=$DIR/../
 cd $ROOT
@@ -13,7 +16,7 @@ fi
 if ! command -v "pyenv" > /dev/null 2>&1; then
   echo "pyenv install ..."
   curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
-  PYENV_PATH_SETUP="export PATH=\$HOME/.pyenv/bin:\$HOME/.pyenv/shims:\$PATH"
+  PYENV_PATH_SETUP="export PATH=\$HOME/.pyenv/bin:\$HOME/.pyenv/shims:\$HOME/.pyenv/versions/${PYENV_PYTHON_VERSION}/bin:\$PATH"
 fi
 
 if [ -z "$PYENV_SHELL" ] || [ -n "$PYENV_PATH_SETUP" ]; then
@@ -51,7 +54,12 @@ if ! pyenv prefix ${PYENV_PYTHON_VERSION} &> /dev/null; then
   echo "python ${PYENV_PYTHON_VERSION} install ..."
   CONFIGURE_OPTS="--enable-shared" pyenv install -f ${PYENV_PYTHON_VERSION}
 fi
+
 eval "$(pyenv init --path)"
+eval "$(pyenv init -)"
+eval "$(pyenv virtualenv-init -)"
+pyenv local ${PYENV_PYTHON_VERSION}
+pyenv rehash
 
 echo "update pip"
 pip install pip==24.0
diff --git a/tools/install_ubuntu_dependencies.sh b/tools/install_ubuntu_dependencies.sh
index 1f8ef24ea..1fc5e4fc8 100755
--- a/tools/install_ubuntu_dependencies.sh
+++ b/tools/install_ubuntu_dependencies.sh
@@ -93,7 +93,8 @@ function install_ubuntu_lts_latest_requirements() {
     qtchooser \
     qt5-qmake \
     qtbase5-dev-tools \
-    python3-dev
+    python3-dev \
+    tk-dev
 }
 
 # Install Ubuntu 20.04 packages

From 151b4530ddae30d9c08b86d104d2997cdd4c35e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20R=C4=85czy?= <gfw.kra@gmail.com>
Date: Tue, 18 Jun 2024 17:28:52 -0700
Subject: [PATCH 2/2] Fix openpilot-prebuilt dockerfile (#32787)

* Manually add symlinks to prevent docker for copying duplicate files

* Copy everything
---
 Dockerfile.openpilot | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/Dockerfile.openpilot b/Dockerfile.openpilot
index 5d8f958c4..e26a427eb 100644
--- a/Dockerfile.openpilot
+++ b/Dockerfile.openpilot
@@ -8,23 +8,6 @@ ENV PYTHONPATH ${OPENPILOT_PATH}:${PYTHONPATH}
 RUN mkdir -p ${OPENPILOT_PATH}
 WORKDIR ${OPENPILOT_PATH}
 
-COPY SConstruct ${OPENPILOT_PATH}
-
-COPY ./openpilot ${OPENPILOT_PATH}/openpilot
-COPY ./third_party ${OPENPILOT_PATH}/third_party
-COPY ./site_scons ${OPENPILOT_PATH}/site_scons
-COPY ./rednose ${OPENPILOT_PATH}/rednose
-COPY ./rednose_repo/site_scons ${OPENPILOT_PATH}/rednose_repo/site_scons
-COPY ./tools ${OPENPILOT_PATH}/tools
-COPY ./release ${OPENPILOT_PATH}/release
-COPY ./common ${OPENPILOT_PATH}/common
-COPY ./opendbc ${OPENPILOT_PATH}/opendbc
-COPY ./cereal ${OPENPILOT_PATH}/cereal
-COPY ./msgq_repo ${OPENPILOT_PATH}/msgq_repo
-COPY ./msgq ${OPENPILOT_PATH}/msgq
-COPY ./panda ${OPENPILOT_PATH}/panda
-COPY ./selfdrive ${OPENPILOT_PATH}/selfdrive
-COPY ./system ${OPENPILOT_PATH}/system
-COPY ./body ${OPENPILOT_PATH}/body
+COPY . ${OPENPILOT_PATH}/
 
 RUN scons --cache-readonly -j$(nproc)