diff --git a/sys-fs/stratis-cli/Manifest b/sys-fs/stratis-cli/Manifest index 36a0f34..cf609a3 100644 --- a/sys-fs/stratis-cli/Manifest +++ b/sys-fs/stratis-cli/Manifest @@ -1,7 +1,3 @@ -DIST v1.1.0.tar.gz 35008 BLAKE2B 9300fb008bde6f3d90c6912c3da71f43090f7b713d05133339761bf1aed846199237e3cec0d59930de5a299405e988d5d7c596cca79d69f2f280236bede13e8c SHA512 0c79d646289a4f2390a52b10cb00eb58b55f3ca9b7dce22d5bae5afaa607ffcdb355b17465c69307d707963c4fbd958697e57046c8265f5bc5eee1acc871755e -DIST v2.0.1.tar.gz 44766 BLAKE2B efa41ab2a8fff80491da0e98625e032f0a7a34615ab771012401c1b0f32677e86c0568c596892b75b9b41f13dea763459663dd61b616c37e486d9c89e051d4d8 SHA512 0eca58aa81e85f764d03cd0aee55f22720c01c450205028517f2fde0499f87637d7c868197b0f1d8d0b4c61611d3abe2a739c47e3746cb0f5574814e06ae2162 -DIST v2.1.0.tar.gz 57602 BLAKE2B bc4dc2e5043f354e4f3e96588d1f0308d1ab747f762f7e5be5b79fe529dc8b51ae888a1bd3be167097ef3b63aed8ec95450dfa9f316306aac339037c71d65141 SHA512 590066cc94db713dd3dfda01a53f48b81b4ec6d29e61b974539df7976d0b3ed13bd0855fde52a9fab1c0e6c4fa8c1a68e6dc852947f366df491a3c05220b831f -EBUILD stratis-cli-1.1.0.ebuild 665 BLAKE2B ed6ca670ccd786da254586c460b8ef8423719e6b3671228a7c7df36dd52776b80cd63a102bf00c03c7bd58d8ef0f550c703b352e5e78b410611d2001974580fe SHA512 5437c9b9d7a79f1115a6107904fc96487413bc0c7e7d7ba9ae27d4619eb7ca2f8a7b5bd82567493ec25e6fe462a591f220121b17c500e321a02afb3ff7d64a6f -EBUILD stratis-cli-2.0.1.ebuild 665 BLAKE2B ed6ca670ccd786da254586c460b8ef8423719e6b3671228a7c7df36dd52776b80cd63a102bf00c03c7bd58d8ef0f550c703b352e5e78b410611d2001974580fe SHA512 5437c9b9d7a79f1115a6107904fc96487413bc0c7e7d7ba9ae27d4619eb7ca2f8a7b5bd82567493ec25e6fe462a591f220121b17c500e321a02afb3ff7d64a6f -EBUILD stratis-cli-2.1.0.ebuild 719 BLAKE2B 10c1e48a14c99ad05805ebbbe33b22a01f991df1e5b1c9b985e579a1fff5366aeea84e33bc5dde61a4f635c746eb6f51d40fdaa2b2e5f46b57d2ca387c66c23b SHA512 3264980601d9ce799719e61259da4df051b719bd1bcc6bcba2c4dbc230a50b47215bf11369b2095ec6fe41500437222a541551d4af8334d822977c3a3d24b8fb +DIST v2.4.1.tar.gz 60296 BLAKE2B 64c47449ebb126039c628b4657c2bc65c343cad1801c74d3683512765eb8ed649a1c2a3fa03b56c115c29135cddbe9c298712901b47305ed5b6da7cef96ac132 SHA512 1d318fb244ad1ef48882e686cace0166237ead7261e26c9197e3b98517128013c1c9b9978ad894e9f0e7d90bd312d98246b39a80f90e3d0fd7a88618110137e7 +EBUILD stratis-cli-2.4.1.ebuild 771 BLAKE2B f25ba31011e7a845d5242d3f3e08e02cbf7f0fb9aeeb611367b263d5e7a680364d1a00a1f22e2ffcafae4bc64dcf05415a7447046cf4c48865534870159579e8 SHA512 f3ca2691c92f2fe37ee5b87d3ea8f2e05371751b5e4625f3f620d60d8455c765801fbe9e011fe0af768e0f3540338f8276e1ebe60d0bdcbd1e82925f6693756a MISC metadata.xml 345 BLAKE2B 950376b3f4d4a3d88b1c0611ef26c82991b4762bf8934ad936cb77a16120c9eae7b4e81fa6e65e277c2fc393ba53c65cf8636e8a505985f9471163f238ef0b01 SHA512 27b47e4850eac374c82ff68d9fcfba7942d7f632a7b3c44174468b9c65586f02523594cb8271fdbfe87c960b142b1fc24304737b5f9d649ef0238aea8b2a9675 diff --git a/sys-fs/stratis-cli/stratis-cli-1.1.0.ebuild b/sys-fs/stratis-cli/stratis-cli-1.1.0.ebuild deleted file mode 100644 index cb5a4e7..0000000 --- a/sys-fs/stratis-cli/stratis-cli-1.1.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit distutils-r1 - -DESCRIPTION="CLI for the Stratis project" -HOMEPAGE="https://stratis-storage.github.io" -SRC_URI="https://github.com/stratis-storage/${PN}/archive/v${PV}.tar.gz" - -SLOT="0" -LICENSE="Apache-2.0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/dbus-python - dev-python/psutil - dev-python/python-dateutil - dev-python/justbytes - dev-python/dbus-client-gen - dev-python/dbus-python-client-gen" -RDEPEND="${DEPEND}" - -distutils_enable_tests pytest diff --git a/sys-fs/stratis-cli/stratis-cli-2.0.1.ebuild b/sys-fs/stratis-cli/stratis-cli-2.0.1.ebuild deleted file mode 100644 index cb5a4e7..0000000 --- a/sys-fs/stratis-cli/stratis-cli-2.0.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit distutils-r1 - -DESCRIPTION="CLI for the Stratis project" -HOMEPAGE="https://stratis-storage.github.io" -SRC_URI="https://github.com/stratis-storage/${PN}/archive/v${PV}.tar.gz" - -SLOT="0" -LICENSE="Apache-2.0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/dbus-python - dev-python/psutil - dev-python/python-dateutil - dev-python/justbytes - dev-python/dbus-client-gen - dev-python/dbus-python-client-gen" -RDEPEND="${DEPEND}" - -distutils_enable_tests pytest diff --git a/sys-fs/stratis-cli/stratis-cli-2.1.0.ebuild b/sys-fs/stratis-cli/stratis-cli-2.4.1.ebuild similarity index 80% rename from sys-fs/stratis-cli/stratis-cli-2.1.0.ebuild rename to sys-fs/stratis-cli/stratis-cli-2.4.1.ebuild index b9b966c..271814e 100644 --- a/sys-fs/stratis-cli/stratis-cli-2.1.0.ebuild +++ b/sys-fs/stratis-cli/stratis-cli-2.4.1.ebuild @@ -3,11 +3,11 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) inherit distutils-r1 -DESCRIPTION="CLI for the Stratis project" +DESCRIPTION="Command-line tool for interacting with the Stratis daemon" HOMEPAGE="https://stratis-storage.github.io" SRC_URI="https://github.com/stratis-storage/${PN}/archive/v${PV}.tar.gz" @@ -25,6 +25,7 @@ DEPEND=" dev-python/dbus-python-client-gen dev-python/semantic_version" RDEPEND="${DEPEND} - =sys-fs/stratisd-${PV}*" + >=sys-fs/stratisd-2.4.0 + -Date: Thu, 9 Jul 2020 15:41:54 -0400 -Subject: [PATCH] Fix issue of devicemapper-rs compatibility with musl - ---- - src/core/dm.rs | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/core/dm.rs b/src/core/dm.rs -index fe598c6..3c6d925 100644 ---- a/src/core/dm.rs -+++ b/src/core/dm.rs -@@ -4,7 +4,7 @@ - - use std::{cmp, fs::File, mem::size_of, os::unix::io::AsRawFd, slice, u32}; - --use nix::libc::{c_ulong, ioctl as nix_ioctl}; -+use nix::libc::ioctl as nix_ioctl; - - use crate::{ - core::{ -@@ -136,8 +136,7 @@ impl DM { - .as_mut() - .expect("pointer to own structure v can not be NULL") - }; -- let op = -- request_code_readwrite!(DM_IOCTL, ioctl, size_of::()) as c_ulong; -+ let op = request_code_readwrite!(DM_IOCTL, ioctl, size_of::()); - loop { - if let Err(err) = - unsafe { convert_ioctl_res!(nix_ioctl(self.file.as_raw_fd(), op, v.as_mut_ptr())) } --- -2.26.2 - diff --git a/sys-fs/stratisd/files/init.d.stratisd-r2 b/sys-fs/stratisd/files/init.d.stratisd-r3 similarity index 82% rename from sys-fs/stratisd/files/init.d.stratisd-r2 rename to sys-fs/stratisd/files/init.d.stratisd-r3 index 163897b..a5d239a 100644 --- a/sys-fs/stratisd/files/init.d.stratisd-r2 +++ b/sys-fs/stratisd/files/init.d.stratisd-r3 @@ -8,12 +8,12 @@ command_background=true output_log=/var/log/stratisd.log error_log=/var/log/stratisd.log pidfile=${pidfile:-/run/stratisd.pid} -description="Easy to use local storage management for Linux" +description="Daemon that manages block devices to create filesystems" description_start="Start stratis daemon" description_stop="Stop stratis daemon" depend() { - need sysfs dev-settle + need sysfs dev-settle before fsck checkfs after modules } diff --git a/sys-fs/stratisd/stratisd-1.0.6-r1.ebuild b/sys-fs/stratisd/stratisd-1.0.6-r1.ebuild deleted file mode 100644 index f760c2b..0000000 --- a/sys-fs/stratisd/stratisd-1.0.6-r1.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CRATES=" -aho-corasick-0.6.3 -ansi_term-0.10.2 -atty-0.2.6 -backtrace-0.3.3 -backtrace-sys-0.1.16 -bitflags-1.0.1 -bit-set-0.5.0 -bit-vec-0.5.0 -byteorder-1.2.7 -bytes-0.4.6 -cc-1.0.3 -cfg-if-0.1.2 -chrono-0.4.5 -clap-2.29.0 -cloudabi-0.0.3 -crc-1.4.0 -dbghelp-sys-0.2.0 -dbus-0.6.4 -devicemapper-0.28.0 -dtoa-0.4.1 -either-1.1.0 -env_logger-0.5.10 -errno-0.2.3 -error-chain-0.12.1 -fnv-1.0.6 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -gcc-0.3.54 -humantime-1.1.1 -iovec-0.1.2 -itoa-0.3.1 -kernel32-sys-0.2.2 -lazy_static-0.2.8 -lazy_static-1.4.0 -libc-0.2.55 -libdbus-sys-0.1.5 -libmount-0.1.13 -libudev-0.2.0 -libudev-sys-0.1.3 -log-0.4.2 -loopdev-0.2.0 -macro-attr-0.2.0 -matches-0.1.8 -memchr-2.0.1 -memchr-1.0.1 -newtype_derive-0.1.6 -nix-0.14.0 -num-integer-0.1.39 -num-traits-0.2.5 -num-traits-0.1.37 -pkg-config-0.3.9 -proptest-0.8.7 -quick-error-1.2.2 -quote-0.3.15 -rand-0.5.5 -rand-0.4.3 -rand_core-0.3.0 -rand_core-0.2.2 -redox_syscall-0.1.18 -redox_termios-0.1.1 -regex-1.0.1 -regex-syntax-0.6.1 -remove_dir_all-0.5.1 -rustc-demangle-0.1.5 -rustc_version-0.1.7 -rusty-fork-0.2.1 -semver-0.1.20 -serde-1.0.82 -serde_derive-1.0.8 -serde_derive_internals-0.15.1 -serde_json-1.0.2 -strsim-0.6.0 -syn-0.11.11 -synom-0.11.3 -tempfile-3.0.2 -termcolor-0.3.6 -termion-1.5.1 -textwrap-0.9.0 -thread_local-0.3.4 -time-0.1.37 -timerfd-1.0.0 -ucd-util-0.1.1 -unicode-width-0.1.4 -unicode-xid-0.0.4 -unreachable-1.0.0 -utf8-ranges-1.0.0 -uuid-0.7.1 -vec_map-0.8.0 -version_check-0.1.5 -void-1.0.2 -wait-timeout-0.1.5 -winapi-0.3.3 -winapi-0.2.8 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.3.2 -winapi-x86_64-pc-windows-gnu-0.3.2 -wincolor-0.1.6 -" - -inherit cargo systemd - -DESCRIPTION="Linux local storage management tool that aims to enable easy use of advanced storage features such as thin provisioning, snapshots, and pool-based management and monitoring." -HOMEPAGE="https://stratis-storage.github.io/" -SRC_URI="https://github.com/stratis-storage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - $(cargo_crate_uris ${CRATES})" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -BDEPEND=" - >=virtual/rust-1.36.0 -" -DEPEND=" - sys-apps/dbus - || ( sys-fs/eudev sys-fs/udev ) - dev-libs/libpcre -" -RDEPEND=" - ${DEPEND} - sys-fs/xfsprogs - sys-block/thin-provisioning-tools -" - -QA_FLAGS_IGNORED="/sbin/stratisd /usr/libexec/stratisd" - -src_compile(){ - cargo_src_compile --no-default-features - mv "${S}"/target/release/stratisd "${S}"/target/release/stratisd-init - cargo_src_compile --all-features -} - -src_install() { - exeinto /sbin - doexe "${S}"/target/release/stratisd-init - - exeinto /usr/libexec - doexe "${S}"/target/release/stratisd - - einstalldocs - dodoc -r docs/. - - newinitd "${FILESDIR}/init.d.stratisd-r2" stratisd - systemd_dounit "${S}/stratisd.service" - - insinto /etc/dbus-1/system.d - doins ${S}/stratisd.conf -} diff --git a/sys-fs/stratisd/stratisd-2.0.1-r2.ebuild b/sys-fs/stratisd/stratisd-2.0.1-r2.ebuild deleted file mode 100644 index f1e260e..0000000 --- a/sys-fs/stratisd/stratisd-2.0.1-r2.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CRATES=" -aho-corasick-0.6.3 -ansi_term-0.10.2 -atty-0.2.6 -autocfg-0.1.6 -backtrace-0.3.3 -backtrace-sys-0.1.16 -bitflags-1.0.1 -bit-set-0.5.0 -bit-vec-0.5.0 -byteorder-1.2.7 -cc-1.0.3 -cfg-if-0.1.2 -chrono-0.4.5 -clap-2.29.0 -cloudabi-0.0.3 -crc-1.4.0 -dbghelp-sys-0.2.0 -dbus-0.6.4 -devicemapper-0.28.0 -dtoa-0.4.1 -either-1.1.0 -env_logger-0.5.10 -errno-0.2.3 -error-chain-0.12.1 -fnv-1.0.6 -fuchsia-cprng-0.1.1 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -humantime-1.1.1 -itertools-0.8.0 -itoa-0.3.1 -kernel32-sys-0.2.2 -lazy_static-0.2.8 -lazy_static-1.4.0 -libc-0.2.55 -libdbus-sys-0.1.5 -libmount-0.1.13 -libudev-0.2.0 -libudev-sys-0.1.3 -log-0.4.2 -loopdev-0.2.0 -matches-0.1.8 -memchr-1.0.1 -memchr-2.0.1 -nix-0.14.0 -num-integer-0.1.39 -num-traits-0.1.37 -num-traits-0.2.5 -pkg-config-0.3.9 -proptest-0.9.4 -quick-error-1.2.2 -quote-0.3.15 -rand-0.4.3 -rand-0.5.5 -rand-0.6.5 -rand_chacha-0.1.1 -rand_core-0.2.2 -rand_core-0.3.1 -rand_core-0.4.2 -rand_hc-0.1.0 -rand_isaac-0.1.1 -rand_jitter-0.1.4 -rand_os-0.1.3 -rand_pcg-0.1.2 -rand_xorshift-0.1.1 -rdrand-0.4.0 -redox_syscall-0.1.18 -redox_termios-0.1.1 -regex-1.0.1 -regex-syntax-0.6.1 -remove_dir_all-0.5.1 -rustc-demangle-0.1.5 -rusty-fork-0.2.1 -serde-1.0.82 -serde_derive-1.0.8 -serde_derive_internals-0.15.1 -serde_json-1.0.2 -strsim-0.6.0 -syn-0.11.11 -synom-0.11.3 -tempfile-3.0.2 -termcolor-0.3.6 -termion-1.5.1 -textwrap-0.9.0 -thread_local-0.3.4 -time-0.1.37 -timerfd-1.0.0 -ucd-util-0.1.1 -unicode-width-0.1.4 -unicode-xid-0.0.4 -unreachable-1.0.0 -utf8-ranges-1.0.0 -uuid-0.7.1 -vec_map-0.8.0 -version_check-0.1.5 -void-1.0.2 -wait-timeout-0.1.5 -winapi-0.2.8 -winapi-0.3.3 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.3.2 -winapi-x86_64-pc-windows-gnu-0.3.2 -wincolor-0.1.6 -" - -inherit cargo systemd - -DESCRIPTION="Linux local storage management tool that aims to enable easy use of advanced storage features such as thin provisioning, snapshots, and pool-based management and monitoring." -HOMEPAGE="https://stratis-storage.github.io/" -SRC_URI="https://github.com/stratis-storage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - $(cargo_crate_uris ${CRATES})" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -BDEPEND=" - >=virtual/rust-1.37.0 -" -DEPEND=" - sys-apps/dbus - || ( sys-fs/eudev sys-fs/udev ) - dev-libs/libpcre -" -RDEPEND=" - ${DEPEND} - sys-fs/xfsprogs - sys-block/thin-provisioning-tools -" - -QA_FLAGS_IGNORED="/sbin/stratisd /usr/libexec/stratisd" - -PATCHES=( - # Until feature will be released https://github.com/stratis-storage/project/issues/161 - ${FILESDIR}/0001-disable-xfs-uuid-change-after-snapshot-create.patch - # Until issue will be fixed https://github.com/stratis-storage/stratisd/issues/1780 - ${FILESDIR}/0002-duplicate_check-disable.patch -) - -src_compile(){ - cargo_src_compile --no-default-features - mv "${S}"/target/release/stratisd "${S}"/target/release/stratisd-init - cargo_src_compile --all-features -} - -src_install() { - exeinto /sbin - doexe "${S}"/target/release/stratisd-init - - exeinto /usr/libexec - doexe "${S}"/target/release/stratisd - - einstalldocs - dodoc -r docs/. - - newinitd "${FILESDIR}/init.d.stratisd-r2" stratisd - systemd_dounit "${S}/stratisd.service" - - insinto /etc/dbus-1/system.d - doins ${S}/stratisd.conf -} diff --git a/sys-fs/stratisd/stratisd-2.1.0-r2.ebuild b/sys-fs/stratisd/stratisd-2.1.0-r2.ebuild deleted file mode 100644 index 2a31993..0000000 --- a/sys-fs/stratisd/stratisd-2.1.0-r2.ebuild +++ /dev/null @@ -1,199 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CRATES=" -aho-corasick-0.7.8 -ansi_term-0.10.2 -atty-0.2.6 -autocfg-0.1.6 -backtrace-0.3.3 -backtrace-sys-0.1.16 -bindgen-0.53.1 -bitflags-1.2.1 -bit-set-0.5.0 -bit-vec-0.5.0 -byteorder-1.2.7 -cc-1.0.50 -cexpr-0.3.6 -cfg-if-0.1.2 -chrono-0.4.5 -clang-sys-0.28.1 -clap-2.29.0 -cloudabi-0.0.3 -crc-1.4.0 -dbghelp-sys-0.2.0 -dbus-0.8.1 -devicemapper-0.28.0 -dtoa-0.4.1 -either-1.5.3 -env_logger-0.5.10 -env_logger-0.7.1 -errno-0.2.3 -error-chain-0.12.1 -fnv-1.0.6 -fuchsia-cprng-0.1.1 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -glob-0.3.0 -humantime-1.3.0 -itertools-0.8.0 -itoa-0.3.1 -kernel32-sys-0.2.2 -lazycell-1.2.1 -lazy_static-0.2.8 -lazy_static-1.4.0 -libc-0.2.68 -libcryptsetup-rs-0.4.0 -libcryptsetup-rs-sys-0.1.2 -libdbus-sys-0.2.1 -libloading-0.5.2 -libmount-0.1.13 -libudev-0.2.0 -libudev-sys-0.1.3 -log-0.4.8 -loopdev-0.2.0 -matches-0.1.8 -memchr-2.3.3 -nix-0.14.0 -nom-4.2.3 -num-integer-0.1.39 -num-traits-0.1.37 -num-traits-0.2.5 -peeking_take_while-0.1.2 -pkg-config-0.3.9 -proc-macro2-1.0.8 -proptest-0.9.6 -quick-error-1.2.2 -quote-0.3.15 -quote-1.0.3 -rand-0.4.3 -rand-0.6.5 -rand_chacha-0.1.1 -rand_core-0.3.1 -rand_core-0.4.2 -rand_hc-0.1.0 -rand_isaac-0.1.1 -rand_jitter-0.1.4 -rand_os-0.1.3 -rand_pcg-0.1.2 -rand_xorshift-0.1.1 -rdrand-0.4.0 -redox_syscall-0.1.18 -redox_termios-0.1.1 -regex-1.3.4 -regex-syntax-0.6.14 -remove_dir_all-0.5.1 -rustc-demangle-0.1.5 -rustc-hash-1.1.0 -rusty-fork-0.2.1 -semver-0.9.0 -semver-parser-0.7.0 -serde-1.0.82 -serde_derive-1.0.8 -serde_derive_internals-0.15.1 -serde_json-1.0.2 -shlex-0.1.1 -strsim-0.6.0 -syn-0.11.11 -synom-0.11.3 -tempfile-3.0.2 -termcolor-0.3.6 -termcolor-1.1.0 -termion-1.5.1 -textwrap-0.9.0 -thread_local-1.0.1 -time-0.1.37 -timerfd-1.0.0 -unicode-width-0.1.4 -unicode-xid-0.0.4 -unicode-xid-0.2.0 -uuid-0.7.4 -vec_map-0.8.0 -version_check-0.1.5 -void-1.0.2 -wait-timeout-0.1.5 -which-3.1.0 -winapi-0.2.8 -winapi-0.3.3 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.3.2 -winapi-util-0.1.3 -winapi-x86_64-pc-windows-gnu-0.3.2 -wincolor-0.1.6 -" - -inherit cargo systemd - -DESCRIPTION="Linux local storage management tool that aims to enable easy use of advanced storage features such as thin provisioning, snapshots, and pool-based management and monitoring." -HOMEPAGE="https://stratis-storage.github.io/" -SRC_URI="https://github.com/stratis-storage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - $(cargo_crate_uris ${CRATES})" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="elibc_musl initramfs" - -BDEPEND=" - >=virtual/rust-1.43.0 - sys-devel/clang -" -DEPEND=" - sys-apps/dbus - virtual/udev - dev-libs/libpcre - >=sys-fs/cryptsetup-2.3 - >=sys-apps/util-linux-2.32 -" -RDEPEND=" - ${DEPEND} - sys-fs/xfsprogs - sys-block/thin-provisioning-tools -" - -QA_FLAGS_IGNORED="/sbin/stratisd /usr/libexec/stratisd" - -PATCHES=( - # Until feature will be released. https://github.com/stratis-storage/project/issues/161 - ${FILESDIR}/0001-disable-xfs-uuid-change-after-snapshot-create.patch - # Until issue will be fixed. https://github.com/stratis-storage/stratisd/issues/1470 https://github.com/stratis-storage/stratisd/issues/1780 - ${FILESDIR}/0002-duplicate_check-disable.patch -) - -src_prepare() { - default - - # Fix musl build. https://github.com/stratis-storage/devicemapper-rs/issues/560 - cd ${WORKDIR}/cargo_home/gentoo/devicemapper-0.28.0 - eapply ${FILESDIR}/0001-Fix-issue-of-devicemapper-rs-compatibility-with-musl.patch -} - -src_compile(){ - if use initramfs; then - cargo_src_compile --no-default-features - mv "${S}"/target/release/stratisd "${S}"/target/release/stratisd-init || die - fi - - cargo_src_compile --all-features -} - -src_install() { - if use initramfs; then - exeinto /sbin - doexe "${S}"/target/release/stratisd-init - fi - - exeinto /usr/libexec - doexe "${S}"/target/release/stratisd - - einstalldocs - dodoc -r docs/. - - newinitd "${FILESDIR}/init.d.stratisd-r2" stratisd - systemd_dounit "${S}/stratisd.service" - - insinto /etc/dbus-1/system.d - doins ${S}/stratisd.conf -} diff --git a/sys-fs/stratisd/stratisd-2.4.2.ebuild b/sys-fs/stratisd/stratisd-2.4.2.ebuild new file mode 100644 index 0000000..b0316f0 --- /dev/null +++ b/sys-fs/stratisd/stratisd-2.4.2.ebuild @@ -0,0 +1,232 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CRATES=" +addr2line-0.15.1 +adler-1.0.2 +aho-corasick-0.7.18 +ansi_term-0.11.0 +atty-0.2.14 +autocfg-1.0.1 +backtrace-0.3.59 +bindgen-0.57.0 +bit-set-0.5.2 +bit-vec-0.6.3 +bitflags-1.2.1 +block-buffer-0.9.0 +build_const-0.2.2 +byteorder-1.4.3 +cc-1.0.68 +cexpr-0.4.0 +cfg-if-0.1.10 +cfg-if-1.0.0 +chrono-0.4.19 +clang-sys-1.2.0 +clap-2.33.3 +cpufeatures-0.1.4 +crc-1.8.1 +data-encoding-2.3.2 +dbus-0.9.2 +dbus-tree-0.9.1 +devicemapper-0.29.1 +digest-0.9.0 +either-1.6.1 +env_logger-0.8.3 +errno-0.2.7 +errno-dragonfly-0.1.1 +error-chain-0.12.4 +fnv-1.0.7 +futures-0.3.15 +futures-channel-0.3.15 +futures-core-0.3.15 +futures-executor-0.3.15 +futures-io-0.3.15 +futures-macro-0.3.15 +futures-sink-0.3.15 +futures-task-0.3.15 +futures-util-0.3.15 +gcc-0.3.55 +generic-array-0.14.4 +getrandom-0.2.3 +gimli-0.24.0 +glob-0.3.0 +hermit-abi-0.1.18 +humantime-2.1.0 +itertools-0.10.0 +itoa-0.4.7 +lazy_static-1.4.0 +lazycell-1.3.0 +libc-0.2.95 +libcryptsetup-rs-0.4.4 +libcryptsetup-rs-sys-0.1.5 +libdbus-sys-0.2.1 +libloading-0.7.0 +libmount-0.1.15 +libudev-0.2.0 +libudev-sys-0.1.4 +log-0.4.14 +loopdev-0.2.1 +matches-0.1.8 +memchr-2.4.0 +miniz_oxide-0.4.4 +mio-0.7.11 +miow-0.3.7 +nix-0.14.1 +nix-0.20.0 +nom-5.1.2 +ntapi-0.3.6 +num-integer-0.1.44 +num-traits-0.2.14 +num_cpus-1.13.0 +object-0.24.0 +once_cell-1.7.2 +opaque-debug-0.3.0 +peeking_take_while-0.1.2 +pest-2.1.3 +pin-project-lite-0.2.6 +pin-utils-0.1.0 +pkg-config-0.3.19 +ppv-lite86-0.2.10 +pretty-hex-0.2.1 +proc-macro-hack-0.5.19 +proc-macro-nested-0.1.7 +proc-macro2-1.0.27 +proptest-1.0.0 +quick-error-1.2.3 +quick-error-2.0.1 +quote-1.0.9 +rand-0.8.3 +rand_chacha-0.3.0 +rand_core-0.6.2 +rand_hc-0.3.0 +rand_xorshift-0.3.0 +redox_syscall-0.2.8 +regex-1.5.4 +regex-syntax-0.6.25 +remove_dir_all-0.5.3 +rpassword-5.0.1 +rustc-demangle-0.1.19 +rustc-hash-1.1.0 +rusty-fork-0.3.0 +ryu-1.0.5 +semver-0.11.0 +semver-parser-0.10.2 +serde-1.0.126 +serde_derive-1.0.126 +serde_json-1.0.64 +sha-1-0.9.6 +shlex-0.1.1 +signal-hook-registry-1.4.0 +slab-0.4.3 +strsim-0.8.0 +syn-1.0.72 +tempfile-3.2.0 +termcolor-1.1.2 +textwrap-0.11.0 +time-0.1.43 +tokio-1.6.1 +tokio-macros-1.2.0 +typenum-1.13.0 +ucd-trie-0.1.3 +unicode-width-0.1.8 +unicode-xid-0.2.2 +uuid-0.8.2 +vec_map-0.8.2 +version_check-0.9.3 +void-1.0.2 +wait-timeout-0.2.0 +wasi-0.10.2+wasi-snapshot-preview1 +which-3.1.1 +winapi-0.3.9 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-util-0.1.5 +winapi-x86_64-pc-windows-gnu-0.4.0 +" + +inherit cargo systemd + +DESCRIPTION="Daemon that manages block devices to create filesystems" +HOMEPAGE="https://stratis-storage.github.io/" +SRC_URI="https://github.com/stratis-storage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + $(cargo_crate_uris ${CRATES})" + +LICENSE="MPL-2.0 BSD MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="elibc_musl extra dracut systemd" + +BDEPEND=" + >=virtual/rust-1.49.0 + sys-devel/clang +" +DEPEND=" + dracut? ( >=sys-kernel/dracut-0251 ) + app-crypt/clevis + sys-apps/dbus + virtual/udev + dev-libs/libpcre + >=sys-fs/cryptsetup-2.3 + >=sys-apps/util-linux-2.32 +" +RDEPEND=" + ${DEPEND} + sys-fs/xfsprogs + sys-block/thin-provisioning-tools +" + +#QA_FLAGS_IGNORED="/usr/libexec/stratisd " + +PATCHES=( + # Until feature will be released. https://github.com/stratis-storage/project/issues/161 + ${FILESDIR}/0001-disable-xfs-uuid-change-after-snapshot-create.patch + # Until issue will be fixed. https://github.com/stratis-storage/stratisd/issues/1470 https://github.com/stratis-storage/stratisd/issues/1780 + ${FILESDIR}/0002-duplicate_check-disable.patch +) + +src_compile() { + # allow building on musl with dynamic linking support + # https://github.com/BurntSushi/rust-pcre2/issues/7 + use elibc_musl && export PCRE2_SYS_STATIC=0 + cargo_src_compile --no-default-features --features dbus_enabled,min$(usex extra ",extras" "")$(usex systemd ",systemd_compat" "") +} + +src_install() { + einstalldocs + dodoc -r docs/. + + insinto /etc/dbus-1/system.d + doins ${S}/stratisd.conf + + newinitd "${FILESDIR}/init.d.stratisd-r3" stratisd + + exeinto /usr/libexec + + doexe ${S}/target/release/stratisd ${S}/target/release/stratis-utils ${S}/target/release/stratisd-min ${S}/target/release/stratis-min + + if use extra; then + doexe ${S}/target/release/stratis_dumpmetadata + fi + + if use systemd; then + systemd_dounit "${S}/systemd/stratisd.service" + systemd_dounit "${S}/systemd/stratis-fstab-setup" + systemd_dounit "${S}/systemd/stratis-fstab-setup@.service" + fi + + if use dracut; then + insinto /usr/lib/dracut/modules.d/ + doins -r ${S}/dracut/90stratis + + insinto /etc/dracut.conf.d + doins ${S}/dracut/90-stratis.conf + fi + + if use systemd; then + systemd_dounit "${S}/systemd/stratisd.service" + systemd_dounit "${S}/systemd/stratis-fstab-setup" + systemd_dounit "${S}/systemd/stratis-fstab-setup@.service" + fi + +}