diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-18 10:15:03 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-18 10:15:03 +0000 |
| commit | b284a3168fa91a038925d2ecf5e4791011ea5e7d (patch) | |
| tree | 16fe44748708acacd909d4e2e160a09a7f6d936a /sys-cluster/ceph | |
| parent | 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff) | |
gentoo resync : 18.11.2019
Diffstat (limited to 'sys-cluster/ceph')
| -rw-r--r-- | sys-cluster/ceph/Manifest | 2 | ||||
| -rw-r--r-- | sys-cluster/ceph/ceph-14.2.4-r1.ebuild | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index 877c3a806de9..8ed321f8ab19 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -59,5 +59,5 @@ EBUILD ceph-12.2.12-r2.ebuild 8390 BLAKE2B dbbf53017559230bfc03f4cf267e325e5c2c1 EBUILD ceph-12.2.8-r1.ebuild 7886 BLAKE2B e99590739ce73d96895c282108d3b945bb0e13bdb73e34b06d2da5c9e7d74dc4fdceddfb6330a106b775c612c7cca6b67325b83389f1c6d5af712e59a6f1fd55 SHA512 ab8d2a1ee7c4a7d7179f81e18dc601a18da365663351d88cf6dfee32e2aaaf40412bc2fde98d7c07012f79f8b6c19bac773ef97b872a32b663748ce41a5954c1 EBUILD ceph-13.2.5-r4.ebuild 9007 BLAKE2B fc84d7fee8572582743979cd3da76cdd337667843410f8efb167ec80442d006b6d4c1c947ffeeb9c6265c47116a6cf15a012f4277c619cb55ad942b0e95f6cdb SHA512 eec2780a80d98b3a535a33c86efaae4112605b8c6e220b61beb9956ece895a8807024fe71f86b626c89b3ca8af3b94a4c0e990c47e9951cc31490a90c1841ff3 EBUILD ceph-13.2.6.ebuild 9133 BLAKE2B d5990d637edaa460b90eadc0b97c8952b2e7688c4916f0978bb15e9c2b99c206f3be5c2f57ded889393e5ba32fa63bf08a89138ea96a7045b6a47a3cd59d0381 SHA512 7a510c208b8b15fe124aafba24d25c0f181bc2ff61710d274e59c383f5d0a27ef83fbbd6b19e1020953887a0a4221769d88e8f75e720d0af3fa93ba5d9c50792 -EBUILD ceph-14.2.4-r1.ebuild 9945 BLAKE2B f5aa6e5f8341fd59eb697bf876e86515b48c9ede34286c0c3b0241f1f5ca26178f29d6c0080de56306fd522dfd49722472d444116db5af929fc220a7623edff0 SHA512 de6c0549824599cd43984794a2ccff68cf3526cadb53a87f743eda5ac9be759664eff0b478dfdda2a7645da4b24c3a3b39757d707bc981c9a6103bf07270990a +EBUILD ceph-14.2.4-r1.ebuild 10019 BLAKE2B 2429f9e8a00619a84061448a90445913bb8134d203ad539a2f68d851de095ab5362eb99d8b10378fb7ef3f9ad3b8702d36135866f02c30df499b6094d9f89cac SHA512 fe643c2b3f36152b54fd843da858bac2103d762cb3928a57c7d63f64051a9859160906ce1dd61b5e9afe47029e8ec22c8f79808042ba721665624ea9fa151e26 MISC metadata.xml 1588 BLAKE2B c3a1f7afa0e61fc589e60ec00bc1702a6f953bbbbc1ab6a8582fe08bad9f6af9217350641399bc7de4dfb69a79ee0e41b46d971eef53348f3b568c6dcd439273 SHA512 ac2196349f897b7dfafaa924cda3f4eb094233bd04e7949b9f8fafd135775202c3c1bdc11cc4a931e752fb40b9d1c86524cdd849a23d364e4f2aa240bbdf1250 diff --git a/sys-cluster/ceph/ceph-14.2.4-r1.ebuild b/sys-cluster/ceph/ceph-14.2.4-r1.ebuild index b5c3ff61473f..b56ddd9c3f0c 100644 --- a/sys-cluster/ceph/ceph-14.2.4-r1.ebuild +++ b/sys-cluster/ceph/ceph-14.2.4-r1.ebuild @@ -348,8 +348,9 @@ src_install() { python_fix_shebang "${ED}"/usr/{,s}bin/ # python_fix_shebang apparently is not idempotent - sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \ - "${ED}"/usr/sbin/{mount.*,ceph-volume{,-systemd}} || die "sed failed" + local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]' + grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \ + | xargs --null --no-run-if-empty -- sed -i -r "s:${shebang_regex}:\1:" || die local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* ) dostrip -x "${rados_classes[@]#${ED}}" |