Commit 3fdcf5b6 authored by FredericLeroy's avatar FredericLeroy
Browse files

feat(conf2uedata): uses nvram and usim binary

This commit reverts behaviour of data generation as before
commit 7207c65b05fd812a18371827f2bfb1431fc58696:

    fix .ue* filenames in scripts and documentation

    TODO add option to conf2uedata and adapt script
parent 3d0fbc00
...@@ -519,6 +519,12 @@ function main() { ...@@ -519,6 +519,12 @@ function main() {
cd $DIR/nas_sim_tools/build cd $DIR/nas_sim_tools/build
cmake .. cmake ..
compilations \
nas_sim_tools usim \
usim $dbin/usim
compilations \
nas_sim_tools nvram \
nvram $dbin/nvram
compilations \ compilations \
nas_sim_tools conf2uedata \ nas_sim_tools conf2uedata \
conf2uedata $dbin/conf2uedata conf2uedata $dbin/conf2uedata
...@@ -526,6 +532,10 @@ function main() { ...@@ -526,6 +532,10 @@ function main() {
# generate USIM data # generate USIM data
if [ -f $dbin/conf2uedata ]; then if [ -f $dbin/conf2uedata ]; then
install_nas_tools $conf_nvram_path $gen_nvram_path install_nas_tools $conf_nvram_path $gen_nvram_path
echo_info "Copying UE specific part to $DIR/$lte_build_dir/build"
cp -Rvf $dbin/.ue_emm.nvram0 $DIR/$lte_build_dir/build
cp -Rvf $dbin/.ue.nvram0 $DIR/$lte_build_dir/build
cp -Rvf $dbin/.usim.nvram0 $DIR/$lte_build_dir/build
else else
echo_warning "not generated UE NAS files: binaries not found" echo_warning "not generated UE NAS files: binaries not found"
fi fi
...@@ -641,6 +651,12 @@ function main() { ...@@ -641,6 +651,12 @@ function main() {
mkdir -p $DIR/nas_sim_tools/build mkdir -p $DIR/nas_sim_tools/build
cd $DIR/nas_sim_tools/build cd $DIR/nas_sim_tools/build
cmake .. cmake ..
compilations \
nas_sim_tools usim \
usim $dbin/usim
compilations \
nas_sim_tools nvram \
nvram $dbin/nvram
compilations \ compilations \
nas_sim_tools conf2uedata \ nas_sim_tools conf2uedata \
conf2uedata $dbin/conf2uedata conf2uedata $dbin/conf2uedata
......
...@@ -450,13 +450,23 @@ install_asn1c_from_source(){ ...@@ -450,13 +450,23 @@ install_asn1c_from_source(){
################################################ ################################################
install_nas_tools() { install_nas_tools() {
if [ ! -f $2/.ue.nvram0 -o ! -f $2/.usim.nvram0 ]; then if [ ! -f .ue.nvram0 ]; then
cd $OPENAIR_DIR/targets/bin echo_success "generate .ue_emm.nvram .ue.nvram"
./conf2uedata -c $1 -o $2 ./nvram --gen -c $1 -o $2
echo_success "$1 $2" else
[ ./nvram -nt .ue.nvram0 -o ./nvram -nt .ue_emm.nvram0 ] && ./nvram --gen -c $1 -o $2
fi
if [ ! -f .usim.nvram0 ]; then
echo_success "generate .usim.nvram"
./usim --gen -c $1 -o $2
else
[ ./usim -nt .usim.nvram0 ] && ./usim --gen -c $1 -o $2
fi fi
} }
################################ ################################
# set_openair_env # set_openair_env
############################### ###############################
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment