Skip to content

Commit

Permalink
Merge pull request elisa-tech#45 from sudipm-mukherjee/sudip/needlefish
Browse files Browse the repository at this point in the history
Update dockerfile for needlefish
  • Loading branch information
pahmann authored Jan 2, 2023
2 parents c99c700 + b9f7855 commit 1596505
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions Docker_container/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ Setup step (the easy way):
-------------------------

$ setup_elisa.sh
$ cd home/AGL/koi/
$ cd home/AGL/needlefish/

The above command will ask you to enter your name and email and then will configure everything and will also clone the required source code at elisa/home/AGL/koi folder.
The above command will ask you to enter your name and email and then will configure everything and will also clone the required source code at elisa/home/AGL/needlefish folder.


Setup step (the expert way):
Expand All @@ -52,8 +52,8 @@ Setup step (the expert way):
$ curl https://storage.googleapis.com/git-repo-downloads/repo > $HOME/bin/repo
$ chmod a+x $HOME/bin/repo
$ cd $AGL_TOP
$ mkdir koi
$ cd koi
$ mkdir needlefish
$ cd needlefish

The next two commands (Setting your name and email adress for use by GIT) are not documented in AGL but needed before 'repo' can be used.

Expand All @@ -65,7 +65,7 @@ Setup step (the expert way):
Last two commands from AGL:
--------------------------

$ repo init -b koi -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
$ repo init -b needlefish -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
$ repo sync

Instructions from Elisa:
Expand All @@ -91,7 +91,7 @@ Only the following should be sufficient.

$ cd elisa
$ docker run -it --rm -v $PWD:/src --workdir /src elisa
$ cd $AGL_TOP/koi
$ cd $AGL_TOP/needlefish
$ source meta-agl/scripts/aglsetup.sh -f elisa-cluster-demo
$ bitbake elisa-cluster-demo-platform
$ exit
10 changes: 5 additions & 5 deletions Docker_container/elisa.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN set -x && apt-get update && apt-get upgrade -y \
&& apt-get install -y curl python\
gawk wget git-core diffstat unzip texinfo gcc-multilib \
build-essential chrpath socat libsdl1.2-dev xterm \
cpio file locales
cpio file locales lz4 zstd

RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && locale-gen en_US.UTF-8
RUN echo "#!/bin/bash\n\nif [ ! -d /src/home ]; then\n\tmkdir /src/home\nfi\n\n/bin/bash" > /bin/start.sh
Expand All @@ -31,10 +31,10 @@ if [ ! -f \$HOME/bin/repo ]; then\n\
chmod a+x \$HOME/bin/repo\n\
fi\n\
export AGL_TOP=\$HOME/AGL\n\
if [ ! -d \$AGL_TOP/koi ]; then\n\
mkdir -p \$AGL_TOP/koi\n\
cd \$AGL_TOP/koi\n\
repo init -b koi -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo\n\
if [ ! -d \$AGL_TOP/needlefish ]; then\n\
mkdir -p \$AGL_TOP/needlefish\n\
cd \$AGL_TOP/needlefish\n\
repo init -b needlefish -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo\n\
repo sync\n\
git clone https://github.com/elisa-tech/meta-elisa.git\n\
fi" > /bin/setup_elisa.sh
Expand Down

0 comments on commit 1596505

Please sign in to comment.