From 5f27cc04e1174367ec2ccb4105d4374d065a339a Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 8 Apr 2014 11:27:10 -0700 Subject: [PATCH 1/2] fix(coreos-base/update_engine): Add rule to remove old dbus config. --- .../coreos-base/update_engine/files/update-engine.conf | 1 + ...ngine-0.0.1-r386.ebuild => update_engine-0.0.1-r387.ebuild} | 0 .../coreos-base/update_engine/update_engine-9999.ebuild | 3 +++ 3 files changed, 4 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine.conf rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.0.1-r386.ebuild => update_engine-0.0.1-r387.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine.conf b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine.conf new file mode 100644 index 0000000000..6c093a6968 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine.conf @@ -0,0 +1 @@ +r /etc/dbus-1/system.d/UpdateEngine.conf - - - 0 - diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r386.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r387.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r386.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r387.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild index 7706dc3a8d..522a39035f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild @@ -108,6 +108,9 @@ src_install() { insinto /usr/share/dbus-1/system.d doins UpdateEngine.conf + # Install rule to remove old UpdateEngine.conf from /etc + systemd_dotmpfilesd "${FILESDIR}"/update-engine.conf + insinto /usr/include/chromeos/update_engine doins update_engine.dbusserver.h doins update_engine.dbusclient.h From 619143843464eb807c31b239e4e8db0f3351082b Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 8 Apr 2014 11:43:04 -0700 Subject: [PATCH 2/2] bump(coreos-base/update_engine): small fix for update_engine_stub --- ...engine-0.0.1-r387.ebuild => update_engine-0.0.1-r388.ebuild} | 0 .../coreos-base/update_engine/update_engine-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.0.1-r387.ebuild => update_engine-0.0.1-r388.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r387.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r388.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r387.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r388.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild index 522a39035f..7d0b443b5c 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild @@ -8,7 +8,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~x86" else - CROS_WORKON_COMMIT="f084f56dec6aeb1259e901112f3b9461e265883f" + CROS_WORKON_COMMIT="cf6827237b9123b2173b9d3d326c2471804dcea4" KEYWORDS="amd64 arm x86" fi