Skip to content

Commit 0203612

Browse files
daniel-rossierdaniel-rossier
authored
Merge pull request #54 from smartobjectoriented/52-use-so3-as-submodule
52 use so3 as submodule
2 parents 3794eb3 + 492f932 commit 0203612

24,548 files changed

Lines changed: 119 additions & 5126052 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "ME/so3"]
2+
path = ME/so3
3+
url = git@github.com:smartobjectoriented/so3

‎ME/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This script is used to configure, build and generate MEs.
44

55
ME_PATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
6-
SO3_PATH=$ME_PATH/../so3
6+
SO3_PATH=$ME_PATH/work/so3
77

88
RED='\033[0;31m'
99
NC='\033[0m' # No Color

‎ME/deploy.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ fi
8787
if [ "$deploy_me" == "y" ]; then
8888
echo Deploying the ME into its itb file...
8989

90-
cd ../so3/target
90+
cd work/so3/target
9191
./mkuboot.sh $3
9292

9393
echo Copying the ITB image $2.itb in the $2 directory

so3/so3/configs/agency_defconfig renamed to ME/soo/so3/so3/configs/agency_defconfig

File renamed without changes.

so3/so3/configs/blind_64_defconfig renamed to ME/soo/so3/so3/configs/blind_64_defconfig

File renamed without changes.

so3/so3/configs/blind_defconfig renamed to ME/soo/so3/so3/configs/blind_defconfig

File renamed without changes.

so3/so3/configs/chat_64_defconfig renamed to ME/soo/so3/so3/configs/chat_64_defconfig

File renamed without changes.

so3/so3/configs/chat_defconfig renamed to ME/soo/so3/so3/configs/chat_defconfig

File renamed without changes.

so3/so3/configs/iuoc_64_defconfig renamed to ME/soo/so3/so3/configs/iuoc_64_defconfig

File renamed without changes.

so3/so3/configs/ledctrl_64_defconfig renamed to ME/soo/so3/so3/configs/ledctrl_64_defconfig

File renamed without changes.

0 commit comments

Comments
 (0)