Skip to content
This repository has been archived by the owner on Sep 18, 2020. It is now read-only.

Enable etcd-wrapper on arm64. #2520

Merged
merged 3 commits into from
May 1, 2017
Merged

Enable etcd-wrapper on arm64. #2520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
972461a
etcd-wrapper: Add missing metadata.xml
glevand Apr 27, 2017
f14aa1b
etcd-wrapper: Enable on arm64
glevand Apr 27, 2017
8fa412e
coreos: Enable etcd-wrapper on arm64
glevand Apr 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions app-admin/etcd-wrapper/etcd-wrapper-3.1.6.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ inherit systemd

DESCRIPTION="etcd (System Application Container)"
HOMEPAGE="https://github.com/coreos/etcd"
KEYWORDS="amd64"
KEYWORDS="amd64 arm64"

LICENSE="Apache-2.0"
IUSE=""
Expand All @@ -22,8 +22,15 @@ RDEPEND=">=app-emulation/rkt-1.9.1[rkt_stage1_fly]"
S=${WORKDIR}

src_install() {
local tag="v${PV}"
if [[ "${ARCH}" != "amd64" ]]; then
tag+="-${ARCH}"
fi

exeinto /usr/lib/coreos
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 changes: 1 addition & 1 deletion app-admin/etcd-wrapper/files/etcd-member.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RestartSec=10s
TimeoutStartSec=0
LimitNOFILE=40000

Environment="ETCD_IMAGE_TAG=v3.1.6"
Environment="ETCD_IMAGE_TAG=@ETCD_IMAGE_TAG@"
Environment="ETCD_NAME=%m"
Environment="ETCD_USER=etcd"
Environment="ETCD_DATA_DIR=/var/lib/etcd"
Expand Down
4 changes: 4 additions & 0 deletions app-admin/etcd-wrapper/metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
</pkgmetadata>
0 coreos-base/coreos/coreos-0.0.1-r277.ebuild → coreos-base/coreos/coreos-0.0.1-r278.ebuild
View file
Open in desktop
File renamed without changes.
4 changes: 1 addition & 3 deletions coreos-base/coreos/coreos-0.0.1.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@ RDEPEND="${RDEPEND}
)
etcd_protocols_2? (
dev-db/etcd:2
amd64? (
app-admin/etcd-wrapper
)
app-admin/etcd-wrapper
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The coreos ebuild revision number should probably be bumped for this. (The symlink in the same directory.) Maybe the coreos-base/coreos changes could be in their own commit.

)
"

Expand Down