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

Merge pull request #1146 from crawford/etcd

Browse Source 
etcd: bump to 2.0.5 and enable by default
This commit is contained in:
Alex Crawford 2015-03-18 11:32:14 -07:00
commit 9b295da99f
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.4-r1.ebuild → sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.5.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild vendored
View File

@ -14,7 +14,7 @@ inherit coreos-doc coreos-go toolchain-funcs cros-workon systemd
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64" KEYWORDS="~amd64"
else else
CROS_WORKON_COMMIT="1a2c6d3f2fbcb047712bfa3234bff5b9d07bdc57" # v2.0.4 CROS_WORKON_COMMIT="9481945228b97c5d019596b921d8b03833964d9e" # v2.0.5
KEYWORDS="amd64" KEYWORDS="amd64"
fi fi

2
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults vendored
View File

@ -13,7 +13,7 @@ USE_EXPAND_HIDDEN="${USE_EXPAND_HIDDEN} CROS_WORKON_TREE"
# via use flags because if two versions are installed one must provide # via use flags because if two versions are installed one must provide
# the "default" /usr/bin/etcd binary and systemd services. # the "default" /usr/bin/etcd binary and systemd services.
USE_EXPAND="${USE_EXPAND} ETCD_PROTOCOLS" USE_EXPAND="${USE_EXPAND} ETCD_PROTOCOLS"
ETCD_PROTOCOLS="1" ETCD_PROTOCOLS="1 2"
# Extra use flags for CoreOS SDK # Extra use flags for CoreOS SDK
USE="${USE} cros_host expat -introspection -cups -tcpd -pcre -berkdb" USE="${USE} cros_host expat -introspection -cups -tcpd -pcre -berkdb"