Commit ffe2275b authored by Frédéric Leroy's avatar Frédéric Leroy

fix .ue* filenames in scripts and documentation

TODO add option to conf2uedata and adapt script
parent d2f57bc5
...@@ -450,7 +450,7 @@ install_asn1c_from_source(){ ...@@ -450,7 +450,7 @@ install_asn1c_from_source(){
################################################ ################################################
install_nas_tools() { install_nas_tools() {
if [ ! -f $2/§.ue.nvram -o ! -f $2/.usim.nvram ]; then if [ ! -f $2/.ue.nvram0 -o ! -f $2/.usim.nvram0 ]; then
cd $OPENAIR_DIR/targets/bin cd $OPENAIR_DIR/targets/bin
./conf2uedata -c $1 -o $2 ./conf2uedata -c $1 -o $2
echo_success "$1 $2" echo_success "$1 $2"
......
...@@ -18,9 +18,9 @@ EURECOM-NAS directory should contain following files: ...@@ -18,9 +18,9 @@ EURECOM-NAS directory should contain following files:
EURECOM-NAS EURECOM-NAS
|-- bin |-- bin
| |-- .ue.nvram | |-- .ue.nvram0
| |-- .ue_emm.nvram | |-- .ue_emm.nvram0
| |-- .usim.nvram | |-- .usim.nvram0
| |-- NetworkProcess | |-- NetworkProcess
| |-- UEprocess | |-- UEprocess
| `-- UserProcess | `-- UserProcess
...@@ -57,10 +57,10 @@ UE for testing purpose. ...@@ -57,10 +57,10 @@ UE for testing purpose.
When starting up, UEprocess reads configuration data from .nvram binary When starting up, UEprocess reads configuration data from .nvram binary
files used as UE's non-volatile memory. files used as UE's non-volatile memory.
.usim.nvram contains data stored into the USIM .usim.nvram0 contains data stored into the USIM
.ue.nvram contains data related to the UE identification (IMEI, .ue.nvram0 contains data related to the UE identification (IMEI,
manufacturer, model, PIN code) manufacturer, model, PIN code)
.ue_emm.nvram contains data related to EPS Mobility Management (IMSI, last .ue_emm.nvram0 contains data related to EPS Mobility Management (IMSI, last
registered PLMN) registered PLMN)
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
......
...@@ -125,18 +125,18 @@ if [ ! -f $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data ] || [ ! -f $OPENAIR3_DIR/NA ...@@ -125,18 +125,18 @@ if [ ! -f $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data ] || [ ! -f $OPENAIR3_DIR/NA
fi fi
echo_success "make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS -f Makefile PROCESS=UE all" echo_success "make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS -f Makefile PROCESS=UE all"
make -f Makefile --debug=b --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS PROCESS=UE all make -f Makefile --debug=b --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS PROCESS=UE all
rm .ue.nvram rm .ue.nvram0
rm .usim.nvram rm .usim.nvram0
touch /tmp/nas_cleaned touch /tmp/nas_cleaned
fi fi
if [ ! -f .ue.nvram ]; then if [ ! -f .ue.nvram0 ]; then
echo_success "generate .ue_emm.nvram .ue.nvram" echo_success "generate .ue_emm.nvram0 .ue.nvram0"
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --gen $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
fi fi
if [ ! -f .usim.nvram ]; then if [ ! -f .usim.nvram0 ]; then
echo_success "generate .usim.nvram" echo_success "generate .usim.nvram0"
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --gen $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
fi fi
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --print $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --print
......
...@@ -68,20 +68,20 @@ export NVRAM_DIR=$THIS_SCRIPT_PATH ...@@ -68,20 +68,20 @@ export NVRAM_DIR=$THIS_SCRIPT_PATH
if [ ! -f $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data ]; then if [ ! -f $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data ]; then
make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS veryveryclean make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS veryveryclean
make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS PROCESS=UE make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS PROCESS=UE
rm .ue.nvram rm .ue.nvram0
fi fi
if [ ! -f $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data ]; then if [ ! -f $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data ]; then
make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS veryveryclean make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS veryveryclean
make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS PROCESS=UE make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS PROCESS=UE
rm .usim.nvram rm .usim.nvram0
fi fi
if [ ! -f .ue.nvram ]; then if [ ! -f .ue.nvram0 ]; then
# generate .ue_emm.nvram .ue.nvram # generate .ue_emm.nvram0 .ue.nvram0
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --gen $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
fi fi
if [ ! -f .usim.nvram ]; then if [ ! -f .usim.nvram0 ]; then
# generate .usim.nvram # generate .usim.nvram0
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --gen $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
fi fi
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --print $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --print
......
...@@ -852,8 +852,8 @@ compile_nas_tools() { ...@@ -852,8 +852,8 @@ compile_nas_tools() {
fi fi
echo_success "make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS/tools all" echo_success "make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS/tools all"
make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS/tools all make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS/tools all
rm .ue.nvram rm .ue.nvram0
rm .usim.nvram rm .usim.nvram0
touch /tmp/nas_cleaned touch /tmp/nas_cleaned
} }
...@@ -1027,13 +1027,13 @@ install_oaisim() { ...@@ -1027,13 +1027,13 @@ install_oaisim() {
install_nas_tools() { install_nas_tools() {
cd $OPENAIR_TARGETS/bin cd $OPENAIR_TARGETS/bin
if [ ! -f .ue.nvram ]; then if [ ! -f .ue.nvram0 ]; then
echo_success "generate .ue_emm.nvram .ue.nvram" echo_success "generate .ue_emm.nvram0 .ue.nvram0"
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --gen $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
fi fi
if [ ! -f .usim.nvram ]; then if [ ! -f .usim.nvram0 ]; then
echo_success "generate .usim.nvram" echo_success "generate .usim.nvram0"
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --gen $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
fi fi
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --print $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --print
......
...@@ -756,13 +756,13 @@ if [ $RUN -ne 0 ]; then ...@@ -756,13 +756,13 @@ if [ $RUN -ne 0 ]; then
install_nasmesh install_nasmesh
else else
# prepare NAS for UE # prepare NAS for UE
if [ ! -f .ue.nvram ]; then if [ ! -f .ue.nvram0 ]; then
echo_success "generate .ue_emm.nvram .ue.nvram" echo_success "generate .ue_emm.nvram0 .ue.nvram0"
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --gen $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
fi fi
if [ ! -f .usim.nvram ]; then if [ ! -f .usim.nvram0 ]; then
echo_success "generate .usim.nvram" echo_success "generate .usim.nvram0"
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --gen $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
fi fi
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --print $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --print
......
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