v3.0.2 Fix backup from USB installed OSes. rebootp makefile.

procount · Dec 22, 2018 · 54a781a · 54a781a
1 parent 471d599
commit 54a781a
Show file tree

Hide file tree

Showing 30 changed files with 2,534 additions and 2,536 deletions.
diff --git a/README_PINN.md b/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 v3.0.1
+This README relates to v3.0.2
 
 <sup>(PINN-lite 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`. More recently, `pinn.zip` has also been made available for download which includes versions of Raspbian and LibreELEC.)</sup>
 

diff --git a/README_SUM.md b/README_SUM.md
@@ -45,6 +45,10 @@ Please note that in some cases it may extract the files into a folder, if this i
 
 ## Change History
 
+## V3.0.2
+
+- **Backup USB**        - Improved backup size calculation for USB installed OSes.
+
 ## V3.0.1
 
 - **Backup/Download**   - Removed the need to reboot after a download or backup.

diff --git a/changes.md b/changes.md
@@ -462,3 +462,7 @@ Fixes the incorrect recovery.cmdline bug in v2.5.2.
 - **Wallpapers**        - removed wallpapers folder & Allowed JPEGs
 - **Default wallpaper   - Changed default to wallpaper.jpg
 
+## V3.0.2
+
+- **Backup USB**        - Improved backup size calculation for USB installed OSes.
+
diff --git a/history.md b/history.md
@@ -5,6 +5,10 @@ PINN is a version of the NOOBS Operating System Installer for the Raspberry Pi w
 
 ## Change History
 
+## V3.0.2
+
+- **Backup USB**        - Improved backup size calculation for USB installed OSes.
+
 ## V3.0.1
 
 - **Backup/Download**   - Removed the need to reboot after a download or backup.

diff --git a/rebootp/Makefile b/rebootp/Makefile
@@ -1,4 +1,5 @@
-CC=/home/kevin/noobs_test/buildroot/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc
+#CC=/home/kevin/noobs_test/buildroot/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc
+CC=$(PWD)/../noobs_test/buildroot/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc
 
 all: rebootp
 	$(MAKE) $(AM_MAKEFLAGS) rebootp

diff --git a/recovery/backupthread.cpp b/recovery/backupthread.cpp
@@ -148,9 +148,11 @@ bool BackupThread::processImage(const QVariantMap & entry)
     foreach (PartitionInfo * pPart, *partitions)
     {
         QString label = pPart->label();
-        QString dev = partdevices[i].toString();
+        QString part = partdevices[i].toString();
         QByteArray fstype   = pPart->fsType();
 
+        QString dev = getDevice(part);
+
         //   Mount it
         QProcess::execute("mount -o ro "+dev+" /tmp/src");
         emit newDrive(dev);

diff --git a/recovery/config.h b/recovery/config.h
@@ -2,7 +2,7 @@
 #define CONFIG_H
 
 /* Version number displayed in the title bar */
-#define VERSION_NUMBER "3.0.1"
+#define VERSION_NUMBER "3.0.2"
 
 /* Color of the background */
 // #define BACKGROUND_COLOR  Qt::white

diff --git a/recovery/mainwindow.cpp b/recovery/mainwindow.cpp
@@ -3164,10 +3164,11 @@ void MainWindow::startImageBackup()
             {
                 QString part = pv.toString();
                 QString mntpoint = "/tmp/media/p"+QString::number(i);
-
                 QString fname = "/tmp/size"+QString::number(i)+".txt";
 
-                cmd = "sh -c \"grep "+part+" /tmp/df.txt >/tmp/sizes.txt\""; QProcess::execute(cmd);
+                QString dev = getDevice(part);
+
+                cmd = "sh -c \"grep "+ dev +" /tmp/df.txt >/tmp/sizes.txt\""; QProcess::execute(cmd);
                 cmd = "sh -c \"sed -i 's/ \\+/ /g' /tmp/sizes.txt\""; QProcess::execute(cmd);
                 //get USED space in 1K blocks
                 cmd = "sh -c \"cat /tmp/sizes.txt | cut -d ' ' -f 3 >"+fname+"\""; QProcess::execute(cmd);