From d729fc2dbbfc4bae691b6cc3be51b446fccbf8f1 Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <tjcarter@spiritsubstance.com>
Date: Sat, 6 May 2017 16:16:00 -0700
Subject: [PATCH 01/27] 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.
---
 README.md | 66 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 57 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 0603869698..8ee6506b90 100755
--- a/README.md
+++ b/README.md
@@ -1,12 +1,24 @@
 # pi-gen
+
 _Tool used to create the raspberrypi.org Raspbian images_
 
+
 ### TODO
 1. Documentation
 
+
 ## Dependencies
 
-`quilt parted realpath qemu-user-static debootstrap zerofree pxz zip dosfstools bsdtar libcap2-bin grep rsync`
+On Debian-based systems:
+
+```bash
+apt-get install quilt parted realpath qemu-user-static debootstrap zerofree pxz zip \
+dosfstools bsdtar libcap2-bin grep rsync
+```
+
+The file `depends` contains a list of tools needed.  The format of this
+package is `<tool>[:<debian-package>]`.
+
 
 ## Config
 
@@ -29,29 +41,57 @@ The following environment variables are supported:
    will not be included in the image, making it safe to use an `apt-cacher` or
    similar package for development.
 
+ * `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.
+
+ * `DEPLOY_DIR`  (Default: `"$BASE_DIR/deploy"`)
+
+   Output directory for target system images and NOOBS bundles.
+
+
 A simple example for building Raspbian:
 
 ```bash
 IMG_NAME='Raspbian'
 ```
 
+
 ## Docker Build
 
 ```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 pigen_work`
 
 If something breaks along the line, you can edit the corresponding scripts, and
 continue:
 
-```
+```bash
 CONTINUE=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).
+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
 
@@ -104,14 +144,22 @@ maintenance and allows for more easy customization.
    the stage that installs all of the things that make Raspbian friendly to
    new users.
 
+
 ### 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 remove the `EXPORT*` files from `./stage4` (if building up to stage 2) or from `./stage2` (if building a minimal system).
+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 remove the `EXPORT*` files from `./stage4` (if building up to stage 2) or
+from `./stage2` (if building a minimal system).
+
+```bash
 # Example for building a lite system
-$ touch ./stage3/SKIP ./stage4/SKIP
-$ rm stage4/EXPORT*
+touch ./stage3/SKIP ./stage4/SKIP
+rm stage4/EXPORT*
 ```
-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.
+
+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.

From 4e5dc43a36ea0f0512fd67c432e5df7aadab19ed Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Mon, 8 May 2017 16:48:34 +0100
Subject: [PATCH 02/27] stage4: Install 'git' instead of transitional package
 'git-core'

Fixes #11
---
 stage3/00-install-packages/00-packages | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages
index 2ed3b2a984..d7966ce461 100644
--- a/stage3/00-install-packages/00-packages
+++ b/stage3/00-install-packages/00-packages
@@ -1,7 +1,8 @@
 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
+rpi-update
 omxplayer
 raspberrypi-artwork
 policykit-1

From 8e377c407fff9469df598b8013ea36b81b1242bb Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Wed, 10 May 2017 13:08:02 +0100
Subject: [PATCH 03/27] stage0: Verify Releases during bootstrap

Fixes #5
---
 scripts/common               |   4 ++--
 stage0/files/raspberrypi.gpg | Bin 0 -> 2424 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 stage0/files/raspberrypi.gpg

diff --git a/scripts/common b/scripts/common
index bd18a07e20..74f9c4ce6a 100644
--- a/scripts/common
+++ b/scripts/common
@@ -16,8 +16,8 @@ bootstrap(){
 	fi
 
 	capsh --drop=cap_setfcap -- -c "${BOOTSTRAP_CMD} --components=main,contrib,non-free \
-		--arch armhf\
-		--no-check-gpg \
+		--arch armhf \
+		--keyring "${STAGE_DIR}/files/raspberrypi.gpg" \
 		$1 $2 $3"
 }
 export -f bootstrap
diff --git a/stage0/files/raspberrypi.gpg b/stage0/files/raspberrypi.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..fe1d207eb1ec50f159e3b99415dd00b363262fb4
GIT binary patch
literal 2424
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

literal 0
HcmV?d00001


From 7bbaac3344807e81d491a859168c83ef469a250f Mon Sep 17 00:00:00 2001
From: Ben Nuttall <ben@bennuttall.com>
Date: Fri, 17 Mar 2017 20:12:09 +0000
Subject: [PATCH 04/27] Shorten config.txt url

Because why not? :)
---
 stage1/00-boot-files/files/config.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage1/00-boot-files/files/config.txt b/stage1/00-boot-files/files/config.txt
index 9c6860c4c3..06364c54e4 100644
--- a/stage1/00-boot-files/files/config.txt
+++ b/stage1/00-boot-files/files/config.txt
@@ -1,5 +1,5 @@
 # For more options and information see
-# http://rpf.io/configtxtreadme
+# 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

From d64c21bfc9a2d729e769d480025531985d7f17b3 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Mon, 8 May 2017 16:56:11 +0100
Subject: [PATCH 05/27] stage4: Add pimoroni's packages

---
 stage4/00-install-packages/01-packages | 19 +++++++++++++++++++
 stage5/EXPORT_NOOBS                    |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 stage4/00-install-packages/01-packages

diff --git a/stage4/00-install-packages/01-packages b/stage4/00-install-packages/01-packages
new file mode 100644
index 0000000000..4ede68ee42
--- /dev/null
+++ b/stage4/00-install-packages/01-packages
@@ -0,0 +1,19 @@
+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
diff --git a/stage5/EXPORT_NOOBS b/stage5/EXPORT_NOOBS
index a7e95afd80..908acc8294 100644
--- a/stage5/EXPORT_NOOBS
+++ b/stage5/EXPORT_NOOBS
@@ -1,2 +1,2 @@
-NOOBS_NAME="Raspbian with PIXEL"
+NOOBS_NAME="Raspbian"
 NOOBS_DESCRIPTION="A port of Debian jessie for the Raspberry Pi (full desktop version)"

From f89ebe2382fa516a70fb702413ca35314a8ef785 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Mon, 8 May 2017 17:50:20 +0100
Subject: [PATCH 06/27] stage4: Add Scratch 2

---
 stage4/00-install-packages/00-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages
index 80625b672a..8faa73da40 100644
--- a/stage4/00-install-packages/00-packages
+++ b/stage4/00-install-packages/00-packages
@@ -33,3 +33,4 @@ 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

From 51f27e752c5465c936d823368efe890122f0ae47 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Wed, 10 May 2017 11:48:43 +0100
Subject: [PATCH 07/27] stage4: Add Thonny

---
 stage4/00-install-packages/00-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages
index 8faa73da40..0568ce5e7b 100644
--- a/stage4/00-install-packages/00-packages
+++ b/stage4/00-install-packages/00-packages
@@ -34,3 +34,4 @@ python3-codebug-tether python3-codebug-i2c-tether
 python-sense-emu python3-sense-emu sense-emu-tools python-sense-emu-doc
 pprompt
 scratch2
+pi-thonny-theme

From 3c0b364028638c68d7995908a5ecc2b2a6842ba5 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Wed, 10 May 2017 17:05:32 +0100
Subject: [PATCH 08/27] stage0: Install locales

fixes #65
---
 stage0/00-locale/00-debconf      | 6 ++++++
 stage0/00-locale/00-packages     | 1 +
 stage2/01-sys-tweaks/00-debconf  | 6 ------
 stage2/01-sys-tweaks/00-packages | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 stage0/00-locale/00-debconf
 create mode 100644 stage0/00-locale/00-packages

diff --git a/stage0/00-locale/00-debconf b/stage0/00-locale/00-debconf
new file mode 100644
index 0000000000..e9d6348a34
--- /dev/null
+++ b/stage0/00-locale/00-debconf
@@ -0,0 +1,6 @@
+# Locales to be generated:
+# Choices: All locales, aa_DJ ISO-8859-1, aa_DJ.UTF-8 UTF-8, aa_ER UTF-8, aa_ER@saaho UTF-8, aa_ET UTF-8, af_ZA ISO-8859-1, af_ZA.UTF-8 UTF-8, ak_GH UTF-8, am_ET UTF-8, an_ES ISO-8859-15, an_ES.UTF-8 UTF-8, anp_IN UTF-8, ar_AE ISO-8859-6, ar_AE.UTF-8 UTF-8, ar_BH ISO-8859-6, ar_BH.UTF-8 UTF-8, ar_DZ ISO-8859-6, ar_DZ.UTF-8 UTF-8, ar_EG ISO-8859-6, ar_EG.UTF-8 UTF-8, ar_IN UTF-8, ar_IQ ISO-8859-6, ar_IQ.UTF-8 UTF-8, ar_JO ISO-8859-6, ar_JO.UTF-8 UTF-8, ar_KW ISO-8859-6, ar_KW.UTF-8 UTF-8, ar_LB ISO-8859-6, ar_LB.UTF-8 UTF-8, ar_LY ISO-8859-6, ar_LY.UTF-8 UTF-8, ar_MA ISO-8859-6, ar_MA.UTF-8 UTF-8, ar_OM ISO-8859-6, ar_OM.UTF-8 UTF-8, ar_QA ISO-8859-6, ar_QA.UTF-8 UTF-8, ar_SA ISO-8859-6, ar_SA.UTF-8 UTF-8, ar_SD ISO-8859-6, ar_SD.UTF-8 UTF-8, ar_SS UTF-8, ar_SY ISO-8859-6, ar_SY.UTF-8 UTF-8, ar_TN ISO-8859-6, ar_TN.UTF-8 UTF-8, ar_YE ISO-8859-6, ar_YE.UTF-8 UTF-8, as_IN UTF-8, ast_ES ISO-8859-15, ast_ES.UTF-8 UTF-8, ayc_PE UTF-8, az_AZ UTF-8, be_BY CP1251, be_BY.UTF-8 UTF-8, be_BY@latin UTF-8, bem_ZM UTF-8, ber_DZ UTF-8, ber_MA UTF-8, bg_BG CP1251, bg_BG.UTF-8 UTF-8, bho_IN UTF-8, bn_BD UTF-8, bn_IN UTF-8, bo_CN UTF-8, bo_IN UTF-8, br_FR ISO-8859-1, br_FR.UTF-8 UTF-8, br_FR@euro ISO-8859-15, brx_IN UTF-8, bs_BA ISO-8859-2, bs_BA.UTF-8 UTF-8, byn_ER UTF-8, ca_AD ISO-8859-15, ca_AD.UTF-8 UTF-8, ca_ES ISO-8859-1, ca_ES.UTF-8 UTF-8, ca_ES.UTF-8@valencia UTF-8, ca_ES@euro ISO-8859-15, ca_ES@valencia ISO-8859-15, ca_FR ISO-8859-15, ca_FR.UTF-8 UTF-8, ca_IT ISO-8859-15, ca_IT.UTF-8 UTF-8, cmn_TW UTF-8, crh_UA UTF-8, cs_CZ ISO-8859-2, cs_CZ.UTF-8 UTF-8, csb_PL UTF-8, cv_RU UTF-8, cy_GB ISO-8859-14, cy_GB.UTF-8 UTF-8, da_DK ISO-8859-1, da_DK.UTF-8 UTF-8, de_AT ISO-8859-1, de_AT.UTF-8 UTF-8, de_AT@euro ISO-8859-15, de_BE ISO-8859-1, de_BE.UTF-8 UTF-8, de_BE@euro ISO-8859-15, de_CH ISO-8859-1, de_CH.UTF-8 UTF-8, de_DE ISO-8859-1, de_DE.UTF-8 UTF-8, de_DE@euro ISO-8859-15, de_LI.UTF-8 UTF-8, de_LU ISO-8859-1, de_LU.UTF-8 UTF-8, de_LU@euro ISO-8859-15, doi_IN UTF-8, dv_MV UTF-8, dz_BT UTF-8, el_CY ISO-8859-7, el_CY.UTF-8 UTF-8, el_GR ISO-8859-7, el_GR.UTF-8 UTF-8, en_AG UTF-8, en_AU ISO-8859-1, en_AU.UTF-8 UTF-8, en_BW ISO-8859-1, en_BW.UTF-8 UTF-8, en_CA ISO-8859-1, en_CA.UTF-8 UTF-8, en_DK ISO-8859-1, en_DK.ISO-8859-15 ISO-8859-15, en_DK.UTF-8 UTF-8, en_GB ISO-8859-1, en_GB.ISO-8859-15 ISO-8859-15, en_GB.UTF-8 UTF-8, en_HK ISO-8859-1, en_HK.UTF-8 UTF-8, en_IE ISO-8859-1, en_IE.UTF-8 UTF-8, en_IE@euro ISO-8859-15, en_IN UTF-8, en_NG UTF-8, en_NZ ISO-8859-1, en_NZ.UTF-8 UTF-8, en_PH ISO-8859-1, en_PH.UTF-8 UTF-8, en_SG ISO-8859-1, en_SG.UTF-8 UTF-8, en_US ISO-8859-1, en_US.ISO-8859-15 ISO-8859-15, en_US.UTF-8 UTF-8, en_ZA ISO-8859-1, en_ZA.UTF-8 UTF-8, en_ZM UTF-8, en_ZW ISO-8859-1, en_ZW.UTF-8 UTF-8, eo ISO-8859-3, eo.UTF-8 UTF-8, es_AR ISO-8859-1, es_AR.UTF-8 UTF-8, es_BO ISO-8859-1, es_BO.UTF-8 UTF-8, es_CL ISO-8859-1, es_CL.UTF-8 UTF-8, es_CO ISO-8859-1, es_CO.UTF-8 UTF-8, es_CR ISO-8859-1, es_CR.UTF-8 UTF-8, es_CU UTF-8, es_DO ISO-8859-1, es_DO.UTF-8 UTF-8, es_EC ISO-8859-1, es_EC.UTF-8 UTF-8, es_ES ISO-8859-1, es_ES.UTF-8 UTF-8, es_ES@euro ISO-8859-15, es_GT ISO-8859-1, es_GT.UTF-8 UTF-8, es_HN ISO-8859-1, es_HN.UTF-8 UTF-8, es_MX ISO-8859-1, es_MX.UTF-8 UTF-8, es_NI ISO-8859-1, es_NI.UTF-8 UTF-8, es_PA ISO-8859-1, es_PA.UTF-8 UTF-8, es_PE ISO-8859-1, es_PE.UTF-8 UTF-8, es_PR ISO-8859-1, es_PR.UTF-8 UTF-8, es_PY ISO-8859-1, es_PY.UTF-8 UTF-8, es_SV ISO-8859-1, es_SV.UTF-8 UTF-8, es_US ISO-8859-1, es_US.UTF-8 UTF-8, es_UY ISO-8859-1, es_UY.UTF-8 UTF-8, es_VE ISO-8859-1, es_VE.UTF-8 UTF-8, et_EE ISO-8859-1, et_EE.ISO-8859-15 ISO-8859-15, et_EE.UTF-8 UTF-8, eu_ES ISO-8859-1, eu_ES.UTF-8 UTF-8, eu_ES@euro ISO-8859-15, eu_FR ISO-8859-1, eu_FR.UTF-8 UTF-8, eu_FR@euro ISO-8859-15, fa_IR UTF-8, ff_SN UTF-8, fi_FI ISO-8859-1, fi_FI.UTF-8 UTF-8, fi_FI@euro ISO-8859-15, fil_PH UTF-8, fo_FO ISO-8859-1, fo_FO.UTF-8 UTF-8, fr_BE ISO-8859-1, fr_BE.UTF-8 UTF-8, fr_BE@euro ISO-8859-15, fr_CA ISO-8859-1, fr_CA.UTF-8 UTF-8, fr_CH ISO-8859-1, fr_CH.UTF-8 UTF-8, fr_FR ISO-8859-1, fr_FR.UTF-8 UTF-8, fr_FR@euro ISO-8859-15, fr_LU ISO-8859-1, fr_LU.UTF-8 UTF-8, fr_LU@euro ISO-8859-15, fur_IT UTF-8, fy_DE UTF-8, fy_NL UTF-8, ga_IE ISO-8859-1, ga_IE.UTF-8 UTF-8, ga_IE@euro ISO-8859-15, gd_GB ISO-8859-15, gd_GB.UTF-8 UTF-8, gez_ER UTF-8, gez_ER@abegede UTF-8, gez_ET UTF-8, gez_ET@abegede UTF-8, gl_ES ISO-8859-1, gl_ES.UTF-8 UTF-8, gl_ES@euro ISO-8859-15, gu_IN UTF-8, gv_GB ISO-8859-1, gv_GB.UTF-8 UTF-8, ha_NG UTF-8, hak_TW UTF-8, he_IL ISO-8859-8, he_IL.UTF-8 UTF-8, hi_IN UTF-8, hne_IN UTF-8, hr_HR ISO-8859-2, hr_HR.UTF-8 UTF-8, hsb_DE ISO-8859-2, hsb_DE.UTF-8 UTF-8, ht_HT UTF-8, hu_HU ISO-8859-2, hu_HU.UTF-8 UTF-8, hy_AM UTF-8, hy_AM.ARMSCII-8 ARMSCII-8, ia_FR UTF-8, id_ID ISO-8859-1, id_ID.UTF-8 UTF-8, ig_NG UTF-8, ik_CA UTF-8, is_IS ISO-8859-1, is_IS.UTF-8 UTF-8, it_CH ISO-8859-1, it_CH.UTF-8 UTF-8, it_IT ISO-8859-1, it_IT.UTF-8 UTF-8, it_IT@euro ISO-8859-15, iu_CA UTF-8, iw_IL ISO-8859-8, iw_IL.UTF-8 UTF-8, ja_JP.EUC-JP EUC-JP, ja_JP.UTF-8 UTF-8, ka_GE GEORGIAN-PS, ka_GE.UTF-8 UTF-8, kk_KZ PT154, kk_KZ RK1048, kk_KZ.UTF-8 UTF-8, kl_GL ISO-8859-1, kl_GL.UTF-8 UTF-8, km_KH UTF-8, kn_IN UTF-8, ko_KR.EUC-KR EUC-KR, ko_KR.UTF-8 UTF-8, kok_IN UTF-8, ks_IN UTF-8, ks_IN@devanagari UTF-8, ku_TR ISO-8859-9, ku_TR.UTF-8 UTF-8, kw_GB ISO-8859-1, kw_GB.UTF-8 UTF-8, ky_KG UTF-8, lb_LU UTF-8, lg_UG ISO-8859-10, lg_UG.UTF-8 UTF-8, li_BE UTF-8, li_NL UTF-8, lij_IT UTF-8, lo_LA UTF-8, lt_LT ISO-8859-13, lt_LT.UTF-8 UTF-8, lv_LV ISO-8859-13, lv_LV.UTF-8 UTF-8, lzh_TW UTF-8, mag_IN UTF-8, mai_IN UTF-8, mg_MG ISO-8859-15, mg_MG.UTF-8 UTF-8, mhr_RU UTF-8, mi_NZ ISO-8859-13, mi_NZ.UTF-8 UTF-8, mk_MK ISO-8859-5, mk_MK.UTF-8 UTF-8, ml_IN UTF-8, mn_MN UTF-8, mni_IN UTF-8, mr_IN UTF-8, ms_MY ISO-8859-1, ms_MY.UTF-8 UTF-8, mt_MT ISO-8859-3, mt_MT.UTF-8 UTF-8, my_MM UTF-8, nan_TW UTF-8, nan_TW@latin UTF-8, nb_NO ISO-8859-1, nb_NO.UTF-8 UTF-8, nds_DE UTF-8, nds_NL UTF-8, ne_NP UTF-8, nhn_MX UTF-8, niu_NU UTF-8, niu_NZ UTF-8, nl_AW UTF-8, nl_BE ISO-8859-1, nl_BE.UTF-8 UTF-8, nl_BE@euro ISO-8859-15, nl_NL ISO-8859-1, nl_NL.UTF-8 UTF-8, nl_NL@euro ISO-8859-15, nn_NO ISO-8859-1, nn_NO.UTF-8 UTF-8, nr_ZA UTF-8, nso_ZA UTF-8, oc_FR ISO-8859-1, oc_FR.UTF-8 UTF-8, om_ET UTF-8, om_KE ISO-8859-1, om_KE.UTF-8 UTF-8, or_IN UTF-8, os_RU UTF-8, pa_IN UTF-8, pa_PK UTF-8, pap_AN UTF-8, pap_AW UTF-8, pap_CW UTF-8, pl_PL ISO-8859-2, pl_PL.UTF-8 UTF-8, ps_AF UTF-8, pt_BR ISO-8859-1, pt_BR.UTF-8 UTF-8, pt_PT ISO-8859-1, pt_PT.UTF-8 UTF-8, pt_PT@euro ISO-8859-15, quz_PE UTF-8, ro_RO ISO-8859-2, ro_RO.UTF-8 UTF-8, ru_RU ISO-8859-5, ru_RU.CP1251 CP1251, ru_RU.KOI8-R KOI8-R, ru_RU.UTF-8 UTF-8, ru_UA KOI8-U, ru_UA.UTF-8 UTF-8, rw_RW UTF-8, sa_IN UTF-8, sat_IN UTF-8, sc_IT UTF-8, sd_IN UTF-8, sd_IN@devanagari UTF-8, se_NO UTF-8, shs_CA UTF-8, si_LK UTF-8, sid_ET UTF-8, sk_SK ISO-8859-2, sk_SK.UTF-8 UTF-8, sl_SI ISO-8859-2, sl_SI.UTF-8 UTF-8, so_DJ ISO-8859-1, so_DJ.UTF-8 UTF-8, so_ET UTF-8, so_KE ISO-8859-1, so_KE.UTF-8 UTF-8, so_SO ISO-8859-1, so_SO.UTF-8 UTF-8, sq_AL ISO-8859-1, sq_AL.UTF-8 UTF-8, sq_MK UTF-8, sr_ME UTF-8, sr_RS UTF-8, sr_RS@latin UTF-8, ss_ZA UTF-8, st_ZA ISO-8859-1, st_ZA.UTF-8 UTF-8, sv_FI ISO-8859-1, sv_FI.UTF-8 UTF-8, sv_FI@euro ISO-8859-15, sv_SE ISO-8859-1, sv_SE.ISO-8859-15 ISO-8859-15, sv_SE.UTF-8 UTF-8, sw_KE UTF-8, sw_TZ UTF-8, szl_PL UTF-8, ta_IN UTF-8, ta_LK UTF-8, te_IN UTF-8, tg_TJ KOI8-T, tg_TJ.UTF-8 UTF-8, th_TH TIS-620, th_TH.UTF-8 UTF-8, the_NP UTF-8, ti_ER UTF-8, ti_ET UTF-8, tig_ER UTF-8, tk_TM UTF-8, tl_PH ISO-8859-1, tl_PH.UTF-8 UTF-8, tn_ZA UTF-8, tr_CY ISO-8859-9, tr_CY.UTF-8 UTF-8, tr_TR ISO-8859-9, tr_TR.UTF-8 UTF-8, ts_ZA UTF-8, tt_RU UTF-8, tt_RU@iqtelif UTF-8, ug_CN UTF-8, uk_UA KOI8-U, uk_UA.UTF-8 UTF-8, unm_US UTF-8, ur_IN UTF-8, ur_PK UTF-8, uz_UZ ISO-8859-1, uz_UZ.UTF-8 UTF-8, uz_UZ@cyrillic UTF-8, ve_ZA UTF-8, vi_VN UTF-8, wa_BE ISO-8859-1, wa_BE.UTF-8 UTF-8, wa_BE@euro ISO-8859-15, wae_CH UTF-8, wal_ET UTF-8, wo_SN UTF-8, xh_ZA ISO-8859-1, xh_ZA.UTF-8 UTF-8, yi_US CP1255, yi_US.UTF-8 UTF-8, yo_NG UTF-8, yue_HK UTF-8, zh_CN GB2312, zh_CN.GB18030 GB18030, zh_CN.GBK GBK, zh_CN.UTF-8 UTF-8, zh_HK BIG5-HKSCS, zh_HK.UTF-8 UTF-8, zh_SG GB2312, zh_SG.GBK GBK, zh_SG.UTF-8 UTF-8, zh_TW BIG5, zh_TW.EUC-TW EUC-TW, zh_TW.UTF-8 UTF-8, zu_ZA ISO-8859-1, zu_ZA.UTF-8 UTF-8
+locales	locales/locales_to_be_generated	multiselect	en_GB.UTF-8 UTF-8
+# Default locale for the system environment:
+# Choices: None, C.UTF-8, en_GB.UTF-8
+locales	locales/default_environment_locale	select	en_GB.UTF-8
diff --git a/stage0/00-locale/00-packages b/stage0/00-locale/00-packages
new file mode 100644
index 0000000000..a3068018e3
--- /dev/null
+++ b/stage0/00-locale/00-packages
@@ -0,0 +1 @@
+locales
diff --git a/stage2/01-sys-tweaks/00-debconf b/stage2/01-sys-tweaks/00-debconf
index 4ad03781c1..41e9435d63 100644
--- a/stage2/01-sys-tweaks/00-debconf
+++ b/stage2/01-sys-tweaks/00-debconf
@@ -13,12 +13,6 @@ tzdata	tzdata/Areas	select	Etc
 # Time zone:
 # Choices: GMT, GMT+0, GMT+1, GMT+10, GMT+11, GMT+12, GMT+2, GMT+3, GMT+4, GMT+5, GMT+6, GMT+7, GMT+8, GMT+9, GMT-0, GMT-1, GMT-10, GMT-11, GMT-12, GMT-13, GMT-14, GMT-2, GMT-3, GMT-4, GMT-5, GMT-6, GMT-7, GMT-8, GMT-9, GMT0, Greenwich, UCT, UTC, Universal, Zulu
 tzdata	tzdata/Zones/Etc	select	UTC
-# Locales to be generated:
-# Choices: All locales, aa_DJ ISO-8859-1, aa_DJ.UTF-8 UTF-8, aa_ER UTF-8, aa_ER@saaho UTF-8, aa_ET UTF-8, af_ZA ISO-8859-1, af_ZA.UTF-8 UTF-8, ak_GH UTF-8, am_ET UTF-8, an_ES ISO-8859-15, an_ES.UTF-8 UTF-8, anp_IN UTF-8, ar_AE ISO-8859-6, ar_AE.UTF-8 UTF-8, ar_BH ISO-8859-6, ar_BH.UTF-8 UTF-8, ar_DZ ISO-8859-6, ar_DZ.UTF-8 UTF-8, ar_EG ISO-8859-6, ar_EG.UTF-8 UTF-8, ar_IN UTF-8, ar_IQ ISO-8859-6, ar_IQ.UTF-8 UTF-8, ar_JO ISO-8859-6, ar_JO.UTF-8 UTF-8, ar_KW ISO-8859-6, ar_KW.UTF-8 UTF-8, ar_LB ISO-8859-6, ar_LB.UTF-8 UTF-8, ar_LY ISO-8859-6, ar_LY.UTF-8 UTF-8, ar_MA ISO-8859-6, ar_MA.UTF-8 UTF-8, ar_OM ISO-8859-6, ar_OM.UTF-8 UTF-8, ar_QA ISO-8859-6, ar_QA.UTF-8 UTF-8, ar_SA ISO-8859-6, ar_SA.UTF-8 UTF-8, ar_SD ISO-8859-6, ar_SD.UTF-8 UTF-8, ar_SS UTF-8, ar_SY ISO-8859-6, ar_SY.UTF-8 UTF-8, ar_TN ISO-8859-6, ar_TN.UTF-8 UTF-8, ar_YE ISO-8859-6, ar_YE.UTF-8 UTF-8, as_IN UTF-8, ast_ES ISO-8859-15, ast_ES.UTF-8 UTF-8, ayc_PE UTF-8, az_AZ UTF-8, be_BY CP1251, be_BY.UTF-8 UTF-8, be_BY@latin UTF-8, bem_ZM UTF-8, ber_DZ UTF-8, ber_MA UTF-8, bg_BG CP1251, bg_BG.UTF-8 UTF-8, bho_IN UTF-8, bn_BD UTF-8, bn_IN UTF-8, bo_CN UTF-8, bo_IN UTF-8, br_FR ISO-8859-1, br_FR.UTF-8 UTF-8, br_FR@euro ISO-8859-15, brx_IN UTF-8, bs_BA ISO-8859-2, bs_BA.UTF-8 UTF-8, byn_ER UTF-8, ca_AD ISO-8859-15, ca_AD.UTF-8 UTF-8, ca_ES ISO-8859-1, ca_ES.UTF-8 UTF-8, ca_ES.UTF-8@valencia UTF-8, ca_ES@euro ISO-8859-15, ca_ES@valencia ISO-8859-15, ca_FR ISO-8859-15, ca_FR.UTF-8 UTF-8, ca_IT ISO-8859-15, ca_IT.UTF-8 UTF-8, cmn_TW UTF-8, crh_UA UTF-8, cs_CZ ISO-8859-2, cs_CZ.UTF-8 UTF-8, csb_PL UTF-8, cv_RU UTF-8, cy_GB ISO-8859-14, cy_GB.UTF-8 UTF-8, da_DK ISO-8859-1, da_DK.UTF-8 UTF-8, de_AT ISO-8859-1, de_AT.UTF-8 UTF-8, de_AT@euro ISO-8859-15, de_BE ISO-8859-1, de_BE.UTF-8 UTF-8, de_BE@euro ISO-8859-15, de_CH ISO-8859-1, de_CH.UTF-8 UTF-8, de_DE ISO-8859-1, de_DE.UTF-8 UTF-8, de_DE@euro ISO-8859-15, de_LI.UTF-8 UTF-8, de_LU ISO-8859-1, de_LU.UTF-8 UTF-8, de_LU@euro ISO-8859-15, doi_IN UTF-8, dv_MV UTF-8, dz_BT UTF-8, el_CY ISO-8859-7, el_CY.UTF-8 UTF-8, el_GR ISO-8859-7, el_GR.UTF-8 UTF-8, en_AG UTF-8, en_AU ISO-8859-1, en_AU.UTF-8 UTF-8, en_BW ISO-8859-1, en_BW.UTF-8 UTF-8, en_CA ISO-8859-1, en_CA.UTF-8 UTF-8, en_DK ISO-8859-1, en_DK.ISO-8859-15 ISO-8859-15, en_DK.UTF-8 UTF-8, en_GB ISO-8859-1, en_GB.ISO-8859-15 ISO-8859-15, en_GB.UTF-8 UTF-8, en_HK ISO-8859-1, en_HK.UTF-8 UTF-8, en_IE ISO-8859-1, en_IE.UTF-8 UTF-8, en_IE@euro ISO-8859-15, en_IN UTF-8, en_NG UTF-8, en_NZ ISO-8859-1, en_NZ.UTF-8 UTF-8, en_PH ISO-8859-1, en_PH.UTF-8 UTF-8, en_SG ISO-8859-1, en_SG.UTF-8 UTF-8, en_US ISO-8859-1, en_US.ISO-8859-15 ISO-8859-15, en_US.UTF-8 UTF-8, en_ZA ISO-8859-1, en_ZA.UTF-8 UTF-8, en_ZM UTF-8, en_ZW ISO-8859-1, en_ZW.UTF-8 UTF-8, eo ISO-8859-3, eo.UTF-8 UTF-8, es_AR ISO-8859-1, es_AR.UTF-8 UTF-8, es_BO ISO-8859-1, es_BO.UTF-8 UTF-8, es_CL ISO-8859-1, es_CL.UTF-8 UTF-8, es_CO ISO-8859-1, es_CO.UTF-8 UTF-8, es_CR ISO-8859-1, es_CR.UTF-8 UTF-8, es_CU UTF-8, es_DO ISO-8859-1, es_DO.UTF-8 UTF-8, es_EC ISO-8859-1, es_EC.UTF-8 UTF-8, es_ES ISO-8859-1, es_ES.UTF-8 UTF-8, es_ES@euro ISO-8859-15, es_GT ISO-8859-1, es_GT.UTF-8 UTF-8, es_HN ISO-8859-1, es_HN.UTF-8 UTF-8, es_MX ISO-8859-1, es_MX.UTF-8 UTF-8, es_NI ISO-8859-1, es_NI.UTF-8 UTF-8, es_PA ISO-8859-1, es_PA.UTF-8 UTF-8, es_PE ISO-8859-1, es_PE.UTF-8 UTF-8, es_PR ISO-8859-1, es_PR.UTF-8 UTF-8, es_PY ISO-8859-1, es_PY.UTF-8 UTF-8, es_SV ISO-8859-1, es_SV.UTF-8 UTF-8, es_US ISO-8859-1, es_US.UTF-8 UTF-8, es_UY ISO-8859-1, es_UY.UTF-8 UTF-8, es_VE ISO-8859-1, es_VE.UTF-8 UTF-8, et_EE ISO-8859-1, et_EE.ISO-8859-15 ISO-8859-15, et_EE.UTF-8 UTF-8, eu_ES ISO-8859-1, eu_ES.UTF-8 UTF-8, eu_ES@euro ISO-8859-15, eu_FR ISO-8859-1, eu_FR.UTF-8 UTF-8, eu_FR@euro ISO-8859-15, fa_IR UTF-8, ff_SN UTF-8, fi_FI ISO-8859-1, fi_FI.UTF-8 UTF-8, fi_FI@euro ISO-8859-15, fil_PH UTF-8, fo_FO ISO-8859-1, fo_FO.UTF-8 UTF-8, fr_BE ISO-8859-1, fr_BE.UTF-8 UTF-8, fr_BE@euro ISO-8859-15, fr_CA ISO-8859-1, fr_CA.UTF-8 UTF-8, fr_CH ISO-8859-1, fr_CH.UTF-8 UTF-8, fr_FR ISO-8859-1, fr_FR.UTF-8 UTF-8, fr_FR@euro ISO-8859-15, fr_LU ISO-8859-1, fr_LU.UTF-8 UTF-8, fr_LU@euro ISO-8859-15, fur_IT UTF-8, fy_DE UTF-8, fy_NL UTF-8, ga_IE ISO-8859-1, ga_IE.UTF-8 UTF-8, ga_IE@euro ISO-8859-15, gd_GB ISO-8859-15, gd_GB.UTF-8 UTF-8, gez_ER UTF-8, gez_ER@abegede UTF-8, gez_ET UTF-8, gez_ET@abegede UTF-8, gl_ES ISO-8859-1, gl_ES.UTF-8 UTF-8, gl_ES@euro ISO-8859-15, gu_IN UTF-8, gv_GB ISO-8859-1, gv_GB.UTF-8 UTF-8, ha_NG UTF-8, hak_TW UTF-8, he_IL ISO-8859-8, he_IL.UTF-8 UTF-8, hi_IN UTF-8, hne_IN UTF-8, hr_HR ISO-8859-2, hr_HR.UTF-8 UTF-8, hsb_DE ISO-8859-2, hsb_DE.UTF-8 UTF-8, ht_HT UTF-8, hu_HU ISO-8859-2, hu_HU.UTF-8 UTF-8, hy_AM UTF-8, hy_AM.ARMSCII-8 ARMSCII-8, ia_FR UTF-8, id_ID ISO-8859-1, id_ID.UTF-8 UTF-8, ig_NG UTF-8, ik_CA UTF-8, is_IS ISO-8859-1, is_IS.UTF-8 UTF-8, it_CH ISO-8859-1, it_CH.UTF-8 UTF-8, it_IT ISO-8859-1, it_IT.UTF-8 UTF-8, it_IT@euro ISO-8859-15, iu_CA UTF-8, iw_IL ISO-8859-8, iw_IL.UTF-8 UTF-8, ja_JP.EUC-JP EUC-JP, ja_JP.UTF-8 UTF-8, ka_GE GEORGIAN-PS, ka_GE.UTF-8 UTF-8, kk_KZ PT154, kk_KZ RK1048, kk_KZ.UTF-8 UTF-8, kl_GL ISO-8859-1, kl_GL.UTF-8 UTF-8, km_KH UTF-8, kn_IN UTF-8, ko_KR.EUC-KR EUC-KR, ko_KR.UTF-8 UTF-8, kok_IN UTF-8, ks_IN UTF-8, ks_IN@devanagari UTF-8, ku_TR ISO-8859-9, ku_TR.UTF-8 UTF-8, kw_GB ISO-8859-1, kw_GB.UTF-8 UTF-8, ky_KG UTF-8, lb_LU UTF-8, lg_UG ISO-8859-10, lg_UG.UTF-8 UTF-8, li_BE UTF-8, li_NL UTF-8, lij_IT UTF-8, lo_LA UTF-8, lt_LT ISO-8859-13, lt_LT.UTF-8 UTF-8, lv_LV ISO-8859-13, lv_LV.UTF-8 UTF-8, lzh_TW UTF-8, mag_IN UTF-8, mai_IN UTF-8, mg_MG ISO-8859-15, mg_MG.UTF-8 UTF-8, mhr_RU UTF-8, mi_NZ ISO-8859-13, mi_NZ.UTF-8 UTF-8, mk_MK ISO-8859-5, mk_MK.UTF-8 UTF-8, ml_IN UTF-8, mn_MN UTF-8, mni_IN UTF-8, mr_IN UTF-8, ms_MY ISO-8859-1, ms_MY.UTF-8 UTF-8, mt_MT ISO-8859-3, mt_MT.UTF-8 UTF-8, my_MM UTF-8, nan_TW UTF-8, nan_TW@latin UTF-8, nb_NO ISO-8859-1, nb_NO.UTF-8 UTF-8, nds_DE UTF-8, nds_NL UTF-8, ne_NP UTF-8, nhn_MX UTF-8, niu_NU UTF-8, niu_NZ UTF-8, nl_AW UTF-8, nl_BE ISO-8859-1, nl_BE.UTF-8 UTF-8, nl_BE@euro ISO-8859-15, nl_NL ISO-8859-1, nl_NL.UTF-8 UTF-8, nl_NL@euro ISO-8859-15, nn_NO ISO-8859-1, nn_NO.UTF-8 UTF-8, nr_ZA UTF-8, nso_ZA UTF-8, oc_FR ISO-8859-1, oc_FR.UTF-8 UTF-8, om_ET UTF-8, om_KE ISO-8859-1, om_KE.UTF-8 UTF-8, or_IN UTF-8, os_RU UTF-8, pa_IN UTF-8, pa_PK UTF-8, pap_AN UTF-8, pap_AW UTF-8, pap_CW UTF-8, pl_PL ISO-8859-2, pl_PL.UTF-8 UTF-8, ps_AF UTF-8, pt_BR ISO-8859-1, pt_BR.UTF-8 UTF-8, pt_PT ISO-8859-1, pt_PT.UTF-8 UTF-8, pt_PT@euro ISO-8859-15, quz_PE UTF-8, ro_RO ISO-8859-2, ro_RO.UTF-8 UTF-8, ru_RU ISO-8859-5, ru_RU.CP1251 CP1251, ru_RU.KOI8-R KOI8-R, ru_RU.UTF-8 UTF-8, ru_UA KOI8-U, ru_UA.UTF-8 UTF-8, rw_RW UTF-8, sa_IN UTF-8, sat_IN UTF-8, sc_IT UTF-8, sd_IN UTF-8, sd_IN@devanagari UTF-8, se_NO UTF-8, shs_CA UTF-8, si_LK UTF-8, sid_ET UTF-8, sk_SK ISO-8859-2, sk_SK.UTF-8 UTF-8, sl_SI ISO-8859-2, sl_SI.UTF-8 UTF-8, so_DJ ISO-8859-1, so_DJ.UTF-8 UTF-8, so_ET UTF-8, so_KE ISO-8859-1, so_KE.UTF-8 UTF-8, so_SO ISO-8859-1, so_SO.UTF-8 UTF-8, sq_AL ISO-8859-1, sq_AL.UTF-8 UTF-8, sq_MK UTF-8, sr_ME UTF-8, sr_RS UTF-8, sr_RS@latin UTF-8, ss_ZA UTF-8, st_ZA ISO-8859-1, st_ZA.UTF-8 UTF-8, sv_FI ISO-8859-1, sv_FI.UTF-8 UTF-8, sv_FI@euro ISO-8859-15, sv_SE ISO-8859-1, sv_SE.ISO-8859-15 ISO-8859-15, sv_SE.UTF-8 UTF-8, sw_KE UTF-8, sw_TZ UTF-8, szl_PL UTF-8, ta_IN UTF-8, ta_LK UTF-8, te_IN UTF-8, tg_TJ KOI8-T, tg_TJ.UTF-8 UTF-8, th_TH TIS-620, th_TH.UTF-8 UTF-8, the_NP UTF-8, ti_ER UTF-8, ti_ET UTF-8, tig_ER UTF-8, tk_TM UTF-8, tl_PH ISO-8859-1, tl_PH.UTF-8 UTF-8, tn_ZA UTF-8, tr_CY ISO-8859-9, tr_CY.UTF-8 UTF-8, tr_TR ISO-8859-9, tr_TR.UTF-8 UTF-8, ts_ZA UTF-8, tt_RU UTF-8, tt_RU@iqtelif UTF-8, ug_CN UTF-8, uk_UA KOI8-U, uk_UA.UTF-8 UTF-8, unm_US UTF-8, ur_IN UTF-8, ur_PK UTF-8, uz_UZ ISO-8859-1, uz_UZ.UTF-8 UTF-8, uz_UZ@cyrillic UTF-8, ve_ZA UTF-8, vi_VN UTF-8, wa_BE ISO-8859-1, wa_BE.UTF-8 UTF-8, wa_BE@euro ISO-8859-15, wae_CH UTF-8, wal_ET UTF-8, wo_SN UTF-8, xh_ZA ISO-8859-1, xh_ZA.UTF-8 UTF-8, yi_US CP1255, yi_US.UTF-8 UTF-8, yo_NG UTF-8, yue_HK UTF-8, zh_CN GB2312, zh_CN.GB18030 GB18030, zh_CN.GBK GBK, zh_CN.UTF-8 UTF-8, zh_HK BIG5-HKSCS, zh_HK.UTF-8 UTF-8, zh_SG GB2312, zh_SG.GBK GBK, zh_SG.UTF-8 UTF-8, zh_TW BIG5, zh_TW.EUC-TW EUC-TW, zh_TW.UTF-8 UTF-8, zu_ZA ISO-8859-1, zu_ZA.UTF-8 UTF-8
-locales	locales/locales_to_be_generated	multiselect	en_GB.UTF-8 UTF-8
-# Default locale for the system environment:
-# Choices: None, C.UTF-8, en_GB.UTF-8
-locales	locales/default_environment_locale	select	en_GB.UTF-8
 # Key to function as AltGr:
 # Choices: The default for the keyboard layout, No AltGr key, Right Alt (AltGr), Right Control, Right Logo key, Menu key, Left Alt, Left Logo key, Keypad Enter key, Both Logo keys, Both Alt keys
 keyboard-configuration	keyboard-configuration/altgr	select	The default for the keyboard layout
diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages
index 45ff003fc7..8dd3f63616 100644
--- a/stage2/01-sys-tweaks/00-packages
+++ b/stage2/01-sys-tweaks/00-packages
@@ -1,4 +1,4 @@
-ssh locales less fbset sudo psmisc strace module-init-tools ed ncdu crda
+ssh less fbset sudo psmisc strace module-init-tools 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

From dc7b589e7a67cb8db3d7316dd02a1288071b02c4 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Mon, 15 May 2017 15:46:59 +0100
Subject: [PATCH 09/27] Move rpi-update from stage3 to stage2

---
 stage2/01-sys-tweaks/00-packages       | 1 +
 stage3/00-install-packages/00-packages | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages
index 8dd3f63616..1f26b57bfc 100644
--- a/stage2/01-sys-tweaks/00-packages
+++ b/stage2/01-sys-tweaks/00-packages
@@ -16,3 +16,4 @@ apt-listchanges
 usb-modeswitch
 apt-transport-https
 libpam-chksshpwd
+rpi-update
diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages
index d7966ce461..4b979cca43 100644
--- a/stage3/00-install-packages/00-packages
+++ b/stage3/00-install-packages/00-packages
@@ -2,7 +2,6 @@ gstreamer1.0-x gstreamer1.0-omx gstreamer1.0-plugins-base gstreamer1.0-plugins-g
 xpdf gtk2-engines alsa-utils
 desktop-base
 git
-rpi-update
 omxplayer
 raspberrypi-artwork
 policykit-1

From 921202e371b8d4e272c309cacf123927dd375e07 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Mon, 15 May 2017 16:40:31 +0100
Subject: [PATCH 10/27] stage4: add /etc/mtab symlink

---
 export-image/04-finalise/01-run.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/export-image/04-finalise/01-run.sh b/export-image/04-finalise/01-run.sh
index 2de42caaa2..cc69dec627 100755
--- a/export-image/04-finalise/01-run.sh
+++ b/export-image/04-finalise/01-run.sh
@@ -35,6 +35,8 @@ rm -f ${ROOTFS_DIR}/var/lib/dbus/machine-id
 
 true > ${ROOTFS_DIR}/etc/machine-id
 
+ln -nsf /proc/mounts ${ROOTFS_DIR}/etc/mtab
+
 for _FILE in $(find ${ROOTFS_DIR}/var/log/ -type f); do
 	true > ${_FILE}
 done

From f9637fb24e9bc0025fa4f6e809664acf90083550 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Mon, 15 May 2017 16:46:18 +0100
Subject: [PATCH 11/27] Update release notes

---
 export-noobs/00-release/files/release_notes.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt
index e3c8feb385..f98b3b303d 100644
--- a/export-noobs/00-release/files/release_notes.txt
+++ b/export-noobs/00-release/files/release_notes.txt
@@ -1,4 +1,13 @@
 UNRELEASED:
+  * 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

From 046db2d3d3964eaeb75f375a6db9ca4184bd16cb Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Tue, 20 Jun 2017 16:11:17 +0100
Subject: [PATCH 12/27] NOOBS: update kernel version number

---
 export-noobs/00-release/files/os.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/export-noobs/00-release/files/os.json b/export-noobs/00-release/files/os.json
index a667a09c97..46e1634ce0 100644
--- a/export-noobs/00-release/files/os.json
+++ b/export-noobs/00-release/files/os.json
@@ -1,7 +1,7 @@
 {
     "description": "NOOBS_DESCRIPTION",
     "feature_level": 35120124,
-    "kernel": "4.4",
+    "kernel": "4.9",
     "name": "NOOBS_NAME",
     "password": "raspberry",
     "release_date": "UNRELEASED",

From e583c18ebaa9608182ebb4085cbd38fc74a6f979 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Tue, 20 Jun 2017 16:12:32 +0100
Subject: [PATCH 13/27] stage4: install python3-thonny

---
 stage4/00-install-packages/00-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages
index 0568ce5e7b..e84df51a44 100644
--- a/stage4/00-install-packages/00-packages
+++ b/stage4/00-install-packages/00-packages
@@ -34,4 +34,4 @@ python3-codebug-tether python3-codebug-i2c-tether
 python-sense-emu python3-sense-emu sense-emu-tools python-sense-emu-doc
 pprompt
 scratch2
-pi-thonny-theme
+python3-thonny

From 02728fe65e3473ba7da03ab7862ed0cf2a05a746 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Tue, 20 Jun 2017 16:13:59 +0100
Subject: [PATCH 14/27] export-image: use apparent size when calculating disk
 usage

---
 export-image/prerun.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/export-image/prerun.sh b/export-image/prerun.sh
index 661fc4e3e6..9f54ce671d 100755
--- a/export-image/prerun.sh
+++ b/export-image/prerun.sh
@@ -8,8 +8,8 @@ rm -f ${IMG_FILE}
 rm -rf ${ROOTFS_DIR}
 mkdir -p ${ROOTFS_DIR}
 
-BOOT_SIZE=$(du -s ${EXPORT_ROOTFS_DIR}/boot --block-size=1 | cut -f 1)
-TOTAL_SIZE=$(du -s ${EXPORT_ROOTFS_DIR} --exclude var/cache/apt/archives --block-size=1 | cut -f 1)
+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=$((BOOT_SIZE + TOTAL_SIZE + (400 * 1024 * 1024)))
 

From 530b66fd3f813101fd65b4bf4866e8a97cc30408 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Tue, 20 Jun 2017 16:17:12 +0100
Subject: [PATCH 15/27] bootstrap: cope with NFS and FUSE filesystems

---
 scripts/common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/common b/scripts/common
index 74f9c4ce6a..f18fd89a46 100644
--- a/scripts/common
+++ b/scripts/common
@@ -18,7 +18,7 @@ bootstrap(){
 	capsh --drop=cap_setfcap -- -c "${BOOTSTRAP_CMD} --components=main,contrib,non-free \
 		--arch armhf \
 		--keyring "${STAGE_DIR}/files/raspberrypi.gpg" \
-		$1 $2 $3"
+		$1 $2 $3" || rmdir "$2/debootstrap"
 }
 export -f bootstrap
 

From d347d8d5f7c1fae250322265dad83ae5825bf50e Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Wed, 21 Jun 2017 08:55:30 +0100
Subject: [PATCH 16/27] stage0: configure apt before locales

---
 stage0/{01-configure-apt => 00-configure-apt}/00-run.sh           | 0
 stage0/{01-configure-apt => 00-configure-apt}/files/51cache       | 0
 .../files/raspberrypi.gpg.key                                     | 0
 stage0/{01-configure-apt => 00-configure-apt}/files/raspi.list    | 0
 stage0/{01-configure-apt => 00-configure-apt}/files/sources.list  | 0
 stage0/{00-locale => 01-locale}/00-debconf                        | 0
 stage0/{00-locale => 01-locale}/00-packages                       | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 rename stage0/{01-configure-apt => 00-configure-apt}/00-run.sh (100%)
 rename stage0/{01-configure-apt => 00-configure-apt}/files/51cache (100%)
 rename stage0/{01-configure-apt => 00-configure-apt}/files/raspberrypi.gpg.key (100%)
 rename stage0/{01-configure-apt => 00-configure-apt}/files/raspi.list (100%)
 rename stage0/{01-configure-apt => 00-configure-apt}/files/sources.list (100%)
 rename stage0/{00-locale => 01-locale}/00-debconf (100%)
 rename stage0/{00-locale => 01-locale}/00-packages (100%)

diff --git a/stage0/01-configure-apt/00-run.sh b/stage0/00-configure-apt/00-run.sh
similarity index 100%
rename from stage0/01-configure-apt/00-run.sh
rename to stage0/00-configure-apt/00-run.sh
diff --git a/stage0/01-configure-apt/files/51cache b/stage0/00-configure-apt/files/51cache
similarity index 100%
rename from stage0/01-configure-apt/files/51cache
rename to stage0/00-configure-apt/files/51cache
diff --git a/stage0/01-configure-apt/files/raspberrypi.gpg.key b/stage0/00-configure-apt/files/raspberrypi.gpg.key
similarity index 100%
rename from stage0/01-configure-apt/files/raspberrypi.gpg.key
rename to stage0/00-configure-apt/files/raspberrypi.gpg.key
diff --git a/stage0/01-configure-apt/files/raspi.list b/stage0/00-configure-apt/files/raspi.list
similarity index 100%
rename from stage0/01-configure-apt/files/raspi.list
rename to stage0/00-configure-apt/files/raspi.list
diff --git a/stage0/01-configure-apt/files/sources.list b/stage0/00-configure-apt/files/sources.list
similarity index 100%
rename from stage0/01-configure-apt/files/sources.list
rename to stage0/00-configure-apt/files/sources.list
diff --git a/stage0/00-locale/00-debconf b/stage0/01-locale/00-debconf
similarity index 100%
rename from stage0/00-locale/00-debconf
rename to stage0/01-locale/00-debconf
diff --git a/stage0/00-locale/00-packages b/stage0/01-locale/00-packages
similarity index 100%
rename from stage0/00-locale/00-packages
rename to stage0/01-locale/00-packages

From d2b8d634b9b79d34b4aec10ce75f3503c439f6eb Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Wed, 21 Jun 2017 10:46:10 +0100
Subject: [PATCH 17/27] export-image: switch from fallocate to truncate

---
 export-image/prerun.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/export-image/prerun.sh b/export-image/prerun.sh
index 9f54ce671d..b782081181 100755
--- a/export-image/prerun.sh
+++ b/export-image/prerun.sh
@@ -13,7 +13,7 @@ TOTAL_SIZE=$(du --apparent-size -s ${EXPORT_ROOTFS_DIR} --exclude var/cache/apt/
 
 IMG_SIZE=$((BOOT_SIZE + TOTAL_SIZE + (400 * 1024 * 1024)))
 
-fallocate -l ${IMG_SIZE} ${IMG_FILE}
+truncate -s ${IMG_SIZE} ${IMG_FILE}
 fdisk -H 255 -S 63 ${IMG_FILE} <<EOF
 o
 n

From a0060bd475994d0466b2e24ea00003a38a8a0288 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Wed, 21 Jun 2017 10:56:07 +0100
Subject: [PATCH 18/27] export-image: increase free space padding

---
 export-image/prerun.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/export-image/prerun.sh b/export-image/prerun.sh
index b782081181..34a6d78889 100755
--- a/export-image/prerun.sh
+++ b/export-image/prerun.sh
@@ -11,7 +11,7 @@ mkdir -p ${ROOTFS_DIR}
 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=$((BOOT_SIZE + TOTAL_SIZE + (400 * 1024 * 1024)))
+IMG_SIZE=$((BOOT_SIZE + TOTAL_SIZE + (800 * 1024 * 1024)))
 
 truncate -s ${IMG_SIZE} ${IMG_FILE}
 fdisk -H 255 -S 63 ${IMG_FILE} <<EOF

From 50e5c01f573254410839dd86ca8407998b565983 Mon Sep 17 00:00:00 2001
From: Thomas Phillips <thomas@teknique.com>
Date: Fri, 2 Jun 2017 16:51:54 +1200
Subject: [PATCH 19/27] Image build date now honours timezone

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 25a85398d1..06d9abcbae 100755
--- a/build.sh
+++ b/build.sh
@@ -128,7 +128,7 @@ if [ -z "${IMG_NAME}" ]; then
 	exit 1
 fi
 
-export IMG_DATE=${IMG_DATE:-"$(date -u +%Y-%m-%d)"}
+export IMG_DATE=${IMG_DATE:-"$(date +%Y-%m-%d)"}
 
 export BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 export SCRIPT_DIR="${BASE_DIR}/scripts"

From c92638438a59fbc705eb9aff16a4a1c249fac91c Mon Sep 17 00:00:00 2001
From: Thomas Phillips <thomas@teknique.com>
Date: Fri, 2 Jun 2017 16:33:08 +1200
Subject: [PATCH 20/27] Fixed running docker script from within pwd containing
 spaces

---
 build-docker.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/build-docker.sh b/build-docker.sh
index 94b2dc02e2..6d0b2d0276 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -12,9 +12,9 @@ if ! $DOCKER ps >/dev/null; then
 fi
 set -e
 
-config_mount=
+config_mount="/dev/null:/dev/null"
 if [ -f config ]; then
-	config_mount="-v $(pwd)/config:/pi-gen/config:ro"
+	config_mount="$(pwd)/config:/pi-gen/config:ro"
 	source config
 fi
 
@@ -54,6 +54,7 @@ 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;
@@ -62,8 +63,9 @@ if [ "$CONTAINER_EXISTS" != "" ]; then
 else
 	trap "echo 'got CTRL+C... please wait 5s'; docker stop -t 5 ${CONTAINER_NAME}" SIGINT SIGTERM
 	$DOCKER run --name "${CONTAINER_NAME}" --privileged \
-		-v $(pwd)/deploy:/pi-gen/deploy \
-		${config_mount} \
+		-e IMG_NAME=${IMG_NAME}\
+		-v "$(pwd)/deploy:/pi-gen/deploy" \
+		-v "${config_mount}" \
 		pi-gen \
 		bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static &&
 	cd /pi-gen; ./build.sh &&

From d2f88a6e4f7fe125ca4d61df046c8f96556b7bd0 Mon Sep 17 00:00:00 2001
From: Jacob Siverskog <jacob@teenage.engineering>
Date: Wed, 17 May 2017 13:27:57 +0200
Subject: [PATCH 21/27] 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.
---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8ee6506b90..5d8a807679 100755
--- a/README.md
+++ b/README.md
@@ -156,8 +156,10 @@ from `./stage2` (if building a minimal system).
 
 ```bash
 # Example for building a lite system
-touch ./stage3/SKIP ./stage4/SKIP
+echo "IMG_NAME='Raspbian'" > config
+touch ./stage3/SKIP ./stage4/SKIP ./stage5/SKIP
 rm stage4/EXPORT*
+sudo ./build.sh  # or ./build-docker.sh
 ```
 
 If you wish to build further configurations upon (for example) the lite

From 22c4105b57f370f7626df326be7a89957d3c0749 Mon Sep 17 00:00:00 2001
From: Andrew Smith <me@andrewmichaelsmith.com>
Date: Wed, 17 May 2017 16:36:04 +0100
Subject: [PATCH 22/27] 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.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5d8a807679..ca956629e8 100755
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ vi config         # Edit your config file. See above.
 ```
 
 If everything goes well, your finished image will be in the `deploy/` folder.
-You can then remove the build container with `docker rm pigen_work`
+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:

From cdf1cf2abaa6d0659a046a23a3b5dd633bc814de Mon Sep 17 00:00:00 2001
From: Andrew Smith <me@andrewmichaelsmith.com>
Date: Thu, 18 May 2017 14:15:31 +0100
Subject: [PATCH 23/27] Also use -v in error message

---
 build-docker.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-docker.sh b/build-docker.sh
index 6d0b2d0276..39bd51b028 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -45,7 +45,7 @@ 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 $CONTAINER_NAME"
+	echo "  docker rm -v $CONTAINER_NAME"
 	exit 1
 fi
 

From be2018ee5f1a25ab5409fe8a9058e195494e074e Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Tue, 27 Jun 2017 13:16:41 +0100
Subject: [PATCH 24/27] README: Add stage 5 description

---
 README.md | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index ca956629e8..a0b6f84b05 100755
--- a/README.md
+++ b/README.md
@@ -138,12 +138,14 @@ maintenance and allows for more easy customization.
    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
 

From 234c4b79371dd2f4531482e1045752de9e183a68 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Mon, 3 Jul 2017 16:39:26 +0100
Subject: [PATCH 25/27] Export-image: disable metadata_csum for compatibility
 with older SD card copiers

---
 export-image/prerun.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/export-image/prerun.sh b/export-image/prerun.sh
index 34a6d78889..a639c9c369 100755
--- a/export-image/prerun.sh
+++ b/export-image/prerun.sh
@@ -51,7 +51,7 @@ echo "/boot: offset $BOOT_OFFSET, length $BOOT_LENGTH"
 echo "/:     offset $ROOT_OFFSET, length $ROOT_LENGTH"
 
 mkdosfs -n boot -F 32 -v $BOOT_DEV > /dev/null
-mkfs.ext4 -O ^huge_file $ROOT_DEV > /dev/null
+mkfs.ext4 -O ^metadata_csum,^huge_file $ROOT_DEV > /dev/null
 
 mount -v $ROOT_DEV ${ROOTFS_DIR} -t ext4
 mkdir -p ${ROOTFS_DIR}/boot

From dd7de2554c08e6db89806eb45d955356d0456c66 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Wed, 5 Jul 2017 11:23:54 +0100
Subject: [PATCH 26/27] Update release notes

---
 export-noobs/00-release/files/release_notes.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt
index f98b3b303d..1d78de0599 100644
--- a/export-noobs/00-release/files/release_notes.txt
+++ b/export-noobs/00-release/files/release_notes.txt
@@ -1,4 +1,7 @@
 UNRELEASED:
+  * 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

From 137efd2379000ae49e4c4e9122774d0dec8ceced Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Mon, 10 Jul 2017 14:29:11 +0100
Subject: [PATCH 27/27] Update release notes

---
 export-noobs/00-release/files/release_notes.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt
index 1d78de0599..1d82bbcf7c 100644
--- a/export-noobs/00-release/files/release_notes.txt
+++ b/export-noobs/00-release/files/release_notes.txt
@@ -1,4 +1,6 @@
 UNRELEASED:
+  * 
+2017-07-05:
   * New kernel and firmware
   * Filesystem created without the metadata_csum feature
 2017-06-21: