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

2018-04-08 13:20:09 +03:00
parent a8632aa6ea 93db373672
commit 7f33e570ef
38 changed files with 539 additions and 222 deletions
@@ -0,0 +1,14 @@
+gstreamer1.0-x gstreamer1.0-omx gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-libav
+xpdf gtk2-engines alsa-utils
+desktop-base
+git
+omxplayer
+raspberrypi-artwork
+policykit-1
+gvfs
+rfkill
+chromium-browser rpi-chromium-mods
+gldriver-test
+fonts-droid-fallback
+fonts-liberation2
+obconf
@@ -0,0 +1,3 @@
+#!/bin/bash -e
+
+rm -f "${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d/wait.conf"
@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+if [ ! -d "${ROOTFS_DIR}" ]; then
+	copy_previous
+fi