39910dcd1d68987ccee7c3031dc269233a8490bb |
|
10-Nov-2015 |
Alex Deymo <deymo@google.com> |
Split payload application code into a subdirectory. This patch splits from the main libupdate_engine code the part that is strictly used to download and apply a payload into a new static library, moving the code to subdirectories. The new library is divided in two subdirectories: common/ and payload_consumer/, and should not depend on other update_engine files outside those two subdirectories. The main difference between those two is that the common/ tools are more generic and not tied to the payload consumer process, but otherwise they are both compiled together. There are still dependencies from the new libpayload_consumer library into the main directory files and DBus generated files. Those will be addressed in follow up CLs. Bug: 25197634 Test: FEATURES=test emerge-link update_engine; `mm` on Brillo. Change-Id: Id8d0204ea573627e6e26ca9ea17b9592ca95bc23
/system/update_engine/image_properties_android.cc
|
856166594771c61973856f563e622ccb7dd48aa1 |
|
16-Oct-2015 |
Alex Deymo <deymo@google.com> |
Read ProductId, ProductVersion and Channel setting in Brillo. The ProductId, ProductVersion and current/target channels are specified in a very different way in Brillo compared to Chrome OS. This patch moves the logic to read and parse /etc/lsb-release in Chrome OS to a new image_properties module and implements the equivalent module in Brillo. This new module replaces some of the logic previously in the OmahaRequestParams class, both for parsing the read-only properties from the rootfs and parsing and storing the target channel in the stateful partition. The Chrome OS version of the new module keeps the same behavior, except that it falls back to "stable-channel" if the the current channel is missing in the rootfs (unlikely in Chrome OS). On the other hand, the new Brillo implementation reads these settings from the /etc/osrelease file and /etc/osrelease.d directory and doesn't allow to override those setting during development. The persisted target_channel and powerwash_allowed settings are stored in Prefs as many other settings. Finally, since Brillo images don't contain a channel name baked in the image, we store the channel name where we got the image from at the time of the update. The first boot after provisioning will default to "stable-channel". Bug: 25013069 Test: unittest in Chrome OS; `mm` and tested on a Brillo device. Change-Id: Icc114b8098af3edaaba715c9c2e3ebe9f417c876
/system/update_engine/image_properties_android.cc
|