Commit 290d8685 authored by YannGarcia's avatar YannGarcia
Browse files

Bug fixes in docker-dev

parent a5000c97

titan-test-system-framework @ ffbcefb5

Original line number Diff line number Diff line 
Subproject commit 554d6b6b3ce1e51d88267a3c946cd30caac97a55
 
Subproject commit ffbcefb5dbe4bc24623f5738c8a64153c8f3599d

AtsIPv6OverGeoNetworking @ 3e3e90ce

Compare 566cc49b to 3e3e90ce
Original line number Diff line number Diff line 
Subproject commit 566cc49bf1b16aa64c26dea40268c8cd0c7acab6
 
Subproject commit 3e3e90ce7c54d4b3ab1e2551778d8d52aade506c

module @ 732c9934

Compare affc1fa4 to 732c9934
Original line number Diff line number Diff line 
Subproject commit affc1fa4e6497ff138b79a958caa79532fba6857
 
Subproject commit 732c9934d2c87966b5ab9ba4e6886f353d5e4ace

virtualization/docker-dev/home/etc/init.d/30-asn1c.sh

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ cd ./asn1c 
sed --in-place 's/AC_CHECK_INCLUDES_DEFAULT/#AC_CHECK_INCLUDES_DEFAULT/g' ./configure.ac

autoreconf -iv && ./configure --prefix=${HOME} && make install || exit 1



export ASN1CDIR=`pwd`



cd ${HOME}



exit 0

virtualization/docker-dev/home/etc/init.d/40-ttf024.sh

+3 −48
Original line number Diff line number Diff line
@@ -6,56 +6,11 @@ set -vx 
echo -e "*****************************\n* Checkout TS.ITS sources\n*****************************\n"

cd ${HOME}/dev || exit 1



git clone --recurse-submodules --single-branch --branch ttf_t024 https://forge.etsi.org/rep/ITS/TS.ITS.git TS.ITS || exit 1

git clone --recurse-submodules https://forge.etsi.org/rep/ITS/TS.ITS.git TS.ITS || exit 1

cd ./TS.ITS || exit 1

for i in `find ./ttcn -type d -name "Ats*"`

do

    cd $i

    git checkout devel2

    cd -

done

for i in `find ./ttcn/Ats* -type d -name "asn1"`

do

    cd $i

    git checkout testing2

#    if [ -f ETSI-ITS-CDD.asn ]

#    then

#        ln -sf ETSI-ITS-CDD.asn ETSI_ITS_CDD.asn || exit 1

#    elif [ -f IVIM-PDU-Descriptions.asn ]

#    then

#        ln -sf IVIM-PDU-Descriptions.asn IVIM_PDU_Descriptions.asn || exit 1

#        ln -sf MAPEM-PDU-Descriptions.asn MAPEM_PDU_Descriptions.asn || exit 1

#        ln -sf RTCMEM-PDU-Descriptions.asn RTCMEM_PDU_Descriptions.asn || exit 1

#        ln -sf SPATEM-PDU-Descriptions.asn SPATEM_PDU_Descriptions.asn || exit 1

#        ln -sf SREM-PDU-Descriptions.asn SREM_PDU_Descriptions.asn || exit 1

#        ln -sf SSEM-PDU-Descriptions.asn SSEM_PDU_Descriptions.asn || exit 1

#        ln -sf iso-patched/'ISO14906(2018)EfcDsrcApplicationv6-patched.asn' iso-patched/EfcDsrcApplication.asn || exit 1

#        ln -sf iso-patched/'ISO14906(2018)EfcDsrcGenericv7-patched.asn' iso-patched/EfcDsrcGeneric.asn || exit 1

#        ln -sf iso-patched/ISO24534-3_ElectronicRegistrationIdentificationVehicleDataModule-patched.asn iso-patched/ElectronicRegistrationIdentificationVehicleDataModule.asn || exit 1

#        ln -sf iso-patched/ISO14823-missing.asn iso-patched/GDD.asn || exit 1

#    fi

    SUB_DIRS=`find . -type d`

    if [ "SUB_DIRS" != "" ]

    then

        for j in $SUB_DIRS

        do

            cd $j

            git checkout testing2

            cd -

        done

    fi

    cd -

done

cd ${HOME}/dev/TS.ITS/titan-test-system-framework

git checkout devel

cd ./ttcn/LibHttp

ln -sf module_its.mk module.mk

cd ${HOME}/dev/TS.ITS/ttcn/LibIts

git checkout devel2

git checkout ttf_t024 || exit 1



cd ${HOME}/dev/TS.ITS/

cp ./ttcn/patch_lib_common/module.mk ./ttcn/LibCommon/

cp ./ttcn/patch_lib_common/ttcn/* ./ttcn/LibCommon/ttcn

./switch_its_r2.sh || exit 1



echo -e "*****************************\n* Setup environment\n*****************************\n"

cd ${HOME}/dev/TS.ITS/scripts