mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-22 23:11:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2520 from glevand/for-merge-etcd

Browse Source 
Enable etcd-wrapper on arm64.
This commit is contained in:
Geoff Levand 2017-05-01 10:33:56 -07:00 committed by GitHub
commit 61896d1e5a
5 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.1.6.ebuild vendored
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
} }

2
sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-member.service vendored
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"

4
sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/metadata.xml vendored Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
</pkgmetadata>

0
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r277.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r278.ebuild vendored
View File

4
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild vendored
View File

@ -75,9 +75,7 @@ RDEPEND="${RDEPEND}
) )
etcd_protocols_2? ( etcd_protocols_2? (
dev-db/etcd:2 dev-db/etcd:2
amd64? ( app-admin/etcd-wrapper
app-admin/etcd-wrapper
)
) )
" "