Commit graph

11767 commits

Author SHA1 Message Date
Doug Zongker
2d87023e77 am 2c3539e4: save the log from recovery\'s last run in /cache/recovery/last_log
Merge commit '2c3539e4d8251ad91e0b881253d39583680093e8' into gingerbread-plus-aosp

* commit '2c3539e4d8251ad91e0b881253d39583680093e8':
  save the log from recovery's last run in /cache/recovery/last_log
2010-09-29 13:46:06 -07:00
Doug Zongker
2c3539e4d8 save the log from recovery's last run in /cache/recovery/last_log
Also, don't lose the start of the log whenever a wipe cache is
performed.

Change-Id: I29999762854eb36d1ff2bc20b4183c9077b19777
2010-09-29 13:40:44 -07:00
Doug Zongker
1a32732db2 am 704fa750: am 9b125b04: handle old-style CACHE: packages
Merge commit '704fa75024467fb4e362537f7c341eb056e283b5'

* commit '704fa75024467fb4e362537f7c341eb056e283b5':
  handle old-style CACHE: packages
2010-09-22 13:53:57 -07:00
Doug Zongker
704fa75024 am 9b125b04: handle old-style CACHE: packages
Merge commit '9b125b04c6ba8f07d8aa6494d58917a596443dc5' into gingerbread-plus-aosp

* commit '9b125b04c6ba8f07d8aa6494d58917a596443dc5':
  handle old-style CACHE: packages
2010-09-22 12:06:24 -07:00
Doug Zongker
9b125b04c6 handle old-style CACHE: packages
Change-Id: I7bf52b56770c207ba1c8329243991b07ebb65779
2010-09-22 12:01:37 -07:00
Doug Zongker
6b26c882a8 am af78591c: am 2c3c5c15: Merge "mount sdcard only on demand; fix sideload installs" into gingerbread
Merge commit 'af78591c9a2aa8379c2d8528c31ea1eb813f6cae'

* commit 'af78591c9a2aa8379c2d8528c31ea1eb813f6cae':
  mount sdcard only on demand; fix sideload installs
2010-09-21 20:21:52 -07:00
Doug Zongker
af78591c9a am 2c3c5c15: Merge "mount sdcard only on demand; fix sideload installs" into gingerbread
Merge commit '2c3c5c15d15faf1c9fa074851c57d0afa2a40d28' into gingerbread-plus-aosp

* commit '2c3c5c15d15faf1c9fa074851c57d0afa2a40d28':
  mount sdcard only on demand; fix sideload installs
2010-09-21 20:01:51 -07:00
Doug Zongker
2c3c5c15d1 Merge "mount sdcard only on demand; fix sideload installs" into gingerbread 2010-09-21 20:00:18 -07:00
Doug Zongker
c18eeb874b mount sdcard only on demand; fix sideload installs
Bug: 3009493
Change-Id: I1a7f99fc41a6a7012742e82f8c06a0c75584890a
2010-09-21 16:58:10 -07:00
Doug Zongker
3d798835a3 am 8147ba85: (-s ours) am 93ca4fc6: use fs_type "emmc" instead of "block" for consistency (do not merge)
Merge commit '8147ba850b2e74dc950183e67c77a0da2b1a19b7'

* commit '8147ba850b2e74dc950183e67c77a0da2b1a19b7':
  use fs_type "emmc" instead of "block" for consistency (do not merge)
2010-09-21 14:46:43 -07:00
Doug Zongker
8147ba850b am 93ca4fc6: use fs_type "emmc" instead of "block" for consistency (do not merge)
Merge commit '93ca4fc6943a3ebf758c5db98531531b8fe92c98' into gingerbread-plus-aosp

* commit '93ca4fc6943a3ebf758c5db98531531b8fe92c98':
  use fs_type "emmc" instead of "block" for consistency (do not merge)
2010-09-21 14:37:10 -07:00
Doug Zongker
93ca4fc694 use fs_type "emmc" instead of "block" for consistency (do not merge)
Change-Id: Iab60665d9c6daef7893896a64b7f319120a5f8ee
2010-09-21 14:28:11 -07:00
Doug Zongker
cc8cd3f3ca remove the notion of "root path"; support mixed flash types
Remove the wacky notion of "roots" and "root paths" (those things that
look like "FOO:some/path" instead of just "/foo/some/path").  Let each
device specify its own table of available partitions and how to mount
them (needed for devices that use both MTD/yaffs2 and EMMC/ext4
partitions).

(Cherrypicked from gingerbread w/slight edits.)

Change-Id: I2479ce76b13e73f1d12035c89386c3a82b3edf51
2010-09-21 14:13:45 -07:00
Doug Zongker
0f1ad110f8 am 3dba40da: (-s ours) am d4208f9f: remove the notion of "root path"; support mixed flash types (do not merge)
Merge commit '3dba40da1e533c6f419857e4274d9d9dd55868b6'

* commit '3dba40da1e533c6f419857e4274d9d9dd55868b6':
  remove the notion of "root path"; support mixed flash types (do not merge)
2010-09-21 11:38:21 -07:00
Doug Zongker
3dba40da1e am d4208f9f: remove the notion of "root path"; support mixed flash types (do not merge)
Merge commit 'd4208f9f9d4e9f268ba1888c1fe879ee73eb7e47' into gingerbread-plus-aosp

* commit 'd4208f9f9d4e9f268ba1888c1fe879ee73eb7e47':
  remove the notion of "root path"; support mixed flash types (do not merge)
2010-09-21 11:34:39 -07:00
Doug Zongker
d4208f9f9d remove the notion of "root path"; support mixed flash types (do not merge)
Remove the wacky notion of "roots" and "root paths" (those things that
look like "FOO:some/path" instead of just "/foo/some/path").  Let each
device specify its own table of available partitions and how to mount
them (needed for devices that use both MTD/yaffs2 and EMMC/ext4
partitions).

Change-Id: I18b0a572a71c5e087e0b7ae11b1774388339bfd1
2010-09-20 18:07:31 -07:00
Doug Zongker
c9ebb58623 resolved conflicts for merge of 40f0d3b4 to master
Change-Id: If14ab094a8bb11106b0ea7fdf8736e5e4c223089
2010-09-17 16:07:14 -07:00
Doug Zongker
40f0d3b4e0 am d7d42089: remove unneeded partition roots
Merge commit 'd7d4208976125d114d0b8e44438e2417d5275098' into gingerbread-plus-aosp

* commit 'd7d4208976125d114d0b8e44438e2417d5275098':
  remove unneeded partition roots
2010-09-17 13:30:15 -07:00
Doug Zongker
d7d4208976 remove unneeded partition roots
Recovery itself no longer needs to access all these partitions;
manipulation of them is done by the updater binary.  This is a small
first step towards removing roots entirely.

Change-Id: I3fbcada32079a37db4cc097861dfa91e0a08da30
2010-09-17 13:02:48 -07:00
Brian Swetland
97e54ef573 am 1dcd2fd0: (-s ours) am 792b0071: do not merge - update to match ext4utils api
Merge commit '1dcd2fd0c7cc44cae279a5088241bdf15f084cb8'

* commit '1dcd2fd0c7cc44cae279a5088241bdf15f084cb8':
  do not merge - update to match ext4utils api
2010-09-15 19:49:56 -07:00
Brian Swetland
1dcd2fd0c7 am 792b0071: do not merge - update to match ext4utils api
Merge commit '792b00712bb1411d3b0583bcea95b43b3107fb95' into gingerbread-plus-aosp

* commit '792b00712bb1411d3b0583bcea95b43b3107fb95':
  do not merge - update to match ext4utils api
2010-09-15 18:07:22 -07:00
Doug Zongker
dc49ce453e add missing sparseness parameter
Change-Id: Ie6e309b127e80cd6475f1deaa5dbadf9f5cc2746
2010-09-15 18:05:10 -07:00
Brian Swetland
792b00712b do not merge - update to match ext4utils api
Change-Id: I9d34e491022d7dfed653a861b0728a0a656f1fbe
2010-09-15 18:03:58 -07:00
Doug Zongker
6c3e03b3c5 resolved conflicts for merge of 85bcf776 to master
Change-Id: Iab4f25702a5a62b9172f81fd543a8240a0e603c3
2010-09-15 17:51:50 -07:00
Doug Zongker
a66c32ab1d resolved conflicts for merge of 9f89b0e4 to master
Change-Id: Id458df96fd56830fdb35397e95a80274761ecff5
2010-09-15 17:40:14 -07:00
Doug Zongker
d7693c4c8e resolved conflicts for merge of 76445f3a to master
Change-Id: I658894dcaddbf0de428e3c51dbcdc306d3f47a52
2010-09-15 17:03:51 -07:00
Doug Zongker
6b1ff61f62 am 858f0a76: am 8e5e4dad: close update package before installing; allow remount
Merge commit '858f0a763d0f736eb721f54257b6164886bfcbfc'

* commit '858f0a763d0f736eb721f54257b6164886bfcbfc':
  close update package before installing; allow remount
2010-09-15 16:32:52 -07:00
Doug Zongker
4f69afdb63 am bd4bc088: am d12560aa: add the ability to seek to a raw location while reading MTD partition
Merge commit 'bd4bc088e286b87a5d1469598644125ecc0fd547'

* commit 'bd4bc088e286b87a5d1469598644125ecc0fd547':
  add the ability to seek to a raw location while reading MTD partition
2010-09-15 12:32:22 -07:00
Doug Zongker
85bcf776e1 am 8a8e6cc3: (cherry-pick) EMMC support in applypatch
Merge commit '8a8e6cc33cc0dcfe7e184b59d5ef1f1c29095509' into gingerbread-plus-aosp

* commit '8a8e6cc33cc0dcfe7e184b59d5ef1f1c29095509':
  (cherry-pick) EMMC support in applypatch
2010-09-15 11:17:34 -07:00
Doug Zongker
9f89b0e467 am 56c5105b: support for ext4/EMMC filesystems in updater binary
Merge commit '56c5105bd7096704eaed35329b2c8c84cc282867' into gingerbread-plus-aosp

* commit '56c5105bd7096704eaed35329b2c8c84cc282867':
  support for ext4/EMMC filesystems in updater binary
2010-09-15 11:14:51 -07:00
Doug Zongker
76445f3aef am 8674a726: (cherry-pick) support installing any .zip file on the sdcard
Merge commit '8674a726ff05a4a6c09c6934778c251635f130a8' into gingerbread-plus-aosp

* commit '8674a726ff05a4a6c09c6934778c251635f130a8':
  (cherry-pick) support installing any .zip file on the sdcard
2010-09-15 11:12:34 -07:00
Doug Zongker
8a8e6cc33c (cherry-pick) EMMC support in applypatch
Let applypatch read and write EMMC partitions as well as MTD ones.
This enables incremental updates that include boot image changes, as
well as OTA of new recovery partitions.

Change-Id: Ib1861219c7ca66dff29ad02d6a0a14e5f03eb4d8
2010-09-15 11:12:11 -07:00
Doug Zongker
56c5105bd7 support for ext4/EMMC filesystems in updater binary
Make the mount and format functions take extra parameters describing
the filesystem type and add support for mounting and formatting ext4
filesystems on EMMC.

Change recovery to consistently use stdout for status messages instead
of mixing stdout and stderr.
2010-09-15 11:10:02 -07:00
Doug Zongker
8674a726ff (cherry-pick) support installing any .zip file on the sdcard
Replaces the "install sdcard:update zip" menu option with one that
displays a menu of zip files (and subdirs) on the sdcard and lets you
pick which one to install.

Change-Id: Icff541525f2fdfc8939a91af626ecc386ac9dd07
2010-09-15 11:08:23 -07:00
Doug Zongker
858f0a763d am 8e5e4dad: close update package before installing; allow remount
Merge commit '8e5e4dada713609c9b2c45ea9cf4572bb89ef761' into gingerbread-plus-aosp

* commit '8e5e4dada713609c9b2c45ea9cf4572bb89ef761':
  close update package before installing; allow remount
2010-09-14 21:32:14 -07:00
Doug Zongker
8e5e4dada7 close update package before installing; allow remount
Close the update package before invoking the binary, to allow the
installer to unmount /cache if it wants to.  Add a function to allow
remounting of a mount as read-only.

Change-Id: Idfcc96c3da66083295177f729263560be58034e4
2010-09-14 21:26:38 -07:00
Doug Zongker
bd4bc088e2 am d12560aa: add the ability to seek to a raw location while reading MTD partition
Merge commit 'd12560aa2134d3af21a1220cd4873553f9c51743' into gingerbread-plus-aosp

* commit 'd12560aa2134d3af21a1220cd4873553f9c51743':
  add the ability to seek to a raw location while reading MTD partition
2010-09-14 15:32:07 -07:00
Doug Zongker
d12560aa21 add the ability to seek to a raw location while reading MTD partition
Change-Id: Id1563ca667c50e61cf1bb15d2cf783a50937eece
2010-09-14 15:28:54 -07:00
Doug Zongker
6a84721c76 am f94a3575: am 61ba7a83: stop treating all-zero blocks as bad
Merge commit 'f94a3575d76f1fd6df20f82ca28fff688d53cfbc'

* commit 'f94a3575d76f1fd6df20f82ca28fff688d53cfbc':
  stop treating all-zero blocks as bad
2010-09-12 14:28:45 -07:00
Doug Zongker
f94a3575d7 am 61ba7a83: stop treating all-zero blocks as bad
Merge commit '61ba7a83ef46494689801ddaad569d7d174153b1' into gingerbread-plus-aosp

* commit '61ba7a83ef46494689801ddaad569d7d174153b1':
  stop treating all-zero blocks as bad
2010-09-12 14:23:25 -07:00
Doug Zongker
61ba7a83ef stop treating all-zero blocks as bad
Change-Id: If49fa6485f66598d16a7e44fce3129de55fab422
2010-09-12 13:36:40 -07:00
Doug Zongker
0b519b25c3 am a2c9a1e8: am aaf3f56c: block is bad if ioctl() returns nonzero
Merge commit 'a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8'

* commit 'a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8':
  block is bad if ioctl() returns nonzero
2010-09-09 17:01:49 -07:00
Doug Zongker
a2c9a1e8a2 am aaf3f56c: block is bad if ioctl() returns nonzero
Merge commit 'aaf3f56c44c37dca4ef9cc9efde68727ca26105f' into gingerbread-plus-aosp

* commit 'aaf3f56c44c37dca4ef9cc9efde68727ca26105f':
  block is bad if ioctl() returns nonzero
2010-09-09 16:59:05 -07:00
Doug Zongker
aaf3f56c44 block is bad if ioctl() returns nonzero
Change-Id: I6fc4ce796bc663d05035927c0af0ce7ab6d07218
2010-09-09 16:54:35 -07:00
Doug Zongker
b56db27d08 am 28cae98c: am 4bc98062: add --show_text option to recovery
Merge commit '28cae98c834fb4bc47588b34dc3fe19811d5162b'

* commit '28cae98c834fb4bc47588b34dc3fe19811d5162b':
  add --show_text option to recovery
2010-09-03 11:23:21 -07:00
Doug Zongker
28cae98c83 am 4bc98062: add --show_text option to recovery
Merge commit '4bc980626c1cf6f1ea7d36e4b54e0023c896c9de' into gingerbread-plus-aosp

* commit '4bc980626c1cf6f1ea7d36e4b54e0023c896c9de':
  add --show_text option to recovery
2010-09-03 11:20:50 -07:00
Doug Zongker
4bc980626c add --show_text option to recovery
Change-Id: Ie6c6c920260dfa759fbb15b1f352d6bb0fa7146c
2010-09-03 11:18:36 -07:00
Ying Wang
5200114fe8 am 4c7c2f73: (-s ours) am 532c8600: Revert 21f0f97eba
Merge commit '4c7c2f73af773872faf5a65167d74900865d96ba'

* commit '4c7c2f73af773872faf5a65167d74900865d96ba':
  Revert 21f0f97eba
2010-09-01 17:03:23 -07:00
Ying Wang
3e115b81a4 am 17b44ee3: (-s ours) am 21f0f97e: Fix for crespo.
Merge commit '17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01'

* commit '17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01':
  Fix for crespo.
2010-09-01 17:01:06 -07:00
Ying Wang
4c7c2f73af am 532c8600: Revert 21f0f97eba
Merge commit '532c86002bb89db43094b27ec50f001ae173c650' into gingerbread-plus-aosp

* commit '532c86002bb89db43094b27ec50f001ae173c650':
  Revert 21f0f97eba
2010-09-01 14:56:27 -07:00