From d510d48af521db2b7da530cf3d0694e935424b5d Mon Sep 17 00:00:00 2001 From: Patrick Bellasi Date: Wed, 10 Feb 2016 18:47:04 +0000 Subject: [PATCH] submodules: tracking ARM-Software versions of TRAPpy and BART This patch update the external libraries to track the official mainline repos for BART and TRAPpy. We target a specified branch/tag version. The init_env script has been updated as well to ensure that, for example in case we change the remote repository, all the submodules are properly initialized before the update. This version of init_env should also work properly in zsh. Signed-off-by: Patrick Bellasi --- .gitmodules | 12 +++++------- init_env | 15 +++++---------- libs/bart | 2 +- libs/trappy | 2 +- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/.gitmodules b/.gitmodules index 859b0bff9..dade2277b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,10 @@ -[submodule "devlib-next"] +[submodule "libs/devlib"] path = libs/devlib url = https://github.com/derkling/devlib.git branch = devlib-next -[submodule "trappy-next"] +[submodule "libs/trappy"] path = libs/trappy - url = https://github.com/derkling/trappy.git - branch = trappy-next -[submodule "bart-next"] + url = https://github.com/ARM-Software/trappt.git +[submodule "libs/bart"] path = libs/bart - url = https://github.com/derkling/bart.git - branch = bart-next + url = https://github.com/ARM-Software/bart.git diff --git a/init_env b/init_env index 81c0a118d..c267cdbe5 100644 --- a/init_env +++ b/init_env @@ -6,23 +6,18 @@ export PYTHONPATH='' export PYTHONPATH=`pwd`/libs/utils:$PYTHONPATH export PYTHONPATH=`pwd`/libs/wlgen:$PYTHONPATH -if [ "x$DEVMODE" == "x1" ]; then +if [[ "x$DEVMODE" == "x1" ]]; then export PYTHONPATH=`pwd`/libs/devlib:$PYTHONPATH export PYTHONPATH=`pwd`/libs/trappy:$PYTHONPATH export PYTHONPATH=`pwd`/libs/bart:$PYTHONPATH echo - echo 'Developer mode ENABLED, using libraries provided by submodules' - echo 'PYTHONPATH: ' - echo $PYTHONPATH + echo 'Developer mode ENABLED, using libraries provided by:' + echo " ${PYTHONPATH//:/\\n }" echo - if [ ! -f libs/devlib/README.rst ]; then - echo 'Initializing submodules...' - git submodule init - fi - echo 'Update submodules if required' - git submodule update + echo 'Checking for sumbmodules updates required...' + git submodule update --init echo 'DONE' fi diff --git a/libs/bart b/libs/bart index b7fe44209..290caafb3 160000 --- a/libs/bart +++ b/libs/bart @@ -1 +1 @@ -Subproject commit b7fe442093cd3ea4c2148f1e56c9b0b793238654 +Subproject commit 290caafb3675103f8ee91b71245a7aba0f2b0c2c diff --git a/libs/trappy b/libs/trappy index 9a6ecdad1..26cf414f6 160000 --- a/libs/trappy +++ b/libs/trappy @@ -1 +1 @@ -Subproject commit 9a6ecdad176389e2c66b5cac2e72cf6049f2254f +Subproject commit 26cf414f6b6c5eca30ef12822bc03e06cb1adc34 -- GitLab