From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- sys-fs/bcache-tools/Manifest | 8 --- .../bcache-tools-1.0.8_p20140220-r1.ebuild | 77 ---------------------- .../1.0.8_p20140220/bcache-status-python3.patch | 8 --- .../1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch | 55 ---------------- ...che-tools-1.0.8-probe-bcache-underlinking.patch | 13 ---- .../bcache-tools-20131018-fedconf.patch | 5 -- .../bcache-tools-status-20130826-man.patch | 49 -------------- 7 files changed, 215 deletions(-) delete mode 100644 sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild delete mode 100644 sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-status-python3.patch delete mode 100644 sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch delete mode 100644 sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-probe-bcache-underlinking.patch delete mode 100644 sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-20131018-fedconf.patch delete mode 100644 sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-status-20130826-man.patch (limited to 'sys-fs/bcache-tools') diff --git a/sys-fs/bcache-tools/Manifest b/sys-fs/bcache-tools/Manifest index 4df7777e542e..2f9faedb4d4b 100644 --- a/sys-fs/bcache-tools/Manifest +++ b/sys-fs/bcache-tools/Manifest @@ -1,14 +1,6 @@ -AUX 1.0.8_p20140220/bcache-status-python3.patch 320 BLAKE2B b3fdc9b16a3528947e4ef5820fc24c6983fd7c72d49404df87765973338e5832396cffb94b7118467e54455714a6ddb483234fee6b67b778290791a9ee7070b0 SHA512 d522cd5e6296a55ced53dab25a5e0978d04ec8eb0a6b353753b4627a3f0318658b0c52a27e6cd4a81d39e6f646aa0c936797b89280cb32490d4e671fbb532476 -AUX 1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch 1869 BLAKE2B b9545aa070b0a1c8c3f6dcbd8455288b46e745120c650edd681d40cd47248f51445532d67a813a41eafae07e0fa2b031fb3f03d45bda1099fe817d554ef876b9 SHA512 ce4706849c2c4f7c414682d2f9df37989eb79a0b52d8ddf1e903065a6f5fb190cb3476f6579670d5a6cba0f2d13ab843e454966798edbf9cd4e54cc4a1a6c2cd AUX 1.0.8_p20140220/bcache-tools-1.0.8-noprobe.patch 1335 BLAKE2B bb99576cd404dca383a04f49693b083d09618272aea92194c8e7108340a786ce31f8fb2c2bf37559fe3aece73c8305447e1d5fba2f6d27351ff81818a4ab9567 SHA512 d1a28bb32f28a074c46244213c09c6dfdd93b18647b94cabd29c2e3f2e6d28fba015bfdda4bcda412ea511ee6eee057becf1bb913bc4007e3deb378c0da5b735 -AUX 1.0.8_p20140220/bcache-tools-1.0.8-probe-bcache-underlinking.patch 531 BLAKE2B 3e1ec0b19cf4e68cb30197c94f4a2c85f3479e60b9ca953553f2c5c5730a30cd1bef7b013c5d5087a9220f05bf0d634903a4ed263df250673641f78982d98835 SHA512 883dbb66051bc7d1cbb170235ef8dbb4a1d115d0a598eae907d89fae6365c2e6725929e1297f9f74c742150d893ed8febb99a03bf55e91f0b90cc33314cf51d2 -AUX 1.0.8_p20140220/bcache-tools-20131018-fedconf.patch 253 BLAKE2B 74ebc9f660eab05c6633ac9574951ee5b6355bceb0e32ff6bc586a6cc0e4bde70bbe085e71fe6186fc4e29317c4f7d7d1556945f1ec237688d555695a95112c0 SHA512 459875969ef1a80a5bb635e5da2187222a01aefe9ea49eb7feeab89d5290e4d478a0e5e37e424dd77a69916811b0ad3f82f7ec4e0ae91ae686e3fe7f5eac9d57 -AUX 1.0.8_p20140220/bcache-tools-status-20130826-man.patch 1095 BLAKE2B df33f5ce76d5e5b9b859588ebe4be1ea5c710281e21595cc80438ffd2dece7cf9278936bc08c9f8250672d4d3f9daa4b52c9723340650fbc9d348794cfead564 SHA512 44f4227e7cd3e4ec3b4c90d27445be8bfa36b229aa11a08b9b66c08c224dc9c006c0d358580b0906a8372eb83b938c0a5a199665680e96898aa2070bb55000de AUX 1.1/bcache-tools-add-bcache-status.patch 13158 BLAKE2B e986d81d6fdf76f809ffcaad0c93869421e369e77efb7a51f81c1abe07b941c703bf80ce89e4c09bad42f5b4d76a7bb7c40fa5ad94c87f31237b676c40b41049 SHA512 bdcc2912d3b6e47781e9023433e2b152d628ce9fa538ae4ff7ed8385a495752786cdb32bd8f82d7a7c84ad068d49b22b3911c0125e235f561a729c20c8223363 AUX 1.1/bcache-tools-add-man-page-bcache-status.8.patch 1431 BLAKE2B f88c54286ad07766e4ebe216a27b99838ee9eb63412bb50a1036c93e1e41d77ea9d02cc47c148105ab63115f954c4dcc52903e7c726399b2d2ec2066a7b24ecc SHA512 e6e5f073b01e0272710bc6effeecf5ce6786f1606986e12f18bf37a1124d25858a4ed25fa42f2da85bf04e95844e3c6156af2e83bed323bb83621601774b0802 -DIST bcache-status-20140220.tar.gz 3779 BLAKE2B a3fa5e9d87b2c51f1f5178693db6d9f8b4bde31c77783d1ebd9de6e81995d89a4b07df43178cba384757b212087c474a0508640d1d3ddcd97d3d928643971e4a SHA512 0c8db02dc865b469f3a5964f679a3bfdf5cdbf5a2f6ccd5d81544f3bb3c06df2f5d06b9f09aaec527ec90229740dcd31fbb33e2628721b6da139cfcee6b48d7c -DIST bcache-tools-1.0.8_p20140220.tgz 22153 BLAKE2B d40a64b02e0d66ef8868151870715f6e6ab54633e4875c32d0e03dfe1871e5aa98d7e133b9eed583ac4898b1598f38b71e47109210009ca51c4dfe9dbd31768c SHA512 21eaed457e5de623089c0d4e1c11394a3950f29c749c502bfd5dd94d3dcdc7379c4a910825e33bf9fc8080df656949b94a1a28d19048a8eb6422976cb391b7dc DIST bcache-tools-1.1.tar.gz 34548 BLAKE2B e6ebc0f609debe0cc123deba0e21076441c37cdbc6edd02bf2c16c0e36fe806f1fc160b9e9baed577f86f6358884182a4e3903f34bccee81943191c0ba6a2d11 SHA512 4ccbef47255bf3644a50242a79951b1f3720e71a55eb1e07dc6b8486df0245da99a77bba751b50197d489b4c5d738e5284aabc014c2f7f44816ddf6a1bb807ca -EBUILD bcache-tools-1.0.8_p20140220-r1.ebuild 1598 BLAKE2B d9eacc64525ba8669ae624c52812eb5b13aa2c2db467f0fa0a5abd276efba473b270077a8220092e81d2506068ba391eedbca245444e702da4c8fecb1e9107e4 SHA512 f3594e28dc0e0cf922af7c6bcf292f7042796f9269a3c3fe7f960f566c816e390097cca0c8762aa838d861b81540f7f90127a3f06d0d6e920ca3aa18e8569cfd EBUILD bcache-tools-1.1.ebuild 1350 BLAKE2B 0d6049bd33425fade4f7de92b223b0453daa15f0cf79a1c3751ce45813c6f1304996ecfcb145a49d42e82ab30d733f907f14924250fba73c937934f3e1fd2ea6 SHA512 7e43a1a108c67b77c8e75fce35c0f212e5731d3d8e1870fbf231be3bc027f0002355eb5c2ab419229825ca1167e33da74456b2ae1647b6030e3706663da5bd19 MISC metadata.xml 253 BLAKE2B 053cd7caa33b4ace537584fb68b0fd010978dd08ec030003d4f4cad19896018102a7fa85ccdfd6cbecb8f8c62c63fd97b7babc6a5b72d2a6f37d4aec14442694 SHA512 3ea0dad00b289add099c74cf0b6b8202e9adc0ac7537b16b7673d2fadddcf83c7c686b0662bfd4766819d37af300cf978bb939133aed74b9a8aa8de2b84e805a 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 deleted file mode 100644 index d53d514a64e2..000000000000 --- a/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit eutils flag-o-matic python-r1 toolchain-funcs udev - -DESCRIPTION="Tools for bcachefs" -HOMEPAGE="https://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/files/1.0.8_p20140220/bcache-status-python3.patch b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-status-python3.patch deleted file mode 100644 index 0cb08cc1a281..000000000000 --- a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-status-python3.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- 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 deleted file mode 100644 index 9b11d80c0091..000000000000 --- a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch +++ /dev/null @@ -1,55 +0,0 @@ -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-probe-bcache-underlinking.patch b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-probe-bcache-underlinking.patch deleted file mode 100644 index c6ca74d68882..000000000000 --- a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-probe-bcache-underlinking.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 993ec216f888..000000000000 --- a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-20131018-fedconf.patch +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 3eabb3f4b832..000000000000 --- a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-status-20130826-man.patch +++ /dev/null @@ -1,49 +0,0 @@ -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. -+ -- cgit v1.2.3