Skip to content

Commit bcaa572

Browse files
committed
chore: update 10.x and fix issues
- cyber: - a6160493e7 fix: fix container name issue - 799ed5600f chore: add env setup cmd to rcfile after container created - 6c5c3267a1 chore: enable timezone mutable in container - 81ab328121 chore: change aem copy dest - 2e2b96521a chore: enable aem auto complete - be2a9ea41e chore: change aem path in container and fix permission issue for setup.sh - 28e9b37502 chore: add geographiclib and gtsam - 27f9d02b77 chore: upgrade openssl to 3.0.2 in u22 env - 11b24ab9c5 chore: add lib symbolic link for openssl-3 - 82aa48e946 fix(cyber): fix args file path found - f2b995fcae fix: aem remove issue for env before 9.x - docs: - 887f342fdb fix: fix install_src issue and docs TOF - dreamview: - 78cf80c513 merge: merge branch 9.2 dvp frontend into preview - 9763d2fb72 build(dvp): build dreamview_plus frontend - 60f0cfe153 build(dvp): build dreamview_plus frontend - 8491ac8cef fix: 修复第一次启动dreamview时切换simControl失败的问题 - 06bbeb4e4e build(dvp): build dreamviewplus - planning: - e7ec14fa03 fix(planning): Setting use_sqp to true in open space scene Signed-off-by: liangjinping <liangjinping@baidu.com> Change-Id: Ie470c35cd105972d0f4ce5753d0825c15d69201f
1 parent 7bc54b8 commit bcaa572

File tree

123 files changed

+128960
-158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+128960
-158
lines changed

aem/aem-create

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,19 @@ execute() {
240240
check_agreement
241241

242242
# load custom environment variables
243+
local _old_apollo_env_name="${APOLLO_ENV_NAME}"
244+
local _old_apollo_env_container_name="${APOLLO_ENV_CONTAINER_NAME}"
243245
[[ -f "${PWD}/.env" ]] && set -a && source "${PWD}/.env" && set +a
246+
# fix related environment variables
247+
if [[ "${_old_apollo_env_name}" != "${APOLLO_ENV_NAME}" ]]; then
248+
if [[ "${_old_apollo_env_container_name}" == "${APOLLO_ENV_CONTAINER_NAME}" ]]; then
249+
# container name is not set in .env
250+
export APOLLO_ENV_CONTAINER_NAME="${APOLLO_ENV_CONTAINER_PREFIX}${APOLLO_ENV_NAME}"
251+
fi
252+
fi
253+
if [[ "${APOLLO_ENV_BACKEND}" == "host" ]]; then
254+
export APOLLO_ENV_WORKROOT="${APOLLO_ENV_WORKSPACE}"
255+
fi
244256

245257
parse_arguments "$@"
246258

aem/aem-remove

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,7 @@ execute() {
5555
parse_arguments "$@"
5656

5757
if [[ ! -d "${APOLLO_ENVS_ROOT}/${APOLLO_ENV_NAME}" ]]; then
58-
if [[ ! -d "${APOLLO_ENVS_ROOT}/${APOLLO_ENV_CONTAINER_PREFIX}${APOLLO_ENV_NAME}" ]]; then
59-
error "env ${APOLLO_ENV_NAME} not found"
60-
return 1
61-
elif ! docker_container_exists "${APOLLO_ENV_CONTAINER_PREFIX}${APOLLO_ENV_NAME}"; then
58+
if [[ ! -d "${APOLLO_ENVS_ROOT}/${APOLLO_ENV_CONTAINER_PREFIX}${APOLLO_ENV_NAME}" ]] && ! docker_container_exists "${APOLLO_ENV_CONTAINER_PREFIX}${APOLLO_ENV_NAME}"; then
6259
error "env ${APOLLO_ENV_NAME} not found"
6360
return 1
6461
fi

aem/ansible/roles/base_env/tasks/Ubuntu.18.04.x86_64.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
- wget
3333
- xz-utils
3434
- zip
35+
- bash-completion
3536
state: latest
3637
update_cache: false
3738
when: "'apt' in ansible_facts.packages"

aem/ansible/roles/base_env/tasks/Ubuntu.20.04.aarch64.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
- wget
3333
- xz-utils
3434
- zip
35+
- bash-completion
3536
state: latest
3637
update_cache: false
3738
when: "'apt' in ansible_facts.packages"

aem/ansible/roles/base_env/tasks/Ubuntu.20.04.x86_64.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
- wget
3333
- xz-utils
3434
- zip
35+
- bash-completion
3536
state: latest
3637
update_cache: false
3738
when: "'apt' in ansible_facts.packages"

aem/ansible/roles/base_env/tasks/Ubuntu.22.04.x86_64.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
- wget
3333
- xz-utils
3434
- zip
35+
- bash-completion
3536
state: latest
3637
update_cache: false
3738
when: "'apt' in ansible_facts.packages"
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 5bad53988..ba50de92a 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -29,6 +29,9 @@ set (CMAKE_PROJECT_VERSION_MAJOR ${GTSAM_VERSION_MAJOR})
6+
set (CMAKE_PROJECT_VERSION_MINOR ${GTSAM_VERSION_MINOR})
7+
set (CMAKE_PROJECT_VERSION_PATCH ${GTSAM_VERSION_PATCH})
8+
9+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native")
10+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
11+
+
12+
###############################################################################
13+
# Gather information, perform checks, set defaults
14+
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 5bad53988..259b68ea4 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -29,6 +29,9 @@ set (CMAKE_PROJECT_VERSION_MAJOR ${GTSAM_VERSION_MAJOR})
6+
set (CMAKE_PROJECT_VERSION_MINOR ${GTSAM_VERSION_MINOR})
7+
set (CMAKE_PROJECT_VERSION_PATCH ${GTSAM_VERSION_PATCH})
8+
9+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx2")
10+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx2")
11+
+
12+
###############################################################################
13+
# Gather information, perform checks, set defaults
14+
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#!/usr/bin/env bash
2+
3+
###############################################################################
4+
# Copyright 2024 The Apollo Authors. All Rights Reserved.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
###############################################################################
18+
19+
# Fail on first error.
20+
set -e
21+
22+
INSTALL_ATOM=${INSTALL_ATOM:-GeographicLib-2.3}
23+
24+
SCRIPT_DIR="$(
25+
cd "$(dirname "${BASH_SOURCE[0]}")"
26+
pwd -P
27+
)"
28+
[[ -f "${SCRIPT_DIR}/installer_base.sh" ]] && source ${SCRIPT_DIR}/installer_base.sh
29+
[[ -f "${SCRIPT_DIR}/cmake_package_install_funcs.sh" ]] && source ${SCRIPT_DIR}/cmake_package_install_funcs.sh
30+
31+
if ldconfig -p | grep libGeographicLib.so | grep -q /usr/lib; then
32+
info "libGeographicLib was already installed"
33+
exit 0
34+
fi
35+
36+
# fallback
37+
# SRC_URI="${SRC_URI:-https://jaist.dl.sourceforge.net/project/geographiclib/distrib-C%2B%2B/${PN}-${PV}.tar.gz}"
38+
SRC_URI="${SRC_URI:-https://apollo-system.cdn.bcebos.com/archive/10.0/${PN}-${PV}.tar.gz}"
39+
40+
if [[ "${BASH_SOURCE[0]}" != "${0}" ]]; then
41+
# Being sourced, do nothing
42+
:
43+
else
44+
install_package "$@"
45+
fi
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
#!/usr/bin/env bash
2+
3+
###############################################################################
4+
# Copyright 2024 The Apollo Authors. All Rights Reserved.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
###############################################################################
18+
19+
# Fail on first error.
20+
set -e
21+
22+
INSTALL_ATOM=${INSTALL_ATOM:-gtsam-4.2}
23+
24+
SCRIPT_DIR="$(
25+
cd "$(dirname "${BASH_SOURCE[0]}")"
26+
pwd -P
27+
)"
28+
[[ -f "${SCRIPT_DIR}/installer_base.sh" ]] && source ${SCRIPT_DIR}/installer_base.sh
29+
[[ -f "${SCRIPT_DIR}/cmake_package_install_funcs.sh" ]] && source ${SCRIPT_DIR}/cmake_package_install_funcs.sh
30+
31+
if ldconfig -p | grep libgtsam.so | grep -q /usr/lib; then
32+
info "gtsam was already installed"
33+
exit 0
34+
fi
35+
36+
# fallback
37+
# SRC_URI="${SRC_URI:-https://github.com/borglab/gtsam/archive/refs/tags/${PV}.tar.gz} -> ${PN}-${PV}.tar.gz}"
38+
SRC_URI="${SRC_URI:-https://apollo-system.cdn.bcebos.com/archive/10.0/${PN}-${PV}.tar.gz}"
39+
PATCHES=(
40+
"${FILESDIR}/gtsam-4.2_compilation_flags_$(uname -m).patch"
41+
)
42+
43+
src_prepare_pre() {
44+
# apt_get_update_and_install libboost-all-dev
45+
apt_get_update_and_install apollo-neo-3rd-boost
46+
# TODO: pack to 3rd-boost release tarball
47+
boost_cmake_files_url='https://apollo-system.cdn.bcebos.com/archive/10.0/3rd-boost_1.74.0_cmake_files.tar.gz'
48+
curl -sSL "${boost_cmake_files_url}" | tar xz -C /opt/apollo/neo/packages/3rd-boost/latest
49+
}
50+
51+
cmake_src_configure() {
52+
mkdir -p "${WORKDIR}/${PF}_build"
53+
pushd "${WORKDIR}/${PF}_build"
54+
cmake ${WORKDIR}/${PF} \
55+
-DBUILD_SHARED_LIBS=ON \
56+
-DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
57+
-DBoost_NO_SYSTEM_PATHS="true" \
58+
-DBOOST_ROOT="${BOOST_ROOT:-/opt/apollo/neo/packages/3rd-boost/latest}" \
59+
-DCMAKE_BUILD_TYPE=Release
60+
popd
61+
}
62+
63+
if [[ "${BASH_SOURCE[0]}" != "${0}" ]]; then
64+
# Being sourced, do nothing
65+
:
66+
else
67+
install_package "$@"
68+
fi

0 commit comments

Comments
 (0)