11 files changed, 108 insertions, 50 deletions
diff --git a/INSTALL/setup.d/20_worker_base b/INSTALL/setup.d/20_worker_base
index 8b87922..b262afb 100644
--- a/INSTALL/setup.d/20_worker_base
+++ b/INSTALL/setup.d/20_worker_base
@@ -1,35 +1,7 @@
 #!/bin/bash
 
-# install prereqs for bitbake plus other pkgs
-apt-get install -y gawk wget git git-core diffstat unzip texinfo gcc-multilib build-essential chrpath socat libsdl1.2-dev cpio libzip2 lsb-release python3 
- 
 # add some cool base tools
-apt-get install -y vim-gtk man tree fonts-liberation
-
-# for gerrit 
-apt-get install -y git-review gitg
-
-# screen, xterm for bitbake devshell
-# libncurses5-dev for kernel 'make menuconfig'
-apt-get install -y ccache curl screen xterm libncurses5-dev
-
-# for toaster
-apt-get install -y python-pip
-pip install "Django==1.6" "South==0.8.4" "argparse==1.2.1" "wsgiref==0.1.2" "beautifulsoup4>=4.4.0"
-
-# for network boot through tftp+nbd
-apt-get install -y tftpd-hpa xnbd-server
-# adjust config file to have the server point to bitbake images deployment dir
-sed -i -e "s#^\(TFTP_DIRECTORY=\).*\$#\1\"$XDT_BUILD/tmp/deploy/images\"#" /etc/default/tftpd-hpa
-
-# update xterm resources to have truetype fonts and utf-8
-cat <<EOF >>/etc/X11/app-defaults/XTerm
-
-!iotbzh: enable truetype fonts and UTF-8 encoding
-*VT100*faceName: mono
-*VT100*faceSize: 13
-*VT100*locale: true
-EOF
+apt-get install -y man tree curl screen 
 
 # add the build user
 useradd -c "Builder" -d $DEVUSER_HOME -G sudo -m -U -s /bin/bash -u $DEVUSER_UID $DEVUSER
@@ -54,10 +26,6 @@ export PATH=~/bin:$PATH
 
 EOF
 
-# copy meta init script in ~devel/bin:
-wget -O $DEVUSER_HOME/bin/prepare_meta https://raw.githubusercontent.com/iotbzh/agl-manifest/master/prepare_meta
-chmod +x $DEVUSER_HOME/bin/*
-
 chown -R $DEVUSER:$DEVUSER $XDT_DIR
 chown -R $DEVUSER:$DEVUSER $DEVUSER_HOME
 
diff --git a/INSTALL/setup.d/30_tools b/INSTALL/setup.d/30_tools
deleted file mode 100755
index 231f0ea..0000000
--- a/INSTALL/setup.d/30_tools
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-apt-get install -y python-lzma python-gpgme pbzip2 pigz lzop
-
-dpkg -i	\
-	$INSTDIR/tools/bmaptools/bmap-tools*.deb \
-	$INSTDIR/tools/tar/*.deb \
-	$INSTDIR/tools/xz-utils/*.deb 
-
-mkdir -p /usr/local/bin
-for x in $INSTDIR/tools/scripts/*; do
-	install --mode=755 $x /usr/local/bin/
-done
-
-# grab and install repo tool
-wget -O /usr/local/bin/repo https://storage.googleapis.com/git-repo-downloads/repo
-chmod a+x /usr/local/bin/repo
diff --git a/INSTALL/setup.d/30_yocto b/INSTALL/setup.d/30_yocto
new file mode 100644
index 0000000..af21a8c
--- /dev/null
+++ b/INSTALL/setup.d/30_yocto
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# install prereqs for bitbake (Yocto mega-manual)
+# http://www.yoctoproject.org/docs/2.2/mega-manual/mega-manual.html#detailed-supported-distros
+apt-get install -y gawk wget git git-core diffstat unzip texinfo gcc-multilib \
+	build-essential chrpath socat 
+	
+# some packages are not mentioned or not pulled...
+apt-get install -y libsdl1.2-dev cpio libzip2 lsb-release python3 
+
+# dev tools
+apt-get install -y make ccache
+
+# for documentation
+#apt-get install -y xsltproc docbook-utils fop dblatex xmlto
+
+# for gerrit 
+apt-get install -y git-review
+
+# libncurses5-dev for kernel 'make menuconfig'
+apt-get install -y libncurses5-dev
+
+# copy meta init script in ~devel/bin:
+wget -O $DEVUSER_HOME/bin/prepare_meta https://raw.githubusercontent.com/iotbzh/agl-manifest/master/prepare_meta
+chmod +x $DEVUSER_HOME/bin/*
+
+# for image creation and compression
+apt-get install -y python-lzma python-gpgme pbzip2 pigz lzop
+
+dpkg -i	\
+	$INSTDIR/tools/bmaptools/bmap-tools*.deb \
+	$INSTDIR/tools/tar/*.deb \
+	$INSTDIR/tools/xz-utils/*.deb 
+
+# install specific scripts
+mkdir -p /usr/local/bin
+for x in $INSTDIR/tools/scripts_yocto/*; do
+	install --mode=755 $x /usr/local/bin/
+done
+
+# grab and install repo tool
+wget -O /usr/local/bin/repo https://storage.googleapis.com/git-repo-downloads/repo
+chmod a+x /usr/local/bin/repo
+
diff --git a/INSTALL/setup.d/31_yocto_toaster b/INSTALL/setup.d/31_yocto_toaster
new file mode 100644
index 0000000..9dbb698
--- /dev/null
+++ b/INSTALL/setup.d/31_yocto_toaster
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# for toaster
+apt-get install -y python-pip
+pip install "Django==1.6" "South==0.8.4" "argparse==1.2.1" "wsgiref==0.1.2" "beautifulsoup4>=4.4.0"
+
+
diff --git a/INSTALL/setup.d/40_netboot b/INSTALL/setup.d/40_netboot
new file mode 100644
index 0000000..05d6f30
--- /dev/null
+++ b/INSTALL/setup.d/40_netboot
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# for network boot through tftp+nbd
+apt-get install -y tftpd-hpa xnbd-server
+
+# adjust config file to have the server point to bitbake images deployment dir
+sed -i -e "s#^\(TFTP_DIRECTORY=\).*\$#\1\"$XDT_BUILD/tmp/deploy/images\"#" /etc/default/tftpd-hpa
+
+# install specific scrips
+mkdir -p /usr/local/bin
+for x in $INSTDIR/tools/scripts_netboot/*; do
+	install --mode=755 $x /usr/local/bin/
+done
+
+
diff --git a/INSTALL/setup.d/50_sdk b/INSTALL/setup.d/50_sdk
new file mode 100644
index 0000000..1a44fd9
--- /dev/null
+++ b/INSTALL/setup.d/50_sdk
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# install specific scripts
+mkdir -p /usr/local/bin
+for x in $INSTDIR/tools/scripts_sdk/*; do
+	install --mode=755 $x /usr/local/bin/
+done
+
+# install node.js and tools (npm, gulp, bower) if needed
+if [[ -z $(which node) ]]; then
+    curl -sL https://deb.nodesource.com/setup_6.x | bash -
+    apt-get install nodejs
+    npm install --global gulp bower
+fi
+
diff --git a/INSTALL/setup.d/60_x11_tools b/INSTALL/setup.d/60_x11_tools
new file mode 100644
index 0000000..5c2cd75
--- /dev/null
+++ b/INSTALL/setup.d/60_x11_tools
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+apt-get install -y gitg vim-gtk xterm fonts-liberation
+
+# update xterm resources to have truetype fonts and utf-8
+cat <<EOF >>/etc/X11/app-defaults/XTerm
+
+!iotbzh: enable truetype fonts and UTF-8 encoding
+*VT100*faceName: mono
+*VT100*faceSize: 13
+*VT100*locale: true
+EOF
+
diff --git a/INSTALL/setup.d/70_doc b/INSTALL/setup.d/70_doc
new file mode 100644
index 0000000..9336de9
--- /dev/null
+++ b/INSTALL/setup.d/70_doc
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# install node.js and tools (npm, gulp, bower) if needed
+if [[ -z $(which node) ]]; then
+    curl -sL https://deb.nodesource.com/setup_6.x | bash -
+    apt-get install -y nodejs
+    npm install --global gulp bower
+fi
+
+# tools used to generate developer website (https://github.com/automotive-grade-linux/docs-agl)
+gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 \
+    && curl -sSL https://get.rvm.io | bash -s stable --ruby --gems=jekyll
+
diff --git a/INSTALL/tools/scripts/run_xnbd_server b/INSTALL/tools/scripts_netboot/run_xnbd_server
index 190301d..190301d 100755
--- a/INSTALL/tools/scripts/run_xnbd_server
+++ b/INSTALL/tools/scripts_netboot/run_xnbd_server
diff --git a/INSTALL/tools/scripts/install_sdk b/INSTALL/tools/scripts_sdk/install_sdk
index 27035c8..27035c8 100644
--- a/INSTALL/tools/scripts/install_sdk
+++ b/INSTALL/tools/scripts_sdk/install_sdk
diff --git a/INSTALL/tools/scripts/mksdcard b/INSTALL/tools/scripts_yocto/mksdcard
index 306ec87..306ec87 100755
--- a/INSTALL/tools/scripts/mksdcard
+++ b/INSTALL/tools/scripts_yocto/mksdcard