summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Improve payload magic header handlingKelvin Zhang2021-07-031-4/+31
| | | | | | | | | | | | | | | Currently, we use central directory's extra fields and filenames to determine starting position of a zipentry's file data. However, central directory's extra field might differ from extra field in local file header. For example, the Extended-Timestamp field has different formats depending on whether it's in local file header or central directory. We should use local file header for computing offsets. CRs-Fixed: 2804037 Test: Serve an OTA by update_device.py Change-Id: I00d150d874b9c874bb713569ea14938e036f854e (cherry picked from commit aba70abe81618542044dc20907f281a56b8b500e)
* Allow update_device install the secondary payloadTianjie Xu2019-11-021-8/+17
| | | | | | | | | | Add an option to support installation of the secondary payload. This is used to verify an android factory OTA, where it has one step to install the secondary payload. The payload and its property file store under the secondary/ directory of the update package. Test: install a secondary payload from a factory OTA package Change-Id: I1d2e1d6945f1daa9afaab6af8ce9aad0f7c2100f
* Update update_metadata_pb2.pyYifan Hong2019-10-081-151/+210
| | | | | | | | | Generated with: aprotoc --python_out scripts/update_payload update_metadata.proto Test: cd system/update_engine/scripts && ./run_unittests Change-Id: I68b0659e5de7545fb0143a930859c703ec50ae13
* Replace `look` with `grep`.Tao Bao2019-10-031-1/+1
| | | | | | | | | `look` is an external host tool that's not coming from the Android repo. https://android.googlesource.com/platform/build/+/master/Changes.md#path_tools Bug: 142073223 Test: `m -j ota_from_target_files`; Generate incremental package. Change-Id: Idf5ee71846ea641387a36887a0ffc3d4a322743d
* Add a flag to disable the fec data computationTianjie Xu2019-08-221-6/+17
| | | | | | | | | | | The write of fec data is currently mandatory in the update engine. This step reduces the update package size but it's also time comsuming. So we add a flag to allow partners make the trade off and disable the on device fec data computation. Bug: 139723500 Test: generate and apply incremental updates for verified boot 1.0 & 2.0 Change-Id: Ic7c63396bb4d4fbbc3c3b2e9ff3804c9ff941f2f
* Stop using unzip -p when extracting imagesTianjie Xu2019-08-071-10/+34
| | | | | | | | | | | brillo_update_payload uses `unzip -p` to extract images to a named temp file. But the command doesn't generate an error when the disk is full. This cl creates a helper function and switches to use `unzip -d` to extract the image; and then move the extracted image to the intended name. Bug: 138725843 Test: generate and verify a payload, check the extract error when disk is full Change-Id: I71c2d07de3c1c826f2e07fcc6497437c4051944f
* Abort the payload generation on extract_image errors.Tao Bao2019-04-021-2/+10
| | | | | | | | | | | | | extract_image, in particular extract_image_brillo, spawns multiple processes to handle the unzipping and unsparsing works in parallel. However, `wait` doesn't abort the execution on child process errors. This CL tracks the PIDs of the worker processes. It then waits for each individual PID and aborts appropriately. No-op for the CrOS path. Bug: 129773355 Test: Inject error into simg2img. brillo_update_payload aborts. Change-Id: Id87aa5216fee7e9db132b7f7947742d2ac11b2bc
* update_payload: uprev to minor version 6Amin Hassani2019-01-102-5/+2
| | | | | | | | BUG=chromium:920699 TEST=unittest TEST=check_update_payload --check # with a delta payload Change-Id: I40bc1e535ed241b74c6d889757a8dcf046bac0de
* Merge aosp/upstream-master into aosp/master.Sen Jiang2019-01-043-24/+34
|\ | | | | | | | | | | | | Added BinderUpdateEngineClient::AttemptInstall(). Test: update_engine_unittests Change-Id: Id6911f49d763b0d572658acb7d66857016bf6969
| * update_engine: brillo_update_payload: Switch to major version 2Amin Hassani2019-01-021-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per this CL, we switch the payloads to major version 2 from servers. For more information regarding this switch refer to the attached issue. We also change the default major version to 2. BUG=chromium:794404 TEST=brillo_update_payload Change-Id: I8403805c07210c3d947100efce74dc184a022cdb Reviewed-on: https://chromium-review.googlesource.com/1234590 Commit-Ready: Amin Hassani <ahassani@chromium.org> Tested-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Don Garrett <dgarrett@chromium.org> Reviewed-by: Sen Jiang <senj@chromium.org>
| * update_payload: Fix problem with signature size on unsigned payloadsAmin Hassani2018-12-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the payload is unsigned (e.g. for test image), then the checker.sigs_file would not exist. So check for that variable before using it. BUG=chromium:794404 BUG=chromium:914705 TEST=manually signing the payload ran update_payload_check with signed and unsigned image TEST=unittests Change-Id: I871137eadef00d012ee926d12fd4eee36a454487 Reviewed-on: https://chromium-review.googlesource.com/1375023 Commit-Ready: Amin Hassani <ahassani@chromium.org> Tested-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Sen Jiang <senj@chromium.org>
| * update_payload: Add the remaining major version 2 signature supportsAmin Hassani2018-12-102-18/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the issues with signatures (sizes) in major version 2 and a few minor issues with the payload and metadata sizes. BUG=chromium:862679 TEST=manually signing the payload and running update_payload_check TEST=unittests Change-Id: I9b431379b0574a150474a913f1ec4a11e86288ae Reviewed-on: https://chromium-review.googlesource.com/1363339 Commit-Ready: Amin Hassani <ahassani@chromium.org> Tested-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Sen Jiang <senj@chromium.org>
| * brillo_update_payload: stop searching /usr/lib/crosutilsMike Frysinger2018-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the SDK & on boards, we have /usr/share/misc/shflags everywhere. So we don't need this old /usr/lib/crosutils path at all. BUG=None TEST=None Change-Id: I89b1d96e5f28f7952175aff6ca9a6ccb462a17c5 Reviewed-on: https://chromium-review.googlesource.com/1278108 Commit-Ready: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org> Reviewed-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Alex Deymo <deymo@google.com>
* | Use xxd directly rather than head and hexdumpYifan Hong2018-12-071-1/+1
| | | | | | | | | | | | Test: build OTA and manual apply Change-Id: I4ae6da33e1ea784c00e4fdf9893f3887950bab4c Fixes: 120681840
* | Use xxd directly rather than head and hexdumpElliott Hughes2018-11-281-1/+1
| | | | | | | | | | | | | | | | | | I hit this when trying to switch the AOSP build to toybox head (which doesn't yet support --bytes). I'll add --bytes and --lines anyway, but just using xxd seems like a better way to do this? Test: builds Change-Id: I2bd2d3467b70c98534468d37da6794fe705652d3
* | Update update_metadata_pb2.pySen Jiang2018-11-151-11/+164
| | | | | | | | | | | | | | | | | | Generated with: protoc --python_out scripts/update_payload update_metadata.proto Bug: 119222724 Test: None Change-Id: I384f370358a3e97e038b2350416f422d47fe999a
* | Add dynamic_partition_metadata to update manifestYifan Hong2018-10-261-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | At build time, it will be filled with BOARD_SUPER_PARTITION_GROUPS, BOARD_*_SIZE, and BOARD_*_PARTITION_LIST. Only the information from the new target_files package is used. The META/dynamic_partition_info.txt from old target_files is ignored. Test: builds and manual OTA Bug: 117182932 Change-Id: I02ce99caaf7d01cec1470f7262c45490c15dfcb7
* | Convert perl usage to pythonDan Willemsen2018-10-041-4/+2
| | | | | | | | | | | | | | | | | | We're trying to remove the usage of perl during the build. Since this is called via python, it should hopefully be safe to use python (though using whatever python in the path isn't a great option). Test: treehugger Change-Id: I0b37e7af7fe668a968f9d06a3db54e82dd58c76a
* | brillo_update_payload: Extract partition images in parallel.Sen Jiang2018-09-261-70/+90
| | | | | | | | | | | | | | | | | | | | | | unzipping and converting sparse image to raw could take a while for large partitions like system and vendor, this CL move them into a separate function and run them in background. Bug: 77817425 Test: brillo_update_payload generate Test: brillo_update_payload verify Change-Id: Ic55b9e35eb3c275533a7231d2b57722aa89c96a5
* | payload_generator: Use actions to apply payload.Sen Jiang2018-09-261-14/+17
| | | | | | | | | | | | | | | | | | Verity data is written by FilesystemVerifierAction(), so we need to use the actions to apply payload correctly. Bug: 28171891 Test: brillo_update_payload verify Change-Id: I106053a6291282538008f7fbbaba0e6d14346770
* | A/B update: Replace the zip FileHeader mechanism for update packageShashikant Baviskar2018-08-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the update package gets larger than 2 GiB, payload.bin offset mentioned in metadata file for ota-streaming-property-files gets shifted (CrAU of payload.bin) because ZipInfo FileHeader() returns incorrect value. To solve the issue, offset is re-calculated from fixed bytes of central directory file header, filename length and extra length. Test: manually create an A/B update package and run it using update_device.py Bug: 111198589 Change-Id: Iadb2e8bbff478d9b006bb155d57fea35968d84b7
* | Merge remote-tracking branch 'aosp/upstream-master' into aosp/master.Sen Jiang2018-08-1310-254/+810
|\| | | | | | | | | | | | | | | | | | | | | | | The following change is reverted because aosp has newer libchrome. 71818c84 Partially Revert 2b9d241 Added stub override for ReportInternalErrorCode(). Fixed RunPosinstallAction typo. Bug: 112326236 Test: update_engine_unittests Change-Id: Ieaae0eef425cbb1278067a48aa19b14ed056317a
| * update_payload: Modify payload_info_unittest.pyAmin Hassani2018-07-232-146/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch modifies payload_info_unittest.py to run in the unittests and actives it in the run_unittests script. This removes the dependency to the chromite utils used for unit testing and creates small similar tools to capture those behaviors. BUG=chromium:865845 TEST=unitests Change-Id: Ib931831ce9c4b0ae3fc2f62972db82ec2ec5897f Reviewed-on: https://chromium-review.googlesource.com/1144643 Commit-Ready: Amin Hassani <ahassani@chromium.org> Tested-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Xiaochu Liu <xiaochu@chromium.org>
| * update_payload: import cros_payload_unittest.py as isAmin Hassani2018-07-231-0/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | import from chromite/cli/cros/cros_payload_unittest.py BUG=chromium:865845 TEST=none Change-Id: I4b1d0a65e1e0d19cd230e90651075afad26eded2 Reviewed-on: https://chromium-review.googlesource.com/1144642 Commit-Ready: Amin Hassani <ahassani@chromium.org> Tested-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Xiaochu Liu <xiaochu@chromium.org>
| * brillo_update_payload: Clean up arguments in calls to delta_generatorTudor Brindus2018-07-171-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit normalizes using -- instead of a mix of - and -- prefixes to delta_generator invocations. delta_generator accepts both. BUG=chromium:862679 TEST=ran commands Change-Id: I5688e8dc11b6d120ae785ebab76dac9f306b845c Reviewed-on: https://chromium-review.googlesource.com/1133706 Commit-Ready: Tudor Brindus <tbrindus@chromium.org> Tested-by: Tudor Brindus <tbrindus@chromium.org> Reviewed-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org>
| * brillo_update_payload: Add paycheck.py-based check commandTudor Brindus2018-07-171-16/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a `check` command to brillo_update_payload that is analogous to the existing `verify` command, but uses paycheck.py as a verification tool instead of delta_generator. BUG=chromium:794404 TEST=results from `check` match results from `verify` Change-Id: Ia0f4ca8508b16abaf538e38c478655cd40cbfc19 Reviewed-on: https://chromium-review.googlesource.com/1121100 Commit-Ready: Tudor Brindus <tbrindus@chromium.org> Tested-by: Tudor Brindus <tbrindus@chromium.org> Reviewed-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Sen Jiang <senj@chromium.org>
| * update_payload: Drop usage of deprecated paycheck.py args from test_paycheck.shTudor Brindus2018-07-171-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes usage of paycheck.py's --out_dst_kern, --out_dst_root, --dst_kern, --dst_root, --src_kern, --src_root in favor of the new --part_names used alongside --out_dst_part_paths, --dst_part_paths, --src_part_paths. BUG=chromium:794404 TEST=no errors during run_unittests or test_paycheck.sh with both version 1 and version 2 payloads Change-Id: I1580404301b3460ba6d014cd2cee343d94b8cda3 Reviewed-on: https://chromium-review.googlesource.com/1108960 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Tested-by: Tudor Brindus <tbrindus@chromium.org> Reviewed-by: Amin Hassani <ahassani@chromium.org>
| * update_payload: Make paycheck take "root" instead of "rootfs"Tudor Brindus2018-07-113-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit makes paycheck take "root" as the rootfs partition label instead of "rootfs", which makes it consistent with other tooling like delta_generator. BUG=chromium:794404 TEST=test_paycheck.sh and run_unittests Change-Id: I20835e93adbcde459bc86d832e695b38bca55e38 Reviewed-on: https://chromium-review.googlesource.com/1132843 Commit-Ready: Tudor Brindus <tbrindus@chromium.org> Tested-by: Tudor Brindus <tbrindus@chromium.org> Reviewed-by: Amin Hassani <ahassani@chromium.org>
| * delta_generator: Use "kernel" and "root" partition names internallyTudor Brindus2018-07-091-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit abandons using "boot" and "system" names internally for major version 1 payloads in favor of "kernel" and "root", which is symmetrical with what's used in major version 2 payloads. BUG=chromium:794404 TEST=no errors running brillo_update_payload with FORCE_MAJOR_VERSION set to either 1 or 2; paycheck.py <generated payload> --check and printing partition names in protobuf confirms correct names are generated Change-Id: I396274812d5586e19a021c05b8b7a415aac976bf Reviewed-on: https://chromium-review.googlesource.com/1119573 Commit-Ready: Tudor Brindus <tbrindus@chromium.org> Tested-by: Tudor Brindus <tbrindus@chromium.org> Reviewed-by: Amin Hassani <ahassani@chromium.org>
| * update_payload: Implement applying for major version 2 payloadsTudor Brindus2018-06-261-29/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds payload major version 2 support to paycheck.py applying. BUG=b:794404 TEST=no errors during run_unittests and paycheck.py <major version 2 payload> --part_names boot system --out_dst_part_paths /tmp/boot_part /tmp/system_part (./test_paycheck.sh does not pass for major version 2 payloads since it currently does not detect version 2 payloads, and specifies rootfs/kernel as the partitions to paycheck.py instead of system/boot; no regressions when running on major version 1 payloads) Change-Id: Ic411607cee6f032851d1fa9545bed68fe2d3da77 Reviewed-on: https://chromium-review.googlesource.com/1106656 Commit-Ready: Tudor Brindus <tbrindus@chromium.org> Tested-by: Tudor Brindus <tbrindus@chromium.org> Reviewed-by: Amin Hassani <ahassani@chromium.org>
| * update_payload: Implement checking for major version 2 payloadsTudor Brindus2018-06-262-66/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds payload major version 2 support to paycheck.py --check. For consistency, report messages for affected fields are kept the same across both major version 1 and 2 checks, even if the particular field name does not exist in one version. BUG=b:794404 TEST=no errors during run_unittests and paycheck.py --check <major version 2 payload> (./test_paycheck.sh does not pass for major version 2 payloads since applying is not implemented yet; no regressions when running on major version 1 payloads) Change-Id: I3c5d0cbca3336c8136326ca52b19f659c7c741c9 Reviewed-on: https://chromium-review.googlesource.com/1105610 Commit-Ready: Tudor Brindus <tbrindus@chromium.org> Tested-by: Tudor Brindus <tbrindus@chromium.org> Reviewed-by: Amin Hassani <ahassani@chromium.org>
| * update_payload: Allow specifying partition options for major version 2Tudor Brindus2018-06-255-79/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the ability to specify partition options for more than just kernel/rootfs. This supersedes -p/--root-part-size, -P/--kern-part-size, --dst_kern, --dst_root, --src_kern, --src_root, --out_dst_kern, and --out_dst_root. They are replaced by --part_names used in conjunction with --part_sizes, --dst_part_paths, --src_part_paths, and --out_dst_part_paths. Backwards-compatibility with the old flags is kept, so long as they are not used alongside the new flags. BUG=b:794404 TEST=no errors during run_unittests and test_paycheck.sh Change-Id: Icc1118abbf89dd268be3eafe41723657c5178197 Reviewed-on: https://chromium-review.googlesource.com/1103063 Commit-Ready: Tudor Brindus <tbrindus@chromium.org> Tested-by: Tudor Brindus <tbrindus@chromium.org> Reviewed-by: Amin Hassani <ahassani@chromium.org>
| * update_payload: De-duplicate paycheck partition handling for major version 2Tudor Brindus2018-06-213-75/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit makes handling of major version 2 rootfs/kernel partitions more generic, with the goal of reusing the same code paths for major version 2 (which has an arbitrary number of partitions per payload). BUG=b:794404 TEST=no errors during run_unittests and test_paycheck.sh Change-Id: Ic6e8cdaae557c10dfbd302dba0e52ff8b2870c9f Reviewed-on: https://chromium-review.googlesource.com/1101500 Commit-Ready: Tudor Brindus <tbrindus@chromium.org> Tested-by: Tudor Brindus <tbrindus@chromium.org> Reviewed-by: Amin Hassani <ahassani@chromium.org>
| * update_payload: Remove instances to au-generatorAmin Hassani2018-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now do paygen in chroot. There is no need for au-generator anymore. So remove all references to it. BUG=chromium:808495 TEST=tryjob payload Change-Id: I0d0e76cc1dd7a742abdd9b3b457709044af98862 Reviewed-on: https://chromium-review.googlesource.com/1085547 Commit-Ready: Amin Hassani <ahassani@chromium.org> Tested-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Nicolas Norvez <norvez@chromium.org> Reviewed-by: Sen Jiang <senj@chromium.org>
| * Merge commit '3538a883700a86c8224bff075e1cc4bab552d2ed' into patch_branchchrome-bot2018-06-053-5/+265
| |\ | | | | | | | | | Change-Id: I48fa7c6e8d3977813623d05353bb3c005d19ba83
| | * Merge remote-tracking branch 'cros/upstream' into cros/masterAmin Hassani2018-06-043-5/+265
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG=chromium:815356 TEST=unittest TEST=precq TEST=cros flash Change-Id: I8d9c37411708d0cae61613b285123a090ce6deb1
| * | | update_engine: Rename signing variables.Amin Hassani2018-06-041-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename 'signatures' to 'payload_signatures' so there is a clear distinction between metadata and payload signatures and their input files. BUG=chromium:845614 TEST=payload tryjobs CQ-DEPEND=CL:1069530 Change-Id: Ic2e924871611af1b1f0ee2f1dfd7c6b9f52decc8 Reviewed-on: https://chromium-review.googlesource.com/1069527 Commit-Ready: Amin Hassani <ahassani@chromium.org> Tested-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Nicolas Norvez <norvez@chromium.org> Reviewed-by: Xiaochu Liu <xiaochu@chromium.org>
| * | update_payload: Allow check for given metadata sizeAmin Hassani2018-03-234-8/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow passing metadata size to check_update_payload so we can verify the metadata size in omaha equals to the one in the payload. BUG=chromium:820243 TEST=run paycheck.py with both valid and invalid metadata sizes reports as expected TEST=unittests Change-Id: Ib41ce77af77636fffec6752201c363e7fbbf868d Reviewed-on: https://chromium-review.googlesource.com/955679 Commit-Ready: Amin Hassani <ahassani@chromium.org> Tested-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Ben Chan <benchan@chromium.org>
* | | Add update_engine/scripts/payload_info.py am: e6e0f046a3Sen Jiang2018-05-301-0/+249
|\ \ \ | | |/ | |/| | | | | | | | | | am: be0780fd15 Change-Id: I2d5457ccf1a468eb1683c4407692cda134bbb169
| * | Add update_engine/scripts/payload_info.pySen Jiang2018-05-291-0/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copied from cros_payload.py, renamed to payload_info.py, removed dependency on chromite, fixed pylint issues, changed to AOSP license. usage: payload_info.py [-h] [--list_ops] [--stats] [--signatures] payload_file Show information about an update payload. positional arguments: payload_file The update payload file. optional arguments: -h, --help show this help message and exit --list_ops List the install operations and their extents. --stats Show information about overall input/output. --signatures Show signatures stored in the payload. Bug: 28797993 Test: payload_info.py --list_ops --stats --signatures payload.bin Change-Id: Id67a939243fa6ff4a4e9683c7711f71884ee3d6d
* | | Additionally look for partition files under RADIO/ in target_files zip. am: ↵Tao Bao2018-04-191-2/+13
|\| | | | | | | | | | | | | | | | | | | | | | | 07216d6fd7 am: 00751159df Change-Id: I18d6a3f34c8436aec20fc557a35943adfc14ca83
| * | Additionally look for partition files under RADIO/ in target_files zip.Tao Bao2018-04-191-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change, we will in turn look for partition image files under IMAGES/ and RADIO/ in a given Android/Brillo target_files zip file. We used to request the caller (e.g. ota_from_target_files.py) to have all the updatable images ready under IMAGES/, by possibly copying some of them from RADIO/ to IMAGES/. This CL avoids that cost, and keeps working with legacy target_files zip files. Bug: 77218220 Test: `m dist` produces the same full OTA package with the matching change to ota_from_target_files.py. Test: It keeps working with legacy target_files zip that has everything under IMAGES/. Change-Id: I9485508991115774ddbe70c1c235adf6806d91a4
* | | Correct some spellings. am: 771f6486a3Sen Jiang2018-04-051-3/+3
|\| | | | | | | | | | | | | | | | | am: 5e67287bc1 Change-Id: I98a5bd68116da28a5bbcc61da6830e188d854be0
| * | Correct some spellings.Sen Jiang2018-04-041-3/+3
| |/ | | | | | | | | Test: mma Change-Id: Icc49a4ee76f12d302ed18982d334f2f70b7263a8
| * Merge remote-tracking branch 'aosp/upstream-master'.Sen Jiang2018-03-0916-407/+520
| |\ | | | | | | | | | | | | | | | | | | Bug: 30989362 Test: update_engine_unittests Change-Id: I04417ac21508f4da3ead29b1dea34886f2fc84af Merged-In: I04417ac21508f4da3ead29b1dea34886f2fc84af
| * \ Merge remote-tracking branch 'goog/upstream-master'.Sen Jiang2018-01-1115-190/+410
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following commits were reverted: 840703a Fix update over cellular network on guest account eaad5d0 Do not merge to AOSP: Fixes the link to brillo-clang-format in CrOS 740efad Reboot even if a system update is not available. Fixed a few sign compare warnings. Had to ifdef out 2 SquashfsFilesystemTest because it depends on unsquashfs -m. Test: update_engine_unittests Change-Id: I6f4ca5003e78c76064ec60d0797505d8c18d00bf Merged-In: I6f4ca5003e78c76064ec60d0797505d8c18d00bf
* | \ \ Merge remote-tracking branch 'goog/upstream-master'.Sen Jiang2018-03-0916-407/+520
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Bug: 30989362 Test: update_engine_unittests Change-Id: I04417ac21508f4da3ead29b1dea34886f2fc84af Merged-In: I04417ac21508f4da3ead29b1dea34886f2fc84af
| * | | update_payload: Allow paycheck.py to compare apply results.Amin Hassani2018-03-052-16/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently paycheck.py only applies the payloads. The responsibility of checking if the final root and kernel partitions are what we wanted is out of paycheck.py. Currently when paycheck.py runs and applies a payload files passed by --dst_kern and --dst_root are populated with the newly generated partitions by applier.py. This patch adds two new flags --out_dst_kern and --out_dst_root so instead paychek.py outputs the new partitions into paths passed by these flags and --dst_kern and --dst_root is reserved for passing the actual original partitions that newly generated partitions need to be compared to. This allows paycheck.py to check the newly generated partitions against the given ones and make sure they are equal. BUG=chromium:808495 TEST=test_paycheck.sh old.full delta.bin new.full Change-Id: I57a476de1477e3cba7557d0564b49ec03253c047 Reviewed-on: https://chromium-review.googlesource.com/929652 Commit-Ready: Amin Hassani <ahassani@chromium.org> Tested-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Don Garrett <dgarrett@chromium.org> Reviewed-by: Ben Chan <benchan@chromium.org> Reviewed-by: Sen Jiang <senj@chromium.org>
| * | | update_engine: Disable puffin in minor version 4Amin Hassani2018-02-084-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch disables puffin for minor version 4, but keeps BROTLI_BSDIFF in the same minor version. Also adds puffin for minor version 5, but it does not enable it. BUG=b:72815313 BUG=chromium:810184 TEST=update_engine unittests pass TEST=update_payload unittests pass TEST=test_paycheck.sh on two images with minor version 4 pass TEST=brill_update_payload generate/verify pass Change-Id: I814fc126d67207501d419cff9c575cd13d877b48 Reviewed-on: https://chromium-review.googlesource.com/907223 Commit-Ready: Amin Hassani <ahassani@chromium.org> Tested-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Amin Hassani <ahassani@chromium.org>
| * | | update_payload: migrate the license headers to AOSPAmin Hassani2018-01-3015-45/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update_engine/scripts/* have CROS license but the rest of UE have android license. This cl just migrates all CROS licenses to AOSP. BUG=None TEST=repo upload did not complain about the mismatched licenses. Change-Id: Id947be3e860baf7a523163965336f47d268c6808 Reviewed-on: https://chromium-review.googlesource.com/891688 Commit-Ready: Amin Hassani <ahassani@chromium.org> Tested-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Amin Hassani <ahassani@chromium.org>