Merge branch 'dev' of https://github.com/RPi-Distro/pi-gen into dev

2016-09-28 08:00:37 -07:00 · 2016-09-28 08:00:37 -07:00 · 9da3e2f1c1
parent d4ad78dd70 62406bad92
commit 9da3e2f1c1
5 changed files with 21 additions and 0 deletions
--- a/stage2/EXPORT_NOOBS
+++ b/stage2/EXPORT_NOOBS
--- a/stage3/00-install-packages/00-packages
+++ b/stage3/00-install-packages/00-packages
@ -6,3 +6,5 @@ omxplayer
 raspberrypi-artwork
 policykit-1
 udisks
+rfkill
+chromium-browser rpi-chromium-mods
--- a/stage3/00-install-packages/01-run.sh
+++ b/stage3/00-install-packages/01-run.sh
@ -0,0 +1,9 @@
+#!/bin/bash -e
+
+on_chroot sh -e - <<EOF
+update-alternatives --install /usr/bin/x-www-browser \
+  x-www-browser /usr/bin/chromium-browser 86
+update-alternatives --install /usr/bin/gnome-www-browser \
+  gnome-www-browser /usr/bin/chromium-browser 86
+EOF
+
--- a/stage4/00-install-packages/00-packages
+++ b/stage4/00-install-packages/00-packages
@ -27,3 +27,10 @@ piclone
 pulseaudio-module-bluetooth
 wiringpi pigpio python-pigpio python3-pigpio raspi-gpio python-gpiozero python3-gpiozero python3-rpi.gpio
 python-spidev python3-spidev
+realvnc-vnc-server realvnc-vnc-viewer
+python-twython python3-twython
+python-smbus python3-smbus
+python-flask python3-flask
+python-picraft python3-picraft
+python3-codebug-tether python3-codebug-i2c-tether
+python-sense-emu python3-sense-emu sense-emu-tools python-sense-emu-doc
--- a/stage4/00-install-packages/01-run.sh
+++ b/stage4/00-install-packages/01-run.sh
@ -0,0 +1,3 @@
+#!/bin/bash -e
+
+rm -f "${ROOTFS_DIR}/root/.vnc/private.key"