From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- sys-fs/bcache-tools/Manifest | 17 +++++ sys-fs/bcache-tools/bcache-tools-1.0.5.ebuild | 51 ++++++++++++++ sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild | 51 ++++++++++++++ .../bcache-tools-1.0.8_p20140220-r1.ebuild | 77 ++++++++++++++++++++++ sys-fs/bcache-tools/bcache-tools-9999.ebuild | 57 ++++++++++++++++ .../1.0.8_p20140220/bcache-status-python3.patch | 8 +++ .../1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch | 55 ++++++++++++++++ .../bcache-tools-1.0.8-noprobe.patch | 32 +++++++++ ...che-tools-1.0.8-probe-bcache-underlinking.patch | 13 ++++ .../bcache-tools-20131018-fedconf.patch | 5 ++ .../bcache-tools-status-20130826-man.patch | 49 ++++++++++++++ sys-fs/bcache-tools/metadata.xml | 10 +++ 12 files changed, 425 insertions(+) create mode 100644 sys-fs/bcache-tools/Manifest create mode 100644 sys-fs/bcache-tools/bcache-tools-1.0.5.ebuild create mode 100644 sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild create mode 100644 sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild create mode 100644 sys-fs/bcache-tools/bcache-tools-9999.ebuild create mode 100644 sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-status-python3.patch create mode 100644 sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch create mode 100644 sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-noprobe.patch create mode 100644 sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-probe-bcache-underlinking.patch create mode 100644 sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-20131018-fedconf.patch create mode 100644 sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-status-20130826-man.patch create mode 100644 sys-fs/bcache-tools/metadata.xml (limited to 'sys-fs/bcache-tools') diff --git a/sys-fs/bcache-tools/Manifest b/sys-fs/bcache-tools/Manifest new file mode 100644 index 000000000000..596f5acadb36 --- /dev/null +++ b/sys-fs/bcache-tools/Manifest @@ -0,0 +1,17 @@ +AUX 1.0.8_p20140220/bcache-status-python3.patch 320 SHA256 0c6e7f3c16f778c5fe935895e9652e7393fc1f13e9fddf5bce279867de591be3 SHA512 d522cd5e6296a55ced53dab25a5e0978d04ec8eb0a6b353753b4627a3f0318658b0c52a27e6cd4a81d39e6f646aa0c936797b89280cb32490d4e671fbb532476 WHIRLPOOL 56459748ef7fd80caf1a0467e6f7d15889d29add802cb5e52126742fd43ab653a369a3588c61ffced8d8b35098c96fe4c582929eb18bd72cdc182dde1f66fb98 +AUX 1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch 1869 SHA256 28f7db58ef1041180c5f96368cdb803fa35f1efe23443798f1f4b74d13aca0ac SHA512 ce4706849c2c4f7c414682d2f9df37989eb79a0b52d8ddf1e903065a6f5fb190cb3476f6579670d5a6cba0f2d13ab843e454966798edbf9cd4e54cc4a1a6c2cd WHIRLPOOL 598599a8caa0f728b758aacd3888a41017cb83bd15243f4f95e5a012eabf3e8e49ebb9539e13cb08831bb0f27745ffa093fe5e26d76365f1b0aa71b64da6e349 +AUX 1.0.8_p20140220/bcache-tools-1.0.8-noprobe.patch 1335 SHA256 f82b512fb8ffa8d808f03280a0fb38b317f661c03943a6032f979be4855c169c SHA512 d1a28bb32f28a074c46244213c09c6dfdd93b18647b94cabd29c2e3f2e6d28fba015bfdda4bcda412ea511ee6eee057becf1bb913bc4007e3deb378c0da5b735 WHIRLPOOL c513a97101e11cbfd4ca97e08894e19976d0b57be44daf827823f4ada57933d5dffaa83d206c2bfb9eaf7cc2004bc0b2979fd12d8f269ba1de87ae41a5b41766 +AUX 1.0.8_p20140220/bcache-tools-1.0.8-probe-bcache-underlinking.patch 531 SHA256 2d60afa14bd5b0e91e474d36d68f0bea54fb008c328f92b3bc7c4bfe4f6dde3c SHA512 883dbb66051bc7d1cbb170235ef8dbb4a1d115d0a598eae907d89fae6365c2e6725929e1297f9f74c742150d893ed8febb99a03bf55e91f0b90cc33314cf51d2 WHIRLPOOL ff8311a4550e3089696c47ae1b8b211811f0959c79e4ffbc45dc31138264b1d99c1429aacc17072fe2a61accffe2fd355dd99493c394fd10c28946c94837033e +AUX 1.0.8_p20140220/bcache-tools-20131018-fedconf.patch 253 SHA256 8df197319cc9102ed98ebdbf5032892f23e8385a71843147b8111fbd9c72d9b1 SHA512 459875969ef1a80a5bb635e5da2187222a01aefe9ea49eb7feeab89d5290e4d478a0e5e37e424dd77a69916811b0ad3f82f7ec4e0ae91ae686e3fe7f5eac9d57 WHIRLPOOL 978ad6bf04e6f8a5655a509761a7d396163489f077d1bda5f153b5cdedf58041f0871ccf91973d7fb6865ec5bd820a18e888c293293c8789ded163ccb6bbee14 +AUX 1.0.8_p20140220/bcache-tools-status-20130826-man.patch 1095 SHA256 11c7b012b1200dcc1eb0a846f0f25d73eebf9cc304cc8b0dfee4c53e391ec59b SHA512 44f4227e7cd3e4ec3b4c90d27445be8bfa36b229aa11a08b9b66c08c224dc9c006c0d358580b0906a8372eb83b938c0a5a199665680e96898aa2070bb55000de WHIRLPOOL eb7b0ef093e8a47c7bc933a7831ab354d6a8286b208667c1252ee8171b6511082eb3d3d55da0a8236f5ce5c10a7ab3ad9fe4abb733c6092fb84d11c13c642193 +DIST bcache-status-20140220.tar.gz 3779 SHA256 5f05ced834a80c824bb5fc78a6b1a71641ebc981c77422679b5514d44d5e055d SHA512 0c8db02dc865b469f3a5964f679a3bfdf5cdbf5a2f6ccd5d81544f3bb3c06df2f5d06b9f09aaec527ec90229740dcd31fbb33e2628721b6da139cfcee6b48d7c WHIRLPOOL eee642edaf8c9fd7b567d6e0c83aa7bbbfe1c147db97998dafb716ba9e76d0e5ba8f87c4226b9309ca8f8ba1a3f66c83f03f162d4ebc4569008fc7d1ce026acf +DIST bcache-tools-1.0.5.tgz 21934 SHA256 1449294ef545b3dc6f715f7b063bc2c8656984ad73bcd81a0dc048cbba416ea9 SHA512 aaf27e4cc3037d482cb14c8bb083c1ce5cda5641a19cec67ca1ad22cde71ce035e49701145c6d920b4d62058897c4b7d29d341b3b8bd436c9c51e2f8bdb5c568 WHIRLPOOL 7c2dd6919ba7cc7eebab0c90b517cd73ab4b7e02aedf4c998d95681e3feeedf5368fa5edf58a6a3e079fd7ad3ae5040fe6f02c743132f054c7f56fbad9c44f4b +DIST bcache-tools-1.0.8.tgz 22153 SHA256 d56923936f37287efc57a46315679102ef2c86cd0be5874590320acd48c1201c SHA512 21eaed457e5de623089c0d4e1c11394a3950f29c749c502bfd5dd94d3dcdc7379c4a910825e33bf9fc8080df656949b94a1a28d19048a8eb6422976cb391b7dc WHIRLPOOL 7fada61d2bce55755dd75a1d5518c264c0470b071b6a3c6a003bb3016554eba5715014edfda1a05597d3dca1b557fd7eaea19df467c6c503ad1a52b9664657ef +DIST bcache-tools-1.0.8_p20140220.tgz 22153 SHA256 d56923936f37287efc57a46315679102ef2c86cd0be5874590320acd48c1201c SHA512 21eaed457e5de623089c0d4e1c11394a3950f29c749c502bfd5dd94d3dcdc7379c4a910825e33bf9fc8080df656949b94a1a28d19048a8eb6422976cb391b7dc WHIRLPOOL 7fada61d2bce55755dd75a1d5518c264c0470b071b6a3c6a003bb3016554eba5715014edfda1a05597d3dca1b557fd7eaea19df467c6c503ad1a52b9664657ef +EBUILD bcache-tools-1.0.5.ebuild 950 SHA256 f0bd5849a808642f4761761ad7206658f710b322beb6935bed5da90c6648d893 SHA512 94e89384c4783604f1a930ed840428deb9574fbae37653ac5e6c3d315be62fb3497ba6a463ef95f3a0fa5a983a56cff84d55dba371b6f3ce7f2d39ab6323f028 WHIRLPOOL b687652c708be6a5824825a05604a9001210680e8bb2ecefea6639cc2d0482408898c9e843e1e616eb7c4ea58883035948e0423a23b43bf357a78e676c5a55e4 +EBUILD bcache-tools-1.0.8.ebuild 950 SHA256 f0bd5849a808642f4761761ad7206658f710b322beb6935bed5da90c6648d893 SHA512 94e89384c4783604f1a930ed840428deb9574fbae37653ac5e6c3d315be62fb3497ba6a463ef95f3a0fa5a983a56cff84d55dba371b6f3ce7f2d39ab6323f028 WHIRLPOOL b687652c708be6a5824825a05604a9001210680e8bb2ecefea6639cc2d0482408898c9e843e1e616eb7c4ea58883035948e0423a23b43bf357a78e676c5a55e4 +EBUILD bcache-tools-1.0.8_p20140220-r1.ebuild 1600 SHA256 6690c68735ad1fee43c33c2a7f2a6e8115f1e90dc27aabdaa0ec7f48a64930c6 SHA512 47c51e16d667ca999af9a6f1743790082641067f4fbe79e9539d2a8c787641b31711703917a9ba1960b46e9788413207d25c6053284e57be0ec5bcd5f4facc21 WHIRLPOOL d19c05de02cf71c9078583157160489083318f50c98cd446466e68897d948098f84212e2148496c44a7e1036c4e6a901a25a5b83a988e2c14bbb7ec778db12fb +EBUILD bcache-tools-9999.ebuild 994 SHA256 d84859632b73bf45e473e6d35dd0f1ca658af5cf88177a5475a5135196c0285f SHA512 d329bdbaa5f93eb42cfe8e7d77416d01f279db42f3f28f3186399253641442e064395db9ea9ea56db26f8cb9d3fd432eac986799c3f342bf1187fe1885709f02 WHIRLPOOL c4d39a5c50a44ffe1a95e02e0803638e9ef830eeb3b469623106f06f6d9903bbbc53b9b91f551c780439082d096721d1825377e8120575aac17f461982634a76 +MISC ChangeLog 4493 SHA256 86f34bb357f84600348e036c882927a80a0d9428f4dcfae691c459c66d0582e8 SHA512 d0d59d18a9c47e2aedfb8195e753643ac16cc9da981d1e51ef80b62432395a2415371f26f32df9caec95312fcad3370186f0815c6f12c0b016a08febb4b14a5c WHIRLPOOL ce39e45c3baa84cd8cae7eba5be9b2bbe86d85467f0942508a001ccf1417b6b664519d31165343c461c75a984041798276a45b1b23f37fc5fac402af03a1102e +MISC ChangeLog-2015 1520 SHA256 7db197d5557cb19560985a20cea7493d739b9c7b0b5dbbf3f71d6523431756b2 SHA512 a65e6d492252b5aa8640bc2c0e676d194cfee6436601d19d83eec78b5a3b3f7fc80b93ea18e17420845fab690eb6ad077b7b6b464fead9fac745934b5ed4e2c6 WHIRLPOOL bd196bee8509e3348d70c75ecc87cd8bd72b6e4711152c71d616b90c019f81f0cbb37ea53eafe48b4313cd67a3557dc31079bccf8097cc657a1c9a3ea97a109d +MISC metadata.xml 304 SHA256 5774594a5416b221102988ae0bdd15095168ce582dc8cc525a8d60158fcf4833 SHA512 4b5575ff0ece142ff6839b8a8a81c7c0515ac42993f5ca415d53d3a85a7171ff565332edbb237448cd662abe6f1d1ffa5dce0eb21817dd861a728f0652dcb541 WHIRLPOOL 43701037ee7a417a9a38137afc0ab3ced7148e34904849dce00d7f27802ef797b8aabeecdc28be5268f211a7ccf98cce1542eb698571985164d012bd39bf7aa7 diff --git a/sys-fs/bcache-tools/bcache-tools-1.0.5.ebuild b/sys-fs/bcache-tools/bcache-tools-1.0.5.ebuild new file mode 100644 index 000000000000..6cbfae0c1a1e --- /dev/null +++ b/sys-fs/bcache-tools/bcache-tools-1.0.5.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit toolchain-funcs udev + +DESCRIPTION="Tools for bcachefs" +HOMEPAGE="http://bcache.evilpiepirate.org/" +SRC_URI="https://github.com/g2p/bcache-tools/archive/v${PV}.tar.gz -> ${P}.tgz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=">=sys-apps/util-linux-2.24" +DEPEND="${RDEPEND}" + +src_prepare() { + tc-export CC + sed \ + -e '/^CFLAGS/s:-O2::' \ + -e '/^CFLAGS/s:-g:-std=gnu89:' \ + -i Makefile || die +} + +src_install() { + into / + dosbin make-bcache bcache-super-show + + exeinto $(get_udevdir) + doexe bcache-register probe-bcache + + udev_dorules 69-bcache.rules + + insinto /etc/initramfs-tools/hooks/bcache + doins initramfs/hook + + # that is what dracut does + insinto /usr/lib/dracut/modules.d/90bcache + doins dracut/module-setup.sh + + doman *.8 + + dodoc README +} + +pkg_postinst() { + udev_reload +} diff --git a/sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild b/sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild new file mode 100644 index 000000000000..6cbfae0c1a1e --- /dev/null +++ b/sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit toolchain-funcs udev + +DESCRIPTION="Tools for bcachefs" +HOMEPAGE="http://bcache.evilpiepirate.org/" +SRC_URI="https://github.com/g2p/bcache-tools/archive/v${PV}.tar.gz -> ${P}.tgz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=">=sys-apps/util-linux-2.24" +DEPEND="${RDEPEND}" + +src_prepare() { + tc-export CC + sed \ + -e '/^CFLAGS/s:-O2::' \ + -e '/^CFLAGS/s:-g:-std=gnu89:' \ + -i Makefile || die +} + +src_install() { + into / + dosbin make-bcache bcache-super-show + + exeinto $(get_udevdir) + doexe bcache-register probe-bcache + + udev_dorules 69-bcache.rules + + insinto /etc/initramfs-tools/hooks/bcache + doins initramfs/hook + + # that is what dracut does + insinto /usr/lib/dracut/modules.d/90bcache + doins dracut/module-setup.sh + + doman *.8 + + dodoc README +} + +pkg_postinst() { + udev_reload +} diff --git a/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild b/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild new file mode 100644 index 000000000000..bc8099d825ce --- /dev/null +++ b/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( python3_{4,5} ) + +inherit eutils flag-o-matic python-r1 toolchain-funcs udev + +DESCRIPTION="Tools for bcachefs" +HOMEPAGE="http://bcache.evilpiepirate.org/" +SRC_URI=" + https://github.com/g2p/bcache-tools/archive/v${PV%%_p*}.tar.gz -> ${P}.tgz + https://dev.gentoo.org/~jlec/distfiles/bcache-status-20140220.tar.gz +" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + >=sys-apps/util-linux-2.24" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PV}/bcache-status-python3.patch + "${FILESDIR}"/${PV}/bcache-tools-1.0.8-crc64.patch + "${FILESDIR}"/${PV}/bcache-tools-1.0.8-noprobe.patch + "${FILESDIR}"/${PV}/bcache-tools-20131018-fedconf.patch + "${FILESDIR}"/${PV}/bcache-tools-status-20130826-man.patch +) + +S="${WORKDIR}"/${P%%_p*} + +src_prepare() { + tc-export CC + sed \ + -e '/^CFLAGS/s:-O2::' \ + -e '/^CFLAGS/s:-g:-std=gnu99:' \ + -i Makefile || die + + append-lfs-flags + + cp ../bcache-status*/bcache-status . || die + + epatch "${PATCHES[@]}" +} + +src_install() { + into / + dosbin make-bcache bcache-super-show + + exeinto $(get_udevdir) + doexe bcache-register probe-bcache + + python_foreach_impl python_doscript bcache-status + + udev_dorules 69-bcache.rules + + insinto /etc/initramfs-tools/hooks/bcache + doins initramfs/hook + + # that is what dracut does + insinto /usr/lib/dracut/modules.d/90bcache + doins dracut/module-setup.sh + + doman *.8 + + dodoc README +} + +pkg_postinst() { + udev_reload +} diff --git a/sys-fs/bcache-tools/bcache-tools-9999.ebuild b/sys-fs/bcache-tools/bcache-tools-9999.ebuild new file mode 100644 index 000000000000..1ac411be39f2 --- /dev/null +++ b/sys-fs/bcache-tools/bcache-tools-9999.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +EGIT_NONSHALLOW=true + +inherit git-r3 toolchain-funcs udev + +DESCRIPTION="Tools for bcachefs" +HOMEPAGE="http://bcache.evilpiepirate.org/" +SRC_URI="" +EGIT_REPO_URI="https://github.com/g2p/bcache-tools.git" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="" +IUSE="" + +RDEPEND=">=sys-apps/util-linux-2.24" +DEPEND="${RDEPEND}" + +src_prepare() { + tc-export CC + sed \ + -e '/^CFLAGS/s:-O2::' \ + -e '/^CFLAGS/s:-g:-std=gnu89:' \ + -i Makefile || die +} + +src_install() { + into / + dosbin make-bcache bcache-super-show + + exeinto $(get_udevdir) + doexe bcache-register probe-bcache + + udev_dorules 69-bcache.rules + + insinto /etc/initramfs-tools/hooks/bcache + doins initramfs/hook + + insinto /etc/initcpio/install/bcache + doins initcpio/install + + # that is what dracut does + insinto /usr/lib/dracut/modules.d/90bcache + doins dracut/module-setup.sh + + doman *.8 + + dodoc README +} + +pkg_postinst() { + udev_reload +} diff --git a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-status-python3.patch b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-status-python3.patch new file mode 100644 index 000000000000..0cb08cc1a281 --- /dev/null +++ b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-status-python3.patch @@ -0,0 +1,8 @@ +--- bcache-tools-1.0.8/bcache-status.orig 2015-06-20 08:56:22.343589706 +0200 ++++ bcache-tools-1.0.8/bcache-status 2015-06-20 08:56:39.971692433 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # + # Dumb script to dump (some) of bcache status + # Copyright 2014 Darrick J. Wong. All rights reserved. diff --git a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch new file mode 100644 index 000000000000..9b11d80c0091 --- /dev/null +++ b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch @@ -0,0 +1,55 @@ +diff -ruN bcache-tools-1.0.8.orig/bcache.c bcache-tools-1.0.8/bcache.c +--- bcache-tools-1.0.8.orig/bcache.c 2014-12-04 23:51:24.000000000 +0100 ++++ bcache-tools-1.0.8/bcache.c 2015-05-22 19:40:41.039355096 +0200 +@@ -26,7 +26,7 @@ + * x^7 + x^4 + x + 1 + */ + +-static const uint64_t crc_table[256] = { ++const uint64_t crc_table[256] = { + 0x0000000000000000ULL, 0x42F0E1EBA9EA3693ULL, 0x85E1C3D753D46D26ULL, + 0xC711223CFA3E5BB5ULL, 0x493366450E42ECDFULL, 0x0BC387AEA7A8DA4CULL, + 0xCCD2A5925D9681F9ULL, 0x8E224479F47CB76AULL, 0x9266CC8A1C85D9BEULL, +@@ -114,16 +114,3 @@ + 0x5DEDC41A34BBEEB2ULL, 0x1F1D25F19D51D821ULL, 0xD80C07CD676F8394ULL, + 0x9AFCE626CE85B507ULL + }; +- +-inline uint64_t crc64(const void *_data, size_t len) +-{ +- uint64_t crc = 0xFFFFFFFFFFFFFFFFULL; +- const unsigned char *data = _data; +- +- while (len--) { +- int i = ((int) (crc >> 56) ^ *data++) & 0xFF; +- crc = crc_table[i] ^ (crc << 8); +- } +- +- return crc ^ 0xFFFFFFFFFFFFFFFFULL; +-} +diff -ruN bcache-tools-1.0.8.orig/bcache.h bcache-tools-1.0.8/bcache.h +--- bcache-tools-1.0.8.orig/bcache.h 2014-12-04 23:51:24.000000000 +0100 ++++ bcache-tools-1.0.8/bcache.h 2015-05-22 19:40:34.924320569 +0200 +@@ -115,7 +115,20 @@ + #define BDEV_STATE_DIRTY 2U + #define BDEV_STATE_STALE 3U + +-uint64_t crc64(const void *_data, size_t len); ++extern const uint64_t crc_table[]; ++ ++inline uint64_t crc64(const void *_data, size_t len) ++{ ++ uint64_t crc = 0xFFFFFFFFFFFFFFFFULL; ++ const unsigned char *data = _data; ++ ++ while (len--) { ++ int i = ((int) (crc >> 56) ^ *data++) & 0xFF; ++ crc = crc_table[i] ^ (crc << 8); ++ } ++ ++ return crc ^ 0xFFFFFFFFFFFFFFFFULL; ++} + + #define node(i, j) ((void *) ((i)->d + (j))) + #define end(i) node(i, (i)->keys) +Binary files bcache-tools-1.0.8.orig/bcache-register and bcache-tools-1.0.8/bcache-register differ diff --git a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-noprobe.patch b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-noprobe.patch new file mode 100644 index 000000000000..6d2d9f515379 --- /dev/null +++ b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-noprobe.patch @@ -0,0 +1,32 @@ +diff -ruN bcache-tools-1.0.8.orig/69-bcache.rules bcache-tools-1.0.8/69-bcache.rules +--- bcache-tools-1.0.8.orig/69-bcache.rules 2014-12-04 23:51:24.000000000 +0100 ++++ bcache-tools-1.0.8/69-bcache.rules 2014-12-05 19:38:42.284643952 +0100 +@@ -7,17 +7,10 @@ + KERNEL=="fd*|sr*", GOTO="bcache_end" + + # blkid was run by the standard udev rules +-# It recognised bcache (util-linux 2.24+) +-ENV{ID_FS_TYPE}=="bcache", GOTO="bcache_backing_found" +-# It recognised something else; bail +-ENV{ID_FS_TYPE}=="?*", GOTO="bcache_backing_end" +- + # Backing devices: scan, symlink, register +-IMPORT{program}="probe-bcache -o udev $tempnode" + ENV{ID_FS_TYPE}!="bcache", GOTO="bcache_backing_end" + ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" + +-LABEL="bcache_backing_found" + RUN{builtin}+="kmod load bcache" + RUN+="bcache-register $tempnode" + LABEL="bcache_backing_end" +diff -ruN bcache-tools-1.0.8.orig/dracut/module-setup.sh bcache-tools-1.0.8/dracut/module-setup.sh +--- bcache-tools-1.0.8.orig/dracut/module-setup.sh 2014-12-04 23:51:24.000000000 +0100 ++++ bcache-tools-1.0.8/dracut/module-setup.sh 2014-12-05 19:32:37.771480651 +0100 +@@ -29,6 +29,6 @@ + } + + install() { +- inst_multiple ${udevdir}/probe-bcache ${udevdir}/bcache-register ++ inst_multiple ${udevdir}/bcache-register + inst_rules 69-bcache.rules + } diff --git a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-probe-bcache-underlinking.patch b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-probe-bcache-underlinking.patch new file mode 100644 index 000000000000..c6ca74d68882 --- /dev/null +++ b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-probe-bcache-underlinking.patch @@ -0,0 +1,13 @@ +Fix underlinking in GCC 4.9 and below + +--- bcache-tools-1.0.8/Makefile ++++ bcache-tools-1.0.8/Makefile +@@ -24,7 +24,7 @@ + make-bcache: LDLIBS += `pkg-config --libs uuid blkid` + make-bcache: CFLAGS += `pkg-config --cflags uuid blkid` + make-bcache: bcache.o +-probe-bcache: LDLIBS += `pkg-config --libs uuid blkid` ++probe-bcache: LDLIBS += `pkg-config --libs uuid blkid` bcache.o + probe-bcache: CFLAGS += `pkg-config --cflags uuid blkid` + bcache-super-show: LDLIBS += `pkg-config --libs uuid` + bcache-super-show: CFLAGS += -std=gnu99 diff --git a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-20131018-fedconf.patch b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-20131018-fedconf.patch new file mode 100644 index 000000000000..993ec216f888 --- /dev/null +++ b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-20131018-fedconf.patch @@ -0,0 +1,5 @@ +diff -ruN bcache-tools-20130827.orig/configure bcache-tools-20130827/configure +--- bcache-tools-20130827.orig/configure 1970-01-01 01:00:00.000000000 +0100 ++++ bcache-tools-20130827/configure 2013-08-31 15:12:41.093218432 +0200 +@@ -0,0 +1 @@ ++#!/bin/sh diff --git a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-status-20130826-man.patch b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-status-20130826-man.patch new file mode 100644 index 000000000000..3eabb3f4b832 --- /dev/null +++ b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-status-20130826-man.patch @@ -0,0 +1,49 @@ +diff -ruN bcache-tools-20130820.orig/bcache-status.8 bcache-tools-20130820/bcache-status.8 +--- bcache-tools-20130820.orig/bcache-status.8 1970-01-01 01:00:00.000000000 +0100 ++++ bcache-tools-20130820/bcache-status.8 2013-08-26 23:32:02.477274882 +0200 +@@ -0,0 +1,45 @@ ++.TH bcache-status 8 ++.SH NAME ++bcache-status \- Display useful bcache statistics ++.SH SYNOPSIS ++.B bcache-status ++[\fB \--help\fR ] ++[\fB \-f\fR ] ++[\fB \-h\fR ] ++[\fB \-d\fR ] ++[\fB \-t\fR ] ++[\fB \-a\fR ] ++[\fB \-r\fR ] ++[\fB \-s\fR ] ++[\fB \-g\fR ] ++.SH DESCRIPTION ++This command displays useful bcache statistics in a convenient way. ++.SH OPTIONS ++.TP ++.BR \---help ++Print help message and exit. ++.TP ++.BR \-f,\ --five-minute ++Print the last five minutes of stats. ++.TP ++.BR \-h,\ --hour ++Print the last hour of stats. ++.TP ++.BR \-d,\ --day ++Print the last day of stats. ++.TP ++.BR \-t,\ --total ++Print total stats. ++.TP ++.BR \-a,\ --all ++Print all stats. ++.TP ++.BR \-r,\ --reset-stats ++Reset stats after printing them. ++.TP ++.BR \-s,\ --sub-status ++Print subdevice status. ++.TP ++.BR \-g,\ --gc ++Print subdevice status. ++ diff --git a/sys-fs/bcache-tools/metadata.xml b/sys-fs/bcache-tools/metadata.xml new file mode 100644 index 000000000000..afb6723f41a7 --- /dev/null +++ b/sys-fs/bcache-tools/metadata.xml @@ -0,0 +1,10 @@ + + + + + jlec@gentoo.org + + + g2p/bcache-tools + + -- cgit v1.2.3