From 577453a5533a612f0ca13e3ceae8961a62b679de Mon Sep 17 00:00:00 2001
From: Matt Spencer <Matthew.Spencer@amd.com>
Date: Fri, 17 Jul 2026 14:38:53 +0000
Subject: [PATCH] Fix patch application in container.

---
 Dockerfile               | 2 +-
 patches/apply_patches.sh | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2a94d15..74233e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ COPY patches ./patches/
 COPY upstream.jazzy.repos ./upstream.jazzy.repos
 
 # Import all upstream repostories
-RUN vcs import ./src/upstream < ./upstream.jazzy.repos
+RUN mkdir -p src/upstream && vcs import ./src/upstream < ./upstream.jazzy.repos
 
 # Apply patches to upstream
 RUN ./patches/apply_patches.sh
diff --git a/patches/apply_patches.sh b/patches/apply_patches.sh
index 5bb5c6b..bd6d339 100755
--- a/patches/apply_patches.sh
+++ b/patches/apply_patches.sh
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 set -u
 
-ROOT_DIR="/workspaces/agv_pro_ros2"
+PATCH_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ROOT_DIR="$(dirname "$PATCH_DIR")"
 PATCH_DIR="$ROOT_DIR/patches"
 
 apply_patch_once() {
@@ -23,8 +24,8 @@ apply_patch_once() {
     || git -C "$target_dir" apply --reverse --check "$patch_file" >/dev/null 2>&1
 }
 
-apply_patch_once "$ROOT_DIR/src/upstream/livox_sdk" "$PATCH_DIR/livox_sdk.patch"
-apply_patch_once "$ROOT_DIR/src/upstream/slam_gmapping" "$PATCH_DIR/slam_gmapping.patch"
 apply_patch_once "$ROOT_DIR/src/upstream/FAST_LIO" "$PATCH_DIR/fast_lio.patch"
-apply_patch_once "$ROOT_DIR/src/upstream/unilidar_sdk2" "$PATCH_DIR/unilidar_sdk2.patch"
+apply_patch_once "$ROOT_DIR/src/upstream/livox_sdk" "$PATCH_DIR/livox_sdk.patch"
 apply_patch_once "$ROOT_DIR/src/upstream/livox_ros_driver2" "$PATCH_DIR/livox_ros_driver2.patch"
+apply_patch_once "$ROOT_DIR/src/upstream/slam_gmapping" "$PATCH_DIR/slam_gmapping.patch"
+apply_patch_once "$ROOT_DIR/src/upstream/unilidar_sdk2" "$PATCH_DIR/unilidar_sdk2.patch"