etcd-wrapper: Enable on arm64

Signed-off-by: Geoff Levand <geoff@infradead.org>
This commit is contained in:
Geoff Levand 2017-04-27 09:33:44 -07:00
parent 1e226ef625
commit 52105e099d
2 changed files with 10 additions and 3 deletions

View File

@ -10,7 +10,7 @@ inherit systemd
DESCRIPTION="etcd (System Application Container)" DESCRIPTION="etcd (System Application Container)"
HOMEPAGE="https://github.com/coreos/etcd" HOMEPAGE="https://github.com/coreos/etcd"
KEYWORDS="amd64" KEYWORDS="amd64 arm64"
LICENSE="Apache-2.0" LICENSE="Apache-2.0"
IUSE="" IUSE=""
@ -22,8 +22,15 @@ RDEPEND=">=app-emulation/rkt-1.9.1[rkt_stage1_fly]"
S=${WORKDIR} S=${WORKDIR}
src_install() { src_install() {
local tag="v${PV}"
if [[ "${ARCH}" != "amd64" ]]; then
tag+="-${ARCH}"
fi
exeinto /usr/lib/coreos exeinto /usr/lib/coreos
doexe "${FILESDIR}"/etcd-wrapper doexe "${FILESDIR}"/etcd-wrapper
systemd_dounit "${FILESDIR}"/etcd-member.service sed "s|@ETCD_IMAGE_TAG@|${tag}|g" \
"${FILESDIR}"/etcd-member.service > ${T}/etcd-member.service
systemd_dounit ${T}/etcd-member.service
} }

View File

@ -12,7 +12,7 @@ RestartSec=10s
TimeoutStartSec=0 TimeoutStartSec=0
LimitNOFILE=40000 LimitNOFILE=40000
Environment="ETCD_IMAGE_TAG=v3.1.6" Environment="ETCD_IMAGE_TAG=@ETCD_IMAGE_TAG@"
Environment="ETCD_NAME=%m" Environment="ETCD_NAME=%m"
Environment="ETCD_USER=etcd" Environment="ETCD_USER=etcd"
Environment="ETCD_DATA_DIR=/var/lib/etcd" Environment="ETCD_DATA_DIR=/var/lib/etcd"