commit: 29bb318af5b049d3274ab126ecd4955063ec1888
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 28 09:51:39 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jan 28 10:22:26 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29bb318a
sys-fs/bcache-tools: Import all fedora patches
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sys-fs/bcache-tools/Manifest | 2 +
.../bcache-tools-1.0.8_p20140220.ebuild | 76 ++++++++++++++++++++++
.../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 +++++++++
.../bcache-tools-20131018-fedconf.patch | 5 ++
.../bcache-tools-status-20130826-man.patch | 49 ++++++++++++++
7 files changed, 227 insertions(+)
diff --git a/sys-fs/bcache-tools/Manifest b/sys-fs/bcache-tools/Manifest
index 4cbcd0f..24e90f2 100644
--- a/sys-fs/bcache-tools/Manifest
+++ b/sys-fs/bcache-tools/Manifest
@@ -1,2 +1,4 @@
+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
diff --git a/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220.ebuild
b/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220.ebuild
new file mode 100644
index 0000000..5903050
--- /dev/null
+++ b/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{3,4,5} )
+
+inherit eutils 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::' \
+ -i Makefile || die
+
+ 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/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 0000000..0cb08cc
--- /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 0000000..9b11d80
--- /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 0000000..6d2d9f5
--- /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-20131018-fedconf.patch
b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-20131018-fedconf.patch
new file mode 100644
index 0000000..993ec21
--- /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 0000000..3eabb3f
--- /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.
++
