Merge remote-tracking branch 'origin/yaml-config' into integration_2024_w36
This commit is contained in:
@@ -497,7 +497,7 @@ function main() {
|
||||
# add some default libraries that should always be built
|
||||
# for eNB, gNB, UEs, simulators
|
||||
if [[ $gNB == 1 || $eNB == 1 || $UE == 1 || $nrUE == 1 || $SIMUS_PHY == 1 || $RU == 1 ]]; then
|
||||
TARGET_LIST="$TARGET_LIST params_libconfig coding rfsimulator dfts"
|
||||
TARGET_LIST="$TARGET_LIST params_libconfig coding rfsimulator dfts params_yaml"
|
||||
fi
|
||||
|
||||
mkdir -p $DIR/$BUILD_DIR/build
|
||||
|
||||
@@ -590,8 +590,9 @@ check_install_oai_software() {
|
||||
libtool \
|
||||
patch \
|
||||
openssl \
|
||||
zlib1g-dev \
|
||||
xxd
|
||||
zlib1g-dev \
|
||||
xxd \
|
||||
libyaml-cpp-dev
|
||||
|
||||
elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
|
||||
if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]] || [[ "$OS_DISTRO" == "rocky" ]]; then
|
||||
@@ -626,7 +627,8 @@ check_install_oai_software() {
|
||||
blas \
|
||||
blas-devel \
|
||||
vim-common \
|
||||
zlib-devel
|
||||
zlib-devel \
|
||||
yaml-cpp-devel
|
||||
fi
|
||||
|
||||
install_asn1c_from_source $1
|
||||
|
||||
Reference in New Issue
Block a user