AU: Include old kernel hash for source partition verification.

delta_diff_generator.cc

 // Copyright (c) 2010 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.
 
 #include "update_engine/delta_diff_generator.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
 #include <sys/stat.h>
@@ skipping 428 matching lines @@
             << kInstallOperationTypes[op->type()];
   return true;
 }
 
 struct DeltaObject {
   DeltaObject(const string& in_name, const int in_type, const off_t in_size)
       : name(in_name),
         type(in_type),
         size(in_size) {}
   bool operator <(const DeltaObject& object) const {
-    return size < object.size;
+    return (size != object.size) ? (size < object.size) : (name < object.name);
   }
   string name;
   int type;
   off_t size;
 };
 
 void ReportPayloadUsage(const Graph& graph,
                         const DeltaArchiveManifest& manifest,
                         const int64_t manifest_metadata_size) {
   vector<DeltaObject> objects;
@@ skipping 151 matching lines @@
                                                    &block_size));
     size = static_cast<int64_t>(block_count) * block_size;
   }
   TEST_AND_RETURN_FALSE(size > 0);
   info->set_size(size);
   OmahaHashCalculator hasher;
   TEST_AND_RETURN_FALSE(hasher.UpdateFile(partition, size) == size);
   TEST_AND_RETURN_FALSE(hasher.Finalize());
   const vector<char>& hash = hasher.raw_hash();
   info->set_hash(hash.data(), hash.size());
-  LOG(INFO) << "hash: " << hasher.hash();
+  LOG(INFO) << partition << ": size=" << size << " hash=" << hasher.hash();
   return true;
 }
 
 bool InitializePartitionInfos(const string& old_kernel,
                               const string& new_kernel,
                               const string& old_rootfs,
                               const string& new_rootfs,
                               DeltaArchiveManifest* manifest) {
-  // TODO(petkov): Generate the old kernel info when we stop generating full
-  // updates for the kernel partition.
+  if (!old_kernel.empty()) {
+    TEST_AND_RETURN_FALSE(
+        InitializePartitionInfo(true,
+                                old_kernel,
+                                manifest->mutable_old_kernel_info()));
+  }
   TEST_AND_RETURN_FALSE(
       InitializePartitionInfo(true,
                               new_kernel,
                               manifest->mutable_new_kernel_info()));
   if (!old_rootfs.empty()) {
     TEST_AND_RETURN_FALSE(
         InitializePartitionInfo(false,
                                 old_rootfs,
                                 manifest->mutable_old_rootfs_info()));
   }
@@ skipping 872 matching lines @@
 
   LOG(INFO) << "All done. Successfully created delta file.";
   return true;
 }
 
 const char* const kBsdiffPath = "/usr/bin/bsdiff";
 const char* const kBspatchPath = "/usr/bin/bspatch";
 const char* const kDeltaMagic = "CrAU";
 
 };  // namespace chromeos_update_engine