summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUltrabug <ultrabug@gentoo.org>2019-12-19 13:39:52 +0100
committerUltrabug <ultrabug@gentoo.org>2019-12-19 13:39:52 +0100
commit4ed773b7385b358fb9b06e53140e0d3dc86b991d (patch)
treed8539f6bd315ff35f4e8a4b6e43dae500803fcec
parentdev-db/scylla: remove obsolete dpdk doc (diff)
downloadultrabug-4ed773b7385b358fb9b06e53140e0d3dc86b991d.tar.gz
ultrabug-4ed773b7385b358fb9b06e53140e0d3dc86b991d.tar.bz2
ultrabug-4ed773b7385b358fb9b06e53140e0d3dc86b991d.zip
dev-db/scylla: 3.2 fix scripts path
Package-Manager: Portage-2.3.81, Repoman-2.3.20 Manifest-Sign-Key: 34FCB257983BA23A8CEC5EB7EB9E6405C24BFAE5 Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
-rw-r--r--dev-db/scylla/Manifest18
-rw-r--r--dev-db/scylla/scylla-3.2_rc3.ebuild7
2 files changed, 12 insertions, 13 deletions
diff --git a/dev-db/scylla/Manifest b/dev-db/scylla/Manifest
index c523f51..065bfd8 100644
--- a/dev-db/scylla/Manifest
+++ b/dev-db/scylla/Manifest
@@ -19,20 +19,20 @@ EBUILD scylla-3.1.1-r2.ebuild 7622 BLAKE2B 404ab3d8e42898a7379aa9872eb710aa183ca
EBUILD scylla-3.1.1.ebuild 7497 BLAKE2B 9f9a71a22eecababea0ec5c4f156b50d2c858f3c764acaedb77eb159d0e4c6c9f8ce4c4efde856d04edce0a89d40759ed56bea62c7f693e44e489d3d69f8f6fa SHA512 b6fee615043cce8801f9d84d0599a6e6fb6ded7553b04b1b38bc7b560576ac918b20e542a8064d54ae9615bafa2fe7e854069bb749d0fd332c3c4584104a05a3
EBUILD scylla-3.1.2-r1.ebuild 7672 BLAKE2B 7249eb175499b7aa9ac0a5df43ffb4a573eca25d5f1b23c79935bd444320d977d7c2b3953c4569a606ded4a15028dc09c8374d1a0df8ce6dd45471a23fd2c662 SHA512 0e5ebf4b64ce7f4496ab94c87a3f8c432f762909f35b03501a4c84e6f6a7f780c35b947ececf0fd8e32a0a13dd011b8b074a955994cb46342336c2edb0e348c5
EBUILD scylla-3.1.2.ebuild 7497 BLAKE2B 9f9a71a22eecababea0ec5c4f156b50d2c858f3c764acaedb77eb159d0e4c6c9f8ce4c4efde856d04edce0a89d40759ed56bea62c7f693e44e489d3d69f8f6fa SHA512 b6fee615043cce8801f9d84d0599a6e6fb6ded7553b04b1b38bc7b560576ac918b20e542a8064d54ae9615bafa2fe7e854069bb749d0fd332c3c4584104a05a3
-EBUILD scylla-3.2_rc3.ebuild 7413 BLAKE2B 707db17aad2268070fb25a3655a4123d4aca653669354397d941b01bec0004e22daa1f7a4c3341b2f8e8699c830f10b9721fb2a80db3c68ba86770af6bcbcc8c SHA512 7b8bfdd98cb8a6c3db4f49d1f406064617a26bc9a94f84d435d1d1fe3c1d195f72b612e4ebcd1b4fbb125031b4990868792554f34e935cdb94e688b3ef4f60a8
+EBUILD scylla-3.2_rc3.ebuild 7429 BLAKE2B 1c39cb22262d863a336dcf543702fe61ad1fa875ee35832bda9123210ee169a3feced23e6097388ab060a56cfb0b61448c8e2e040c2966851c774c544f189412 SHA512 ba8e272d50a6dda2609b4875aa96b5098604efb1c76dd9f4ee3f802bd4f41e060a46d40696e1c18f9288ba1478aae51b792aabc02cbbb2f90490191231974389
EBUILD scylla-9999.ebuild 6833 BLAKE2B c21b0db85ca5b2dbe90a7523b739fa6614d40fd0264d8cd5bf77f1c1b37b31f1f042c946b76d5c1e74907badf931c188f7f5112105089658ff6acfc80f440021 SHA512 e5237eddd44fa0f4f88a6aa4bd2d6015dc6c61597636e03957ea932cce240de05533e223aae0abb68d37d16c7734e64267f2b77aedb3913c24b6b73210629972
MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl37bD1fFIAAAAAALgAo
+iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl37b3tfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDA3
QjM0NkQ4QUE4RDZEMEMzQzgyQTQzQjUxRkYyM0YxQUM5Nzc3MkYACgkQUf8j8ayX
-dy9xXggAgCubJPP+rUFVaEwBW+6EMlNCKJP6pWtac2bAYh6nflLlCaMVGJfyoXKi
-n7I4SaU2tTbDNfcj2xKSIbXOiQ7MgQfEuwQFtnQEwbsbBwmGOXpxTdtVJ2YVn24A
-xS/+vW2oGD3cbovkv/1DLyvB3LDCK2amkhaFgA9llehucYD148wY679ahfp3oZ5U
-1DO4EPojMuzSAXFfyoHc8xPbQdv/vcDwSbuWCF+0F0VRoU77m+kv2Vi+1CODa8IW
-NptCHbIuNwrgcUDAyRsVbo0VCYkUMoaYvNv7RYhSMuzRAzOIWO518SsvQn2d+unG
-kRMm4Uf4MKgtWo0a7EfamlTlN4vNiA==
-=g6nj
+dy+UAAf/WvyVpaDT+ihMJf7FypaO6W9k3A9jGOKMqgocGp9aBxZUNfCr8q/+n92V
+p+TZB0Q3XcFBd/RUd5A0/GxOw0xiRKCRXCnPGzw+2pOd/NeZKvnV7t1pNV7SAduh
+SzPMZD9ExlTZ6B1cOaHsmDw8xI8aH3leXvt4Ca7WDD2VDZ/MzVvQ/eFY+Hbjj0kZ
+7ojuvizJIiJ6iYY8T2F2C2mk1bskzLXaWxnzIxJG/cccWXGt9wwVZLBQLoA01QnQ
+MXAX+NfnIKJHlZVUjZ12TbscgzuzuUn887IwtsTkbd88aVRnEZESVByvEpW9Qi11
+g/jm8Z6q9pCYjYcU/WucnINxhy7dSQ==
+=KmHy
-----END PGP SIGNATURE-----
diff --git a/dev-db/scylla/scylla-3.2_rc3.ebuild b/dev-db/scylla/scylla-3.2_rc3.ebuild
index 8892cb8..e51f8cd 100644
--- a/dev-db/scylla/scylla-3.2_rc3.ebuild
+++ b/dev-db/scylla/scylla-3.2_rc3.ebuild
@@ -128,6 +128,9 @@ src_prepare() {
# dist/common/scripts/scylla_config_get.py
find "${S}/dist" -type f -exec sed -e 's/yaml.load(/yaml.full_load(/g' -i {} \+ || die
sed -e 's/yaml.load(/yaml.safe_load(/g' -i seastar/scripts/perftune.py || die
+
+ # fix /opt/scylladb/scripts
+ sed -e 's@/opt/scylladb/scripts@/usr/lib/scylla@g' -i dist/common/scripts/* || die
}
src_configure() {
@@ -229,10 +232,6 @@ src_install() {
fperms +x /usr/lib/scylla/scyllatop/scyllatop.py
dosym /usr/lib/scylla/scyllatop/scyllatop.py /usr/sbin/scyllatop
- for util in $(ls dist/common/sbin/); do
- dosym /usr/lib/scylla/${util} /usr/sbin/${util}
- done
-
insinto /etc/sudoers.d
newins "${FILESDIR}"/scylla.sudoers scylla