From 55b78189546a39ec55d6ed3abcd84dc2f8f65555 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Wed, 23 Mar 2016 19:01:33 -0700 Subject: [PATCH 1/2] Revert "coreos-base/update_engine: include patch for virtio_net compatibility" This reverts commit ad69d744a66903381a14fec66b4b737196cf8194. --- ...ate_engine-0.1.0-r4.ebuild => update_engine-0.1.0-r3.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.1.0-r4.ebuild => update_engine-0.1.0-r3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.1.0-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.1.0-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.1.0-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.1.0-r3.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 195ad77f4c..bd78e4fc6e 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 @@ -11,7 +11,7 @@ AUTOTOOLS_IN_SOURCE_BUILD=1 if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="461adfd48f9d9b5764461b24a672102e11eb0bde" + CROS_WORKON_COMMIT="c88492c39ec0ad81bb26ae6efde7b4fc46a9804a" KEYWORDS="amd64 arm arm64 x86" fi From 6ff0c981c6f6dbbec178287e7fdc9a7def1765e0 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Wed, 23 Mar 2016 19:01:37 -0700 Subject: [PATCH 2/2] Revert "coreos-base/update_engine: explicit RDEPEND on dev-cpp/glog" This reverts commit 0dcc2992ee44653106848c4c12bb17469bfe4e99. --- .../coreos-base/update_engine/update_engine-9999.ebuild | 1 - 1 file changed, 1 deletion(-) 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 bd78e4fc6e..9650fd7980 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 @@ -31,7 +31,6 @@ RDEPEND="!coreos-base/coreos-installer app-arch/bzip2 coreos-base/coreos-au-key coreos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] - dev-cpp/glog dev-cpp/gflags dev-libs/dbus-glib dev-libs/glib