From d75a79ea359accdf1ac1e90b88a28675d4125c51 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Mon, 19 Sep 2016 16:45:59 -0700 Subject: [PATCH] app-admin/flannel: teach flannel about other arches --- .../{flannel-0.6.1.ebuild => flannel-0.6.1-r1.ebuild} | 0 .../coreos-overlay/app-admin/flannel/flannel-9999.ebuild | 7 ++++--- 2 files changed, 4 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/flannel/{flannel-0.6.1.ebuild => flannel-0.6.1-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.1-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.1-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-9999.ebuild index 536ef3ca79..f227c5a19c 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-9999.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2014 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=6 if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64" @@ -9,7 +9,7 @@ else KEYWORDS="amd64" fi -inherit systemd +inherit systemd coreos-go-utils DESCRIPTION="flannel" HOMEPAGE="https://github.com/coreos/flannel" @@ -23,7 +23,8 @@ RDEPEND="app-emulation/rkt" S="$WORKDIR" src_install() { - sed "s/{{flannel_ver}}/v${PV}/" "${FILESDIR}"/flanneld-rkt.service >"${T}"/flanneld.service + local arch_tag="$(go_arch)" + sed "s/{{flannel_ver}}/v${PV}-${arch_tag}/" "${FILESDIR}"/flanneld-rkt.service >"${T}"/flanneld.service systemd_dounit "${T}"/flanneld.service insinto /usr/lib/systemd/network