From e3557a5ce81dddf92d9255ca5749e45b1aa489b4 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Fri, 14 Aug 2015 10:48:17 -0700 Subject: [PATCH 1/2] app-admin/fleet: bump to v0.11.4 --- .../fleet/{fleet-0.10.2-r1.ebuild => fleet-0.11.4.ebuild} | 0 .../coreos-overlay/app-admin/fleet/fleet-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/fleet/{fleet-0.10.2-r1.ebuild => fleet-0.11.4.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.10.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.11.4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.10.2-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.11.4.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild index 2ccbf08df8..82eb88eba7 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild @@ -11,7 +11,7 @@ inherit coreos-doc cros-workon coreos-go systemd if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="76516ab4ae194e37aaae9c1f2fa5090553e541f3" # tag v0.10.2 + CROS_WORKON_COMMIT="f0cbed22bcc50ca63ef6d09590592e7f65b04871" # tag v0.11.4 KEYWORDS="amd64 arm64" fi From af167387d70c6e73efca6c329f24481da2b8781d Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Fri, 14 Aug 2015 10:48:48 -0700 Subject: [PATCH 2/2] app-admin/fleet: use PartOf in socket unit to workaround go bug see a related change to docker in commit 4c556494cf82598e2cfd153df93a30a249a43362 --- .../coreos-overlay/app-admin/fleet/files/fleet.socket | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/fleet.socket b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/fleet.socket index 4fc446e8fe..e094eb7cab 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/fleet.socket +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/fleet.socket @@ -1,2 +1,7 @@ +[Unit] +Description=Fleet API Socket +PartOf=fleet.service + [Socket] ListenStream=/var/run/fleet.sock +