Update release notes

shellcheck
Remove unnecessary files
2018-03-15 14:29:28 +00:00 · 2018-03-13 12:50:50 +00:00 · 2018-03-13 12:37:13 +00:00 · 2018-03-13 10:20:22 +00:00 · 2018-03-05 15:35:11 +00:00 · 2018-03-01 18:02:01 +00:00
106 changed files with 997 additions and 572 deletions
@@ -0,0 +1,5 @@
+output/
+work/
+deploy/
+apt-cacher-ng/
+.git/objects/*
@@ -1,6 +1,9 @@
 deploy/*
 work/*
 config
+postrun.sh
 SKIP
+SKIP_IMAGES
 .pc
 *-pc
+apt-cacher-ng/
@@ -0,0 +1,14 @@
+FROM debian:stretch
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get -y update && \
+    apt-get -y install \
+        git vim parted \
+        quilt realpath qemu-user-static debootstrap zerofree pxz zip dosfstools \
+        bsdtar libcap2-bin rsync grep udev xz-utils curl xxd \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY . /pi-gen/
+
+VOLUME [ "/pi-gen/work", "/pi-gen/deploy"]
@@ -1,13 +1,26 @@
-#TODO
+# pi-gen

-1. Simplify running a single stage
-1. Documentation
+_Tool used to create the raspberrypi.org Raspbian images_

-#Dependencies

-`quilt kpartx realpath qemu-user-static debootstrap zerofree pxz zip`
+## Dependencies

-#Config
+pi-gen runs on Debian based operating systems. Currently it is only supported on
+either Debian Stretch or Ubuntu Xenial and is known to have issues building on
+earlier releases of these systems.
+
+To install the required dependencies for pi-gen you should run:
+
+```bash
+apt-get install quilt parted realpath qemu-user-static debootstrap zerofree pxz zip \
+dosfstools bsdtar libcap2-bin grep rsync xz-utils
+```
+
+The file `depends` contains a list of tools needed.  The format of this
+package is `<tool>[:<debian-package>]`.
+
+
+## Config

 Upon execution, `build.sh` will source the file `config` in the current
 working directory.  This bash shell fragment is intended to set needed
@@ -15,8 +28,50 @@ environment variables.

 The following environment variables are supported:

- * `IMG_NAME`, the name of the distribution to build (required)
- * `APT_PROXY`, proxy/cache URL to be included in the build
+ * `IMG_NAME` **required** (Default: unset)
+
+   The name of the image to build with the current stage directories.  Setting
+   `IMG_NAME=Raspbian` is logical for an unmodified RPi-Distro/pi-gen build,
+   but you should use something else for a customized version.  Export files
+   in stages may add suffixes to `IMG_NAME`.
+
+ * `APT_PROXY` (Default: unset)
+
+   If you require the use of an apt proxy, set it here.  This proxy setting
+   will not be included in the image, making it safe to use an `apt-cacher` or
+   similar package for development.
+
+   If you have Docker installed, you can set up a local apt caching proxy to
+   like speed up subsequent builds like this:
+
+       docker-compose up -d
+       echo 'APT_PROXY=http://172.17.0.1:3142' >> config
+
+ * `BASE_DIR`  (Default: location of `build.sh`)
+
+   **CAUTION**: Currently, changing this value will probably break build.sh
+
+   Top-level directory for `pi-gen`.  Contains stage directories, build
+   scripts, and by default both work and deployment directories.
+
+ * `WORK_DIR`  (Default: `"$BASE_DIR/work"`)
+
+   Directory in which `pi-gen` builds the target system.  This value can be
+   changed if you have a suitably large, fast storage location for stages to
+   be built and cached.  Note, `WORK_DIR` stores a complete copy of the target
+   system for each build stage, amounting to tens of gigabytes in the case of
+   Raspbian.
+   
+   **CAUTION**: If your working directory is on an NTFS partition you probably won't be able to build. Make sure this is a proper Linux filesystem.
+
+ * `DEPLOY_DIR`  (Default: `"$BASE_DIR/deploy"`)
+
+   Output directory for target system images and NOOBS bundles.
+
+ * `USE_QEMU` (Default: `"0"`)
+
+   This enable the Qemu mode and set filesystem and image suffix if set to 1.
+

 A simple example for building Raspbian:

@@ -24,17 +79,89 @@ A simple example for building Raspbian:
 IMG_NAME='Raspbian'
 ```

-#Stage Anatomy
+
+## How the build process works
+
+The following process is followed to build images:
+
+ * Loop through all of the stage directories in alphanumeric order
+
+ * Move on to the next directory if this stage directory contains a file called
+   "SKIP"
+
+ * Run the script ```prerun.sh``` which is generally just used to copy the build
+   directory between stages.
+
+ * In each stage directory loop through each subdirectory and then run each of the
+   install scripts it contains, again in alphanumeric order. These need to be named
+   with a two digit padded number at the beginning.
+   There are a number of different files and directories which can be used to
+   control different parts of the build process:
+
+     - **00-run.sh** - A unix shell script. Needs to be made executable for it to run
+
+     - **00-run-chroot.sh** - A unix shell script which will be run in the chroot
+       of the image build directory. Needs to be made executable for it to run.
+
+     - **00-debconf** - Contents of this file are passed to debconf-set-selections
+       to configure things like locale, etc.
+
+     - **00-packages** - A list of packages to install. Can have more than one, space
+       separated, per line.
+
+     - **00-packages-nr** - As 00-packages, except these will be installed using
+       the ```--no-install-recommends -y``` parameters to apt-get
+
+     - **00-patches** - A directory containing patch files to be applied
+
+  * If the stage directory contains files called "EXPORT_NOOBS" or "EXPORT_IMAGE" then
+    add this stage to a list of images to generate
+
+  * Generate the images for any stages that have specified them
+
+It is recommended to examine build.sh for finer details.


+## Docker Build

-#Raspbian Stage Overview
+```bash
+vi config         # Edit your config file. See above.
+./build-docker.sh
+```
+
+If everything goes well, your finished image will be in the `deploy/` folder.
+You can then remove the build container with `docker rm -v pigen_work`
+
+If something breaks along the line, you can edit the corresponding scripts, and
+continue:
+
+```bash
+CONTINUE=1 ./build-docker.sh
+```
+
+After successful build, the build container is by default removed. This may be undesired when making incremental changes to a customized build. To prevent the build script from remove the container add
+
+```bash
+PRESERVE_CONTAINER=1 ./build-docker.sh
+```
+
+There is a possibility that even when running from a docker container, the
+installation of `qemu-user-static` will silently fail when building the image
+because `binfmt-support` _must be enabled on the underlying kernel_. An easy
+fix is to ensure `binfmt-support` is installed on the host machine before
+starting the `./build-docker.sh` script (or using your own docker build
+solution).
+
+
+## Stage Anatomy
+
+### Raspbian Stage Overview

 The build of Raspbian is divided up into several stages for logical clarity
 and modularity.  This causes some initial complexity, but it simplifies
 maintenance and allows for more easy customization.

- - Stage 0, bootstrap.  The primary purpose of this stage is to create a
+ - **Stage 0** - bootstrap.  The primary purpose of this stage is to create a
   usable filesystem.  This is accomplished largely through the use of
   `debootstrap`, which creates a minimal filesystem suitable for use as a
   base.tgz on Debian systems.  This stage also configures apt settings and
@@ -42,7 +169,7 @@ maintenance and allows for more easy customization.
   minimal core is installed but not configured, and the system will not quite
   boot yet.

- - Stage 1, truly minimal system.  This stage makes the system bootable by
+ - **Stage 1** - truly minimal system.  This stage makes the system bootable by
   installing system files like `/etc/fstab`, configures the bootloader, makes
   the network operable, and installs packages like raspi-config.  At this
   stage the system should boot to a local console from which you have the
@@ -51,7 +178,7 @@ maintenance and allows for more easy customization.
   really usable yet in a traditional sense yet.  Still, if you want minimal,
   this is minimal and the rest you could reasonably do yourself as sysadmin.

- - State 2, lite system.  This stage produces the Raspbian-Lite image.  It
+ - **Stage 2** - lite system.  This stage produces the Raspbian-Lite image.  It
   installs some optimized memory functions, sets timezone and charmap
   defaults, installs fake-hwclock and ntp, wifi and bluetooth support,
   dphys-swapfile, and other basics for managing the hardware.  It also
@@ -59,20 +186,62 @@ maintenance and allows for more easy customization.
   standard console hardware permission groups.

   There are a few tools that may not make a whole lot of sense here for
-   development purposes on a minimal system such as basic python and lua
+   development purposes on a minimal system such as basic Python and Lua
   packages as well as the `build-essential` package.  They are lumped right
   in with more essential packages presently, though they need not be with
   pi-gen.  These are understandable for Raspbian's target audience, but if
-   you were looking for something between truly minimal and Raspbian-lite,
+   you were looking for something between truly minimal and Raspbian-Lite,
   here's where you start trimming.

- - Stage 3, desktop system.  Here's where you get the full desktop system
+ - **Stage 3** - desktop system.  Here's where you get the full desktop system
   with X11 and LXDE, web browsers, git for development, Raspbian custom UI
   enhancements, etc.  This is a base desktop system, with some development
   tools installed.

- - Stage 4, complete Raspbian system.  More development tools, an email
-   client, learning tools like Scratch, specialized packages like sonic-pi and
-   wolfram-engine, system documentation, office productivity, etc.  This is
-   the stage that installs all of the things that make Raspbian friendly to
-   new users.
+ - **Stage 4** - Raspbian system meant to fit on a 4GB card.  More development
+   tools, an email client, learning tools like Scratch, specialized packages
+   like sonic-pi, system documentation, office productivity, etc.  This is the
+   stage that installs all of the things that make Raspbian friendly to new
+   users.
+
+ - **Stage 5** - The official Raspbian Desktop image. Right now only adds
+   Mathematica.
+
+### Stage specification
+
+If you wish to build up to a specified stage (such as building up to stage 2
+for a lite system), place an empty file named `SKIP` in each of the `./stage`
+directories you wish not to include.
+
+Then add an empty file named `SKIP_IMAGES` to `./stage4` (if building up to stage 2) or
+to `./stage2` (if building a minimal system).
+
+```bash
+# Example for building a lite system
+echo "IMG_NAME='Raspbian'" > config
+touch ./stage3/SKIP ./stage4/SKIP ./stage5/SKIP
+touch ./stage4/SKIP_IMAGES ./stage5/SKIP_IMAGES
+sudo ./build.sh  # or ./build-docker.sh
+```
+
+If you wish to build further configurations upon (for example) the lite
+system, you can also delete the contents of `./stage3` and `./stage4` and
+replace with your own contents in the same format.
+
+
+## Skipping stages to speed up development
+
+If you're working on a specific stage the recommended development process is as
+follows:
+
+ * Add a file called SKIP_IMAGES into the directories containing EXPORT_* files
+   (currently stage2, stage4 and stage5)
+ * Add SKIP files to the stages you don't want to build. For example, if you're
+   basing your image on the lite image you would add these to stages 3, 4 and 5.
+ * Run build.sh to build all stages
+ * Add SKIP files to the earlier successfully built stages
+ * Modify the last stage
+ * Rebuild just the last stage using ```sudo CLEAN=1 ./build.sh```
+ * Once you're happy with the image you can remove the SKIP_IMAGES files and
+   export your image to test
+
@@ -0,0 +1,86 @@
+#!/bin/bash -e
+
+DOCKER="docker"
+set +e
+$DOCKER ps >/dev/null 2>&1
+if [ $? != 0 ]; then
+	DOCKER="sudo docker"
+fi
+if ! $DOCKER ps >/dev/null; then
+	echo "error connecting to docker:"
+	$DOCKER ps
+	exit 1
+fi
+set -e
+
+config_file=()
+if [ -f config ]; then
+	config_file=("--env-file" "$(pwd)/config")
+	source config
+fi
+
+CONTAINER_NAME=${CONTAINER_NAME:-pigen_work}
+CONTINUE=${CONTINUE:-0}
+PRESERVE_CONTAINER=${PRESERVE_CONTAINER:-0}
+
+if [ "$*" != "" ] || [ -z "${IMG_NAME}" ]; then
+	if [ -z "${IMG_NAME}" ]; then
+		echo "IMG_NAME not set in 'config'" 1>&2
+		echo 1>&2
+	fi
+	cat >&2 <<EOF
+Usage:
+    build-docker.sh [options]
+Optional environment arguments: ( =<default> )
+    CONTAINER_NAME=pigen_work  set a name for the build container
+    CONTINUE=1                 continue from a previously started container
+    PRESERVE_CONTAINER=1       keep build container even on successful build
+EOF
+	exit 1
+fi
+
+CONTAINER_EXISTS=$($DOCKER ps -a --filter name="$CONTAINER_NAME" -q)
+CONTAINER_RUNNING=$($DOCKER ps --filter name="$CONTAINER_NAME" -q)
+if [ "$CONTAINER_RUNNING" != "" ]; then
+	echo "The build is already running in container $CONTAINER_NAME. Aborting."
+	exit 1
+fi
+if [ "$CONTAINER_EXISTS" != "" ] && [ "$CONTINUE" != "1" ]; then
+	echo "Container $CONTAINER_NAME already exists and you did not specify CONTINUE=1. Aborting."
+	echo "You can delete the existing container like this:"
+	echo "  $DOCKER rm -v $CONTAINER_NAME"
+	exit 1
+fi
+
+$DOCKER build -t pi-gen .
+if [ "$CONTAINER_EXISTS" != "" ]; then
+	trap "echo 'got CTRL+C... please wait 5s'; $DOCKER stop -t 5 ${CONTAINER_NAME}_cont" SIGINT SIGTERM
+	time $DOCKER run --rm --privileged \
+		--volumes-from="${CONTAINER_NAME}" --name "${CONTAINER_NAME}_cont" \
+		-e IMG_NAME="${IMG_NAME}"\
+		pi-gen \
+		bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static &&
+	cd /pi-gen; ./build.sh;
+	rsync -av work/*/build.log deploy/" &
+	wait "$!"
+else
+	trap "echo 'got CTRL+C... please wait 5s'; $DOCKER stop -t 5 ${CONTAINER_NAME}" SIGINT SIGTERM
+	time $DOCKER run --name "${CONTAINER_NAME}" --privileged \
+		-e IMG_NAME="${IMG_NAME}"\
+		"${config_file[@]}" \
+		pi-gen \
+		bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static &&
+	cd /pi-gen; ./build.sh &&
+	rsync -av work/*/build.log deploy/" &
+	wait "$!"
+fi
+echo "copying results from deploy/"
+$DOCKER cp "${CONTAINER_NAME}":/pi-gen/deploy .
+ls -lah deploy
+
+# cleanup
+if [ "$PRESERVE_CONTAINER" != "1" ]; then
+	$DOCKER rm -v $CONTAINER_NAME
+fi
+
+echo "Done! Your image(s) should be in deploy/"
@@ -1,51 +1,52 @@
 #!/bin/bash -e
-
+# shellcheck disable=SC2119,SC1091
 run_sub_stage()
 {
 	log "Begin ${SUB_STAGE_DIR}"
-	pushd ${SUB_STAGE_DIR} > /dev/null
+	pushd "${SUB_STAGE_DIR}" > /dev/null
 	for i in {00..99}; do
-		if [ -f ${i}-debconf ]; then
+		if [ -f "${i}-debconf" ]; then
 			log "Begin ${SUB_STAGE_DIR}/${i}-debconf"
-			on_chroot sh -e - << EOF
+			on_chroot << EOF
 debconf-set-selections <<SELEOF
-`cat ${i}-debconf`
+$(cat "${i}-debconf")
 SELEOF
 EOF
+
 		log "End ${SUB_STAGE_DIR}/${i}-debconf"
 		fi
-		if [ -f ${i}-packages-nr ]; then
+		if [ -f "${i}-packages-nr" ]; then
 			log "Begin ${SUB_STAGE_DIR}/${i}-packages-nr"
-			PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < ${i}-packages-nr)"
+			PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${i}-packages-nr")"
 			if [ -n "$PACKAGES" ]; then
-				on_chroot sh -e - << EOF
+				on_chroot << EOF
 apt-get install --no-install-recommends -y $PACKAGES
 EOF
 			fi
 			log "End ${SUB_STAGE_DIR}/${i}-packages-nr"
 		fi
-		if [ -f ${i}-packages ]; then
+		if [ -f "${i}-packages" ]; then
 			log "Begin ${SUB_STAGE_DIR}/${i}-packages"
-			PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < ${i}-packages)"
+			PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${i}-packages")"
 			if [ -n "$PACKAGES" ]; then
-				on_chroot sh -e - << EOF
+				on_chroot << EOF
 apt-get install -y $PACKAGES
 EOF
 			fi
 			log "End ${SUB_STAGE_DIR}/${i}-packages"
 		fi
-		if [ -d ${i}-patches ]; then
+		if [ -d "${i}-patches" ]; then
 			log "Begin ${SUB_STAGE_DIR}/${i}-patches"
-			pushd ${STAGE_WORK_DIR} > /dev/null
+			pushd "${STAGE_WORK_DIR}" > /dev/null
 			if [ "${CLEAN}" = "1" ]; then
 				rm -rf .pc
-				rm -rf *-pc
+				rm -rf "./*-pc"
 			fi
-			QUILT_PATCHES=${SUB_STAGE_DIR}/${i}-patches
-			SUB_STAGE_QUILT_PATCH_DIR="$(basename $SUB_STAGE_DIR)-pc"
-			mkdir -p $SUB_STAGE_QUILT_PATCH_DIR
-			ln -snf $SUB_STAGE_QUILT_PATCH_DIR .pc
-			if [ -e ${SUB_STAGE_DIR}/${i}-patches/EDIT ]; then
+			QUILT_PATCHES="${SUB_STAGE_DIR}/${i}-patches"
+			SUB_STAGE_QUILT_PATCH_DIR="$(basename "$SUB_STAGE_DIR")-pc"
+			mkdir -p "$SUB_STAGE_QUILT_PATCH_DIR"
+			ln -snf "$SUB_STAGE_QUILT_PATCH_DIR" .pc
+			if [ -e "${SUB_STAGE_DIR}/${i}-patches/EDIT" ]; then
 				echo "Dropping into bash to edit patches..."
 				bash
 			fi
@@ -67,10 +68,10 @@ EOF
 			./${i}-run.sh
 			log "End ${SUB_STAGE_DIR}/${i}-run.sh"
 		fi
-		if [ -f ${i}-run-chroot ]; then
-			log "Begin ${SUB_STAGE_DIR}/${i}-run-chroot"
-			on_chroot sh -e - < ${i}-run-chroot
-			log "End ${SUB_STAGE_DIR}/${i}-run-chroot"
+		if [ -f ${i}-run-chroot.sh ]; then
+			log "Begin ${SUB_STAGE_DIR}/${i}-run-chroot.sh"
+			on_chroot < ${i}-run-chroot.sh
+			log "End ${SUB_STAGE_DIR}/${i}-run-chroot.sh"
 		fi
 	done
 	popd > /dev/null
@@ -80,18 +81,20 @@ EOF

 run_stage(){
 	log "Begin ${STAGE_DIR}"
-	STAGE=$(basename ${STAGE_DIR})
-	pushd ${STAGE_DIR} > /dev/null
-	unmount ${WORK_DIR}/${STAGE}
-	STAGE_WORK_DIR=${WORK_DIR}/${STAGE}
-	ROOTFS_DIR=${STAGE_WORK_DIR}/rootfs
-	if [ -f ${STAGE_DIR}/EXPORT_IMAGE ]; then
-		EXPORT_DIRS="${EXPORT_DIRS} ${STAGE_DIR}"
+	STAGE="$(basename "${STAGE_DIR}")"
+	pushd "${STAGE_DIR}" > /dev/null
+	unmount "${WORK_DIR}/${STAGE}"
+	STAGE_WORK_DIR="${WORK_DIR}/${STAGE}"
+	ROOTFS_DIR="${STAGE_WORK_DIR}"/rootfs
+	if [ ! -f SKIP_IMAGES ]; then
+		if [ -f "${STAGE_DIR}/EXPORT_IMAGE" ]; then
+			EXPORT_DIRS="${EXPORT_DIRS} ${STAGE_DIR}"
+		fi
 	fi
 	if [ ! -f SKIP ]; then
 		if [ "${CLEAN}" = "1" ]; then
-			if [ -d ${ROOTFS_DIR} ]; then
-				rm -rf ${ROOTFS_DIR}
+			if [ -d "${ROOTFS_DIR}" ]; then
+				rm -rf "${ROOTFS_DIR}"
 			fi
 		fi
 		if [ -x prerun.sh ]; then
@@ -100,16 +103,16 @@ run_stage(){
 			log "End ${STAGE_DIR}/prerun.sh"
 		fi
 		for SUB_STAGE_DIR in ${STAGE_DIR}/*; do
-			if [ -d ${SUB_STAGE_DIR} ] &&
-			   [ ! -f ${SUB_STAGE_DIR}/SKIP ]; then
+			if [ -d "${SUB_STAGE_DIR}" ] &&
+			   [ ! -f "${SUB_STAGE_DIR}/SKIP" ]; then
 				run_sub_stage
 			fi
 		done
 	fi
-	unmount ${WORK_DIR}/${STAGE}
-	PREV_STAGE=${STAGE}
-	PREV_STAGE_DIR=${STAGE_DIR}
-	PREV_ROOTFS_DIR=${ROOTFS_DIR}
+	unmount "${WORK_DIR}/${STAGE}"
+	PREV_STAGE="${STAGE}"
+	PREV_STAGE_DIR="${STAGE_DIR}"
+	PREV_ROOTFS_DIR="${ROOTFS_DIR}"
 	popd > /dev/null
 	log "End ${STAGE_DIR}"
 }
@@ -119,6 +122,7 @@ if [ "$(id -u)" != "0" ]; then
 	exit 1
 fi

+
 if [ -f config ]; then
 	source config
 fi
@@ -128,14 +132,17 @@ if [ -z "${IMG_NAME}" ]; then
 	exit 1
 fi

-export IMG_DATE=${IMG_DATE:-"$(date -u +%Y-%m-%d)"}
+export USE_QEMU="${USE_QEMU:-0}"
+export IMG_DATE="${IMG_DATE:-"$(date +%Y-%m-%d)"}"

-export BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 export SCRIPT_DIR="${BASE_DIR}/scripts"
-export WORK_DIR="${BASE_DIR}/work/${IMG_DATE}-${IMG_NAME}"
-export DEPLOY_DIR="${BASE_DIR}/deploy"
+export WORK_DIR="${WORK_DIR:-"${BASE_DIR}/work/${IMG_DATE}-${IMG_NAME}"}"
+export DEPLOY_DIR=${DEPLOY_DIR:-"${BASE_DIR}/deploy"}
 export LOG_FILE="${WORK_DIR}/build.log"

+export BASE_DIR
+
 export CLEAN
 export IMG_NAME
 export APT_PROXY
@@ -148,6 +155,8 @@ export PREV_STAGE_DIR
 export ROOTFS_DIR
 export PREV_ROOTFS_DIR
 export IMG_SUFFIX
+export NOOBS_NAME
+export NOOBS_DESCRIPTION
 export EXPORT_DIR
 export EXPORT_ROOTFS_DIR

@@ -156,29 +165,43 @@ export QUILT_NO_DIFF_INDEX=1
 export QUILT_NO_DIFF_TIMESTAMPS=1
 export QUILT_REFRESH_ARGS="-p ab"

-source ${SCRIPT_DIR}/common
-source ${SCRIPT_DIR}/dependencies_check
+# shellcheck source=scripts/common
+source "${SCRIPT_DIR}/common"
+# shellcheck source=scripts/dependencies_check
+source "${SCRIPT_DIR}/dependencies_check"


-dependencies_check ${BASE_DIR}/depends
+dependencies_check "${BASE_DIR}/depends"

-mkdir -p ${WORK_DIR}
+mkdir -p "${WORK_DIR}"
 log "Begin ${BASE_DIR}"

-for STAGE_DIR in ${BASE_DIR}/stage*; do
+for STAGE_DIR in "${BASE_DIR}/stage"*; do
 	run_stage
 done

 CLEAN=1
 for EXPORT_DIR in ${EXPORT_DIRS}; do
 	STAGE_DIR=${BASE_DIR}/export-image
-	IMG_SUFFIX=$(cat ${EXPORT_DIR}/EXPORT_IMAGE)
-	EXPORT_ROOTFS_DIR=${WORK_DIR}/$(basename ${EXPORT_DIR})/rootfs
+	# shellcheck source=/dev/null
+	source "${EXPORT_DIR}/EXPORT_IMAGE"
+	EXPORT_ROOTFS_DIR=${WORK_DIR}/$(basename "${EXPORT_DIR}")/rootfs
 	run_stage
-	if [ -e ${EXPORT_DIR}/EXPORT_NOOBS ]; then
-		STAGE_DIR=${BASE_DIR}/export-noobs
-		run_stage
+	if [ "${USE_QEMU}" != "1" ]; then
+		if [ -e "${EXPORT_DIR}/EXPORT_NOOBS" ]; then
+			# shellcheck source=/dev/null
+			source "${EXPORT_DIR}/EXPORT_NOOBS"
+			STAGE_DIR="${BASE_DIR}/export-noobs"
+			run_stage
+		fi
 	fi
 done

+if [ -x postrun.sh ]; then
+	log "Begin postrun.sh"
+	cd "${BASE_DIR}"
+	./postrun.sh
+	log "End postrun.sh"
+fi
+
 log "End ${BASE_DIR}"
@@ -1,5 +1,15 @@
 quilt
+parted
+realpath
 qemu-arm-static:qemu-user-static
 debootstrap
-kpartx zerofree
+zerofree
 pxz zip
+mkdosfs:dosfstools
+capsh:libcap2-bin
+bsdtar
+grep
+rsync
+xz:xz-utils
+curl
+xxd
@@ -0,0 +1,10 @@
+version: '2'
+
+services:
+  apt-cacher-ng:
+    restart: unless-stopped
+    image: sameersbn/apt-cacher-ng:latest
+    ports:
+    - "3142:3142"
+    volumes:
+    - ./apt-cacher-ng:/var/cache/apt-cacher-ng
@@ -1,13 +1,5 @@
 #!/bin/bash -e

-if [ -e ${ROOTFS_DIR}/etc/ld.so.preload ]; then
-	mv ${ROOTFS_DIR}/etc/ld.so.preload ${ROOTFS_DIR}/etc/ld.so.preload.disabled
-fi
-
-if [ ! -e ${ROOTFS_DIR}/usr/sbin/policy-rc.d ]; then
-	install -m 744 files/policy-rc.d ${ROOTFS_DIR}/usr/sbin/
-fi
-
-if [ ! -x ${ROOTFS_DIR}/usr/bin/qemu-arm-static ]; then
-	cp /usr/bin/qemu-arm-static ${ROOTFS_DIR}/usr/bin/
+if [ ! -x "${ROOTFS_DIR}/usr/bin/qemu-arm-static" ]; then
+	cp /usr/bin/qemu-arm-static "${ROOTFS_DIR}/usr/bin/"
 fi
@@ -1,2 +0,0 @@
-#!/bin/sh
-exit 101
@@ -3,7 +3,7 @@ Index: export-jessie/rootfs/etc/apt/sources.list.d/raspi.list
 --- export-jessie.orig/rootfs/etc/apt/sources.list.d/raspi.list
 +++ export-jessie/rootfs/etc/apt/sources.list.d/raspi.list
@@ -1,3 +1,3 @@
-deb http://archive.raspberrypi.org/debian/ jessie main ui staging
-+deb http://archive.raspberrypi.org/debian/ jessie main ui
+-deb http://archive.raspberrypi.org/debian/ stretch main ui staging
+deb http://archive.raspberrypi.org/debian/ stretch main ui
 # Uncomment line below then 'apt-get update' to enable 'apt-get source'
- #deb-src http://archive.raspberrypi.org/debian/ jessie main ui
+ #deb-src http://archive.raspberrypi.org/debian/ stretch main ui
@@ -1,6 +1,6 @@
 #!/bin/bash -e

-on_chroot sh -e - <<EOF
+on_chroot << EOF
 apt-get update
 apt-get -y dist-upgrade
 apt-get clean
@@ -1,3 +1,3 @@
-#/bin/bash -e
+#!/bin/bash -e

-install -m 644 files/resolv.conf ${ROOTFS_DIR}/etc/
+install -m 644 files/resolv.conf "${ROOTFS_DIR}/etc/"
@@ -1,35 +0,0 @@
-#!/bin/bash -e
-
-IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img"
-
-on_chroot sh -e - <<EOF
-/etc/init.d/fake-hwclock stop
-hardlink -t /usr/share/doc
-EOF
-
-rm -f ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache
-rm -f ${ROOTFS_DIR}/usr/sbin/policy-rc.d
-rm -f ${ROOTFS_DIR}/usr/bin/qemu-arm-static
-if [ -e ${ROOTFS_DIR}/etc/ld.so.preload.disabled ]; then
-        mv ${ROOTFS_DIR}/etc/ld.so.preload.disabled ${ROOTFS_DIR}/etc/ld.so.preload
-fi
-
-update_issue $(basename ${EXPORT_DIR})
-install -m 644 ${ROOTFS_DIR}/etc/rpi-issue ${ROOTFS_DIR}/boot/issue.txt
-install files/LICENSE.oracle ${ROOTFS_DIR}/boot/
-
-ROOT_DEV=$(mount | grep "${ROOTFS_DIR} " | cut -f1 -d' ')
-
-unmount ${ROOTFS_DIR}
-zerofree -v ${ROOT_DEV}
-
-unmount_image ${IMG_FILE}
-
-mkdir -p ${DEPLOY_DIR}
-
-rm -f ${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip
-
-echo zip ${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip ${IMG_FILE}
-pushd ${STAGE_WORK_DIR} > /dev/null
-zip ${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip $(basename ${IMG_FILE})
-popd > /dev/null
@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img"
+
+IMGID="$(dd if="${IMG_FILE}" skip=440 bs=1 count=4 2>/dev/null | xxd -e | cut -f 2 -d' ')"
+
+BOOT_PARTUUID="${IMGID}-01"
+ROOT_PARTUUID="${IMGID}-02"
+
+sed -i "s/BOOTDEV/PARTUUID=${BOOT_PARTUUID}/" "${ROOTFS_DIR}/etc/fstab"
+sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" "${ROOTFS_DIR}/etc/fstab"
+
+sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" "${ROOTFS_DIR}/boot/cmdline.txt"
@@ -0,0 +1,82 @@
+#!/bin/bash -e
+
+IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img"
+INFO_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.info"
+
+on_chroot << EOF
+/etc/init.d/fake-hwclock stop
+hardlink -t /usr/share/doc
+EOF
+
+if [ -d "${ROOTFS_DIR}/home/pi/.config" ]; then
+	chmod 700 "${ROOTFS_DIR}/home/pi/.config"
+fi
+
+rm -f "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache"
+rm -f "${ROOTFS_DIR}/usr/bin/qemu-arm-static"
+
+rm -f "${ROOTFS_DIR}/etc/apt/sources.list~"
+rm -f "${ROOTFS_DIR}/etc/apt/trusted.gpg~"
+
+rm -f "${ROOTFS_DIR}/etc/passwd-"
+rm -f "${ROOTFS_DIR}/etc/group-"
+rm -f "${ROOTFS_DIR}/etc/shadow-"
+rm -f "${ROOTFS_DIR}/etc/gshadow-"
+
+rm -f "${ROOTFS_DIR}/var/cache/debconf/*-old"
+rm -f "${ROOTFS_DIR}/var/lib/dpkg/*-old"
+
+rm -f "${ROOTFS_DIR}/usr/share/icons/*/icon-theme.cache"
+
+rm -f "${ROOTFS_DIR}/var/lib/dbus/machine-id"
+
+true > "${ROOTFS_DIR}/etc/machine-id"
+
+ln -nsf /proc/mounts "${ROOTFS_DIR}/etc/mtab"
+
+find "${ROOTFS_DIR}/var/log/" -type f -exec cp /dev/null {} \;
+
+rm -f "${ROOTFS_DIR}/root/.vnc/private.key"
+rm -f "${ROOTFS_DIR}/etc/vnc/updateid"
+
+update_issue "$(basename "${EXPORT_DIR}")"
+install -m 644 "${ROOTFS_DIR}/etc/rpi-issue" "${ROOTFS_DIR}/boot/issue.txt"
+install files/LICENSE.oracle "${ROOTFS_DIR}/boot/"
+
+
+cp "$ROOTFS_DIR/etc/rpi-issue" "$INFO_FILE"
+
+
+{
+	firmware=$(zgrep "firmware as of" \
+		"$ROOTFS_DIR/usr/share/doc/raspberrypi-kernel/changelog.Debian.gz" | \
+		head -n1 | sed  -n 's|.* \([^ ]*\)$|\1|p')
+	printf "\nFirmware: https://github.com/raspberrypi/firmware/tree/%s\n" "$firmware"
+
+	kernel="$(curl -s -L "https://github.com/raspberrypi/firmware/raw/$firmware/extra/git_hash")"
+	printf "Kernel: https://github.com/raspberrypi/linux/tree/%s\n" "$kernel"
+
+	uname="$(curl -s -L "https://github.com/raspberrypi/firmware/raw/$firmware/extra/uname_string7")"
+
+	printf "Uname string: %s\n" "$uname"
+	printf "\nPackages:\n"
+	dpkg -l --root "$ROOTFS_DIR"
+} >> "$INFO_FILE"
+
+ROOT_DEV="$(mount | grep "${ROOTFS_DIR} " | cut -f1 -d' ')"
+
+unmount "${ROOTFS_DIR}"
+zerofree -v "${ROOT_DEV}"
+
+unmount_image "${IMG_FILE}"
+
+mkdir -p "${DEPLOY_DIR}"
+
+rm -f "${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip"
+
+pushd "${STAGE_WORK_DIR}" > /dev/null
+zip "${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip" \
+	"$(basename "${IMG_FILE}")"
+popd > /dev/null
+
+cp "$INFO_FILE" "$DEPLOY_DIR"
@@ -1,48 +1,69 @@
 #!/bin/bash -e
+
 IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img"

-unmount_image ${IMG_FILE}
+unmount_image "${IMG_FILE}"

-rm -f ${IMG_FILE}
+rm -f "${IMG_FILE}"

-rm -rf ${ROOTFS_DIR}
-mkdir -p ${ROOTFS_DIR}
+rm -rf "${ROOTFS_DIR}"
+mkdir -p "${ROOTFS_DIR}"

-BOOT_SIZE=$(du -sh ${EXPORT_ROOTFS_DIR}/boot -B M | cut -f 1 | tr -d M)
-TOTAL_SIZE=$(du -sh ${EXPORT_ROOTFS_DIR} -B M | cut -f 1 | tr -d M)
+BOOT_SIZE=$(du --apparent-size -s "${EXPORT_ROOTFS_DIR}/boot" --block-size=1 | cut -f 1)
+TOTAL_SIZE=$(du --apparent-size -s "${EXPORT_ROOTFS_DIR}" --exclude var/cache/apt/archives --block-size=1 | cut -f 1)

-IMG_SIZE=$(expr $BOOT_SIZE \* 2 \+ $TOTAL_SIZE \+ 512)M
+ROUND_SIZE="$((4 * 1024 * 1024))"
+ROUNDED_ROOT_SECTOR=$(((2 * BOOT_SIZE + ROUND_SIZE) / ROUND_SIZE * ROUND_SIZE / 512 + 8192))
+IMG_SIZE=$(((BOOT_SIZE + TOTAL_SIZE + (800 * 1024 * 1024) + ROUND_SIZE - 1) / ROUND_SIZE * ROUND_SIZE))

-fallocate -l ${IMG_SIZE} ${IMG_FILE}
-fdisk ${IMG_FILE} > /dev/null 2>&1 <<EOF
+truncate -s "${IMG_SIZE}" "${IMG_FILE}"
+fdisk -H 255 -S 63 "${IMG_FILE}" <<EOF
 o
 n


 8192
-+`expr $BOOT_SIZE \* 3`M
+$((BOOT_SIZE * 2 /512))
 p
 t
 c
 n


-8192
+${ROUNDED_ROOT_SECTOR}


 p
 w
 EOF

-LOOP_DEV=`kpartx -asv ${IMG_FILE} | grep -E -o -m1 'loop[[:digit:]]+' | head -n 1`
-BOOT_DEV=/dev/mapper/${LOOP_DEV}p1
-ROOT_DEV=/dev/mapper/${LOOP_DEV}p2
+PARTED_OUT=$(parted -s "${IMG_FILE}" unit b print)
+BOOT_OFFSET=$(echo "$PARTED_OUT" | grep -e '^ 1'| xargs echo -n \
+| cut -d" " -f 2 | tr -d B)
+BOOT_LENGTH=$(echo "$PARTED_OUT" | grep -e '^ 1'| xargs echo -n \
+| cut -d" " -f 4 | tr -d B)

-mkdosfs -n boot -S 512 -s 16 -v $BOOT_DEV > /dev/null
-mkfs.ext4 -O ^huge_file $ROOT_DEV > /dev/null
+ROOT_OFFSET=$(echo "$PARTED_OUT" | grep -e '^ 2'| xargs echo -n \
+| cut -d" " -f 2 | tr -d B)
+ROOT_LENGTH=$(echo "$PARTED_OUT" | grep -e '^ 2'| xargs echo -n \
+| cut -d" " -f 4 | tr -d B)

-mount -v $ROOT_DEV ${ROOTFS_DIR} -t ext4
-mkdir -p ${ROOTFS_DIR}/boot
-mount -v $BOOT_DEV ${ROOTFS_DIR}/boot -t vfat
+BOOT_DEV=$(losetup --show -f -o "${BOOT_OFFSET}" --sizelimit "${BOOT_LENGTH}" "${IMG_FILE}")
+ROOT_DEV=$(losetup --show -f -o "${ROOT_OFFSET}" --sizelimit "${ROOT_LENGTH}" "${IMG_FILE}")
+echo "/boot: offset $BOOT_OFFSET, length $BOOT_LENGTH"
+echo "/:     offset $ROOT_OFFSET, length $ROOT_LENGTH"

-rsync ${EXPORT_ROOTFS_DIR}/ ${ROOTFS_DIR}/ -aHAX
+ROOT_FEATURES="^huge_file"
+for FEATURE in metadata_csum 64bit; do
+	if grep -q "$FEATURE" /etc/mke2fs.conf; then
+	    ROOT_FEATURES="^$FEATURE,$ROOT_FEATURES"
+	fi
+done
+mkdosfs -n boot -F 32 -v "$BOOT_DEV" > /dev/null
+mkfs.ext4 -L rootfs -O "$ROOT_FEATURES" "$ROOT_DEV" > /dev/null
+
+mount -v "$ROOT_DEV" "${ROOTFS_DIR}" -t ext4
+mkdir -p "${ROOTFS_DIR}/boot"
+mount -v "$BOOT_DEV" "${ROOTFS_DIR}/boot" -t vfat
+
+rsync -aHAXx --exclude var/cache/apt/archives "${EXPORT_ROOTFS_DIR}/" "${ROOTFS_DIR}/"
@@ -2,30 +2,35 @@

 NOOBS_DIR="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}"

-install -v -m 744	files/partition_setup.sh	${NOOBS_DIR}/
-install -v		files/partitions.json		${NOOBS_DIR}/
-install -v		files/os.json			${NOOBS_DIR}/
-install -v		files/Raspbian.png		${NOOBS_DIR}/
-install -v		files/release_notes.txt		${NOOBS_DIR}/
+install -v -m 744	files/partition_setup.sh	"${NOOBS_DIR}/"
+install -v		files/partitions.json		"${NOOBS_DIR}/"
+install -v		files/os.json			"${NOOBS_DIR}/"
+install -v		files/OS.png			"${NOOBS_DIR}/"
+install -v		files/release_notes.txt		"${NOOBS_DIR}/"

-tar -v -c -C		files/marketing			-f ${NOOBS_DIR}/marketing.tar .
+tar -v -c -C		files/marketing			-f "${NOOBS_DIR}/marketing.tar" .

-BOOT_SIZE=$(xz --robot -l ${NOOBS_DIR}/boot.tar.xz  | grep totals | cut -f 5)
-ROOT_SIZE=$(xz --robot -l ${NOOBS_DIR}/root.tar.xz  | grep totals | cut -f 5)
+BOOT_SIZE="$(xz --robot -l "${NOOBS_DIR}/boot.tar.xz"  | grep totals | cut -f 5)"
+ROOT_SIZE="$(xz --robot -l "${NOOBS_DIR}/root.tar.xz"  | grep totals | cut -f 5)"

-BOOT_SIZE=$(expr ${BOOT_SIZE} / 1000000 \+ 1)
-ROOT_SIZE=$(expr ${ROOT_SIZE} / 1000000 \+ 1)
+BOOT_SIZE="$(( BOOT_SIZE / 1000000 + 1))"
+ROOT_SIZE="$(( ROOT_SIZE / 1000000 + 1))"

-BOOT_NOM=$(expr ${BOOT_SIZE} \* 3)
-ROOT_NOM=$(expr ${ROOT_SIZE} \+ 400)
+BOOT_NOM="$(( BOOT_SIZE * 3 ))"
+ROOT_NOM="$(( ROOT_SIZE + 400 ))"

-sed ${NOOBS_DIR}/partitions.json -i -e "s|BOOT_SIZE|${BOOT_SIZE}|"
-sed ${NOOBS_DIR}/partitions.json -i -e "s|ROOT_SIZE|${ROOT_SIZE}|"
+mv "${NOOBS_DIR}/OS.png" "${NOOBS_DIR}/${NOOBS_NAME// /_}.png"

-sed ${NOOBS_DIR}/partitions.json -i -e "s|BOOT_NOM|${BOOT_NOM}|"
-sed ${NOOBS_DIR}/partitions.json -i -e "s|ROOT_NOM|${ROOT_NOM}|"
+sed "${NOOBS_DIR}/partitions.json" -i -e "s|BOOT_SIZE|${BOOT_SIZE}|"
+sed "${NOOBS_DIR}/partitions.json" -i -e "s|ROOT_SIZE|${ROOT_SIZE}|"

-sed ${NOOBS_DIR}/release_notes.txt -i -e "s|UNRELEASED|${IMG_DATE}|"
-sed ${NOOBS_DIR}/os.json -i -e "s|UNRELEASED|${IMG_DATE}|"
+sed "${NOOBS_DIR}/partitions.json" -i -e "s|BOOT_NOM|${BOOT_NOM}|"
+sed "${NOOBS_DIR}/partitions.json" -i -e "s|ROOT_NOM|${ROOT_NOM}|"

-cp -a ${NOOBS_DIR} ${DEPLOY_DIR}/
+sed "${NOOBS_DIR}/os.json" -i -e "s|UNRELEASED|${IMG_DATE}|"
+sed "${NOOBS_DIR}/os.json" -i -e "s|NOOBS_NAME|${NOOBS_NAME}|"
+sed "${NOOBS_DIR}/os.json" -i -e "s|NOOBS_DESCRIPTION|${NOOBS_DESCRIPTION}|"
+
+sed "${NOOBS_DIR}/release_notes.txt" -i -e "s|UNRELEASED|${IMG_DATE}|"
+
+cp -a "${NOOBS_DIR}" "${DEPLOY_DIR}/"
@@ -1,8 +1,8 @@
 {
-    "description": "A community-created port of Debian jessie for the Raspberry Pi",
+    "description": "NOOBS_DESCRIPTION",
    "feature_level": 35120124,
-    "kernel": "4.4",
-    "name": "Raspbian",
+    "kernel": "4.9",
+    "name": "NOOBS_NAME",
    "password": "raspberry",
    "release_date": "UNRELEASED",
    "supported_hex_revisions": "2,3,4,5,6,7,8,9,d,e,f,10,11,12,14,19,1040,1041,0092,0093,2082",
@@ -10,9 +10,10 @@
        "Pi Model",
        "Pi 2",
        "Pi Zero",
-        "Pi 3"
+        "Pi 3",
+        "Pi Compute Module 3"
    ],
    "url": "http://www.raspbian.org/",
    "username": "pi",
-    "version": "jessie"
+    "version": "stretch"
 }
@@ -12,12 +12,24 @@ mkdir -p /tmp/1 /tmp/2
 mount "$part1" /tmp/1
 mount "$part2" /tmp/2

-sed /tmp/1/cmdline.txt -i -e "s|root=/dev/[^ ]*|root=${part2}|"
+sed /tmp/1/cmdline.txt -i -e "s|root=[^ ]*|root=${part2}|"
 sed /tmp/2/etc/fstab -i -e "s|^.* / |${part2}  / |"
 sed /tmp/2/etc/fstab -i -e "s|^.* /boot |${part1}  /boot |"

+if [ -f /mnt/ssh ]; then
+  cp /mnt/ssh /tmp/1/
+fi
+
+if [ -f /mnt/ssh.txt ]; then
+  cp /mnt/ssh.txt /tmp/1/
+fi
+
+if [ -f /settings/wpa_supplicant.conf ]; then
+  cp /settings/wpa_supplicant.conf /tmp/1/
+fi
+
 if ! grep -q resize /proc/cmdline; then
-  sed -i 's/ quiet init=.*$//' /tmp/1/cmdline.txt
+  sed -i 's| quiet init=/usr/lib/raspi-config/init_resize.sh||' /tmp/1/cmdline.txt
 fi

 umount /tmp/1
@@ -3,6 +3,7 @@
        {
            "filesystem_type": "FAT",
            "label": "boot",
+            "mkfs_options": "-F 32",
            "partition_size_nominal": BOOT_NOM,
            "uncompressed_tarball_size": BOOT_SIZE,
            "want_maximised": false
@@ -1,4 +1,126 @@
 UNRELEASED:
+  * Raspberry Pi 3 B+ support
+  * WiFi is disabled until wireless regulatory domain is set (Pi 3 B+ only)
+    - The domain can be done through 'Raspberry Pi Configuration' (rc_gui),
+      'raspi-config' or by setting 'country=' to an appropriate ISO 3166
+      alpha2 country code in /etc/wpa_supplicant/wpa_supplicant.conf.
+  * Default wireless regulatory domain is now unset
+  * Added support to desktop for different screen sizes and resolutions,
+    including multiple preset options in Appearance Settings and pixel doubling
+    option in Raspberry Pi Configuration
+  * Version 2.1.16 of Thonny included
+  * Version 29.0.0.113 of Adobe PepperFlash player included
+  * Version 1.2.post1 of Pygame Zero included
+  * Bluetooth plugin now supports connection to Bluetooth LE HID devices
+  * Network plugin now indicates 5G-compatible APs
+  * Latest changes to Bluez ALSA service merged
+    - service now started on CLI boot as well as GUI boot
+  * Latest changes to dhcpcd networking plugin merged
+  * Improved support for running on pi-top devices
+  * Small design changes to PiX theme and icons
+  * Bug fix - hide spurious window resize handles
+  * Bug fix - Scratch 2 remote GPIO state block now works correctly
+  * Updated WiFi Firmware
+    - brcmfmac43455-sdio 7.45.154
+    - brcmfmac43430-sdio 7.45.98.38
+  * New packages:
+    - policykit-1
+    - obconf
+    - python-buttonshim python3-buttonshim
+    - python-unicornhathd  python3-unicornhathd
+    - python-pantilthat python3-pantilthat
+  * Linux kernel 4.9.80+
+  * Raspberry Pi firmware 3347884c7df574bbabeff6dca63caf686e629699
+2017-11-29:
+  * Added battery monitor plugin for taskbar - works on x86 images or first-generation Pi-Top
+  * Added cutdown mode to PCManFM file manager to reduce complexity
+  * Added ability to rename files in PCManFM by clicking name when selected
+  * Bug fix in Bluetooth ALSA module to reduce truncation of audio at end of playback
+  * Various small tweaks, bug fixes and theme modifications
+  * New kernel and firmware
+2017-09-07:
+  * Disable predictable network interface names for Ethernet devices
+  * Bug fix for keyboard settings dialog in Raspberry Pi Configuration
+  * Bug fix for crash on some videos and animations in Chromium
+  * Bug fix for taskbar crash when running RealVNC server
+  * Bug fix for reloading projects with extensions in Scratch 2
+  * Bug fix for MAC address problem in Bluetooth
+  * Simple mode and new icons in Thonny
+  * New Japanese translations in Raspberry Pi Configuration
+  * Install fonts-droid-fallback for international fonts
+2017-08-16:
+  * Based on Raspbian Stretch (Debian version 9)
+  * Version 60 of Chromium browser included
+  * Version 3.0.1 of Sonic Pi included
+  * Version 6.1.1 of RealVNC included
+  * Version 0.17.4 of NodeRED included
+  * Bluetooth audio routed via ALSA rather than Pulseaudio
+  * SenseHAT extension added to Scratch 2
+  * Various desktop applications modified to prompt for sudo password if needed
+  * lxinput control options for mouse speed simplified
+  * lxpanel plugins moved into separate packages
+  * Wireless firmware for Pi 3 and Pi 0W modified to address Broadpwn exploit
+  * Latest kernel and firmware
+  * Various small tweaks, bug fixes and theme modifications
+2017-07-05:
+  * New kernel and firmware
+  * Filesystem created without the metadata_csum feature
+2017-06-21:
+  * Scratch 2 application included
+  * Thonny Python IDE included
+  * New icons with thinner outlines
+  * Volume control more linear in behaviour
+  * Updated Flash player
+  * Updated RealVNC server and viewer
+  * Various tweaks and bugfixes
+  * New kernel and firmware
+2017-04-10:
+  * Wolfram Mathematica updated to version 11.0.1
+  * Adobe Flash Player updated to version 25.0.0.127
+  * Use PARTUUID to support USB boot
+2017-03-02:
+  * Updated kernel and firmware (final Pi Zero W support)
+  * Wolfram Mathematica updated to version 11
+  * NOOBS installs now checks for presence of 'ssh' file on the NOOBS partition.
+2017-02-16:
+  * Chromium browser updated to version 56
+  * Adobe Flash Player updated to version 24.0.0.221
+  * RealVNC Server and Viewer updated to version 6.0.2 (RealVNC Connect)
+  * Sonic Pi updated to version 2.11
+  * Node-RED updated to version 0.15.3
+  * Scratch updated to version 120117
+  * Detection of SSH enabled with default password moved into PAM
+  * Updated desktop GL driver to support use of fake KMS option
+  * Raspberry Pi Configuration and raspi-config allow setting of fixed HDMI resolution
+  * raspi-config allows enabling of serial hardware independent of serial terminal
+  * Updates to kernel and firmware
+  * Various minor bug fixes and usability and appearance tweaks
+2017-01-11:
+  * Re-release of the 2016-11-25 image with a FAT32-formatted boot partition
+2016-11-25:
+  * SSH disabled by default; can be enabled by creating a file with name "ssh" in boot partition
+  * Prompt for password change at boot when SSH enabled with default password unchanged
+  * Adobe Flash Player included
+  * Updates to hardware video acceleration in Chromium browser
+  * Greeter now uses background image from last set in Appearance Settings rather than pi user
+  * Updated version of Scratch
+  * Rastrack option removed from raspi-config and Raspberry Pi Configuration
+  * Ability to disable graphical boot splash screen added to raspi-config and Raspberry Pi Configuration
+  * Appearance Settings dialog made tabbed to work better on small screens
+  * Raspberry Pi Configuration now requires current password to change password
+  * Various small bug fixes
+  * Updated firmware and kernel
+2016-09-23:
+  * New PIXEL desktop environment - new icon set, window design, desktop images, splash screen and greeter
+  * Chromium web browser included
+  * Infinality font rendering patches included
+  * RealVNC server and viewer included
+  * SenseHAT emulator included
+  * Rfkill entries added to Wifi and Bluetooth panel plugins
+  * Updates to various standard applications, including Scratch and NodeRED
+  * Various bug fixes, tweaks and translation updates
+  * Updated firmware and kernel (https://github.com/raspberrypi/firmware/commit/ad8608c08b122b2c228dba0ff5070d6e9519faf5)
+2016-05-27:
  * Fixed crash of lxpanel when D-bus not accessible
  * Fixed permissions for D-bus Bluetooth access
  * Removed sudo from shutdown options
@@ -2,25 +2,39 @@

 IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img"
 NOOBS_DIR="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}"
-unmount_image ${IMG_FILE}
+unmount_image "${IMG_FILE}"

-mkdir -p ${STAGE_WORK_DIR}
-cp ${WORK_DIR}/export-image/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img ${STAGE_WORK_DIR}/
+mkdir -p "${STAGE_WORK_DIR}"
+cp "${WORK_DIR}/export-image/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img" "${STAGE_WORK_DIR}/"

-rm -rf ${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}
+rm -rf "${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}"

-LOOP_DEV=`kpartx -asv ${IMG_FILE} | grep -E -o -m1 'loop[[:digit:]]+' | head -n 1`
-BOOT_DEV=/dev/mapper/${LOOP_DEV}p1
-ROOT_DEV=/dev/mapper/${LOOP_DEV}p2
+PARTED_OUT=$(parted -s "${IMG_FILE}" unit b print)
+BOOT_OFFSET=$(echo "$PARTED_OUT" | grep -e '^ 1'| xargs echo -n \
+| cut -d" " -f 2 | tr -d B)
+BOOT_LENGTH=$(echo "$PARTED_OUT" | grep -e '^ 1'| xargs echo -n \
+| cut -d" " -f 4 | tr -d B)

-mkdir -p ${STAGE_WORK_DIR}/rootfs
-mkdir -p ${STAGE_WORK_DIR}/bootfs
-mkdir -p ${NOOBS_DIR}
+ROOT_OFFSET=$(echo "$PARTED_OUT" | grep -e '^ 2'| xargs echo -n \
+| cut -d" " -f 2 | tr -d B)
+ROOT_LENGTH=$(echo "$PARTED_OUT" | grep -e '^ 2'| xargs echo -n \
+| cut -d" " -f 4 | tr -d B)

-mount $ROOT_DEV ${STAGE_WORK_DIR}/rootfs
-mount $BOOT_DEV ${STAGE_WORK_DIR}/bootfs
+BOOT_DEV=$(losetup --show -f -o "${BOOT_OFFSET}" --sizelimit "${BOOT_LENGTH}" "${IMG_FILE}")
+ROOT_DEV=$(losetup --show -f -o "${ROOT_OFFSET}" --sizelimit "${ROOT_LENGTH}" "${IMG_FILE}")
+echo "/boot: offset $BOOT_OFFSET, length $BOOT_LENGTH"
+echo "/:     offset $ROOT_OFFSET, length $ROOT_LENGTH"

-tar -I pxz -C ${STAGE_WORK_DIR}/bootfs -cpf ${NOOBS_DIR}/boot.tar.xz .
-tar -I pxz -C ${STAGE_WORK_DIR}/rootfs -cpf ${NOOBS_DIR}/root.tar.xz .
+mkdir -p "${STAGE_WORK_DIR}/rootfs"
+mkdir -p "${NOOBS_DIR}"

-unmount_image ${IMG_FILE}
+mount "$ROOT_DEV" "${STAGE_WORK_DIR}/rootfs"
+mount "$BOOT_DEV" "${STAGE_WORK_DIR}/rootfs/boot"
+
+ln -sv "/lib/systemd/system/apply_noobs_os_config.service" "$ROOTFS_DIR/etc/systemd/system/multi-user.target.wants/apply_noobs_os_config.service"
+
+bsdtar --numeric-owner --format gnutar --use-compress-program pxz -C "${STAGE_WORK_DIR}/rootfs/boot" -cpf "${NOOBS_DIR}/boot.tar.xz" .
+umount "${STAGE_WORK_DIR}/rootfs/boot"
+bsdtar --numeric-owner --format gnutar --use-compress-program pxz -C "${STAGE_WORK_DIR}/rootfs" --one-file-system -cpf "${NOOBS_DIR}/root.tar.xz" .
+
+unmount_image "${IMG_FILE}"
@@ -1,10 +1,11 @@
 log (){
-	date +"[%T] $@" | tee -a ${LOG_FILE}
+	date +"[%T] $*" | tee -a "${LOG_FILE}"
 }
 export -f log

 bootstrap(){
-	local ARCH=$(dpkg --print-architecture)
+	local ARCH
+	ARCH=$(dpkg --print-architecture)

 	export http_proxy=${APT_PROXY}

@@ -14,20 +15,20 @@ bootstrap(){
 		local BOOTSTRAP_CMD=debootstrap
 	fi

-	${BOOTSTRAP_CMD} --components=main,contrib,non-free \
-		--arch armhf\
-		--no-check-gpg \
-		$1 $2 $3
+	capsh --drop=cap_setfcap -- "${BOOTSTRAP_CMD}" --components=main,contrib,non-free \
+		--arch armhf \
+		--keyring "${STAGE_DIR}/files/raspberrypi.gpg" \
+		"$1" "$2" "$3" || rmdir "$2/debootstrap"
 }
 export -f bootstrap

 copy_previous(){
-	if [ ! -d ${PREV_ROOTFS_DIR} ]; then
+	if [ ! -d "${PREV_ROOTFS_DIR}" ]; then
 		echo "Previous stage rootfs not found"
 		false
 	fi
-	mkdir -p ${ROOTFS_DIR}
-	rsync -aHAX ${PREV_ROOTFS_DIR}/ ${ROOTFS_DIR}/
+	mkdir -p "${ROOTFS_DIR}"
+	rsync -aHAXx --exclude var/cache/apt/archives "${PREV_ROOTFS_DIR}/" "${ROOTFS_DIR}/"
 }
 export -f copy_previous

@@ -38,10 +39,11 @@ unmount(){
 		DIR=$1
 	fi

-	while mount | grep -q $DIR; do
-		local LOCS=`mount | grep $DIR | cut -f 3 -d ' ' | sort -r`
+	while mount | grep -q "$DIR"; do
+		local LOCS
+		LOCS=$(mount | grep "$DIR" | cut -f 3 -d ' ' | sort -r)
 		for loc in $LOCS; do
-			umount $loc
+			umount "$loc"
 		done
 	done
 }
@@ -50,42 +52,47 @@ export -f unmount
 unmount_image(){
 	sync
 	sleep 1
-	local LOOP_DEV=$(losetup -j ${1} | cut -f1 -d':')
-	if [ -n "${LOOP_DEV}" ]; then
-		local MOUNTED_DIR=$(mount | grep $(basename ${LOOP_DEV} | head -n 1 | cut -f 3 -d ' '))
-		if [ -n "${MOUNTED_DIR}" ]; then
-			unmount $(dirname ${MOUNTED_DIR})
+	local LOOP_DEVICES
+	LOOP_DEVICES=$(losetup -j "${1}" | cut -f1 -d':')
+	for LOOP_DEV in ${LOOP_DEVICES}; do
+		if [ -n "${LOOP_DEV}" ]; then
+			local MOUNTED_DIR
+			MOUNTED_DIR=$(mount | grep "$(basename "${LOOP_DEV}")" | head -n 1 | cut -f 3 -d ' ')
+			if [ -n "${MOUNTED_DIR}" ] && [ "${MOUNTED_DIR}" != "/" ]; then
+				unmount "$(dirname "${MOUNTED_DIR}")"
+			fi
+			sleep 1
+			losetup -d "${LOOP_DEV}"
 		fi
-		sleep 1
-		kpartx -ds ${LOOP_DEV}
-		losetup -d ${LOOP_DEV}
-	fi
+	done
 }
 export -f unmount_image

 on_chroot() {
-	if ! mount | grep -q `realpath ${ROOTFS_DIR}/proc`; then
-		mount -t proc proc ${ROOTFS_DIR}/proc
+	if ! mount | grep -q "$(realpath "${ROOTFS_DIR}"/proc)"; then
+		mount -t proc proc "${ROOTFS_DIR}/proc"
 	fi

-	if ! mount | grep -q `realpath ${ROOTFS_DIR}/dev`; then
-		mount --bind /dev ${ROOTFS_DIR}/dev
+	if ! mount | grep -q "$(realpath "${ROOTFS_DIR}"/dev)"; then
+		mount --bind /dev "${ROOTFS_DIR}/dev"
 	fi
 	
-	if ! mount | grep -q `realpath ${ROOTFS_DIR}/dev/pts`; then
-		mount --bind /dev/pts ${ROOTFS_DIR}/dev/pts
+	if ! mount | grep -q "$(realpath "${ROOTFS_DIR}"/dev/pts)"; then
+		mount --bind /dev/pts "${ROOTFS_DIR}/dev/pts"
 	fi

-	if ! mount | grep -q `realpath ${ROOTFS_DIR}/sys`; then
-		mount --bind /sys ${ROOTFS_DIR}/sys
+	if ! mount | grep -q "$(realpath "${ROOTFS_DIR}"/sys)"; then
+		mount --bind /sys "${ROOTFS_DIR}/sys"
 	fi

-	chroot ${ROOTFS_DIR}/ "$@"
+	capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- "$@"
 }
 export -f on_chroot

 update_issue() {
-	local GIT_HASH=$(git rev-parse HEAD)
-	echo -e "Raspberry Pi reference ${IMG_DATE}\nGenerated using pi-gen, https://github.com/RPi-Distro/pi-gen, ${GIT_HASH}, ${1}" > ${ROOTFS_DIR}/etc/rpi-issue
+	local GIT_HASH
+	GIT_HASH=$(git rev-parse HEAD)
+	echo -e "Raspberry Pi reference ${IMG_DATE}\nGenerated using pi-gen, https://github.com/RPi-Distro/pi-gen, ${GIT_HASH}, ${1}" > "${ROOTFS_DIR}/etc/rpi-issue"
 }
 export -f update_issue
+
@@ -1,5 +1,5 @@
 # dependencies_check
-# $@	Dependnecy files to check
+# $@	Dependency files to check
 #
 # Each dependency is in the form of a tool to test for, optionally followed by
 # a : and the name of a package if the package on a Debian-ish system is not
@@ -10,18 +10,18 @@ dependencies_check()

 	for depfile in "$@"; do
 		if [[ -e "$depfile" ]]; then
-			deps="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < ${BASE_DIR}/depends)"
+			deps="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${BASE_DIR}/depends")"

 		fi
 		for dep in $deps; do
-			if ! hash ${dep%:*} 2>/dev/null; then
+			if ! hash "${dep%:*}" 2>/dev/null; then
 				missing="${missing:+$missing }${dep#*:}"
 			fi
 		done
 	done

 	if [[ "$missing" ]]; then
-		echo "Reqired dependencies not installed"
+		echo "Required dependencies not installed"
 		echo
 		echo "This can be resolved on Debian/Raspbian systems by installing:"
 		echo "$missing"
@@ -0,0 +1,17 @@
+#!/bin/bash -e
+
+install -m 644 files/sources.list "${ROOTFS_DIR}/etc/apt/"
+install -m 644 files/raspi.list "${ROOTFS_DIR}/etc/apt/sources.list.d/"
+
+if [ -n "$APT_PROXY" ]; then
+	install -m 644 files/51cache "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache"
+	sed "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache" -i -e "s|APT_PROXY|${APT_PROXY}|"
+else
+	rm -f "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache"
+fi
+
+on_chroot apt-key add - < files/raspberrypi.gpg.key
+on_chroot << EOF
+apt-get update
+apt-get dist-upgrade -y
+EOF
@@ -0,0 +1,3 @@
+deb http://archive.raspberrypi.org/debian/ stretch main ui staging
+# Uncomment line below then 'apt-get update' to enable 'apt-get source'
+#deb-src http://archive.raspberrypi.org/debian/ stretch main ui
@@ -0,0 +1,3 @@
+deb http://mirrordirector.raspbian.org/raspbian/ stretch main contrib non-free rpi
+# Uncomment line below then 'apt-get update' to enable 'apt-get source'
+#deb-src http://archive.raspbian.org/raspbian/ stretch main contrib non-free rpi
@@ -1,17 +0,0 @@
-#!/bin/bash -e
-
-install -m 644 files/sources.list ${ROOTFS_DIR}/etc/apt/
-install -m 644 files/raspi.list ${ROOTFS_DIR}/etc/apt/sources.list.d/
-
-if [ -n "$APT_PROXY" ]; then
-	install -m 644 files/51cache ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache
-	sed ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache -i -e "s|APT_PROXY|${APT_PROXY}|"
-else
-	rm -f ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache
-fi
-
-on_chroot apt-key add - < files/raspberrypi.gpg.key
-on_chroot sh -e - << EOF
-apt-get update
-apt-get dist-upgrade -y
-EOF
@@ -1,3 +0,0 @@
-deb http://archive.raspberrypi.org/debian/ jessie main ui staging
-# Uncomment line below then 'apt-get update' to enable 'apt-get source'
-#deb-src http://archive.raspberrypi.org/debian/ jessie main ui
@@ -1,3 +0,0 @@
-deb http://mirrordirector.raspbian.org/raspbian/ jessie main contrib non-free rpi
-# Uncomment line below then 'apt-get update' to enable 'apt-get source'
-#deb-src http://archive.raspbian.org/raspbian/ jessie main contrib non-free rpi
@@ -0,0 +1 @@
+locales
@@ -1,4 +1,5 @@
 #!/bin/bash -e
-if [ ! -d ${ROOTFS_DIR} ]; then
-	bootstrap jessie ${ROOTFS_DIR} http://mirrordirector.raspbian.org/raspbian/
+
+if [ ! -d "${ROOTFS_DIR}" ]; then
+	bootstrap stretch "${ROOTFS_DIR}" http://mirrordirector.raspbian.org/raspbian/
 fi
@@ -1,4 +1,4 @@
 #!/bin/bash -e

-install -m 644 files/cmdline.txt ${ROOTFS_DIR}/boot/
-install -m 644 files/config.txt ${ROOTFS_DIR}/boot/
+install -m 644 files/cmdline.txt "${ROOTFS_DIR}/boot/"
+install -m 644 files/config.txt "${ROOTFS_DIR}/boot/"
@@ -1 +1 @@
-dwc_otg.lpm_enable=0 console=serial0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait
+dwc_otg.lpm_enable=0 console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait
@@ -1,5 +1,5 @@
 # For more options and information see
-# http://www.raspberrypi.org/documentation/configuration/config-txt.md
+# http://rpf.io/configtxt
 # Some settings may impact device functionality. See link above for details

 # uncomment if you get no picture on HDMI for a default "safe" mode
@@ -1,11 +1,10 @@
 #!/bin/bash -e

-install -d ${ROOTFS_DIR}/etc/systemd/system/[email protected]
-install -m 644 files/noclear.conf ${ROOTFS_DIR}/etc/systemd/system/[email protected]/noclear.conf
-install -m 744 files/policy-rc.d ${ROOTFS_DIR}/usr/sbin/policy-rc.d #TODO: Necessary in systemd?
-install -v -m 644 files/fstab ${ROOTFS_DIR}/etc/fstab
+install -d "${ROOTFS_DIR}/etc/systemd/system/[email protected]"
+install -m 644 files/noclear.conf "${ROOTFS_DIR}/etc/systemd/system/[email protected]/noclear.conf"
+install -v -m 644 files/fstab "${ROOTFS_DIR}/etc/fstab"

-on_chroot sh -e - <<EOF
+on_chroot << EOF
 if ! id -u pi >/dev/null 2>&1; then
 	adduser --disabled-password --gecos "" pi
 fi
@@ -1,3 +1,3 @@
 proc            /proc           proc    defaults          0       0
-/dev/mmcblk0p1  /boot           vfat    defaults          0       2
-/dev/mmcblk0p2  /               ext4    defaults,noatime  0       1
+BOOTDEV  /boot           vfat    defaults          0       2
+ROOTDEV  /               ext4    defaults,noatime  0       1
@@ -1,2 +0,0 @@
-#!/bin/sh
-exit 101
@@ -1,13 +0,0 @@
-Index: jessie-stage1/rootfs/lib/udev/rules.d/75-persistent-net-generator.rules
-===================================================================
--- jessie-stage1.orig/rootfs/lib/udev/rules.d/75-persistent-net-generator.rules
-+++ jessie-stage1/rootfs/lib/udev/rules.d/75-persistent-net-generator.rules
-@@ -22,7 +22,7 @@ IMPORT{cmdline}="net.ifnames"
- ENV{net.ifnames}=="1",			GOTO="persistent_net_generator_end"
- 
- # device name whitelist
-KERNEL!="eth*|ath*|wlan*[0-9]|msh*|ra*|sta*|ctc*|lcs*|hsi*", \
-+KERNEL!="ath*|msh*|ra*|sta*|ctc*|lcs*|hsi*", \
- 					GOTO="persistent_net_generator_end"
- 
- # ignore Xen virtual interfaces
@@ -1,2 +1 @@
 01-hosts.diff
-02-persistant-net.diff
@@ -1,9 +1,6 @@
 #!/bin/bash -e

-install -m 644 files/ipv6.conf ${ROOTFS_DIR}/etc/modprobe.d/ipv6.conf
-install -m 644 files/interfaces ${ROOTFS_DIR}/etc/network/interfaces
-install -m 644 files/hostname ${ROOTFS_DIR}/etc/hostname
+install -m 644 files/ipv6.conf "${ROOTFS_DIR}/etc/modprobe.d/ipv6.conf"
+install -m 644 files/hostname "${ROOTFS_DIR}/etc/hostname"

-on_chroot sh -e - << EOF
-dpkg-divert --add --local /lib/udev/rules.d/75-persistent-net-generator.rules
-EOF
+ln -sf /dev/null "${ROOTFS_DIR}/etc/systemd/network/99-default.link"
@@ -1,4 +1,5 @@
 #!/bin/bash -e
-if [ ! -d ${ROOTFS_DIR} ]; then
+
+if [ ! -d "${ROOTFS_DIR}" ]; then
 	copy_previous
 fi
@@ -1,3 +0,0 @@
-#!/bin/bash -e
-
-touch ${ROOTFS_DIR}/spindle_install
@@ -1,3 +0,0 @@
-#!/bin/bash -e
-
-rm -f ${ROOTFS_DIR}/spindle_install
@@ -1,4 +1,4 @@
-ssh locales less fbset sudo psmisc strace module-init-tools ed ncdu crda
+ssh less fbset sudo psmisc strace ed ncdu crda
 console-setup keyboard-configuration debconf-utils parted unzip
 build-essential manpages-dev python bash-completion gdb pkg-config
 python-rpi.gpio v4l-utils
@@ -6,7 +6,7 @@ avahi-daemon
 lua5.1
 luajit
 hardlink ca-certificates curl
-fake-hwclock ntp nfs-common usbutils
+fake-hwclock nfs-common usbutils
 libraspberrypi-dev libraspberrypi-doc libfreetype6-dev
 dosfstools
 dphys-swapfile
@@ -14,3 +14,11 @@ raspberrypi-sys-mods
 pi-bluetooth
 apt-listchanges
 usb-modeswitch
+apt-transport-https
+libpam-chksshpwd
+rpi-update
+libmtp-runtime
+rsync
+htop
+man-db
+policykit-1
@@ -1,10 +0,0 @@
-Index: jessie-stage2/rootfs/etc/sudoers
-===================================================================
--- jessie-stage2.orig/rootfs/etc/sudoers
-+++ jessie-stage2/rootfs/etc/sudoers
-@@ -25,3 +25,5 @@ root	ALL=(ALL:ALL) ALL
- # See sudoers(5) for more information on "#include" directives:
- 
- #includedir /etc/sudoers.d
-+
-+pi ALL=(ALL) NOPASSWD: ALL
@@ -1,17 +0,0 @@
-Index: jessie-stage2/rootfs/etc/default/console-setup
-===================================================================
--- jessie-stage2.orig/rootfs/etc/default/console-setup
-+++ jessie-stage2/rootfs/etc/default/console-setup
-@@ -6,9 +6,9 @@ ACTIVE_CONSOLES="/dev/tty[1-6]"
- 
- CHARMAP="UTF-8"
- 
-CODESET="Lat15"
-FONTFACE="Fixed"
-FONTSIZE="8x16"
-+CODESET="guess"
-+FONTFACE=""
-+FONTSIZE=""
- 
- VIDEOMODE=
- 
@@ -1,5 +1,5 @@
 --- a/rootfs/boot/cmdline.txt
 +++ b/rootfs/boot/cmdline.txt
@@ -1 +1 @@
-dwc_otg.lpm_enable=0 console=serial0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait
-+dwc_otg.lpm_enable=0 console=serial0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait quiet init=/usr/lib/raspi-config/init_resize.sh
+-dwc_otg.lpm_enable=0 console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait
+dwc_otg.lpm_enable=0 console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait quiet init=/usr/lib/raspi-config/init_resize.sh
@@ -1,8 +1,5 @@
-00-sudoers.diff
 01-useradd.diff
 02-swap.diff
-03-console-setup.diff
 04-inputrc.diff
 05-path.diff
-06-rc_local.diff
 07-resize-init.diff
@@ -1,40 +1,52 @@
 #!/bin/bash -e

-install -m 755 files/regenerate_ssh_host_keys		${ROOTFS_DIR}/etc/init.d/
-install -m 755 files/apply_noobs_os_config		${ROOTFS_DIR}/etc/init.d/
-install -m 755 files/resize2fs_once			${ROOTFS_DIR}/etc/init.d/
+install -m 755 files/resize2fs_once	"${ROOTFS_DIR}/etc/init.d/"

-install -d						${ROOTFS_DIR}/etc/systemd/system/rc-local.service.d
-install -m 644 files/ttyoutput.conf			${ROOTFS_DIR}/etc/systemd/system/rc-local.service.d/
+install -d				"${ROOTFS_DIR}/etc/systemd/system/rc-local.service.d"
+install -m 644 files/ttyoutput.conf	"${ROOTFS_DIR}/etc/systemd/system/rc-local.service.d/"

-install -m 644 files/50raspi				${ROOTFS_DIR}/etc/apt/apt.conf.d/
+install -m 644 files/50raspi		"${ROOTFS_DIR}/etc/apt/apt.conf.d/"

+install -m 644 files/console-setup   	"${ROOTFS_DIR}/etc/default/"

-on_chroot sh -e - <<EOF
+install -m 755 files/rc.local		"${ROOTFS_DIR}/etc/"
+
+on_chroot << EOF
 systemctl disable hwclock.sh
 systemctl disable nfs-common
 systemctl disable rpcbind
 systemctl disable ssh
 systemctl enable regenerate_ssh_host_keys
-systemctl enable apply_noobs_os_config
-systemctl enable resize2fs_once
 EOF

-on_chroot sh -e - << \EOF
+if [ "${USE_QEMU}" = "1" ]; then
+	echo "enter QEMU mode"
+	install -m 644 files/90-qemu.rules "${ROOTFS_DIR}/etc/udev/rules.d/"
+	on_chroot << EOF
+systemctl disable resize2fs_once
+EOF
+	echo "leaving QEMU mode"
+else
+	on_chroot << EOF
+systemctl enable resize2fs_once
+EOF
+fi
+
+on_chroot << \EOF
 for GRP in input spi i2c gpio; do
-	groupadd -f -r $GRP
+	groupadd -f -r "$GRP"
 done
 for GRP in adm dialout cdrom audio users sudo video games plugdev input gpio spi i2c netdev; do
  adduser pi $GRP
 done
 EOF

-on_chroot sh -e - <<EOF
+on_chroot << EOF
 setupcon --force --save-only -v
 EOF

-on_chroot sh -e - <<EOF
+on_chroot << EOF
 usermod --pass='*' root
 EOF

-rm -f ${ROOTFS_DIR}/etc/ssh/ssh_host_*_key*
+rm -f "${ROOTFS_DIR}/etc/ssh/"ssh_host_*_key*
@@ -0,0 +1,3 @@
+KERNEL=="sda", SYMLINK+="mmcblk0"
+KERNEL=="sda?", SYMLINK+="mmcblk0p%n"
+KERNEL=="sda2", SYMLINK+="root"
@@ -1,31 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          apply_noobs_os_config
-# Required-Start:
-# Required-Stop:
-# Default-Start: 2
-# Default-Stop:
-# Short-Description: Apply config from /boot/os_config.json
-# Description:
-### END INIT INFO
-
-. /lib/lsb/init-functions
-
-set -e
-
-case "$1" in
-  start)
-    log_daemon_msg "Applying config from /boot/os_config.json (if it exists)"
-    if raspi-config --apply-os-config; then
-      update-rc.d apply_noobs_os_config remove
-      rm /etc/init.d/apply_noobs_os_config
-      log_end_msg 0
-    else
-      log_end_msg 1
-    fi
-    ;;
-  *)
-    echo "Usage: $0 start" >&2
-    exit 3
-    ;;
-esac
@@ -0,0 +1,16 @@
+# CONFIGURATION FILE FOR SETUPCON
+
+# Consult the console-setup(5) manual page.
+
+ACTIVE_CONSOLES="/dev/tty[1-6]"
+
+CHARMAP="UTF-8"
+
+CODESET="guess"
+FONTFACE=""
+FONTSIZE=""
+
+VIDEOMODE=
+
+# The following is an example how to use a braille font
+# FONT='lat9w-08.psf.gz brl-8x8.psf'
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+#
+# rc.local
+#
+# This script is executed at the end of each multiuser runlevel.
+# Make sure that the script will "exit 0" on success or any other
+# value on error.
+#
+# In order to enable or disable this script just change the execution
+# bits.
+#
+# By default this script does nothing.
+
+# Print the IP address
+_IP=$(hostname -I) || true
+if [ "$_IP" ]; then
+  printf "My IP address is %s\n" "$_IP"
+fi
+
+exit 0
@@ -1,36 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          regenerate_ssh_host_keys
-# Required-Start:
-# Required-Stop:
-# Default-Start: 2
-# Default-Stop:
-# Short-Description: Regenerate ssh host keys
-# Description:
-### END INIT INFO
-
-. /lib/lsb/init-functions
-
-set -e
-
-case "$1" in
-  start)
-    log_daemon_msg "Regenerating ssh host keys (in background)"
-    nohup sh -c "if [ -e /dev/hwrng ]; then
-          dd if=/dev/hwrng of=/dev/urandom count=1 bs=4096
-      fi; \
-      yes | ssh-keygen -q -N '' -t dsa -f /etc/ssh/ssh_host_dsa_key && \
-      yes | ssh-keygen -q -N '' -t rsa -f /etc/ssh/ssh_host_rsa_key && \
-      yes | ssh-keygen -q -N '' -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key && \
-      yes | ssh-keygen -q -N '' -t ed25519 -f /etc/ssh/ssh_host_ed25519_key && \
-      systemctl enable ssh && sync && \
-      rm /etc/init.d/regenerate_ssh_host_keys && \
-      update-rc.d regenerate_ssh_host_keys remove && \
-      printf '\nfinished\n' && systemctl start ssh" > /var/log/regen_ssh_keys.log 2>&1 &
-    log_end_msg $?
-    ;;
-  *)
-    echo "Usage: $0 start" >&2
-    exit 3
-    ;;
-esac
@@ -12,7 +12,7 @@
 case "$1" in
  start)
    log_daemon_msg "Starting resize2fs_once"
-    ROOT_DEV=`grep -Eo 'root=[[:graph:]]+' /proc/cmdline | cut -d '=' -f 2-` &&
+    ROOT_DEV=$(findmnt / -o source -n) &&
    resize2fs $ROOT_DEV &&
    update-rc.d resize2fs_once remove &&
    rm /etc/init.d/resize2fs_once &&
@@ -1,2 +1,4 @@
-wpasupplicant wireless-tools firmware-atheros firmware-brcm80211 firmware-libertas firmware-ralink firmware-realtek
+wpasupplicant wireless-tools firmware-atheros firmware-brcm80211 firmware-libertas firmware-misc-nonfree firmware-realtek
+raspberrypi-net-mods
 dhcpcd5
+net-tools
@@ -1,27 +0,0 @@
-Index: jessie-stage2/rootfs/etc/network/interfaces
-===================================================================
--- jessie-stage2.orig/rootfs/etc/network/interfaces
-+++ jessie-stage2/rootfs/etc/network/interfaces
-@@ -1,4 +1,20 @@
-auto lo
-+# interfaces(5) file used by ifup(8) and ifdown(8)
-+
-+# Please note that this file is written to be used with dhcpcd
-+# For static IP, consult /etc/dhcpcd.conf and 'man dhcpcd.conf'
- 
-+# Include files from /etc/network/interfaces.d:
-+source-directory /etc/network/interfaces.d
-+
-+auto lo
- iface lo inet loopback
-iface eth0 inet dhcp
-+
-+iface eth0 inet manual
-+
-+allow-hotplug wlan0
-+iface wlan0 inet manual
-+    wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
-+
-+allow-hotplug wlan1
-+iface wlan1 inet manual
-+    wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
@@ -1 +0,0 @@
-00-interfaces.diff
@@ -1,8 +1,8 @@
 #!/bin/bash -e

-install -v -d						${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d
-install -v -m 644 files/wait.conf			${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d/
+install -v -d					"${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d"
+install -v -m 644 files/wait.conf		"${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d/"

-install -v -d                                           ${ROOTFS_DIR}/etc/wpa_supplicant
-install -v -m 600 files/wpa_supplicant.conf             ${ROOTFS_DIR}/etc/wpa_supplicant/
+install -v -d					"${ROOTFS_DIR}/etc/wpa_supplicant"
+install -v -m 600 files/wpa_supplicant.conf	"${ROOTFS_DIR}/etc/wpa_supplicant/"

@@ -1,3 +1,3 @@
 [Service]
 ExecStart=
-ExecStart=/sbin/dhcpcd -q -w
+ExecStart=/usr/lib/dhcpcd5/dhcpcd -q -w
@@ -1,3 +1,2 @@
-country=GB
 ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev
 update_config=1
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-on_chroot sh -e - <<EOF
-apt-get clean
-EOF
@@ -1 +1,4 @@
-lite
+IMG_SUFFIX="-lite"
+if [ "${USE_QEMU}" = "1" ]; then
+	export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
+fi
@@ -0,0 +1,2 @@
+NOOBS_NAME="Raspbian Lite"
+NOOBS_DESCRIPTION="A port of Debian Stretch for the Raspberry Pi (minimal version)"
@@ -1,4 +1,5 @@
 #!/bin/bash -e
-if [ ! -d ${ROOTFS_DIR} ]; then
+
+if [ ! -d "${ROOTFS_DIR}" ]; then
 	copy_previous
 fi
@@ -0,0 +1,2 @@
+# Adobe Flash Player. Copyright 1996-2015. Adobe Systems Incorporated. All Rights Reserved.
+rpi-chromium-mods	rpi-chromium-mods/adobe	note
@@ -1,10 +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-core rpi-update
+git
 omxplayer
 raspberrypi-artwork
 policykit-1
-udisks
+gvfs
 rfkill
 chromium-browser rpi-chromium-mods
+gldriver-test
+fonts-droid-fallback
+fonts-liberation2
+obconf
@@ -1,9 +1,8 @@
 #!/bin/bash -e

-on_chroot sh -e - <<EOF
+on_chroot << 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
-
@@ -1,13 +0,0 @@
-Index: jessie-stage3/rootfs/etc/lightdm/lightdm-gtk-greeter.conf
-===================================================================
--- jessie-stage3.orig/rootfs/etc/lightdm/lightdm-gtk-greeter.conf
-+++ jessie-stage3/rootfs/etc/lightdm/lightdm-gtk-greeter.conf
-@@ -16,7 +16,7 @@
- # screensaver-timeout = Timeout (in seconds) until the screen blanks when the greeter is called as lockscreen
- # 
- [greeter]
-background=/usr/share/images/desktop-base/login-background.svg
-+background=#ffffff
- theme-name=Adwaita
- #icon-theme-name=
- #font-name=
@@ -1 +0,0 @@
-01-lightdm.diff
@@ -1,15 +1,3 @@
 #!/bin/bash -e

-on_chroot sh -e - <<EOF
-update-alternatives --set libgksu-gconf-defaults /usr/share/libgksu/debian/gconf-defaults.libgksu-sudo
-update-gconf-defaults
-EOF
-
-on_chroot sh -e - <<EOF
-update-alternatives --install /usr/share/images/desktop-base/desktop-background \
-desktop-background /usr/share/raspberrypi-artwork/raspberry-pi-logo.png 100
-EOF
-
-rm -f							${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d/wait.conf
-install -m 644 files/55-storage.pkla			${ROOTFS_DIR}/etc/polkit-1/localauthority/50-local.d/
-install -m 644 files/75source-profile		${ROOTFS_DIR}/etc/X11/Xsession.d/
+rm -f "${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d/wait.conf"
@@ -1,6 +0,0 @@
-[Storage Permissions]
-Identity=unix-group:plugdev
-Action=org.freedesktop.udisks.filesystem-mount;org.freedesktop.udisks.drive-eject;org.freedesktop.udisks.drive-detach;org.freedesktop.udisks.luks-unlock;org.freedesktop.udisks.inhibit-polling;org.freedesktop.udisks.drive-set-spindown
-ResultAny=yes
-ResultActive=yes
-ResultInactive=no
@@ -1,2 +0,0 @@
-[ -f /etc/profile ] && . /etc/profile
-[ -f "$HOME/.profile" ] && . "$HOME/.profile"
@@ -1,4 +1,5 @@
 #!/bin/bash -e
-if [ ! -d ${ROOTFS_DIR} ]; then
+
+if [ ! -d "${ROOTFS_DIR}" ]; then
 	copy_previous
 fi
@@ -1,4 +1,2 @@
 # Enable realtime process priority?
 jackd2  jackd/tweak_rt_limits   boolean true
-# Do you accept the Wolfram - Raspberry Pi® Bundle License Agreement?
-wolfram-engine  shared/accepted-wolfram-eula    boolean true
@@ -7,13 +7,11 @@ python3-pgzero
 python-serial python3-serial
 python-picamera python3-picamera
 debian-reference-en dillo x2x
-wolfram-engine
 raspberrypi-net-mods raspberrypi-ui-mods
-smartsim penguinspuzzle
+smartsim
 python-pip python3-pip
 python3-numpy
 pypy
-python3-pifacecommon python3-pifacedigitalio python3-pifacedigital-scratch-handler python-pifacecommon python-pifacedigitalio
 minecraft-pi python-minecraftpi
 alacarte rc-gui sense-hat
 claws-mail
@@ -24,13 +22,13 @@ nodered
 libgl1-mesa-dri libgles1-mesa libgles2-mesa xcompmgr
 geany
 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
+pprompt
+scratch2
+python3-thonny
@@ -1,3 +1,4 @@
 libreoffice libreoffice-gtk
 timidity
 pi-package
+realvnc-vnc-server realvnc-vnc-viewer
@@ -0,0 +1,22 @@
+python-automationhat python3-automationhat
+python-blinkt python3-blinkt
+python-cap1xxx python3-cap1xxx
+python-drumhat python3-drumhat
+python-envirophat python3-envirophat
+python-explorerhat python3-explorerhat
+python-fourletterphat python3-fourletterphat
+python-microdotphat python3-microdotphat
+python-mote python3-mote
+python-motephat python3-motephat
+python-phatbeat python3-phatbeat
+python-pianohat python3-pianohat
+python-piglow python3-piglow
+python-rainbowhat python3-rainbowhat
+python-scrollphat python3-scrollphat
+python-scrollphathd python3-scrollphathd
+python-sn3218 python3-sn3218
+python-skywriter python3-skywriter
+python-touchphat python3-touchphat
+python-buttonshim python3-buttonshim
+python-unicornhathd  python3-unicornhathd
+python-pantilthat python3-pantilthat
@@ -1,3 +0,0 @@
-#!/bin/bash -e
-
-rm -f "${ROOTFS_DIR}/root/.vnc/private.key"
@@ -0,0 +1,4 @@
+#!/bin/bash -e
+
+ln -sf /etc/systemd/system/[email protected] \
+	"${ROOTFS_DIR}/etc/systemd/system/getty.target.wants/[email protected]"
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-ln -sf /etc/systemd/system/[email protected] ${ROOTFS_DIR}/etc/systemd/system/getty.target.wants/[email protected]
-
-install -v -m 644 files/40-scratch.rules ${ROOTFS_DIR}/etc/udev/rules.d/
@@ -1 +0,0 @@
-ATTRS{idVendor}=="0694", ATTRS{idProduct}=="0003", SUBSYSTEMS=="usb", ACTION=="add", MODE="0666", GROUP="plugdev"
@@ -1,13 +0,0 @@
-Index: jessie-stage4/rootfs/etc/lightdm/lightdm.conf
-===================================================================
--- jessie-stage4.orig/rootfs/etc/lightdm/lightdm.conf
-+++ jessie-stage4/rootfs/etc/lightdm/lightdm.conf
-@@ -114,7 +114,7 @@
- #session-setup-script=
- #session-cleanup-script=
- #autologin-guest=false
-#autologin-user=
-+autologin-user=pi
- #autologin-user-timeout=0
- #autologin-in-background=false
- #autologin-session=UNIMPLEMENTED
@@ -1 +0,0 @@
-0-autologin.diff
@@ -1,58 +1,25 @@
 #!/bin/bash -e

-HASH=`wget https://api.github.com/repos/KenT2/python-games/git/refs/heads/master -qO -| grep \"sha\" | cut -f 2 -d ':' | cut -f 2 -d \"`
+HASH="$(wget https://api.github.com/repos/KenT2/python-games/git/refs/heads/master -qO -| grep \"sha\" | cut -f 2 -d ':' | cut -f 2 -d \")"

 if [ -f files/python_games.hash ]; then
-	HASH_LOCAL=`cat files/python_games.hash`
+	HASH_LOCAL="$(cat files/python_games.hash)"
 fi

 if [ ! -e files/python_games.tar.gz ] || [ "$HASH" != "$HASH_LOCAL"  ]; then
 	wget "https://github.com/KenT2/python-games/tarball/master" -O files/python_games.tar.gz
-	echo $HASH > files/python_games.hash
+	echo "$HASH" > files/python_games.hash
 fi

-ln -sf pip3 ${ROOTFS_DIR}/usr/bin/pip-3.2
+ln -sf pip3 "${ROOTFS_DIR}/usr/bin/pip-3.2"

-install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/python_games
-tar xvf files/python_games.tar.gz -C ${ROOTFS_DIR}/home/pi/python_games --strip-components=1
-chown 1000:1000 ${ROOTFS_DIR}/home/pi/python_games -Rv
-chmod +x ${ROOTFS_DIR}/home/pi/python_games/launcher.sh
-
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents/BlueJ Projects"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents/Greenfoot Projects"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents/Scratch Projects"
-rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/doc/BlueJ/ "${ROOTFS_DIR}/home/pi/Documents/BlueJ Projects"
-rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/doc/Greenfoot/ "${ROOTFS_DIR}/home/pi/Documents/Greenfoot Projects"
-rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/scratch/Projects/Demos/ "${ROOTFS_DIR}/home/pi/Documents/Scratch Projects"
+install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/python_games"
+tar xvf files/python_games.tar.gz -C "${ROOTFS_DIR}/home/pi/python_games" --strip-components=1
+chown 1000:1000 "${ROOTFS_DIR}/home/pi/python_games" -Rv
+chmod +x "${ROOTFS_DIR}/home/pi/python_games/launcher.sh"

 #Alacarte fixes
 install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local"
 install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local/share"
 install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local/share/applications"
 install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local/share/desktop-directories"
-
-install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config
-install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/pcmanfm
-install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/pcmanfm/LXDE-pi
-install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/openbox
-install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/lxsession
-install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.themes
-install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/gtk-3.0
-install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/lxpanel
-install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/Desktop
-
-install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/etc/xdg/pcmanfm/LXDE-pi/pcmanfm.conf ${ROOTFS_DIR}/home/pi/.config/pcmanfm/LXDE-pi/
-install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/etc/xdg/pcmanfm/LXDE-pi/desktop-items-0.conf ${ROOTFS_DIR}/home/pi/.config/pcmanfm/LXDE-pi/
-
-install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/etc/xdg/openbox/lxde-pi-rc.xml ${ROOTFS_DIR}/home/pi/.config/openbox/
-
-rsync -a --chown=1000:1000 ${ROOTFS_DIR}/etc/xdg/lxsession/LXDE-pi ${ROOTFS_DIR}/home/pi/.config/lxsession/
-rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/themes/PiX ${ROOTFS_DIR}/home/pi/.themes/
-
-install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/usr/share/raspi-ui-overrides/gtk.css ${ROOTFS_DIR}/home/pi/.config/gtk-3.0/
-
-install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/usr/share/raspi-ui-overrides/Trolltech.conf ${ROOTFS_DIR}/home/pi/.config/
-
-install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/etc/xdg/lxpanel/launchtaskbar.cfg ${ROOTFS_DIR}/home/pi/.config/lxpanel/
-rsync -a --chown=1000:1000 ${ROOTFS_DIR}/etc/xdg/lxpanel/profile/LXDE-pi ${ROOTFS_DIR}/home/pi/.config/lxpanel/
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-on_chroot sh -e - <<EOF
-apt-get clean
-EOF
@@ -0,0 +1,4 @@
+IMG_SUFFIX="-4GB"
+if [ "${USE_QEMU}" = "1" ]; then
+	export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
+fi
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Serge Schneider	589afcc72d	Update release notes	2018-03-15 14:29:28 +00:00
Serge Schneider	ff2d5edee1	shellcheck	2018-03-13 12:50:50 +00:00
Serge Schneider	56da271499	Remove unnecessary files	2018-03-13 12:37:13 +00:00
Junian Triajianto	019d47db3b	Update stage specification using SKIP_IMAGES (#163 ) Change Stage specification guide from removing `EXPORT*` files to adding `SKIP_IMAGES` as per new recommended development process.	2018-03-13 10:20:22 +00:00
andig	b4035400ff	Add option to preserve build container (#160 )	2018-03-05 15:35:11 +00:00
Serge Schneider	4d689a25fd	export-image: don't round up if already a multiple of 4MB Fixes #156	2018-03-01 18:02:01 +00:00
James Ruan	40eae05204	make root filesystem 4M aligned (#154 )	2018-03-01 17:52:26 +00:00
Serge Schneider	e6f7cd5cd6	stage2: don't set 'country' in wpa_supplicant.conf	2018-03-01 15:54:13 +00:00
Serge Schneider	c430f618d0	Remove ld.so.preload and policy-rc.d changes	2018-03-01 15:54:12 +00:00
Serge Schneider	4c7980fa1e	stage4: drop 'Documents' directory Closes #121	2018-03-01 15:54:12 +00:00
Serge Schneider	702b3e7e80	stage3: install obconf	2018-03-01 15:54:12 +00:00
Philip Howard	cace22768a	Added Button SHIM, Unicorn HAT HD and Pan Tilt HAT (#159 )	2018-03-01 13:58:09 +00:00
Ben Pirt	066eb03d52	Allow image building to be skipped for stages (#137 )	2018-01-03 12:48:31 +00:00
andig	40e5dae819	Correct help text (#145 )	2018-01-02 18:17:07 +00:00
Ben Pirt	6e32569415	Update README with some information on how the build works (#136 )	2017-12-15 11:31:40 +00:00
Serge Schneider	13185c8224	stage2: install policykit-1 Closes #116	2017-12-13 11:17:58 +00:00
Serge Schneider	b71bf31793	Update os.json	2017-11-24 10:12:09 +00:00
Serge Schneider	4b08ad07b1	Update release notes	2017-11-24 10:12:08 +00:00
Serge Schneider	aa8731012e	Round image size up to nearest 4M block	2017-11-24 10:12:08 +00:00
Serge Schneider	53259b48d3	Remove fonts-arkpandora	2017-11-24 07:10:45 +00:00
Serge Schneider	5c44fc727e	stage2: install man-db	2017-11-24 07:10:45 +00:00
Andrew Wedgbury	35994f5d9c	Remove /etc/vnc/updateid when finalising	2017-11-22 15:49:37 +00:00
XECDesign	31fcc80953	Fix typo in export-image Fixes #132	2017-11-07 05:43:01 +00:00
XECDesign	90adfb1551	Label root partition Fixes #131	2017-11-06 10:53:05 +00:00
Rick	9f2941954f	Add caution about WORK_DIR filesystem	2017-09-28 13:40:58 +01:00
Claus Strasburger	52c6748e67	fix docker-in-docker copying when not doing CONTINUE=1	2017-09-21 15:06:11 +01:00
Claus Strasburger	732a87415d	Docker-Build enhancements - don't use any volume mounts anymore to allow using docker-in-docker (with docker.sock mounted) - smaller Docker build context by ignoring some files	2017-09-21 12:53:01 +01:00
Serge Schneider	9aa87dbfb4	Fix font packages	2017-09-21 12:45:05 +01:00
Jacen	26fcf59f3f	[adding] qemu emulation layout to test images with qemu	2017-09-14 10:12:30 +01:00
Serge Schneider	496e41575e	Revert "stage2: install fdisk" This reverts commit `e7e04fcde3`.	2017-09-05 14:34:19 +01:00
Serge Schneider	e7e04fcde3	stage2: install fdisk	2017-09-05 14:29:33 +01:00
Serge Schneider	5024709d70	Update release notes	2017-09-05 12:36:58 +01:00
Jacen	727db0ed63	[fixing] docker parts	2017-09-04 16:43:25 +01:00
Serge Schneider	e64ea5bce4	stage3: install fonts-droid-fallback	2017-09-04 14:06:23 +01:00
Serge Schneider	63c312d1fe	Update release notes	2017-09-04 12:17:49 +01:00
Serge Schneider	2f032b1d19	Update README.md Fixes #105	2017-09-04 09:39:04 +01:00
Serge Schneider	05b31b287d	Dockerfile: set DEBIAN_FRONTEND noninteractive	2017-08-31 11:27:33 +01:00
Serge Schneider	b8c94731c5	stage1: fix symlink creation Fixes #100	2017-08-31 11:24:01 +01:00
James Ruan	c0513c547a	export-image: when work in a non-English locale environment the PARTUUID will silently fail, resulting to an unbootable image file. (#96 ) * use dd and xxd to get disk identifier * add xxd as dependency	2017-08-31 11:22:33 +01:00
Serge Schneider	dc0fb57fb9	stage2: install net-tools explicitly	2017-08-24 16:31:15 +01:00
Serge Schneider	fcb8cca6ce	NOOBS: bsdtar with --numeric-owner	2017-08-22 13:03:21 +01:00
Serge Schneider	ce46fac1d4	Disable predictable network interface names	2017-08-21 10:15:50 +01:00
Russ K	3cc13f2aa2	Check for curl as a dependency for export-image (#95 ) * Check for curl as a dependency for export-image * Add curl to the Dockerfile	2017-08-21 09:48:55 +01:00
Serge Schneider	4dc1e1670e	Update release notes	2017-08-17 14:46:35 +01:00
Serge Schneider	aaaf0aea13	Update release notes	2017-08-14 15:33:06 +01:00
Serge Schneider	c2db8285a1	Disable 64bit filesystem feature	2017-08-11 17:39:58 +01:00
Serge Schneider	3fe8d79947	Remove pulseaudio	2017-07-28 13:35:46 +01:00
Serge Schneider	8d40bc1bb4	stage3: Add gldriver-test	2017-07-28 13:35:46 +01:00
Serge Schneider	178b1e404b	Remove NTP in favour of systemd-timesyncd	2017-07-28 13:35:46 +01:00
Serge Schneider	f2060a8ee2	export-noobs: enable NOOBS config script here instead of stage2	2017-07-28 13:35:46 +01:00
Serge Schneider	7149e20f2d	export-image: generate .info file	2017-07-28 13:35:46 +01:00
Serge Schneider	207003b5ed	stage2: Move ssh host key regen and NOOBS config scripts to raspberrypi-sys-mods	2017-07-28 13:35:46 +01:00
Serge Schneider	c77669ad9f	stage2: firmware-ralink renamed to firmware-misc-nonfree	2017-07-28 13:35:46 +01:00
Serge Schneider	6618df4b08	stage2: update wait.conf	2017-07-28 13:35:46 +01:00
Serge Schneider	0f5f10d925	stage4: install liberation2 font	2017-07-28 13:35:46 +01:00
Serge Schneider	19fc4a367e	stage2: Add htop	2017-07-28 13:35:46 +01:00
Serge Schneider	036e5242b3	stage2: Add libmtp-runtime and rsync	2017-07-28 13:35:46 +01:00
Serge Schneider	8f361a1c38	Switch to Stretch	2017-07-28 13:35:46 +01:00
Serge Schneider	68cdf34cb4	Add xz-utils dependency Closes #90	2017-07-28 13:22:03 +01:00
TJ Rana	3441133d1c	Corrected various typos (#91 ) * Rename License.md to LICENSE * Correct typos * Clean up code layout Organize layout with extra lines	2017-07-27 12:11:07 +02:00
Claus Strasburger	fe45b73987	Added docker-compose.yml for easy apt-cacher-ng startup	2017-07-17 12:21:37 +02:00
Claus Strasburger	bab0fe3b0d	Docker build: move to debian stretch	2017-07-17 12:21:28 +02:00
Russ Kubes	4d65b2b357	Export-image: Only disable metadata_csum feature if it's possibly enabled.	2017-07-17 11:36:43 +02:00
Serge Schneider	137efd2379	Update release notes	2017-07-10 14:29:11 +01:00
Serge Schneider	dd7de2554c	Update release notes	2017-07-05 11:23:54 +01:00
Serge Schneider	234c4b7937	Export-image: disable metadata_csum for compatibility with older SD card copiers	2017-07-03 16:40:23 +01:00
Serge Schneider	be2018ee5f	README: Add stage 5 description	2017-06-27 13:16:41 +01:00
Andrew Smith	cdf1cf2aba	Also use -v in error message	2017-06-27 13:10:09 +01:00
Andrew Smith	22c4105b57	Tell docker to delete the volume as well Addresses #62 Because of the use of volumes the .img files (and everything else) will stay around on disk even when you do `docker rm pigen_work`. Passing `-v` deletes the volume as well and frees up disk space.	2017-06-27 13:10:09 +01:00
Jacob Siverskog	d2f88a6e4f	Update stage specification example The previous example failed for me due to a missing SKIP in stage5. While at it, complete the example with all steps needed to get an image generated.	2017-06-27 13:09:40 +01:00
Thomas Phillips	c92638438a	Fixed running docker script from within pwd containing spaces	2017-06-27 13:08:08 +01:00
Thomas Phillips	50e5c01f57	Image build date now honours timezone	2017-06-27 13:06:50 +01:00
Serge Schneider	a0060bd475	export-image: increase free space padding	2017-06-21 10:56:07 +01:00
Serge Schneider	d2b8d634b9	export-image: switch from fallocate to truncate	2017-06-21 10:46:10 +01:00
Serge Schneider	d347d8d5f7	stage0: configure apt before locales	2017-06-21 08:55:30 +01:00
Serge Schneider	530b66fd3f	bootstrap: cope with NFS and FUSE filesystems	2017-06-20 16:17:12 +01:00
Serge Schneider	02728fe65e	export-image: use apparent size when calculating disk usage	2017-06-20 16:13:59 +01:00
Serge Schneider	e583c18eba	stage4: install python3-thonny	2017-06-20 16:12:32 +01:00
Serge Schneider	046db2d3d3	NOOBS: update kernel version number	2017-06-20 16:11:17 +01:00
Serge Schneider	f9637fb24e	Update release notes	2017-05-15 16:46:18 +01:00
Serge Schneider	921202e371	stage4: add /etc/mtab symlink	2017-05-15 16:40:31 +01:00
Serge Schneider	dc7b589e7a	Move rpi-update from stage3 to stage2	2017-05-15 15:46:59 +01:00
Serge Schneider	3c0b364028	stage0: Install locales fixes #65	2017-05-15 14:48:25 +01:00
Serge Schneider	51f27e752c	stage4: Add Thonny	2017-05-10 13:43:50 +01:00
Serge Schneider	f89ebe2382	stage4: Add Scratch 2	2017-05-10 13:43:50 +01:00
Serge Schneider	d64c21bfc9	stage4: Add pimoroni's packages	2017-05-10 13:43:50 +01:00
Ben Nuttall	7bbaac3344	Shorten config.txt url Because why not? :)	2017-05-10 13:32:43 +01:00
Serge Schneider	8e377c407f	stage0: Verify Releases during bootstrap Fixes #5	2017-05-10 13:09:20 +01:00
Serge Schneider	4e5dc43a36	stage4: Install 'git' instead of transitional package 'git-core' Fixes #11	2017-05-08 16:49:13 +01:00
T. Joseph Carter	d729fc2dbb	README.md: Describe more config variables, cleanup Added some documentation of environment variables to README.md, specifically WORK_DIR and DEPLOY_DIR. Explicitly did not include SCRIPT_DIR at this time because that appears to require some small work before it can be changed. Took the chance for some other syntax cleanups while I was at it, mostly breaking long lines and inserting whitespace where some Markdown parsers require it.	2017-05-08 16:25:04 +01:00
Serge Schneider	0ee2578bc6	export-noobs: replace all spaces with underscores in OS icon file	2017-04-03 16:39:20 +01:00
Serge Schneider	fa1e67f92e	export-noobs: rename Raspbian.png to match NOOBS_NAME	2017-04-03 16:19:20 +01:00
Serge Schneider	7360f24430	Add a 4GB image	2017-04-03 16:01:13 +01:00
Serge Schneider	6c146a7bb7	Clean up clean up	2017-04-03 16:01:13 +01:00
Serge Schneider	c0a5b85f8f	Update release notes	2017-04-03 16:01:13 +01:00
Benjamin Parzella	762e20cc0a	Minor error in stage2 sys-tweaks debconf file Seems like there is a misplaced line break	2017-04-03 15:59:16 +01:00
Mike Roberts	000e61f84d	Updated {i}-run-chroot script filename to match {i}-run.sh format	2017-03-20 15:53:55 +01:00
David C Wang	16b3133f46	Make WORK_DIR and DEPLOY_DIR configurable through config file	2017-03-14 14:00:28 +00:00
Serge Schneider	9cffa42a35	config.txt: update documentation URL	2017-03-13 17:46:14 +00:00
Serge Schneider	8373e58195	build.sh: execute postrun.sh, if executable	2017-03-13 17:44:31 +00:00
Serge Schneider	1f1ddb5f13	Specify additional variables in EXPORT_* files	2017-03-13 17:39:58 +00:00
Serge Schneider	8f22f2f27e	stage2: install libpam-chksshpwd	2017-03-13 17:31:49 +00:00
Serge Schneider	718a4e8c21	Switch to PARTUUID	2017-03-07 15:14:03 +00:00
Serge Schneider	8e74b4f15c	Revert "Enable pi-gen build when "pi-gen/work" dir is a symlink" This reverts commit `40b5af925b`.	2017-03-06 14:37:13 +00:00
Serge Schneider	8f7c537d71	partition_setup.sh: Only copy files	2017-03-06 11:58:48 +00:00
David C Wang	40b5af925b	Enable pi-gen build when "pi-gen/work" dir is a symlink * Occasionally, it is necessary to symbolically link the pi-gen/work directory to a different place on the filesystem. This is true if the current partition is low on space, or when building within vagrant virtual machine shared mounts which do not support all regular fs operations. * Without this change, the pi-gen build will fail to unmount because the OS 'mount' command returns canonical paths which fails to match the symbolically linked path to 'work' dir.	2017-03-06 11:56:12 +00:00
Serge Schneider	7748ed0df1	Copy wpa_supplicant.conf from NOOBS	2017-03-06 11:49:13 +00:00
Serge Schneider	b0be14afdf	Update release notes	2017-03-06 09:27:48 +00:00
Serge Schneider	daa9e35ada	Copy ssh and ssh.txt to boot partition	2017-03-06 09:27:48 +00:00
Serge Schneider	a68a0713e6	Format boot partition as FAT32	2017-03-06 09:27:48 +00:00
Serge Schneider	d664bfed4b	Update release notes	2017-03-06 09:27:48 +00:00
Serge Schneider	5cccd741fe	stage4: install RealVNC with no recommends	2017-03-06 09:27:48 +00:00
Serge Schneider	3fa66a0699	Update release notes	2017-03-06 09:27:48 +00:00
Serge Schneider	37902fb114	export-image: Format /boot as FAT32	2017-03-06 09:27:48 +00:00
Serge Schneider	51fbf45dd7	stage2: Manually install /etc/default/console-setup debconf alone does not seem to work	2017-03-06 09:27:48 +00:00
Ross Schulman	8f017cb69a	Building in a different direction by replacing stage folders (#51 )	2017-02-26 18:12:37 +00:00
Sam Holmes	a45a061ec4	Add README warning for binfmt-support requirement (#46 )	2017-02-08 16:10:11 +00:00
Claus F. Strasburger	667318116a	Added Docker support (#40 ) * Added Docker support - replaced necessity for devicemapper (through kpartx) by using parted and losetup with offsets - added Dockerfile - added dependency for parted and grep - added hints to README.md - common: loop through unmounts, fix shellcheck warnings * stage2: use debconf instead of console-setup patch. Fixes #41	2017-01-23 12:44:03 +00:00
XECDesign	bc8a74858e	Merge pull request #43 from sam3d/dev Add stage specification documentation	2017-01-20 17:51:55 +00:00
Sam Holmes	a1c26242f6	Add stage specification instructions	2017-01-20 17:38:41 +00:00
Sam Holmes	c5e36bc86a	Tidy up README hierarchy further	2017-01-20 17:38:41 +00:00
Sam Holmes	9f5cfdea6b	Update README markdown formatting The additional space between the # at the beginning of a section and title conforms to correct markdown spec (and works in all markdown renderers, as opposed to just GitHub)	2017-01-20 17:38:37 +00:00
Serge Schneider	1806504983	stage2: Add apt-transport-https Fixes RPi-Distro/repo#52	2017-01-12 14:24:43 +00:00
Serge Schneider	a9c27d27bd	stage4: don't copy ui-mods files	2016-12-06 16:32:33 +00:00
XECDesign	d0020af839	README.md: Add libcap2-bin as a dependency	2016-12-05 12:32:19 +00:00
XECDesign	09a29f745c	Merge pull request #35 from martignoni/dev Add bsdtar to dependencies	2016-12-05 12:31:09 +00:00
Nicolas Martignoni	2b3cb8ff72	Add bsdtar to dependencies	2016-12-04 20:38:28 +01:00
Serge Schneider	06ba664bfc	export-noobs: umount boot before archiving root bsdtar does not add directories which are mountpoints. This removes /boot from the archive and prevents init_resize.sh from working.	2016-11-29 14:42:40 +00:00
Serge Schneider	848cbf48a0	partition_setup.sh: Don't cut off parameters added by pix-plym-splash	2016-11-29 14:42:14 +00:00
Serge Schneider	21a681692a	Port regenerate_ssh_host_key to a systemd service	2016-11-24 20:07:05 +00:00
Serge Schneider	c5e4f61df2	regenerate_ssh_host_keys: run in the foreground	2016-11-24 17:41:10 +00:00
Serge Schneider	58e7e4023e	Disable SSH by default	2016-11-23 16:15:22 +00:00
Serge Schneider	845496123b	export-noobs: use gnutar format for bsdtar	2016-11-22 12:12:40 +00:00
Serge Schneider	b84399f9aa	Update release notes	2016-11-21 18:33:26 +00:00
Serge Schneider	09590eba4a	export-noobs: use bsdtar	2016-11-21 18:00:51 +00:00
Serge Schneider	c4fb032d3b	Use capsh to ensure file capabilities aren't set	2016-11-14 23:55:45 +00:00
Serge Schneider	db10424a9b	stage4: add pprompt	2016-11-14 18:04:10 +00:00
Serge Schneider	354be6e00b	Fix .config permissions	2016-11-14 18:03:57 +00:00
Serge Schneider	88622b63d3	Remove unnecessary lightdm patch	2016-11-14 18:03:12 +00:00
XECDesign	dd72c202ce	Merge pull request #30 from turbobytes/dev adding mkdosfs to depends file	2016-11-14 16:24:44 +00:00
Sajal Kayan	a6c7ad7736	adding mkdosfs to depends file	2016-11-14 23:17:06 +07:00
XECDesign	efb26e03d8	adding dosfstools as a build dependency (#29 )	2016-11-14 15:43:56 +00:00
Sajal Kayan	ed1643bcda	adding dosfstools as a build dependency	2016-11-14 22:38:59 +07:00
Serge Schneider	0908332966	stage4: remove autologin patch (added to lightdm)	2016-10-27 17:43:05 +01:00
Serge Schneider	5854406f80	stage4: remove 40-scratch.rules (added to nuscratch)	2016-10-27 17:43:05 +01:00
Serge Schneider	c017c51d46	stage3: pre-seed rpi-chromium-mods/adobe note	2016-10-27 17:43:05 +01:00
Serge Schneider	e06f61b573	stage2: remove sudoers modification (merged into raspberrypi-sys-mods)	2016-10-18 16:46:21 +01:00
Serge Schneider	801c8cac74	stage3: don't install udisks	2016-10-18 15:25:54 +01:00
Serge Schneider	71793ce183	stage2: install raspberrypi-net-mods	2016-10-18 15:23:02 +01:00
Serge Schneider	232d0a48a0	Remove desktop-background setting (not used by PIXEL)	2016-10-18 15:23:02 +01:00
Serge Schneider	e800956bd8	Remove changes transferred into raspberrypi-ui-mods	2016-10-18 15:23:02 +01:00
Serge Schneider	24ad8c2adb	Revert `7f0c59d5c1`	2016-10-14 15:00:12 +01:00
chz^3	017d3a4341	rsync single file system (#25 ) If proc is mounted in rootfs (e.g., via chroot), rsync will try copying kcore when permitted to cross file system boundaries.	2016-10-09 22:09:25 +01:00
Joseph Carter	d1f766d2b8	Fix umount_image (#22 ) * export-noobs/prerun.sh: Use nested mountpoint While it seems elegant and intuitive to use separate bootfs and rootfs mountpoints for compressing the partitions, doing so violates a precondition of unmount_image that they be mounted as a tree. This causes the image to not be properly unmounted and detached. A better solution might be to pack up the previous stage's chroot directory, but that rework can wait for the time being. scripts/common.sh: Output device name correctly A misplaced ) in unmount_image caused the loop device to be incorrectly identified, resulting in a fair bit of chaos trying to unmount other filesystems on /dev/mapper devices. Such as / on a LUKS-encrypted installation, for example. The unmount will fail as it should and build.sh will abort the build without any cleanup. Best to avoid that. These changes close RPi-Distro/pi-gen#19	2016-10-06 10:14:43 +01:00
Joseph Carter	1d18e27f9c	README.md: Improve config variable documentation (#24 )	2016-10-05 22:56:45 +01:00
Greg MacLellan	7f0c59d5c1	Add MAX_STAGE and RUN_STAGE variables (#21 ) * Add MAX_STAGES variable If set, only runs up to that stage * Show "Skipping stageX" message for all skipped stages * Add RUN_STAGE variable to run a single stage * Document RUN_STAGE and MAX_STAGE * Removed SKIP file support for main stage	2016-10-05 09:32:03 +01:00
				`@@ -1 +0,0 @@`
				`ATTRS{idVendor}=="0694", ATTRS{idProduct}=="0003", SUBSYSTEMS=="usb", ACTION=="add", MODE="0666", GROUP="plugdev"`