aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2018-10-04 23:01:51 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2018-10-04 23:11:24 +0200
commitfac0d98d0708d9b3a0de287c88222b4df37e680e (patch)
treefc6cc8c4dc6d8c0801ed3e4edbbafcb7b50f7990 /docs
parenteb6d3bf04d5ceaf4c6cb377625720acb1a512d80 (diff)
Remove duplicate instructions for SDKs install
Change-Id: I0f10c55977113df5e780e3d7e79b742a724c46a2 Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
Diffstat (limited to 'docs')
-rw-r--r--docs/part-1/1-1_install-xds-server-docker.md2
-rw-r--r--docs/part-2/1_xds-server/2_how-to-run.md130
2 files changed, 27 insertions, 105 deletions
diff --git a/docs/part-1/1-1_install-xds-server-docker.md b/docs/part-1/1-1_install-xds-server-docker.md
index a0ab604..6807800 100644
--- a/docs/part-1/1-1_install-xds-server-docker.md
+++ b/docs/part-1/1-1_install-xds-server-docker.md
@@ -73,7 +73,7 @@ bash ./xds-docker-create-container.sh -id ${ID}
# Check that new container is running
docker ps | grep worker-xds
-f67079db4339 docker.automotivelinux.org/agl/worker-xds:5.0 "/usr/bin/wait_for..." About a minute ago Up 34 seconds 0.0.0.0:(2222+ID)->22/tcp, 0.0.0.0:(69+ID)->69/udp, 0.0.0.0:(8000+ID)->8000/tcp, 0.0.0.0:(10809+ID)->10809/tcp agl-xds-HOSTNAME-ID-USERNAME
+f67079db4339 docker.automotivelinux.org/agl/worker-xds:5.0 "/usr/bin/wait_for..." About a minute ago Up 34 seconds 0.0.0.0:(2222+ID)->22/tcp, 0.0.0.0:(8000+ID)->8000/tcp, 0.0.0.0:(10809+ID)->10809/tcp agl-xds-HOSTNAME-ID-USERNAME
```
<!-- end-section-note -->
diff --git a/docs/part-2/1_xds-server/2_how-to-run.md b/docs/part-2/1_xds-server/2_how-to-run.md
index 79d44b0..a3ae22b 100644
--- a/docs/part-2/1_xds-server/2_how-to-run.md
+++ b/docs/part-2/1_xds-server/2_how-to-run.md
@@ -85,6 +85,30 @@ for example to change logging level or select another configuration file.
<!-- end-section-note -->
+## XDS server REST API and Web application
+
+`xds-server` exposes a REST API and serves a basic web-application.
+
+REST API based url is `http://localhost:8000/api/v1/` when XDS server is
+running on your host (localhost) and basic web-application is available at
+[http://localhost:8000](http://localhost:8000).
+
+Just replace `localhost` by the host name or ip when `xds-server` is running
+on another host.
+
+```bash
+# Get version using REST API
+curl http://localhost:8000/api/v1/version
+
+# Open browser and local xds-server web-application
+xdg-open http://localhost:8000
+```
+
+Then follow instructions provided on this page to install and start `xds-agent`
+that must run locally on your machine.
+
+See also [xds-agent documentation](../2_xds-agent/0_abstract.html) for more details.
+
## SDK cross-toolchain Management
### Setup to add support of a new SDK family
@@ -141,87 +165,9 @@ On startup `xds-server` will call in order:
Please refer to `sdks/README.md` for more information about scripts definition
and to understand how to add support of a new SDK family.
-### Install a new SDK from command line
-
-Used `sdks` command of `xds-cli` tool to managed SDKs.
-
-```bash
-# List all available SDKs
-xds-cli sdks ls -a
-
-List of available SDKs:
-ID NAME STATUS VERSION ARCH
-ec15afe0 AGL-release-eel-4.99.4-raspberrypi3 Not Installed 4.99.4 armv7vehf-neon-vfpv4
-944d2d5a AGL-snapshots-master-latest-intel-corei7-64 Not Installed 4.99.3+snapshot corei7-64
-cf3a4365 AGL-release-dab-4.0.2-qemux86-64 Not Installed 4.0.2 corei7-64
-d65fe750 AGL-release-eel-latest-qemux86-64 Not Installed 4.99.3 corei7-64
-a0ae663d poky-agl-corei7-64-3.99.1+snapshot Installed 3.99.1+snapshot corei7-64
-87f0400b AGL-release-dab-3.99.3-m3ulcb-nogfx Installed 3.99.3 aarch64
-8c2f2841 AGL-release-dab-4.0.2-dragonboard-410c Not Installed 4.0.2 aarch64
-...
-
-# Install a SDK (downloaded + install)
-xds-cli sdks install d65fe750
-
-Installation of 'AGL-release-eel-latest-qemux86-64' SDK successfully started.
-Downloading poky-agl-glibc-x86_64-agl-demo-platform-crosssdk-corei7-64-toolchain-4.99.5.sh ...
---2018-01-02 11:22:23-- https://download.automotivelinux.org/AGL/release/eel/latest/qemux86-64/deploy/sdk/poky-agl-glibc-x86_64-agl-demo-platform-crosssdk-corei7-64-toolchain-4.99.5.sh
-Resolving download.automotivelinux.org (download.automotivelinux.org)... 199.19.213.77
-Connecting to download.automotivelinux.org (download.automotivelinux.org)|199.19.213.77|:443... connected.
-HTTP request sent, awaiting response... 200 OK
-Length: 665996704 (635M) [application/x-sh]
-Saving to: ‘/tmp/tmp.wuQzLdImCS/poky-agl-glibc-x86_64-agl-demo-platform-crosssdk-corei7-64-toolchain-4.99.5.sh’
-
- 0K .......... .......... .......... .......... .......... 0% 82,7K 2h11m
- 50K .......... .......... .......... .......... .......... 0% 89,1K 2h6m
- 100K .......... .......... .......... .......... .......... 0% 82,0K 2h8m
-...
- 50300K .......... .......... .......... .......... .......... 99% 2,15M 0s
- 650350K .......... .......... .......... ....... 100% 4,04M=10m35s
-
-2018-01-02 12:17:06 (1024 KB/s) - ‘/tmp/tmp.CWyEj3z76Q/poky-agl-glibc-x86_64-agl-demo-platform-crosssdk-corei7-64-toolchain-4.99.5.sh’ saved [665996704/665996704]
-
-Automotive Grade Linux SDK installer version 5.0.0
-===================================================
-You are about to install the SDK to "/xdt/sdk/poky-agl/5.0.0/corei7-64". Proceed[Y/n]? Y
-Extracting SDK....................................................................................................................done
-Setting it up...done
-SDK has been successfully set up and is ready to be used.
-Each time you wish to use the SDK in a new shell session, you need to source the environment setup script e.g.
- $ . /xdt/sdk/poky-agl/5.0.0/corei7-64/environment-setup-corei7-64-agl-linux
-
-SDK ID d65fe750-d3a7-38f5-83d8-3d3806054f8d successfully installed.
-
-
-# Abort an installation that is in progress
-xds-cli sdks abort -id d65fe750
-
-# Install a SDK (using a local SDK package/file)
-xds-cli sdks install --file $HOME/xds-workspace/sdks/poky-agl-glibc-x86_64-agl-demo-platform-crosssdk-corei7-64-toolchain-5.0.0.sh
-
-```
-
-<!-- section-note -->
-Installation based on a local SDK package is only supported when SDK file package
-is located in `$HOME/xds-workspace/sdks` directory
-<!-- end-section-note -->
+### Install a new SDK
-### Install a new SDK from XDS Dashboard
-
-Open XDS-Dashboard in web-browser and select `SDKs` entry in left side menu.
-
-Then switch to `SDKs MANAGEMENT` view :
-
-![](../part-1/pictures/xds-dashboard-sdks-mgt.png){:: style="margin:auto; display:flex"}
-
-Use filter boxes to find the SDK you want to install and then click on plus
-icon (Actions column) to start installation.
-
-SDK download and installation process may take several minutes and output of installation script (output of `add` script mentioned in above chapter).
-
-![](../part-1/pictures/xds-dashboard-sdks-install.png){:: style="margin:auto; display:flex"}
-
-Note that you can abort installation by clicking on `CANCEL` button.
+Please refer to [Installing AGL SDKs](../../part-1/3_install-sdks.html) chapter.
### Un-install a SDK from command line
@@ -250,27 +196,3 @@ Open XDS-Dashboard in web-browser and select `SDKs` entry in left side menu.
If needed, switch to `BASIC SDKS VIEW` view and click on trash icon located
in the top-right corner of SDK card.
-
-## XDS server REST API and Web application
-
-`xds-server` exposes a REST API and serves a basic web-application.
-
-REST API based url is `http://localhost:8000/api/v1/` when XDS server is
-running on your host (localhost) and basic web-application is available at
-[http://localhost:8000](http://localhost:8000).
-
-Just replace `localhost` by the host name or ip when `xds-server` is running
-on another host.
-
-```bash
-# Get version using REST API
-curl http://localhost:8000/api/v1/version
-
-# Open browser and local xds-server web-application
-xdg-open http://localhost:8000
-```
-
-Then follow instructions provided on this page to install and start `xds-agent`
-that must run locally on your machine.
-
-See also [xds-agent documentation](../2_xds-agent/0_abstract.html) for more details.