From 203ee91d29425f1775ca958ecc06b7629811c3d9 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Tue, 10 Sep 2013 10:59:50 -0700 Subject: [PATCH 1/3] feat(update-engine): pxe update engine --- ...e-0.0.1-r379.ebuild => update_engine-0.0.1-r380.ebuild} | 0 .../coreos-base/update_engine/update_engine-0.0.1.ebuild | 7 +++++++ .../coreos-base/update_engine/update_engine-9999.ebuild | 7 +++++++ 3 files changed, 14 insertions(+) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.0.1-r379.ebuild => update_engine-0.0.1-r380.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r379.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r380.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r379.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r380.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild index b76aca827d..01175643b8 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild @@ -99,4 +99,11 @@ src_install() { insinto /usr/include/chromeos/update_engine doins update_engine.dbusserver.h doins update_engine.dbusclient.h + + # PXE + insinto /usr/lib/coreos/ + doins "${S}"/pxe/pxe_update_engine + systemd_dounit "${S}"/pxe/pxe-update-engine.service + systemd_dounit "${S}"/pxe/pxe-update-engine.timer + systemd_enable_service default.target pxe-update-engine.timer } 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 8ed2171b58..4d6f38de93 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 @@ -98,4 +98,11 @@ src_install() { insinto /usr/include/chromeos/update_engine doins update_engine.dbusserver.h doins update_engine.dbusclient.h + + # PXE + insinto /usr/lib/coreos/ + doins "${S}"/pxe/pxe_update_engine + systemd_dounit "${S}"/pxe/pxe-update-engine.service + systemd_dounit "${S}"/pxe/pxe-update-engine.timer + systemd_enable_service default.target pxe-update-engine.timer } From 18d85a88e9091b4fbe5290092849c401ce45a653 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Tue, 10 Sep 2013 21:20:30 -0700 Subject: [PATCH 2/3] fix(update_engine): use exeinto for pxe_update_engine use exeinto as suggsted by mike for pxe_update_engine --- .../coreos-base/update_engine/update_engine-0.0.1.ebuild | 4 ++-- .../coreos-base/update_engine/update_engine-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild index 01175643b8..2b32bb2b16 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild @@ -101,8 +101,8 @@ src_install() { doins update_engine.dbusclient.h # PXE - insinto /usr/lib/coreos/ - doins "${S}"/pxe/pxe_update_engine + exeinto /usr/lib/coreos/ + doexe "${S}"/pxe/pxe_update_engine systemd_dounit "${S}"/pxe/pxe-update-engine.service systemd_dounit "${S}"/pxe/pxe-update-engine.timer systemd_enable_service default.target pxe-update-engine.timer 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 4d6f38de93..e08d63b7ce 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 @@ -100,8 +100,8 @@ src_install() { doins update_engine.dbusclient.h # PXE - insinto /usr/lib/coreos/ - doins "${S}"/pxe/pxe_update_engine + exeinto /usr/lib/coreos/ + doexe "${S}"/pxe/pxe_update_engine systemd_dounit "${S}"/pxe/pxe-update-engine.service systemd_dounit "${S}"/pxe/pxe-update-engine.timer systemd_enable_service default.target pxe-update-engine.timer From 8bb386cfe3162e4d2fee02e62b6247aa2cc3f209 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Tue, 10 Sep 2013 21:26:56 -0700 Subject: [PATCH 3/3] chore(coreos-base/update_engine): grab pxe commit --- .../coreos-base/update_engine/update_engine-0.0.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild index 2b32bb2b16..a4bae79718 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="4" -CROS_WORKON_COMMIT="a71fdb93c89d6f716f36c30ff79b7089f4a3f3f5" +CROS_WORKON_COMMIT="388aff6fdb0f8c58a31eb6b00ac3810d11046c27" CROS_WORKON_PROJECT="coreos/update_engine" CROS_WORKON_REPO="git://github.com"