Merge pull request debian-pi#221 from diederikdehaas/release-v1.0.7

Release v1.0.7

CHANGELOG.md

@@ -1,3 +1,22 @@
+# Release v1.0.7 (2015-05-05)
+
+Below are the changes since the 1.0.6 release.
+
+This release fixes the following issues:
+- Added support for the Raspberry Pi 2. This fixes [issue 180](https://github.com/debian-pi/raspbian-ua-netinst/issues/180).
+- Updated the kernel used during installation to 3.18.
+- Removed the kernel-upgrade-script since it doesn't handle sections in /boot/config.txt. See [raspbian-tools issue 2](https://github.com/debian-pi/raspbian-tools/issues/2).
+- Fixed the insecure downloading of the raspberrypi.org GPG key. This fixes [issue 64](https://github.com/debian-pi/raspbian-ua-netinst/issues/64).
+- Increased the size of /boot/ to 128MB by default. This fixes [issue 190](https://github.com/debian-pi/raspbian-ua-netinst/issues/190).
+- Fixed the kernel crashes/rainbow screens that happened with the rpi15 kernel. This fixes [issue 199](https://github.com/debian-pi/raspbian-ua-netinst/issues/199) and [issue 201](https://github.com/debian-pi/raspbian-ua-netinst/issues/201).
+
+NOTE:
+This release also adds support for DeviceTree and this is enabled by default on the Pi 2.  
+For the Pi 1B and 1B+ it is **disabled** by default (in `/boot/config.txt`) since it seems to be the cause for the various kernel crashes/rainbow screens. You can enable DeviceTree quite simple by commenting out or removing the `device_tree=` line and it usually just works. But since we've had just too many crashes it is disabled by default. See also https://github.com/raspberrypi/linux/issues/914.
+
+See the [README](https://github.com/debian-pi/raspbian-ua-netinst/blob/v1.0.7/README.md) for features/installation instruction/etc for this release.
+
+
 # Release v1.0.7-RC (2015-04-22)
 
 This release fixes the following issues:
@@ -18,6 +37,7 @@ This release fixes the following issues:
 - Updated the kernel used during installation to 3.18.
 - Removed the kernel-upgrade-script since it doesn't handle sections in /boot/config.txt. See [raspbian-tools issue 2](https://github.com/debian-pi/raspbian-tools/issues/2).
 
+
 # Release v1.0.6  (2015-01-09)
 
 This release fixes the following issues:

README.md

@@ -1,6 +1,6 @@
 # raspbian-ua-netinst
 
-The minimal Raspbian unattended netinstaller for Raspberry Pi Model 1B, 1B+ and 2B (with [pre-release installer](https://github.com/debian-pi/raspbian-ua-netinst/releases/tag/v1.0.7-RC)).  
+The minimal Raspbian unattended netinstaller for Raspberry Pi Model 1B, 1B+ and 2B.  
 
 This project provides [Raspbian][1] power users the possibility to install a minimal base system unattended using latest Raspbian packages regardless when the installer was built.
 
@@ -30,7 +30,7 @@ Other presets include _minimal_ which has even less packages (no logging, no tex
  - working Ethernet with Internet connectivity
 
 ## Obtaining installer files on Windows and Mac
-Installer archive is around **25MB** and contains all firmware files and the installer.
+Installer archive is around **17MB** and contains all firmware files and the installer.
 
 Go to [our latest release page](https://github.com/debian-pi/raspbian-ua-netinst/releases/latest) and download the .zip file.
 
@@ -39,7 +39,7 @@ Format your SD card as **FAT32** (MS-DOS on _Mac OS X_) and extract the installe
 Try formatting the SD card with this tool: https://www.sdcard.org/downloads/formatter_4/
 
 ## Alternative method for Mac, writing image to SD card
-Prebuilt image is around **25MB** bzip2 compressed and **64MB** uncompressed. It contains the same files as the .zip but is more convenient for Mac users.
+Prebuilt image is around **17MB** bzip2 compressed and **64MB** uncompressed. It contains the same files as the .zip but is more convenient for Mac users.
 
 Go to [our latest release page](https://github.com/debian-pi/raspbian-ua-netinst/releases/latest) and download the .img.bz2 file.
 
@@ -55,7 +55,7 @@ To flash your SD card on Mac:
 _Note the **r** in the of=/dev/rdiskX part on the dd line which should speed up writing the image considerably._
 
 ## SD card image for Linux
-Prebuilt image is around **17MB** xz compressed and **64MB** uncompressed. It contains the same files as the .zip but is more convenient for Linux users.
+Prebuilt image is around **11MB** xz compressed and **64MB** uncompressed. It contains the same files as the .zip but is more convenient for Linux users.
 
 Go to [our latest release page](https://github.com/debian-pi/raspbian-ua-netinst/releases/latest) and download the .img.xz file.
 

build.sh

@@ -243,6 +243,7 @@ cp installer-rpi1.cpio bootfs/
 echo "[pi1]" >> bootfs/config.txt
 echo "kernel=kernel-rpi1_install.img" >> bootfs/config.txt
 echo "initramfs installer-rpi1.cpio" >> bootfs/config.txt
+echo "device_tree=" >> bootfs/config.txt
 
 create_cpio "rpi2"
 cp installer-rpi2.cpio bootfs/
@@ -268,32 +269,6 @@ if [ -d config ] ; then
     cp -r config/* bootfs/config
 fi
 
-if [ ! -d config ] ; then
-    mkdir bootfs/config
-fi
-
-# This is a temporary workaround to make the installer boot on a Pi 1B/1B+
-FIRMWARE_ARCHIVE_FILENAME=raspberrypi-firmware-20150420.zip
-echo -n "Downloading newer, but working, firmware files..."
-curl -s -o bootfs/config/$FIRMWARE_ARCHIVE_FILENAME  https://raw.githubusercontent.com/debian-pi/general/master/workarounds/$FIRMWARE_ARCHIVE_FILENAME
-# test whether the file exists and it's size is > 100k
-if [ -f bootfs/config/$FIRMWARE_ARCHIVE_FILENAME ] && [ $(wc -c < bootfs/config/$FIRMWARE_ARCHIVE_FILENAME) -gt 100000 ] ; then
-    echo "OK"
-else
-    echo "FAILED"
-fi
-
-if [ -f bootfs/config/$FIRMWARE_ARCHIVE_FILENAME ] ; then
-    echo -n "Extracting newer firmware files..."
-    unzip -qo bootfs/config/$FIRMWARE_ARCHIVE_FILENAME -d bootfs/
-    if [ $? -eq 0 ] ; then
-        echo "OK"
-    else
-        echo "FAILED !"
-    fi
-fi
-# End workaround
-
 ZIPFILE=raspbian-ua-netinst-`date +%Y%m%d`-git`git rev-parse --short @{0}`.zip
 rm -f $ZIPFILE
 

scripts/etc/init.d/rcS

@@ -604,6 +604,10 @@ fi
 echo "[pi${rpi_hardware_version}]" >> /rootfs/boot/config.txt
 echo "kernel=vmlinuz-$KERNEL_VERSION" >> /rootfs/boot/config.txt
 echo "initramfs initrd.img-${KERNEL_VERSION} followkernel" >> /rootfs/boot/config.txt
+if [ "${rpi_hardware_version}" = "1" ] ; then
+    echo "# to enable DeviceTree, comment out the next line " >> /rootfs/boot/config.txt
+    echo "device_tree=" >> /rootfs/boot/config.txt
+fi
 
 # set the default kernel file based on the hardware
 default_kernel_file="kernel.img"