allow firmware fetch

make_factory_package.sh

 #!/bin/bash
 
 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to generate a factory install partition set and miniomaha.conf
 # file from a release image and a factory image. This creates a server
 # configuration that can be installed using a factory install shim.
 #
 # miniomaha lives in src/platform/dev/ and miniomaha partition sets live
 # in src/platform/dev/static.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
 . "$(dirname "$0")/common.sh"
 
 # Load functions and constants for chromeos-install
 . "$(dirname "$0")/chromeos-common.sh"
 
 get_default_board
 
 # Flags
 DEFINE_string board "${DEFAULT_BOARD}" "Board for which the image was built"
 DEFINE_string factory "" \
   "Directory and file containing factory image: /path/chromiumos_test_image.bin"
-DEFINE_boolean include_firmware $FLAGS_FALSE \
-  "If set, include the firmware image to the server configuration"
+DEFINE_string firmware_updater "" \
+  "If set, include the firmware shellball into the server configuration"
 DEFINE_string release "" \
   "Directory and file containing release image: /path/chromiumos_image.bin"
 
 
 # Parse command line
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 
 if [ ! -f "${FLAGS_release}" ] ; then
   echo "Cannot find image file ${FLAGS_release}"
   exit 1
 fi
 
 if [ ! -f "${FLAGS_factory}" ] ; then
   echo "Cannot find image file ${FLAGS_factory}"
   exit 1
 fi
 
+if [ ! -z "${FLAGS_firmware_updater}" ] && \
+   [ ! -f "${FLAGS_firmware_updater}" ] ; then
+  echo "Cannot find firmware file ${FLAGS_firmware_updater}"
+  exit 1
+fi
+
 # Convert args to paths.  Need eval to un-quote the string so that shell
 # chars like ~ are processed; just doing FOO=`readlink -f ${FOO}` won't work.
 OMAHA_DIR=${SRC_ROOT}/platform/dev
 OMAHA_DATA_DIR=${OMAHA_DIR}/static/
-FIRMWARE_DIR=${SRC_ROOT}/platform/firmware/${FLAGS_board}
 
 if [ ${INSIDE_CHROOT} -eq 0 ]; then
   echo "Caching sudo authentication"
   sudo -v
   echo "Done"
 fi
 
 # Use this image as the source image to copy
 RELEASE_DIR=`dirname ${FLAGS_release}`
 FACTORY_DIR=`dirname ${FLAGS_factory}`
@@ skipping 64 matching lines @@
 mv rootfs-test.gz ${OMAHA_DATA_DIR}
 echo "test: ${test_hash}"
 
 cat part_1 | gzip -9 > state.gz
 state_hash=`cat state.gz | openssl sha1 -binary | openssl base64`
 mv state.gz ${OMAHA_DATA_DIR}
 echo "state: ${state_hash}"
 
 popd > /dev/null
 
-if [ ${FLAGS_include_firmware} -eq ${FLAGS_TRUE} ] ; then
-  pushd ${FIRMWARE_DIR} > /dev/null
-
-  ./pack_firmware.sh | gzip -9 > firmware.gz
-  if [ "${PIPESTATUS[*]}" != "0 0" ]; then
-    echo "Failed to pack the firmware image."
+if [ ! -z ${FLAGS_firmware_updater} ] ; then
+  SHELLBALL="${FLAGS_firmware_updater}"
+  if [ ! -f  "$SHELLBALL" ]; then
+    echo "Failed to find firmware updater: $SHELLBALL."
     exit 1
   fi
+
+  cat $SHELLBALL | gzip -9 > firmware.gz
   firmware_hash=`cat firmware.gz | openssl sha1 -binary | openssl base64`
   mv firmware.gz ${OMAHA_DATA_DIR}
   echo "firmware: ${firmware_hash}"
-
-  popd > /dev/null
 fi
 
 echo -n "
 config = [
  {
    'qual_ids': set([\"${FLAGS_board}\"]),
    'factory_image': 'rootfs-test.gz',
    'factory_checksum': '${test_hash}',
    'release_image': 'rootfs-release.gz',
    'release_checksum': '${release_hash}',
    'oempartitionimg_image': 'oem.gz',
    'oempartitionimg_checksum': '${oem_hash}',
    'efipartitionimg_image': 'efi.gz',
    'efipartitionimg_checksum': '${efi_hash}',
    'stateimg_image': 'state.gz',
    'stateimg_checksum': '${state_hash}'," > ${OMAHA_DIR}/miniomaha.conf
 
-if [ ${FLAGS_include_firmware} -eq ${FLAGS_TRUE} ] ; then
+if [ ! -z "${FLAGS_firmware_updater}" ]  ; then
   echo -n "
    'firmware_image': 'firmware.gz',
    'firmware_checksum': '${firmware_hash}'," >> ${OMAHA_DIR}/miniomaha.conf
 fi
 
 echo -n "
  },
 ]
 " >> ${OMAHA_DIR}/miniomaha.conf
 
 echo "The miniomaha server lives in src/platform/dev"
 echo "to validate the configutarion, run:"
 echo "  python2.6 devserver.py --factory_config miniomaha.conf \
 --validate_factory_config"
 echo "To run the server:"
 echo "  python2.6 devserver.py --factory_config miniomaha.conf"