Updated stuff for I9220ZSLP1

2 files changed, 17 insertions, 10 deletions

diff --git a/releasetools/galaxynote_edify_generator.py b/releasetools/galaxynote_edify_generator.py
index a2ccc30..95bdf48 100755
--- a/releasetools/galaxynote_edify_generator.py
+++ b/releasetools/galaxynote_edify_generator.py
@@ -35,3 +35,12 @@ class EdifyGenerator(edify_generator.EdifyGenerator):
             ('assert(package_extract_file("%(image)s", "/tmp/%(image)s"),\n'
              '       write_raw_image("/tmp/%(image)s", "%(partition)s"),\n'
              '       delete("/tmp/%(image)s"));') % args)
+
+    def Unmount(self, mount_point):
+      """Unmount the partition with the given mount_point."""
+      fstab = self.info.get("fstab", None)
+      if fstab:
+        p = fstab[mount_point]
+        self.script.append('unmount("%s");' %
+								(p.mount_point))
+        self.mounts.add(p.mount_point)
diff --git a/releasetools/galaxynote_ota_from_target_files b/releasetools/galaxynote_ota_from_target_files
index 4b6150f..06b7918 100755
--- a/releasetools/galaxynote_ota_from_target_files
+++ b/releasetools/galaxynote_ota_from_target_files
@@ -68,6 +68,7 @@ def WriteFullOTAPackage(input_zip, output_zip):
   if OPTIONS.wipe_user_data:
     script.FormatPartition("/data")
 
+  script.Unmount("/system")
   script.FormatPartition("/system")
   script.Mount("/system")
   script.UnpackPackageDir("recovery", "/system")
@@ -75,12 +76,11 @@ def WriteFullOTAPackage(input_zip, output_zip):
 
   (symlinks, retouch_files) = CopySystemFiles(input_zip, output_zip)
   script.MakeSymlinks(symlinks)
-
   if OPTIONS.aslr_mode:
-     script.RetouchBinaries(retouch_files)
+    script.RetouchBinaries(retouch_files)
   else:
-     script.UndoRetouchBinaries(retouch_files)
-  
+    script.UndoRetouchBinaries(retouch_files)
+
   CopyBootFiles(input_zip, output_zip)
 
   Item.GetMetadata(input_zip)
@@ -88,11 +88,9 @@ def WriteFullOTAPackage(input_zip, output_zip):
 
   script.ShowProgress(0.2, 0)
 
-#  if OPTIONS.backuptool:
-#    script.ShowProgress(0.2, 10)
-#    script.RunBackup("restore")
-
-#  script.RunVerifyCachePartitionSize()
+  if OPTIONS.backuptool:
+    script.ShowProgress(0.2, 10)
+    script.RunBackup("restore")
 
   script.ShowProgress(0.2, 10)
   script.EMMCWriteRawImage("/dev/block/mmcblk0p5", "boot.img")
@@ -110,7 +108,7 @@ ota_from_target_files.WriteFullOTAPackage = WriteFullOTAPackage
 
 
 def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip):
-    print "Incremental OTA Packages are not support on the galaxys2 at this time"
+    print "Incremental OTA Packages are not support on the galaxynote at this time"
     sys.exit(1)
 ota_from_target_files.WriteIncrementalOTAPackage = WriteIncrementalOTAPackage