14.06: fix problems with cmp and zipped images

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

3 files changed, 14 insertions, 8 deletions

diff --git a/android/images/armv8-android-juno-lsk/HOWTO_install.txt b/android/images/armv8-android-juno-lsk/HOWTO_install.txt
index 06b0b7f..67c1af6 100644
--- a/android/images/armv8-android-juno-lsk/HOWTO_install.txt
+++ b/android/images/armv8-android-juno-lsk/HOWTO_install.txt
@@ -47,7 +47,9 @@ DRIVE=/dev/sdX # USB drive found from dmesg above
 * Unmount all partitions on the drive
 ** If you do not unmount all of the USB drive's partitions, you run the risk that the image will not be created successfully.
 * Write the image to the drive
-bzcat juno.img.bz2 | sudo dd of=$DRIVE
+
+bc. bunzip2 juno.img.bz2
+sudo dd if=juno.img of=$DRIVE
 
 
 When the image is created, skip down to the section "Booting the image".
@@ -65,7 +67,7 @@ You should also ensure that you have written the image to the USB drive correctl
 
 Once you are ready, run the following commands:
 
-bc. $ sudo cmp /dev/sdX juno.img.bz2
+bc. $ sudo cmp /dev/sdX juno.img
 
 *Note:* Windows users may use the "Image Writer for Windows":https://launchpad.net/win32-image-writer/+download
 
diff --git a/android/images/armv8-juice-juno-lsk/HOWTO_install.txt b/android/images/armv8-juice-juno-lsk/HOWTO_install.txt
index 6235c32..9331773 100644
--- a/android/images/armv8-juice-juno-lsk/HOWTO_install.txt
+++ b/android/images/armv8-juice-juno-lsk/HOWTO_install.txt
@@ -47,7 +47,9 @@ DRIVE=/dev/sdX # USB drive found from dmesg above
 * Unmount all partitions on the drive
 ** If you do not unmount all of the USB drive's partitions, you run the risk that the image will not be created successfully.
 * Write the image to the drive
-bzcat juno.img.bz2 | sudo dd of=$DRIVE
+
+bc. bunzip2 juno.img.bz2
+sudo dd if=juno.img of=$DRIVE
 
 
 When the image is created, skip down to the section "Booting the image".
@@ -65,7 +67,7 @@ You should also ensure that you have written the image to the USB drive correctl
 
 Once you are ready, run the following commands:
 
-bc. $ sudo cmp /dev/sdX juno.img.bz2
+bc. $ sudo cmp /dev/sdX juno.img
 
 *Note:* Windows users may use the "Image Writer for Windows":https://launchpad.net/win32-image-writer/+download
 
diff --git a/openembedded/juno-lsk/INSTALL.textile b/openembedded/juno-lsk/INSTALL.textile
index 888658c..1962acc 100644
--- a/openembedded/juno-lsk/INSTALL.textile
+++ b/openembedded/juno-lsk/INSTALL.textile
@@ -48,9 +48,11 @@ DRIVE=/dev/sdX # USB drive found from dmesg above
 * Unmount all partitions on the drive
 ** If you do not unmount all of the USB drive's partitions, you run the risk that the image will not be created successfully.
 * Write the image to the drive
-zcat *minimal*.img.gz | sudo dd of=$DRIVE
 
-Replace *minimal*.img.gz with the full filename of the prebuilt image you are attempting to write to the disk.
+bc. gunzip *minimal*.img.gz
+sudo dd if=*minimal*.img of=$DRIVE
+
+Replace @*minimal*.img.gz@ with the full filename of the prebuilt image you are attempting to write to the disk.
 
 When the image is created, skip down to the section "Booting the image".
 
@@ -67,7 +69,7 @@ You should also ensure that you have written the image to the USB drive correctl
 
 Once you are ready, run the following commands:
 
-bc. $ sudo cmp /dev/sdX *minimal*.img.gz
+bc. $ sudo cmp /dev/sdX *minimal*.img
 
 Replace *minimal*.img.gz with the full filename of the prebuilt image you are attempting to write to the disk.
 
@@ -249,7 +251,7 @@ It may take a long time, perhaps over a minute for UEFI to save the Boot Device
 
 After you have configured the Boot Device Entry, next you must configure the Flattened Device Tree (FDT) path.  You do this by selecting the option "Update FDT path" by pressing the 4 key and pressing enter.  As with the Add Boot Device Entry option, next you will be presented with a list of Boot Devices that can host the FDT file.  On our test system, the list looked like this:
 
-bc.  [1] Firmware Volume (4068 MB)
+bc. [1] Firmware Volume (4068 MB)
 [2] Firmware Volume (4068 MB)
 [3] NOR Flash (63 MB)
 [4] boot (67 MB)