Update instructions to match the multiple builds

README.md

@@ -1,100 +1,68 @@
-# Raspberry Pi 3 image spec
+# Raspberry Pi image specs
 
-This repository contains the files with which the image referenced at
+This repository contains the files with which the images referenced at
-https://wiki.debian.org/RaspberryPi3 has been built.
+https://wiki.debian.org/RaspberryPiImages have been built.
 
 ## Option 1: Downloading an image
 
-See https://wiki.debian.org/RaspberryPi3#Preview_image for where to obtain the latest pre-built image.
+See https://wiki.debian.org/RaspberryPi3Images for where to obtain the
+latest pre-built image.
 
 ## Option 2: Building your own image
 
-If you prefer, you can build a Debian buster Raspberry Pi 3 image
+If you prefer, you can build a Debian buster Raspberry Pi image
 yourself. If you are reading this document online, you should first
 clone this repository:
 
 ```shell
-git clone --recursive https://github.com/Debian/raspi3-image-spec
+git clone --recursive https://salsa.debian.org/raspi-team/image-specs.git
-cd raspi3-image-spec
+cd image-specs
 ```
 
-For this you will first need to install `vmdb2`. As of July 2018, this
+For this you will first need to install the `vmdb2` package, on a
-repository still ships vmdb2, but will probably be deprecated in the
+Debian Buster or higher system.
-future. You can choose:
 
-<!-- - `vmdb2` is available as a package for Testing and Unstable. If your -->
+The recipes for building the images are:
-<!--   Debian system is either, quite probably installing it systemwide is -->
-<!--   the easiest and most recommended way. -->
-- `vmdb2` is available as a package for Debian Testing and
-  Unstable. However, we require at least [one
-  feature](http://git.liw.fi/vmdb2/commit/?id=474cd53826fda5a571cca8b5dda7cf949291dd62)
-  that has not been included in any of the releases uploaded to
-  Debian.
 
-  Therefore, `vmdb2` is presented as a submodule in this
+- [raspi0w.yaml](raspi0w.yaml) for Raspberry Pi 0 and 0w. We believe
-  project. First install the
+  (but have not tested) it should also work on the 1 models.
-  [requirements](http://git.liw.fi/vmdb2/tree/README) of `vmdb2`:
+- [raspi2.yaml](raspi2.yaml) for Raspberry Pi 2.
+- [raspi3.yaml](raspi3.yaml) for all of the Raspberry Pi 3 models.
 
-	```shell
+You can edit them to customize the built image. Although it could
-	apt install kpartx parted qemu-utils qemu-user-static python3-cliapp \
+(should!) be better documented,
-    python3-jinja2 python3-yaml
+[http://git.liw.fi/vmdb2/tree/README](vmdb2)'s format is very easy to
-	```
+understand.
 
-  Note that `python3-cliapp` is not available in Stretch, but as it
+Once you have edited the recipe for your hardware, you can generate
-  does not carry any dependencies, can be manually installed by
+the image by issuing the following (as root):
-  [fetching its .deb package ](https://packages.debian.org/buster/python3-cliapp)
-  and installing it manually.
-
-Then edit [raspi3.yaml](raspi3.yaml) to select the Debian repository that you
-want to use:
-
-- The images now build correctly with the main repository! If you want
-  to build your image following the regular Testing (*buster*)
-  distribution, leave `raspi3.yaml` as it is
-    - Stable (*stretch*) is not supported, as we require linux ≥ 4.14
-      and raspi3-firmware ≥ 1.20171201-1.
-
-- Testing is, however, constantly changing. You might want to choose a
-  specific point in its history to build with. To do this, locate the
-  line with `qemu-debootstrap: buster` in `raspi3.yaml`. Change
-  `mirror: http://deb.debian.org/debian` to a known-good point in
-  time. One such point can be `mirror:
-  https://snapshot.debian.org/archive/debian/20181204T164956Z/ `.
-    - Due to a
-      [missing feature](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763419)
-      on snapshots, to make the build work, you have to disable an
-      expiration check by APT. To do so, edit raspi3.yaml to replace
-      all `apt-get` invocations with `apt-get -o
-      Acquire::Check-Valid-Until=false`
-
-Once you have edited raspi3.yaml, you can generate the image by
-issuing the following:
 
 ```shell
-umask 022
-sudo env -i LC_CTYPE=C.UTF-8 PATH="/usr/sbin:/sbin:$PATH" \
     ./vmdb2/vmdb2 --rootfs-tarball=raspi3.tar.gz --output \
 	raspi3.img raspi3.yaml --log raspi3.log
 ```
 
-## Installing the image onto the Raspberry Pi 3
+Of course, substituting `raspi3` with the actual flavor you need.
+
+## Installing the image onto the Raspberry Pi
 
 Plug an SD card which you would like to entirely overwrite into your SD card reader.
 
-Assuming your SD card reader provides the device `/dev/sdb`
+Assuming your SD card reader provides the device `/dev/mmcblk0`
 (**Beware** If you choose the wrong device, you might overwrite
 important parts of your system.  Double check it's the correct
 device!), copy the image onto the SD card:
 
 ```shell
-sudo dd if=raspi3.img of=/dev/sdb bs=64k oflag=dsync status=progress
+sudo dd if=raspi3.img of=/dev/mmcblk0 bs=64k oflag=dsync status=progress
 ```
 
-Then, plug the SD card into the Raspberry Pi 3 and power it up.
+Then, plug the SD card into the Raspberry Pi, and power it up.
 
-The image uses the hostname `rpi3`, so assuming your local network
+The image uses the hostname `rpi0w`, `rpi2` or `rpi3` depending on the
-correctly resolves hostnames communicated via DHCP, you can log into
+target build, so assuming your local network correctly resolves
-your Raspberry Pi 3 once it booted:
+hostnames communicated via DHCP, you can log into your Raspberry Pi
+once it booted:
 
 ```shell
 ssh root@rpi3