p2.8.4 Update docs

README_PINN.md

@@ -7,7 +7,7 @@ The latest version of [PINN](http://downloads.sourceforge.net/projects/pinn/pinn
 
 ### - [If you have PINN v2.4.3 - v2.4.4b installed, please manually update to v2.4.4c](https://www.raspberrypi.org/forums/viewtopic.php?f=63&t=142574&start=200#p1239359)
 
-This README relates to v2.8.3
+This README relates to v2.8.4
 
 <sup>(PINN is only available in one format that does not include any operating systems at all. It is more akin to `NOOBS-lite` rather than `NOOBS`. For that reason, the filename that you download is called `pinn-lite.zip`)</sup>
 
@@ -150,6 +150,7 @@ There are three toolbars:
   - **[Password](#how-to-recover-from-a-lost-password)**: Allows the password of an OS to be restored or replaced.
   - **[Fix](#how-to-fix-an-os)**: Performs repairs on file systems of the selected installed OSes.
   - **[Reinstall](#reinstall-individual-oses)**: Allows individual installed OSes to be reinstalled back to their original installation without affecting any of the other installed OSes.
+  - **[Replace](#replace-individual-oses)**: Allows individual installed OSes to be replaced by other/different OSes without affecting any of the other installed OSes.
   - **[Info](#info-on-os)**: [Networking Required] Opens a browser that displays the webpage for the selected OS.
 
 The `more` button can be used to cycle through the 3 toolbars.
@@ -349,6 +350,8 @@ The following is a complete list of all the PINN options that can be added to th
 
 - **runinstaller**: This option is present when PINN is first installed to cause it to reformat the SD card. Once reformatted, PINN will delete this option. Manually adding it back in will cause PINN to reformat the SD card on next boot, losing any and all installed OSes, so be careful!
 
+- **reserve=(+)NNN**: This option will reserve a set amount of space for PINN's partition (typically /dev/mmcblk0p1) when the `runinstaller` option first formats the SD card. This space may be useful for adding OS install files later, or for using the first partition as a transfer area for data between the RPi and a Windows PC that can only read the SD card's first partition. NNN specifies the total size of this partition in MB. The default value is around 64MB. If the size is prefixed with a '+' sign, the value indicates an amount of disk space to be reserved [i]in addition[/i] to the size of PINN's files. So, `reserve=200` will make P1 200MB in size and `reserve=+200` will make it about 263MB in size.
+
 - **no_update**: Prevents PINN from performing a self-update check on boot up. Use the `reinstall` option to manually check for updates on PINN.
 
 - **nofirmware**: Prevents PINN from upgrading the firmware of old OSes to be compatible with PINN.
@@ -512,6 +515,20 @@ Once USB boot mode is enabled, proceed as follows:
 2. Boot PINN on the Pi from the USB device.
 3. Install your requried OSes as normal.
 
+## Project Spaces
+
+Project Spaces are empty OSes that just consist of an empty 100MB FAT32 partition and an empty 500MB nominal ext4 partition. Up to 8 Project Spaces can be installed onto an SD card along with any other OSes. Any remaining space left on the SD card will be divided up between all of these Project Spaces, so their ext4 partitions will expand to fill the remaining space and they will all be the same size.
+
+![alt text](screenshots/projectspaces.png "Project Spaces")
+
+
+Project Spaces are useful when used with the [Replace](#replace-individual-os) OS function, as they reserve OS space that can be used later. The 3 main benefits are:
+1. They reserve OS space, so the choice of which OS to install or add can be made later on.
+2. They allow multiple instances of the same OS to be installed.
+3. They allow the same amount of space to be used for each OS.
+
+When replacing a project space with another OS, remember that the new OS must have the same number of partitions as the project space and each partition must fit within the existing partition sizes. So creating 8 project spaces on a 16GB card may not be very useful as there will be <2GB left on each of the ext4 partitions. That maybe ok for some of the minimal OSes, but no good for a full Raspbian installation, for example.
+
 ## PINN's Firmware Upgrade/Downgrade
 
 PINN v2.5.3+ includes new firmware, kernel and drivers to support the new Pi3B+ model. Whilst this firmware will allow PINN to run on all RPi models, some older OSes may not yet be compatible 
@@ -720,6 +737,8 @@ If you have changed your login password for an OS and forget what it is, PINN wi
 
 If your installed OS will not boot, the Fix option in the maintenance menu may help. It provides a list of operatiosn that you may perform to fix the OS. Check all operations that you want to be performed on your selected OSes.
 
+![alt text](screenshots/fix.png "Fix an OS options.")
+
 ### File System Check
 
 Most RPi OSes typically delay writing any data back to SD or USB drives for performance reasons. Normally, this does not cause a problem provided the Pi is shutdown properly before removing the power, but this is not always possible. You may experience a power loss, or a program crash where pulling the power is your only recourse to recovering control. In these circumstances there is a risk that the SD card or USB drive may become corrupted if some data failed to get written to the drive before the power was lost. 
@@ -740,6 +759,16 @@ The `Reinstall` option gets around this by allowing individual installed OSes to
 
 PINN itself is included in the list of installed OSes. If it is the ONLY OS to be selected, reinstalling it will perform a manual self-update check which is useful in the case where the `no_update` cmdline option has been used.
 
+## Replace Individual OSes
+
+The `replace` function will allow the replacement of an installed OS with another different OS, provided the number of partitions in the two OSes is the same and the new OS will fit within the existing partition sizes. So it will work with most OSes, but not for those that use a non-standard partition layout, like Windows IoT or some Android versions. Any other installed OSes will remain unaltered.
+
+This is particularly useful with the [Project Spaces](#project-spaces) feature, which will allow OS space to be reserved for installing an OS at a later date.
+
+To replace one or more OSes, first select the new OSes you want to install on the `Main Menu`. Then move to the `Maintenance Menu` and select the OSes (or project Spaces) that you want to be replaced and click the `Replace` button. A dialog box will pop up lsiting all the OSes to be replaced. Alongside each one is a drop down box, where you can select which new OS shall replace each installed OS. The Click OK to replace the old OSes with the new OSes.
+
+![alt text](screenshots/replace.png "Replace OSes.")
+
 ---
 
 # Advanced Usage

README_SUM.md

@@ -45,6 +45,15 @@ Please note that in some cases it may extract the files into a folder, if this i
 
 ## Change History
 
+### V2.8.4
+
+- **Replace OSes**            - Allows the replacement of one OS with another
+- **Project Spaces**          - Added Project Spaces
+- **Reserve disk space**      - Reserve some space on PINN's partition before formatting
+- **mkimage**                 - Added mkimage from uboot
+- **xz**                      - Allow XZ Compression
+- **Update Dialog**           - This now cancels any timeout setting
+
 ### V2.8.3
 
 - **Programmable CEC**        - Fixed bugs

buildroot/.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Buildroot 2015.02-git-00008-ga976550-dirty Configuration
+# Buildroot 2015.02-git-00001-g3b7f0db Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
 
@@ -403,7 +403,7 @@ BR2_PACKAGE_KODI_EGL_GLES=y
 # BR2_PACKAGE_LZ4 is not set
 # BR2_PACKAGE_LZIP is not set
 # BR2_PACKAGE_LZOP is not set
-# BR2_PACKAGE_XZ is not set
+BR2_PACKAGE_XZ=y
 
 #
 # Debugging, profiling and benchmark

buildroot/kernelconfig-recovery.armv6

@@ -20,7 +20,6 @@ CONFIG_ARCH_BCM2835=y
 # CONFIG_ARM_THUMB is not set
 # CONFIG_CACHE_L2X0 is not set
 CONFIG_PREEMPT=y
-CONFIG_AEABI=y
 CONFIG_CMA=y
 CONFIG_UACCESS_WITH_MEMCPY=y
 # CONFIG_ATAGS is not set
@@ -94,7 +93,6 @@ CONFIG_RT2800USB_RT55XX=y
 # CONFIG_WLAN_VENDOR_ST is not set
 # CONFIG_WLAN_VENDOR_TI is not set
 CONFIG_ZD1211RW=y
-# CONFIG_WLAN_VENDOR_ZYDAS is not set
 # CONFIG_WLAN_VENDOR_QUANTENNA is not set
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_EVDEV=y

changes.md

@@ -387,3 +387,11 @@ Fixes the incorrect recovery.cmdline bug in v2.5.2.
 - **Programmable CEC**        - Fixed bugs
 - **networktimeout**          - Added timeout to detect network presence
 
+### V2.8.4
+
+- **Replace OSes**            - Allows the replacement of one OS with another
+- **Project Spaces**          - Added Project Spaces
+- **Reserve disk space**      - Reserve some space on PINN's partition before formatting
+- **mkimage**                 - Added mkimage from uboot
+- **xz**                      - Allow XZ Compression
+- **Update Dialog**           - This now cancels any timeout setting

history.md

@@ -5,6 +5,15 @@ PINN is a version of the NOOBS Operating System Installer for the Raspberry Pi w
 
 ## Change History
 
+### V2.8.4
+
+- **Replace OSes**            - Allows the replacement of one OS with another
+- **Project Spaces**          - Added Project Spaces
+- **Reserve disk space**      - Reserve some space on PINN's partition before formatting
+- **mkimage**                 - Added mkimage from uboot
+- **xz**                      - Allow XZ Compression
+- **Update Dialog**           - This now cancels any timeout setting
+
 ### V2.8.3
 
 - **Programmable CEC**        - Fixed bugs

recovery/config.h

@@ -2,7 +2,7 @@
 #define CONFIG_H
 
 /* Version number displayed in the title bar */
-#define VERSION_NUMBER "2.8.3b"
+#define VERSION_NUMBER "2.8.4"
 
 /* Color of the background */
 // #define BACKGROUND_COLOR  Qt::white

recovery/osgroup.cpp

@@ -15,7 +15,7 @@ QT_TRANSLATE_NOOP("OsGroup","Games")
 QT_TRANSLATE_NOOP("OsGroup","Minimal")
 QT_TRANSLATE_NOOP("OsGroup","Education")
 QT_TRANSLATE_NOOP("OsGroup","Installed")
-QT_TRANSLATE_NOOP("OsGroup","Projects")
+QT_TRANSLATE_NOOP("OsGroup","Utility")
 #endif
 
 OsGroup::OsGroup(QMainWindow *mw, Ui::MainWindow *ui, bool doGrouping, QObject *parent) :

recovery/translation_ae.ts

@@ -1255,7 +1255,7 @@ Partition not big enough for new image.</source>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

recovery/translation_ast.ts

@@ -1255,7 +1255,7 @@ Partition not big enough for new image.</source>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

recovery/translation_ca.ts

@@ -1253,7 +1253,7 @@ Partition not big enough for new image.</source>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

recovery/translation_de.ts

@@ -1268,7 +1268,7 @@ Partition not big enough for new image.</source>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

recovery/translation_en.ts

@@ -1253,7 +1253,7 @@ Partition not big enough for new image.</source>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

recovery/translation_es.ts

@@ -1263,7 +1263,7 @@ Partition not big enough for new image.</source>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

recovery/translation_eu.ts

@@ -1261,7 +1261,7 @@ Partition not big enough for new image.</source>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

recovery/translation_fi.ts

@@ -1266,7 +1266,7 @@ Partition not big enough for new image.</source>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

recovery/translation_fr.ts

@@ -1269,7 +1269,7 @@ Partition not big enough for new image.</source>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

recovery/translation_hu.ts

@@ -1268,7 +1268,7 @@ Partition not big enough for new image.</source>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

recovery/translation_it.ts

@@ -1276,7 +1276,7 @@ Partizione non abbastanza grande per la nuova immagine.</translation>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

recovery/translation_ja.ts

@@ -1268,7 +1268,7 @@ Partition not big enough for new image.</source>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

recovery/translation_ko.ts

@@ -1247,7 +1247,7 @@ Partition not big enough for new image.</source>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

recovery/translation_nl.ts

@@ -1268,7 +1268,7 @@ Partition not big enough for new image.</source>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

recovery/translation_no.ts

@@ -1253,7 +1253,7 @@ Partition not big enough for new image.</source>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

recovery/translation_pl.ts

@@ -1268,7 +1268,7 @@ Partition not big enough for new image.</source>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

recovery/translation_pt.ts

@@ -1269,7 +1269,7 @@ Partition not big enough for new image.</source>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

recovery/translation_ru.ts

@@ -1268,7 +1268,7 @@ Partition not big enough for new image.</source>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

recovery/translation_sv.ts

@@ -1266,7 +1266,7 @@ Partition not big enough for new image.</source>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

recovery/translation_tr.ts

@@ -1267,7 +1267,7 @@ Partition not big enough for new image.</source>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

recovery/translation_zh_TW.ts

@@ -1263,7 +1263,7 @@ Partition not big enough for new image.</source>
     </message>
     <message>
         <location filename="osgroup.cpp" line="18"/>
-        <source>Projects</source>
+        <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

sdcontent/reboot

@@ -0,0 +1,2 @@
+#!/bin/sh
+echo b>/proc/sysrq-trigger