From d5d789ba6d67237788b2c75b99867a12a98a0d40 Mon Sep 17 00:00:00 2001
From: lanyongshun <lanyongshun@baidu.com>
Date: Mon, 8 Jan 2024 20:18:04 +0800
Subject: [PATCH] fix: installation issue of dv plugins

---
 scripts/apollo.bashrc         | 1 +
 scripts/install_dv_plugins.sh | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/apollo.bashrc b/scripts/apollo.bashrc
index 7c860d6d20d..22383fb689c 100644
--- a/scripts/apollo.bashrc
+++ b/scripts/apollo.bashrc
@@ -33,6 +33,7 @@ export APOLLO_CACHE_DIR="${APOLLO_ROOT_DIR}/.cache"
 export APOLLO_SYSROOT_DIR="/opt/apollo/sysroot"
 
 export APOLLO_DAG_PATH="${APOLLO_ROOT_DIR}"
+export APOLLO_DISTRIBUTION_VERSION=9.0
 export APOLLO_LIB_PATH="${APOLLO_ROOT_DIR}/bazel-bin"
 export APOLLO_CONF_PATH="${APOLLO_ROOT_DIR}"
 export APOLLO_FLAG_PATH="${APOLLO_ROOT_DIR}"
diff --git a/scripts/install_dv_plugins.sh b/scripts/install_dv_plugins.sh
index 96de86e81d0..234634981b1 100644
--- a/scripts/install_dv_plugins.sh
+++ b/scripts/install_dv_plugins.sh
@@ -20,6 +20,9 @@ TOP_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
 source "${TOP_DIR}/scripts/apollo_base.sh"
 
 mkdir -p /opt/apollo/neo/src
+
+sudo cp -f /etc/ld.so.conf.d/apollo.conf /etc/ld.so.conf.d/apollo_source.conf
+
 dpkg -l apollo-neo-buildtool >/dev/null 2>&1
 # install buildtool
 [[ $? -ne 0 ]] && set -e && sudo rm -rf /etc/apt/keyrings/apolloauto.gpg && \
@@ -41,11 +44,12 @@ if [ -e "/apollo/.workspace.json" ]; then
     cp /apollo/.workspace.json ./
 fi
 sudo rm -rf modules/studio_connector
-sudo cp /etc/ld.so.conf.d/apollo.conf /etc/ld.so.conf.d/apollo_source.conf
 
 buildtool init
 buildtool install --legacy sim-obstacle studio-connector
 
+sudo cp -f /etc/ld.so.conf.d/apollo.conf /etc/ld.so.conf.d/apollo_pkg.conf
+
 # remove buildtool and tmp dir
 sudo apt remove -y apollo-neo-buildtool
 rm -rf ~/apollo_tmp