Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app-admin/scylla-jmx/Manifest4
-rw-r--r--app-admin/scylla-jmx/scylla-jmx-2.3.0.ebuild (renamed from app-admin/scylla-jmx/scylla-jmx-2.2.0.ebuild)12
-rw-r--r--app-admin/scylla-tools/Manifest4
-rw-r--r--app-admin/scylla-tools/scylla-tools-2.3.0.ebuild (renamed from app-admin/scylla-tools/scylla-tools-2.2.0.ebuild)0
-rw-r--r--dev-db/scylla/Manifest13
-rw-r--r--dev-db/scylla/metadata.xml3
-rw-r--r--dev-db/scylla/scylla-2.3.0.ebuild (renamed from dev-db/scylla/scylla-2.2.0.ebuild)119
-rw-r--r--dev-db/scylla/scylla-9999.ebuild108
8 files changed, 155 insertions, 108 deletions
diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest
index 96a7b9c..a469109 100644
--- a/app-admin/scylla-jmx/Manifest
+++ b/app-admin/scylla-jmx/Manifest
@@ -1,6 +1,6 @@
AUX scylla-jmx.confd 243 BLAKE2B a056f7c70df3ff6c903a182f352aa34ca9d23eed458b7c6f5a51c9f6656cf0f989c133e8e45b221991800fcc79fd1505b037410dde7d5dfffdf75e0ee6670090 SHA512 18b5f550c2e0616f4c0da123adfda3fb959bec5711b6be57df3e316613cfa154467353e65504b6b68852911f8faa21f1acccf3fa51970a132b639c1e6d1ea402
AUX scylla-jmx.initd 592 BLAKE2B e1492a3da5ab275fbe6f7f1f4f9beaa3129f037fa54523211a8628d479e196a2da711c41c8051416612d34322c3261e95c3370525e68c84eb80c98ac0949ab69 SHA512 8bf35201a2dd240b1e74d35c3153251f2c15878f2454a8ed05f006ad35679a85d08de413dc8ce8b53aaa2b8e367a806a76d56d63d9b691f4bac569b647764037
-DIST scylla-jmx-2.2.0.tar.gz 98666 BLAKE2B bb024576bf3eff4188b4aa8654932cb6521ff492f4d227c43b810c70b0df26ea7a76ec8eacadb1d82c1d79e1ee887b03ab12ad55b4fb3bddcc0dccfaeefcdfd0 SHA512 b1bd6906930504d887a804c81af748318e0e84482669ef69b8ed795d7047e66064eb6d69bc2fd786c303252ca78599e23b483b1c740e00540e34d932afde7f83
-EBUILD scylla-jmx-2.2.0.ebuild 2355 BLAKE2B f8001c2f7f4c06ec1012d50449294eff4bf3307bfd5439baecc921c7d925324a1c136ef46eb3fe0b0988e9f9582c493819625b9659b334ca5297c21afc7995af SHA512 1e8c37dfdd7bd3fa7c2558d23e1659c65dfccce50d40ab20bdf11794a87e99a5ff6187269dae86922596ca196d0729897147114b9c7060867bea0b6653422d49
+DIST scylla-jmx-2.3.0.tar.gz 103133 BLAKE2B 4ccac783156e0fcc0c9e24e7e5a949db2aac6a5f60ad0335b66242969063a9c5795164f6b862fcbc731da8fdc22525adcd2f7a59e3961c1fa06556e79d2f8575 SHA512 3fc158daf11625ecf2cd600b05d08f3f1457a8db6d2feb52c3ab55616976f6c24ad7129186bee143b5889b5ad31ab2a985d0cb1fbabb8b9266d876fe1a94214b
+EBUILD scylla-jmx-2.3.0.ebuild 2303 BLAKE2B 938bff52beba93b9a8b22e1fb7fc470ad44ec0140393b0e62753b80fa204d1c5e2d309e5ae820044f45e36bda95b9f05565e057413dc47615551a3f1dba920f5 SHA512 227f871e5620956f0070a83a3d18d4f2e703160df46de7fca5b63c3742291d342ba6d71d5cc81adbaacaea56d4e7315acc99b707840be852fe54092d7d0e3471
EBUILD scylla-jmx-9999.ebuild 2354 BLAKE2B 2dcb7c649f9ed55001cd7c9367911403de1f1afdf05db92d1df9dc32918c073ba775e74b1b0d093c828e38265024ba6ddcd2cd08a4a60353caa56830ec8b3004 SHA512 29120858692d1404b4a277cd0d807137a7a35d047be4ae5cca521b6d152582a79dce4a45e4189530b6300d54eb53a40e0a8f39ff62ffb1c88386299242f785ab
MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
diff --git a/app-admin/scylla-jmx/scylla-jmx-2.2.0.ebuild b/app-admin/scylla-jmx/scylla-jmx-2.3.0.ebuild
index 001ec6f..9c936ee 100644
--- a/app-admin/scylla-jmx/scylla-jmx-2.2.0.ebuild
+++ b/app-admin/scylla-jmx/scylla-jmx-2.3.0.ebuild
@@ -35,7 +35,8 @@ RDEPEND="
DEPEND="
${CDEPEND}
- >=virtual/jdk-1.8"
+ >=virtual/jdk-1.8
+ dev-python/pystache[${PYTHON_USEDEP}]"
RESTRICT="test"
@@ -47,10 +48,6 @@ pkg_setup() {
src_prepare() {
default
- # fix systemd service config path
- cp dist/common/systemd/scylla-jmx.service.in dist/common/systemd/scylla-jmx.service || die
- sed -e "s#@@SYSCONFDIR@@#/etc/sysconfig#g" -i dist/common/systemd/scylla-jmx.service || die
-
# fix symlink runtime error on scylla-jmx script
# * scylla-jmx is not available for oracle-jdk-bin-1.8 on x86_64
# * IMPORTANT: some Java tools are not available on some VMs on some architectures
@@ -79,7 +76,10 @@ src_install() {
newinitd "${FILESDIR}/scylla-jmx.initd" ${PN}
newconfd "${FILESDIR}/scylla-jmx.confd" ${PN}
- systemd_dounit dist/common/systemd/*.service
+
+ local MUSTACHE_DIST="\"debian\": true"
+ pystache dist/common/systemd/scylla-jmx.service.mustache "{ $MUSTACHE_DIST }" > scylla-jmx.service
+ systemd_dounit scylla-jmx.service
}
pkg_postinst() {
diff --git a/app-admin/scylla-tools/Manifest b/app-admin/scylla-tools/Manifest
index a90b9a2..e10105e 100644
--- a/app-admin/scylla-tools/Manifest
+++ b/app-admin/scylla-tools/Manifest
@@ -1,4 +1,4 @@
-DIST scylla-tools-2.2.0.tar.gz 26860019 BLAKE2B f06311a5faae7ca9d03a073e18e3a1db21d35910a4edd1ac06e28a42710d605acd5cdf99735e5c9055940defaffa8be06e4b82089225f14bb396a12b1b14f597 SHA512 a7fda34bcfe60eabc741de8cae4f50bada2d59510d9ddb4a030f95fe05b352eaea7d496dac39e9c8f1a45d877f14e36b41e01448cfb8573ca0acedf6bf1a1a4f
-EBUILD scylla-tools-2.2.0.ebuild 2236 BLAKE2B c86eb2302015b4ef80d18c96edc527751d18039aace4d1f72526d62a642c63fd9a2a21db8fafd57ac75a172bc29d27cc1a9607b0a43cf40b0714d437ed8e1a1c SHA512 b7292387fb742f1a49ba4526b9d33d7b09a1d4d26a63f546ceceb325e2fb9ab45b1bc8f1d0671ee6bba67f726bb56225894a35acb0c26d99f1ce3c787d6441e5
+DIST scylla-tools-2.3.0.tar.gz 26861426 BLAKE2B bba08b98cf499ae74e80a72c0a6e17bb7e8ce8e45800d1f9bd9ecd9d63c157b8ccf95f654febfc42e003d20e0bd702fddd80b46848202fd47caaa636c8aa56d5 SHA512 348817cf08fa2b55fabd8360725a95bbb139b2758137cca95bb4733dcb3f4d1224a7aa705d508ecf11012bb68cbba868fbab2b4c1b78ea6b6ead2f4455b2a6fd
+EBUILD scylla-tools-2.3.0.ebuild 2236 BLAKE2B c86eb2302015b4ef80d18c96edc527751d18039aace4d1f72526d62a642c63fd9a2a21db8fafd57ac75a172bc29d27cc1a9607b0a43cf40b0714d437ed8e1a1c SHA512 b7292387fb742f1a49ba4526b9d33d7b09a1d4d26a63f546ceceb325e2fb9ab45b1bc8f1d0671ee6bba67f726bb56225894a35acb0c26d99f1ce3c787d6441e5
EBUILD scylla-tools-9999.ebuild 2236 BLAKE2B 8b39c7cb5f595ef2b1d1269cfc9e5e70616d265f4c8fb48a1a2044248d7f0351e75fd0a86657fd272848c4e38f7c9a83967129d9190bfca61ce35bc5c2d8f93b SHA512 4f521a960fccc072a4c570eac9ad96946bbc3f6bbaff0158aa15bd0bc86cc315fb83d1331548a8f28478f251fc7845a9b16fe4532e5d76452ec3d456351bf216
MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
diff --git a/app-admin/scylla-tools/scylla-tools-2.2.0.ebuild b/app-admin/scylla-tools/scylla-tools-2.3.0.ebuild
index 9d41e14..9d41e14 100644
--- a/app-admin/scylla-tools/scylla-tools-2.2.0.ebuild
+++ b/app-admin/scylla-tools/scylla-tools-2.3.0.ebuild
diff --git a/dev-db/scylla/Manifest b/dev-db/scylla/Manifest
index 5c8c944..1dd10d6 100644
--- a/dev-db/scylla/Manifest
+++ b/dev-db/scylla/Manifest
@@ -3,13 +3,12 @@ AUX boost-1.65.0-icl-ttp-matching.patch 1427 BLAKE2B de9c77253963656f85ed2d05bab
AUX scylla-server.confd 386 BLAKE2B e075e8f5cac2ac373a43a637a4080fde5cbd402b5bef2a3865980f3f9d123366315d994ebf9abbd749167db6e1fa9c840295171add7c5507120be70020aaefa1 SHA512 5d3c55933a02d3b16837013b37110f6669c14e01599532f30935b5dc29871a5bed897c9eb01a6e89469eab7d645c9231745a06c2ef827f6700e13c8faa9cdb87
AUX scylla-server.initd 964 BLAKE2B 46ec149dc24f33773bba1f5edd36d4cab8f4248346e56752ba6fd4b149d056d28cf3297e889adcc0c776da46cd347d25d4b16bb91f545779dc14f59bd8dfcc5d SHA512 e72b817e8a42d843f6766b0cd25c33b8231efbd223f4ad31bca9a2610f670b3980c1be256343f5e3b0fe0f54ba460713f6db8de92c27cf67653140794299f760
DIST c-ares-fd6124c74da0801f23f9d324559d8b66fb83f533.tar.gz 1644001 BLAKE2B ee3f919dbb7de3f489a9027cf89b8db1dd36d9d5068e80f6e3851366c7a6fa532c67cf8ebf0d15e01b26a8ec5bb4e49e7844ec46b605f997fac1e961dcc436f1 SHA512 52b929e4d2615338d8ee4ce7c32f006f18e54ef2db9fbe2534c4e99cd3684d86661a6674d2659acb714592f439fac9c4f0ae6337d9d68c1ec3463d4d16572310
-DIST dpdk-a1774652fbbb1fe7c0ff392d5e66de60a0154df6.tar.gz 12197001 BLAKE2B 3030c2894dbfb6dd2f9259e6d05bb4ce340182ee59291dd66c3f73d6e45787ca417cda90776a916b156566b7cb3f5778d5561f57bd5d3dfa1e9b6854e59027a7 SHA512 90b3b7ef24cf088582bad7444196816a322d4f38a78f627e10f65f22896b897b6b89fc451c9d16c04bd5565c8e3d60fc05aac35e6520ff6075c174a5bc0d4fee
DIST fmt-f61e71ccb9ab253f6d76096b2d958caf38fcccaa.tar.gz 616708 BLAKE2B e71c4ff6d494490366e490307b83fb0619b29228e06650d3abb0a97797009cd6205c23af777a348622eb4c4a08203a0e41c5475ab95c437d0f0c382967e2491f SHA512 d234a58af428e238e559ceec1599ff449fbfbe4ecc212ed00c82ef3f057a3351a9eb59906d3b6f7efeec76188645a49376507d7a78dd68d61806cd63d0fbb3a0
-DIST scylla-2.2.0.tar.gz 2650641 BLAKE2B fffc0a18178a2c8011a150ee7b802f1bcd3daa613db127a9ddce5266a265384124b1d61c31c0d0401915ad9e7d1b6de978053ed78217a9c21ea9588d17415091 SHA512 d84b3098d585a6eb931cdb439b17863fc8036cefc66f4c4f354f8a904f8e6b2db9452eac8e9f09bd6e0b33188d17d39bc7b37a41a7148c62fe9f244dd89ef237
-DIST scylla-ami-6ed71a3126170d32fa1712370da6945c161b4bd8.tar.gz 10340 BLAKE2B dd9cd55be1b4da28676300961f4fc2046cbb2acf6a6648a61a954c8fa8cc7ae4acacdcff44b2ffcc9b7c471872e499c8ffb806892df209abd861924879a0e19e SHA512 59bb9c601f82577ee7fe988f4095d141e5082a4352b6dd2b90522a830a21afaa24573f60fc7d994e9ea3036e58160f88b97add5cebc4b04b94fbddf339b8ddd8
-DIST scylla-seastar-6f61d7456e0a9969193106a0cc0e044ffead2126.tar.gz 804553 BLAKE2B d48a371083e63fcaec8c77038d5d9d8e9fba0d954fc217aae593831dc0f1c0202d5ac0d36b0528896a572586caaf61c4729063dbbb952cd53491964fa3d18d60 SHA512 d1e16097f0fb1a55dd72ac85e63be2df92254bb42c6034b97d6683d01c382bf2f60ae5e6099890ad3c6db40e2e1fa7bc7d0034770b467fe05dee7d428c3f734c
+DIST scylla-2.3.0.tar.gz 6252219 BLAKE2B 254ed07516caf5b151833033f0d6203aa044b5408fe84f5b6dece8bd7d2369112591aef547895064bb25e04ed618a1ddd3be7ebe29f3afa3237b2db8460d2c7a SHA512 9d4e814f48b672e19abf9037c43712f01727435a9a9aabfa3eaa7eb1d03c20ce4ae55e28efcd736217cad8d2ff96dface74026a40fcb5d66c606f300708890d1
+DIST scylla-ami-e7aa504db29e6e2f49b7f597846547155f0a7f64.tar.gz 11172 BLAKE2B 963a078b96430d49a38cf36d5844400a5fabbab96b3b9e0c8ad2e456dd835dee65add30aa48c7057b8d21bc728105047ae0273c1b1f9584515b1adb16ea86d05 SHA512 af5b6e56a3d048042c30eb97ee35c1bae7cb37a5f55171f7c4176a227bca486c34b0cad79f7d58629fc8c6eb38706ade3eb79bde50fc61d78a7677d5db2cfe0e
DIST scylla-swagger-ui-1b212bbe713905aac22af1edb836f5cf8cc39cc2.tar.gz 1372033 BLAKE2B 5f358f44051a2fa9a10d83fce9cab9e57b56505c4270f089a4d12aaa4e9c45a205665b342a0abb5cf314a9fd24b4186f3a176c58328cc627edc73cc854a30079 SHA512 c726a4dac73d3e9d16624727f4f0703688b7205783c627dd7b88b688b165c9055a1884cf7e9987d8c235d3fa470578852a951e34819431aec12059988394da99
+DIST seastar-ebf48120c2e4f973a1c33d8938c7d7bbc819a2d6.tar.gz 841010 BLAKE2B 1d50c7caf2e8bd4f9371cf82c335691d07c50d11c90a9d9895e7b0af5527b3ee57ff6007e657faa9b8c9d9c0a2be0beb5fb8f0769050d10645d7d062b0b8fc55 SHA512 ca9bf80e92bea5e5fc58bad400075c775b32edbd233fa1c174063be78c4accb710e625a0a50cebea887a2383d5d9dd3bece28d001733bdad5852b75b83039368
DIST xxhash-744892b802dcf61a78a3f2f1311d542577c16d66.tar.gz 29205 BLAKE2B 594f09421030809ed456ba7af906adfbf1243f7ded4161e7777ec2ef2b9ab24c653923f784a2e00b22731be0378aea76263e39614941432cb0128d972e9ff488 SHA512 f94b1b19d1c232c2e59058514be34ee169f2f11722a088ab401a38dcd75ae693bb0fbe87180060207ebff29f7b3c2a4444db54e4f57c61cac0438c4db1f118f3
-EBUILD scylla-2.2.0.ebuild 7994 BLAKE2B 04588b153cdf6e069215145a375c0ae6f3570684108464cadee13fda6a224e48eea0949df03f87b2b1d91740ce361a48b01d666563d93b0bd9acaa92533439ad SHA512 44c3e134d7354f794b97bd7370483fe7fcc09e819e6f8ff58d1999f85122930c725bc2c2f34549d64517747c564d096fc2353d8b6c39e451d90359aa9bbe3145
-EBUILD scylla-9999.ebuild 7524 BLAKE2B f3584b8de7fc056d9d39448fba007d88edd439aa177007d1e96de8c7c3a65f04ef07cd51f31ce4f17bbd1ffccd4e0ee4e286307f1f744d9905cfe47c31aca896 SHA512 e70f5440ca2e904d175d5cea209c31df685fb5a5b8fbe5298cf42c891083141f349372400a627b24442dd9fb8778385e91136739386d0c86f260062294da5ccb
-MISC metadata.xml 362 BLAKE2B 233a4e81e481316723b29ce80ff2b45e492f5d040bbfc8b99f36b418b19af807e5570e720e1ae0a995fd31cb0b8e24d4c05d9fbe69920daeb50565f66ef7c454 SHA512 611d9b41d70a9bf5dd8a68efac896cab6f4af2fea5a129c2e1f33379a5e128786d0c2d7517b6f178d56316b32fb549111788736f067411b8a34795f28ce88769
+EBUILD scylla-2.3.0.ebuild 8878 BLAKE2B e451d05e45d36e1863870476556385237701ccc1043e5246dd6723f1049263cc3ae9b4c433009b5fbdc56e07cd160682b4575628a196538d96b4aabcfcc359d9 SHA512 dbc41f4f3187bbfe9106796a22e5dee7cba68e8a8070f0947c85174036c9e6eb72ecbb51894d1b1c330d6b2f14e0263634178b677525d035fad34426059482cc
+EBUILD scylla-9999.ebuild 8646 BLAKE2B 3ca21bde542394f4e4f343e1c60f5324608ce3c747c8b466ebbe47742d96dd456fc8fc443c9e14831fd865280cdce9873c83d09add60cc3051a4ae95141f975d SHA512 3dee9e0687971ed032f7d535a4905733570652366bcce83ae0c55956c5dbf3add1d6f8d37d23780a27e7db6411983c15bace5a698ce56a39c6940d9cdf7e7c96
+MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
diff --git a/dev-db/scylla/metadata.xml b/dev-db/scylla/metadata.xml
index 619c88b..f4e95c6 100644
--- a/dev-db/scylla/metadata.xml
+++ b/dev-db/scylla/metadata.xml
@@ -5,7 +5,4 @@
<email>ultrabug@gentoo.org</email>
<name>Ultrabug</name>
</maintainer>
- <use>
- <flag name="collectd">install (obsolete) <pkg>app-metrics/collectd</pkg> dependency.</flag>
- </use>
</pkgmetadata>
diff --git a/dev-db/scylla/scylla-2.2.0.ebuild b/dev-db/scylla/scylla-2.3.0.ebuild
index 9948b06..e1f1f92 100644
--- a/dev-db/scylla/scylla-2.2.0.ebuild
+++ b/dev-db/scylla/scylla-2.3.0.ebuild
@@ -1,28 +1,25 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# TODO: node_exporter pkg name change to report upstream
-
EAPI=6
if [[ ${PV} == "9999" ]] ; then
+ #EGIT_COMMIT="scylla-"
EGIT_REPO_URI="https://github.com/scylladb/scylla.git"
inherit git-r3
else
MY_PV="${PV/_rc/.rc}"
MY_P="${PN}-${MY_PV}"
- AMI_COMMIT="6ed71a3126170d32fa1712370da6945c161b4bd8"
+ AMI_COMMIT="e7aa504db29e6e2f49b7f597846547155f0a7f64"
C_ARES_COMMIT="fd6124c74da0801f23f9d324559d8b66fb83f533"
- DPDK_COMMIT="a1774652fbbb1fe7c0ff392d5e66de60a0154df6"
FMT_COMMIT="f61e71ccb9ab253f6d76096b2d958caf38fcccaa"
- SEASTAR_COMMIT="6f61d7456e0a9969193106a0cc0e044ffead2126"
+ SEASTAR_COMMIT="ebf48120c2e4f973a1c33d8938c7d7bbc819a2d6"
SWAGGER_COMMIT="1b212bbe713905aac22af1edb836f5cf8cc39cc2"
XXHASH_COMMIT="744892b802dcf61a78a3f2f1311d542577c16d66"
SRC_URI="
https://github.com/scylladb/${PN}/archive/scylla-${MY_PV}.tar.gz -> ${MY_P}.tar.gz
- https://github.com/scylladb/scylla-seastar/archive/${SEASTAR_COMMIT}.tar.gz -> scylla-seastar-${SEASTAR_COMMIT}.tar.gz
+ https://github.com/scylladb/seastar/archive/${SEASTAR_COMMIT}.tar.gz -> seastar-${SEASTAR_COMMIT}.tar.gz
https://github.com/scylladb/scylla-swagger-ui/archive/${SWAGGER_COMMIT}.tar.gz -> scylla-swagger-ui-${SWAGGER_COMMIT}.tar.gz
- https://github.com/scylladb/dpdk/archive/${DPDK_COMMIT}.tar.gz -> dpdk-${DPDK_COMMIT}.tar.gz
https://github.com/scylladb/fmt/archive/${FMT_COMMIT}.tar.gz -> fmt-${FMT_COMMIT}.tar.gz
https://github.com/scylladb/c-ares/archive/${C_ARES_COMMIT}.tar.gz -> c-ares-${C_ARES_COMMIT}.tar.gz
https://github.com/scylladb/scylla-ami/archive/${AMI_COMMIT}.tar.gz -> scylla-ami-${AMI_COMMIT}.tar.gz
@@ -41,7 +38,7 @@ HOMEPAGE="http://scylladb.com/"
LICENSE="AGPL-3"
SLOT="0"
-IUSE="-collectd doc systemd"
+IUSE="doc systemd"
# NOTE:
# if you want to debug using backtraces, enable the 'splitdebug' FEATURE:
@@ -55,6 +52,7 @@ RESTRICT="test"
RDEPEND="
<dev-libs/thrift-0.11.0
<dev-util/ragel-7.0
+ <sys-apps/hwloc-2.0.0
~app-admin/scylla-jmx-${PV}
~app-admin/scylla-tools-${PV}
>=virtual/jdk-1.8.0
@@ -70,6 +68,7 @@ RDEPEND="
dev-libs/libxml2
dev-libs/protobuf
dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/pystache[${PYTHON_USEDEP}]
dev-python/pyudev[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
@@ -78,13 +77,11 @@ RDEPEND="
net-libs/gnutls
net-misc/lksctp-tools
sys-apps/ethtool
- sys-apps/hwloc
sys-fs/xfsprogs
sys-libs/libunwind
sys-libs/zlib
sys-process/numactl
x11-libs/libpciaccess
- collectd? ( app-metrics/collectd )
systemd? ( sys-apps/systemd )
"
DEPEND="${RDEPEND}
@@ -94,12 +91,15 @@ DEPEND="${RDEPEND}
# Discussion about kernel configuration:
# https://groups.google.com/forum/#!topic/scylladb-dev/qJu2zrryv-s
-# For DPDK, removed HUGETLBFS PROC_PAGE_MONITOR UIO_PCI_GENERIC in favor of VFIO
-CONFIG_CHECK="~NUMA_BALANCING ~SYN_COOKIES ~TRANSPARENT_HUGEPAGE ~VFIO"
+CONFIG_CHECK="~NUMA_BALANCING ~SYN_COOKIES ~TRANSPARENT_HUGEPAGE"
ERROR_NUMA_BALANCING="${PN} recommends support for Memory placement aware NUMA scheduler (NUMA_BALANCING)."
ERROR_SYN_COOKIES="${PN} recommends support for TCP syncookie (SYN_COOKIES)."
ERROR_TRANSPARENT_HUGEPAGE="${PN} recommends support for Transparent Hugepage (TRANSPARENT_HUGEPAGE)."
-ERROR_VFIO="${PN} running with DPDK recommends support for Non-Privileged userspace driver framework (VFIO)."
+
+# NOTE: maybe later depending on upstream energy, support DPDK
+# For DPDK, removed HUGETLBFS PROC_PAGE_MONITOR UIO_PCI_GENERIC in favor of VFIO
+# CONFIG_CHECK="~NUMA_BALANCING ~SYN_COOKIES ~TRANSPARENT_HUGEPAGE ~VFIO"
+# ERROR_VFIO="${PN} running with DPDK recommends support for Non-Privileged userspace driver framework (VFIO)."
DOCS=( LICENSE.AGPL NOTICE.txt ORIGIN README.md README-DPDK.md )
PATCHES=()
@@ -110,10 +110,6 @@ pkg_pretend() {
die "You need at least sys-devel/gcc-7.3"
fi
fi
- ewarn ""
- ewarn "IMPORTANT!!"
- ewarn "dev-libs/boost-1.65 needs to be patched with provided boost-1.65.0-icl-ttp-matching.patch"
- ewarn ""
}
pkg_setup() {
@@ -132,10 +128,7 @@ src_prepare() {
echo "${PV}-${git_commit}" > version
else
rmdir seastar || die
- mv "${WORKDIR}/scylla-seastar-${SEASTAR_COMMIT}" seastar || die
-
- rmdir seastar/dpdk || die
- mv "${WORKDIR}/dpdk-${DPDK_COMMIT}" seastar/dpdk || die
+ mv "${WORKDIR}/seastar-${SEASTAR_COMMIT}" seastar || die
rmdir seastar/c-ares || die
mv "${WORKDIR}/c-ares-${C_ARES_COMMIT}" seastar/c-ares || die
@@ -156,16 +149,16 @@ src_prepare() {
echo "${MY_PV}-gentoo" > version
fi
- # fix slotted antlr3 path
- sed -e 's/antlr3 /antlr3.5 /g' -i configure.py || die
-
# fix jsoncpp detection
sed -e 's@json/json.h@jsoncpp/json/json.h@g' -i json.hh || die
- # fix systemd service config path
- mkdir build || die
- cp dist/common/systemd/scylla-server.service.in build/scylla-server.service || die
- sed -e "s#@@SYSCONFDIR@@#/etc/sysconfig#g" -i build/scylla-server.service || die
+ # QA: no -Werror (tho it does not propagate)
+ sed -e 's/\-Werror//g' -i configure.py || die
+
+ # QA NOTE: respect -O3 as it is upstream recommended
+ # and because we would kill the RAM of the machine with lower optimization
+ # since some files can take up to 8GB of RAM to compile!
+ # sed -e 's/\-O3//g' -i configure.py || die
# run a clean autoreconf on c-ares
pushd seastar/c-ares
@@ -176,32 +169,48 @@ src_prepare() {
src_configure() {
python_setup
+ # copied from dist/redhat/scylla.spec.mustache
+ # we want a package compiled with old kernel headers to
+ # support nowait aio if the user upgrades their kernel
+ if ! grep -qwr RWF_NOWAIT /usr/include/linux; then
+ append-cflags "-DRWF_NOWAIT=8"
+ fi
+ if ! grep -qwr aio_rw_flags /usr/include/linux; then
+ append-cflags "-Daio_rw_flags=aio_reserved1"
+ fi
+
# native CPU CFLAGS are strongly enforced by upstreams, respect that
replace-cpu-flags "*" "native"
- ${EPYTHON} configure.py --mode=release --with=scylla --enable-dpdk --disable-xen --compiler "$(tc-getCXX)" --ldflags "${LDFLAGS}" --cflags "${CFLAGS}" --python ${EPYTHON} || die
+ append-cflags "-Wno-attributes -Wno-array-bounds"
+
+ ${EPYTHON} configure.py --enable-gcc6-concepts --mode=release --with=scylla --disable-xen --c-compiler "$(tc-getCC)" --compiler "$(tc-getCXX)" --ldflags "${LDFLAGS}" --cflags "${CFLAGS}" --python ${EPYTHON} --with-antlr3 /usr/bin/antlr3.5 || die
}
src_compile() {
# force number of parallel builds because ninja does a bad job in guessing
# and the default build will kill your RAM/Swap in no time
- ninja -v build/release/scylla build/release/iotune -j4 || die
+ ninja -v build/release/scylla build/release/iotune -j1 || die
}
src_install() {
+ # NOTE:
+ # I base myself on upstream's install.sh file
+
default
+ local MUSTACHE_DIST="\"debian\": true"
+ pystache dist/common/systemd/scylla-server.service.mustache "{ $MUSTACHE_DIST }" > build/scylla-server.service
+ pystache dist/common/systemd/scylla-housekeeping-daily.service.mustache "{ $MUSTACHE_DIST }" > build/scylla-housekeeping-daily.service
+ pystache dist/common/systemd/scylla-housekeeping-restart.service.mustache "{ $MUSTACHE_DIST }" > build/scylla-housekeeping-restart.service
+
insinto /etc/default
doins dist/common/sysconfig/scylla-server
insinto /etc/security/limits.d
doins dist/common/limits.d/scylla.conf
- insinto /etc/collectd.d
- doins dist/common/collectd.d/scylla.conf
-
insinto /etc/scylla.d
- mv conf/housekeeping.cfg dist/common/scylla.d/ || die
doins dist/common/scylla.d/*.conf
insinto /etc/sysctl.d
@@ -209,28 +218,42 @@ src_install() {
doins dist/debian/sysctl.d/*.conf
insinto /etc/scylla
- doins conf/*
+ for config_file in scylla.yaml cassandra-rackdc.properties; do
+ doins conf/${config_file}
+ done
systemd_dounit build/*.service
systemd_dounit dist/common/systemd/*.service
systemd_dounit dist/common/systemd/*.timer
- newinitd "${FILESDIR}/scylla-server.initd" ${PN}-server
- newconfd "${FILESDIR}/scylla-server.confd" ${PN}-server
-
exeinto /usr/lib/scylla
doexe dist/common/scripts/*
doexe seastar/scripts/*
- doexe seastar/dpdk/usertools/dpdk-devbind.py
- doexe scylla-blocktune
- doexe scylla-housekeeping
dobin build/release/iotune
dobin build/release/scylla
dobin dist/common/bin/scyllatop
+ insinto /usr/lib/scylla
+ doins dist/common/scripts/scylla_blocktune.py
+
+ exeinto /usr/lib/scylla
+ doexe dist/common/scripts/scylla-blocktune
+ doexe scylla-housekeeping
+
+ insinto /etc/scylla.d
+ doins conf/housekeeping.cfg
+
+ newinitd "${FILESDIR}/scylla-server.initd" ${PN}-server
+ newconfd "${FILESDIR}/scylla-server.confd" ${PN}-server
+
dodoc -r licenses
+ for x in /var/lib/${PN}/{data,commitlog,hints,coredump} /var/lib/scylla-housekeeping /var/log/scylla; do
+ keepdir "${x}"
+ fowners scylla:scylla "${x}"
+ done
+
insinto /usr/lib/scylla/swagger-ui
doins -r swagger-ui/dist
@@ -241,23 +264,23 @@ src_install() {
doins -r tools/scyllatop/*
fperms +x /usr/lib/scylla/scyllatop/scyllatop.py
+ insinto /var/lib/scylla-housekeeping
+ doins -r scylla-housekeeping
+
for util in $(ls dist/common/sbin/); do
dosym /usr/lib/scylla/${util} /usr/sbin/${util}
done
- for x in /var/lib/${PN}/{data,commitlog,coredump} /var/lib/scylla-housekeeping /var/log/scylla; do
- keepdir "${x}"
- fowners scylla:scylla "${x}"
- done
-
insinto /etc/sudoers.d
doins dist/debian/sudoers.d/scylla
insinto /etc/rsyslog.d
doins "${FILESDIR}/10-scylla.conf"
- insinto /etc/cron.d
- newins dist/debian/scylla-server.cron.d scylla_delay_fstrim
+ if ! use systemd; then
+ insinto /etc/cron.d
+ newins dist/debian/scylla-server.cron.d scylla_delay_fstrim
+ fi
}
pkg_postinst() {
diff --git a/dev-db/scylla/scylla-9999.ebuild b/dev-db/scylla/scylla-9999.ebuild
index b8203c0..144c389 100644
--- a/dev-db/scylla/scylla-9999.ebuild
+++ b/dev-db/scylla/scylla-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=6
if [[ ${PV} == "9999" ]] ; then
- # EGIT_COMMIT="scylla-"
+ EGIT_COMMIT="scylla-2.3.0"
EGIT_REPO_URI="https://github.com/scylladb/scylla.git"
inherit git-r3
else
@@ -12,7 +12,6 @@ else
MY_P="${PN}-${MY_PV}"
AMI_COMMIT=""
C_ARES_COMMIT=""
- DPDK_COMMIT=""
FMT_COMMIT=""
SEASTAR_COMMIT=""
SWAGGER_COMMIT=""
@@ -21,7 +20,6 @@ else
https://github.com/scylladb/${PN}/archive/scylla-${MY_PV}.tar.gz -> ${MY_P}.tar.gz
https://github.com/scylladb/seastar/archive/${SEASTAR_COMMIT}.tar.gz -> seastar-${SEASTAR_COMMIT}.tar.gz
https://github.com/scylladb/scylla-swagger-ui/archive/${SWAGGER_COMMIT}.tar.gz -> scylla-swagger-ui-${SWAGGER_COMMIT}.tar.gz
- https://github.com/scylladb/dpdk/archive/${DPDK_COMMIT}.tar.gz -> dpdk-${DPDK_COMMIT}.tar.gz
https://github.com/scylladb/fmt/archive/${FMT_COMMIT}.tar.gz -> fmt-${FMT_COMMIT}.tar.gz
https://github.com/scylladb/c-ares/archive/${C_ARES_COMMIT}.tar.gz -> c-ares-${C_ARES_COMMIT}.tar.gz
https://github.com/scylladb/scylla-ami/archive/${AMI_COMMIT}.tar.gz -> scylla-ami-${AMI_COMMIT}.tar.gz
@@ -40,7 +38,7 @@ HOMEPAGE="http://scylladb.com/"
LICENSE="AGPL-3"
SLOT="0"
-IUSE="-collectd doc systemd"
+IUSE="doc systemd"
# NOTE:
# if you want to debug using backtraces, enable the 'splitdebug' FEATURE:
@@ -54,6 +52,7 @@ RESTRICT="test"
RDEPEND="
<dev-libs/thrift-0.11.0
<dev-util/ragel-7.0
+ <sys-apps/hwloc-2.0.0
~app-admin/scylla-jmx-${PV}
~app-admin/scylla-tools-${PV}
>=virtual/jdk-1.8.0
@@ -69,6 +68,7 @@ RDEPEND="
dev-libs/libxml2
dev-libs/protobuf
dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/pystache[${PYTHON_USEDEP}]
dev-python/pyudev[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
@@ -77,13 +77,11 @@ RDEPEND="
net-libs/gnutls
net-misc/lksctp-tools
sys-apps/ethtool
- sys-apps/hwloc
sys-fs/xfsprogs
sys-libs/libunwind
sys-libs/zlib
sys-process/numactl
x11-libs/libpciaccess
- collectd? ( app-metrics/collectd )
systemd? ( sys-apps/systemd )
"
DEPEND="${RDEPEND}
@@ -93,12 +91,15 @@ DEPEND="${RDEPEND}
# Discussion about kernel configuration:
# https://groups.google.com/forum/#!topic/scylladb-dev/qJu2zrryv-s
-# For DPDK, removed HUGETLBFS PROC_PAGE_MONITOR UIO_PCI_GENERIC in favor of VFIO
-CONFIG_CHECK="~NUMA_BALANCING ~SYN_COOKIES ~TRANSPARENT_HUGEPAGE ~VFIO"
+CONFIG_CHECK="~NUMA_BALANCING ~SYN_COOKIES ~TRANSPARENT_HUGEPAGE"
ERROR_NUMA_BALANCING="${PN} recommends support for Memory placement aware NUMA scheduler (NUMA_BALANCING)."
ERROR_SYN_COOKIES="${PN} recommends support for TCP syncookie (SYN_COOKIES)."
ERROR_TRANSPARENT_HUGEPAGE="${PN} recommends support for Transparent Hugepage (TRANSPARENT_HUGEPAGE)."
-ERROR_VFIO="${PN} running with DPDK recommends support for Non-Privileged userspace driver framework (VFIO)."
+
+# NOTE: maybe later depending on upstream energy, support DPDK
+# For DPDK, removed HUGETLBFS PROC_PAGE_MONITOR UIO_PCI_GENERIC in favor of VFIO
+# CONFIG_CHECK="~NUMA_BALANCING ~SYN_COOKIES ~TRANSPARENT_HUGEPAGE ~VFIO"
+# ERROR_VFIO="${PN} running with DPDK recommends support for Non-Privileged userspace driver framework (VFIO)."
DOCS=( LICENSE.AGPL NOTICE.txt ORIGIN README.md README-DPDK.md )
PATCHES=()
@@ -106,7 +107,7 @@ PATCHES=()
pkg_pretend() {
if tc-is-gcc ; then
if [[ $(gcc-major-version) -lt 7 && $(gcc-minor-version) -lt 3 ]] ; then
- die "You need at least sys-devel/gcc-7.0"
+ die "You need at least sys-devel/gcc-7.3"
fi
fi
}
@@ -129,9 +130,6 @@ src_prepare() {
rmdir seastar || die
mv "${WORKDIR}/seastar-${SEASTAR_COMMIT}" seastar || die
- rmdir seastar/dpdk || die
- mv "${WORKDIR}/dpdk-${DPDK_COMMIT}" seastar/dpdk || die
-
rmdir seastar/c-ares || die
mv "${WORKDIR}/c-ares-${C_ARES_COMMIT}" seastar/c-ares || die
@@ -151,16 +149,16 @@ src_prepare() {
echo "${MY_PV}-gentoo" > version
fi
- # fix slotted antlr3 path
- sed -e 's/antlr3 /antlr3.5 /g' -i configure.py || die
-
# fix jsoncpp detection
sed -e 's@json/json.h@jsoncpp/json/json.h@g' -i json.hh || die
- # fix systemd service config path
- mkdir build || die
- cp dist/common/systemd/scylla-server.service.in build/scylla-server.service || die
- sed -e "s#@@SYSCONFDIR@@#/etc/sysconfig#g" -i build/scylla-server.service || die
+ # QA: no -Werror (tho it does not propagate)
+ sed -e 's/\-Werror//g' -i configure.py || die
+
+ # QA NOTE: respect -O3 as it is upstream recommended
+ # and because we would kill the RAM of the machine with lower optimization
+ # since some files can take up to 8GB of RAM to compile!
+ # sed -e 's/\-O3//g' -i configure.py || die
# run a clean autoreconf on c-ares
pushd seastar/c-ares
@@ -171,32 +169,48 @@ src_prepare() {
src_configure() {
python_setup
+ # copied from dist/redhat/scylla.spec.mustache
+ # we want a package compiled with old kernel headers to
+ # support nowait aio if the user upgrades their kernel
+ if ! grep -qwr RWF_NOWAIT /usr/include/linux; then
+ append-cflags "-DRWF_NOWAIT=8"
+ fi
+ if ! grep -qwr aio_rw_flags /usr/include/linux; then
+ append-cflags "-Daio_rw_flags=aio_reserved1"
+ fi
+
# native CPU CFLAGS are strongly enforced by upstreams, respect that
replace-cpu-flags "*" "native"
- ${EPYTHON} configure.py --mode=release --with=scylla --enable-dpdk --disable-xen --compiler "$(tc-getCXX)" --ldflags "${LDFLAGS}" --cflags "${CFLAGS}" --python ${EPYTHON} || die
+ append-cflags "-Wno-attributes -Wno-array-bounds"
+
+ ${EPYTHON} configure.py --enable-gcc6-concepts --mode=release --with=scylla --disable-xen --c-compiler "$(tc-getCC)" --compiler "$(tc-getCXX)" --ldflags "${LDFLAGS}" --cflags "${CFLAGS}" --python ${EPYTHON} --with-antlr3 /usr/bin/antlr3.5 || die
}
src_compile() {
# force number of parallel builds because ninja does a bad job in guessing
# and the default build will kill your RAM/Swap in no time
- ninja -v build/release/scylla build/release/iotune -j4 || die
+ ninja -v build/release/scylla build/release/iotune -j1 || die
}
src_install() {
+ # NOTE:
+ # I base myself on upstream's install.sh file
+
default
+ local MUSTACHE_DIST="\"debian\": true"
+ pystache dist/common/systemd/scylla-server.service.mustache "{ $MUSTACHE_DIST }" > build/scylla-server.service
+ pystache dist/common/systemd/scylla-housekeeping-daily.service.mustache "{ $MUSTACHE_DIST }" > build/scylla-housekeeping-daily.service
+ pystache dist/common/systemd/scylla-housekeeping-restart.service.mustache "{ $MUSTACHE_DIST }" > build/scylla-housekeeping-restart.service
+
insinto /etc/default
doins dist/common/sysconfig/scylla-server
insinto /etc/security/limits.d
doins dist/common/limits.d/scylla.conf
- insinto /etc/collectd.d
- doins dist/common/collectd.d/scylla.conf
-
insinto /etc/scylla.d
- mv conf/housekeeping.cfg dist/common/scylla.d/ || die
doins dist/common/scylla.d/*.conf
insinto /etc/sysctl.d
@@ -204,28 +218,42 @@ src_install() {
doins dist/debian/sysctl.d/*.conf
insinto /etc/scylla
- doins conf/*
+ for config_file in scylla.yaml cassandra-rackdc.properties; do
+ doins conf/${config_file}
+ done
systemd_dounit build/*.service
systemd_dounit dist/common/systemd/*.service
systemd_dounit dist/common/systemd/*.timer
- newinitd "${FILESDIR}/scylla-server.initd" ${PN}-server
- newconfd "${FILESDIR}/scylla-server.confd" ${PN}-server
-
exeinto /usr/lib/scylla
doexe dist/common/scripts/*
doexe seastar/scripts/*
- doexe seastar/dpdk/usertools/dpdk-devbind.py
- doexe scylla-blocktune
- doexe scylla-housekeeping
dobin build/release/iotune
dobin build/release/scylla
dobin dist/common/bin/scyllatop
+ insinto /usr/lib/scylla
+ doins dist/common/scripts/scylla_blocktune.py
+
+ exeinto /usr/lib/scylla
+ doexe dist/common/scripts/scylla-blocktune
+ doexe scylla-housekeeping
+
+ insinto /etc/scylla.d
+ doins conf/housekeeping.cfg
+
+ newinitd "${FILESDIR}/scylla-server.initd" ${PN}-server
+ newconfd "${FILESDIR}/scylla-server.confd" ${PN}-server
+
dodoc -r licenses
+ for x in /var/lib/${PN}/{data,commitlog,hints,coredump} /var/lib/scylla-housekeeping /var/log/scylla; do
+ keepdir "${x}"
+ fowners scylla:scylla "${x}"
+ done
+
insinto /usr/lib/scylla/swagger-ui
doins -r swagger-ui/dist
@@ -236,23 +264,23 @@ src_install() {
doins -r tools/scyllatop/*
fperms +x /usr/lib/scylla/scyllatop/scyllatop.py
+ insinto /var/lib/scylla-housekeeping
+ doins -r scylla-housekeeping
+
for util in $(ls dist/common/sbin/); do
dosym /usr/lib/scylla/${util} /usr/sbin/${util}
done
- for x in /var/lib/${PN}/{data,commitlog,coredump} /var/lib/scylla-housekeeping /var/log/scylla; do
- keepdir "${x}"
- fowners scylla:scylla "${x}"
- done
-
insinto /etc/sudoers.d
doins dist/debian/sudoers.d/scylla
insinto /etc/rsyslog.d
doins "${FILESDIR}/10-scylla.conf"
- insinto /etc/cron.d
- newins dist/debian/scylla-server.cron.d scylla_delay_fstrim
+ if ! use systemd; then
+ insinto /etc/cron.d
+ newins dist/debian/scylla-server.cron.d scylla_delay_fstrim
+ fi
}
pkg_postinst() {