Merge lp:~dooferlad/linaro-image-tools/fix-hwpack-no-internet into lp:linaro-image-tools/11.11

[James Tunnicliffe]

Fixing up hardware pack installs when there aren't any packages update lists available to download.

[Milo Casagrande (milo)]

Hello James,

it looks OK to me. I double tested it with latest hwpack/images and also with the oldest I could find. I would need to thoroughly check it also on a 10.04 install. I cannot go back more than 11.07 on releases.l.o.

Just one thing, but not that important:

+ $sudo apt-get $FORCE_OPTIONS -o "$APT_GET_OPTIONS" update -q --no-download

Should we add also the "--no-missing" here to really force no download at all?
In case, add when merging.

review: Approve

[lp:~dooferlad/linaro-image-tools/fix-hwpack-no-internet]

606. By James Tunnicliffe on 2013-02-21

Slightly updated apt-get update call to try harder to complete without a net connection

=== modified file 'linaro-hwpack-install'
--- linaro-hwpack-install	2012-12-03 08:19:48 +0000
+++ linaro-hwpack-install	2013-02-21 14:43:18 +0000
@@ -173,8 +173,16 @@
     FORCE_OPTIONS=""
   fi
 
+  # Do two updates. The first doesn't try to download package lists:
+  # * First update doesn't access net
+  #   - not allowed to fail. Image file + hwpack should contain all packages
+  #     needed to create image. If this update fails we have problems.
+  # * Second update may fail
+  #   - If can't download package updates (the only difference between the two
+  #     commands), we should still be OK.
   echo "Updating apt package lists ..."
-  $sudo apt-get $FORCE_OPTIONS -o "$APT_GET_OPTIONS" update -q
+  $sudo apt-get $FORCE_OPTIONS -o "$APT_GET_OPTIONS" update -q --no-download --ignore-missing
+  $sudo apt-get $FORCE_OPTIONS -o "$APT_GET_OPTIONS" update -q || true
 }
 
 setup_ubuntu_rootfs() {
@@ -282,7 +290,15 @@
     if [ -x /sbin/initctl.REAL ]; then
       mv -f /sbin/initctl.REAL /sbin/initctl
     fi
-    $sudo apt-get update -qq
+    # Do two updates. The first doesn't try to download package lists:
+    # * First update doesn't access net
+    #   - not allowed to fail. Image file + hwpack should contain all packages
+    #     needed to create image. If this update fails we have problems.
+    # * Second update may fail
+    #   - If can't download package updates (the only difference between the two
+    #     commands), we should still be OK.
+    $sudo apt-get update -qq --no-download --ignore-missing
+    $sudo apt-get update -qq || true
   fi
   echo "Done"
 }
 
=== modified file 'linaro_image_tools/media_create/boards.py'
--- linaro_image_tools/media_create/boards.py	2013-01-14 14:56:31 +0000
+++ linaro_image_tools/media_create/boards.py	2013-02-21 14:43:18 +0000
@@ -257,6 +257,7 @@
         with self.hardwarepack_handler:
             self.hwpack_format = self.hardwarepack_handler.get_format()
             if (self.hwpack_format == self.hardwarepack_handler.FORMAT_1):
+                self.bootloader_copy_files = None
                 return
 
             if (self.hwpack_format != self.hardwarepack_handler.FORMAT_1):