diff options
Diffstat (limited to 'sys-fs/btrfs-progs')
| -rw-r--r-- | sys-fs/btrfs-progs/Manifest | 2 | ||||
| -rw-r--r-- | sys-fs/btrfs-progs/btrfs-progs-4.10.2.ebuild (renamed from sys-fs/btrfs-progs/btrfs-progs-4.10-r1.ebuild) | 5 | ||||
| -rw-r--r-- | sys-fs/btrfs-progs/files/btrfs-progs-4.10-fix-headers.patch | 32 | ||||
| -rw-r--r-- | sys-fs/btrfs-progs/files/btrfs-progs-4.10-messages.patch | 34 |
4 files changed, 1 insertions, 72 deletions
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 2862dc802987..17b03c66810d 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -5,7 +5,7 @@ DIST btrfs-progs-v3.18.2.tar.xz 1029228 SHA256 dd8ddb4d201e5ffd32a15ed0e1f33fbc2 DIST btrfs-progs-v3.19.1.tar.xz 1101168 SHA256 248862a7e7e06188bb495bbaa05d3e0e34628b61a10ef03234b3b00698ce88db SHA512 c8b1c348afe3e32f54a72fcf361700bd63c12272e34ab34774936a2eca338dbea568d452f494d6ddd3c7be75b37a6d400fec33500548ed9b6df008212613d7f5 WHIRLPOOL 75bb08fe5ab49711f264d6cd35ddac39ea722ef2bcd57c53ad0d483cdf329b1b1b89c0b70280dea161568fd78c44eae30c76fb574ee649200237a13b3df1d8d4 DIST btrfs-progs-v4.0.1.tar.xz 1104340 SHA256 2c2e10e79edd16a92effe8619c527fd130bc272fbca67896e1705bb2ec0293cb SHA512 52e5165f2fdd0f27f9c2f099b774523c36ab442948a13ede03736297a139903af4c0c444c77abc14b05f3cf633b006eb9dbc29f2b127858698ee1b6ad517a53f WHIRLPOOL ad8d2280c9205537a1045a835bffb39d73684fea87841215cd0916fdc91285aa299dc5885446b3c3aa50fcc2ab562a4b58a33cc9537ede3f57df4bc566aacb47 DIST btrfs-progs-v4.1.2.tar.xz 1123080 SHA256 62db60c6a0868afb6302112cea54c756873bc30b826696b167ec03ecd61b2f12 SHA512 dd159bcc3adb65efd4f612d75f5a6b30df8ad9fa06ef952dd03dac965256de37eab26f4cc2fb3840178403ccbb7368cae11638e27eadb9b1835b636c4b126e2e WHIRLPOOL 819e6d61ecbb0f2d099abcda70ae9ab53b3311a28131fdedbbad7cc033c4984309a460f704d2f2ce7cf36cf0e034e82618c1b45002fdfbb5eced648883e12a29 -DIST btrfs-progs-v4.10.tar.xz 1487708 SHA256 44cbcca39af70dad5a8bf0343fca48f7aaa1aeae0eefac5003688452b3155cda SHA512 63d7fa081f800e586ba5a1291179dfbf0a082d01d477c8145895583302c4412ea4f00acb3c2681a2ca69eee92b6a18e6681d51be320423725669f2b90e309f3a WHIRLPOOL 31f5ebb790e55b3add958d5d5b04c8c6458b6df21678433798897b37283daca97dd5146ba31ab5f9c7ea43b8d5521bfbd130a09b8f630e272d82fb04240d5092 +DIST btrfs-progs-v4.10.2.tar.xz 1508304 SHA256 ed09df670338562a52d9e7d76a362cc932737e2a67adca4c09395374be1de60a SHA512 1a21ca29d03c8d0e697ce075b841e38b021771a67da20087c80ab84bb87c5f56ea80695f9b2a25a2a159fba8b01d74a364435f5462545ec00ebd6f335d3fcd6f WHIRLPOOL 621f1af0273ca3b27e63e20b8a6ec9a3f6519f67fb669f1295be7f742b68362f3c7295be5e4d12ce48e9bc5753d1099b03e52b71fdf878d02664cf1e59720de6 DIST btrfs-progs-v4.2.2.tar.xz 1143760 SHA256 5d87e4ebb2a3a288c167791e489bfa484034d185c704870c484cb0771d921316 SHA512 2ad23546b3bb421faad1f67da37566b6ae1887c5340c0f1d06ca59fc0cd0fb1060d92e74e36ba7bfd85b0aff30811525654cd03b7d3570b0b51c2d8e2d6d9a76 WHIRLPOOL 5051f232bf5d6c2d19bc0fba9f2653546fc09000279863637a7ab44ff5c8bd107e5307aef3d2fbc7113581df3c224965f882045153eb9fa10da5b34cc4318188 DIST btrfs-progs-v4.3.1.tar.xz 1184416 SHA256 0cb5ff15deed01cdf5a77f3f61b7dc9d2cd6787bcf6b6b7dcef424d16e8afd3a SHA512 661c7c05ee3527cc34f3aa08e88e252e6e836a86752f7e607e3f6dc0a9a861d3bc645a6fa0a5af5f6abfe4f3f2f7e193cffc2bb1c53595e0b7f99c3ff59daeff WHIRLPOOL 503ab00d8362ab2b4b9b91a8de18cca9eba1d76f2331f54cbecc7e89cc491dce3cfbd761d8e6e37773499cea7ef67a66dc7f544d7590d0c82acbef90ebe0c824 DIST btrfs-progs-v4.4.1.tar.xz 1173248 SHA256 9964e3ae4fb64692e109ddd733de4554e708348ffa18f0fc16a0cbd4bf40a8fc SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a WHIRLPOOL 188c4dec4f699262b023268e4a582312443aeaf0ea798446105d7288f6375cbad92ea2e8514def0b22cc8991c3ca9aefc5220dd8b6922aa4b506572da973ec33 diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.10-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.10.2.ebuild index 663141c94091..397d271d38c9 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-4.10-r1.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-4.10.2.ebuild @@ -53,11 +53,6 @@ DEPEND="${RDEPEND} ) " -PATCHES=( - "${FILESDIR}"/${P}-messages.patch - "${FILESDIR}"/${P}-fix-headers.patch -) - if [[ ${PV} == 9999 ]]; then DEPEND+=" sys-devel/gnuconfig" fi diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.10-fix-headers.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.10-fix-headers.patch deleted file mode 100644 index 414c0995e411..000000000000 --- a/sys-fs/btrfs-progs/files/btrfs-progs-4.10-fix-headers.patch +++ /dev/null @@ -1,32 +0,0 @@ -Add missing 'sizes.h' header install. - -Noticed on snapper build failure: - In file included from btrfs/send-utils.h:28:0, - from BtrfsUtils.cc:36: - btrfs/ctree.h:37:25: fatal error: linux/sizes.h: No such file or directory -diff --git a/Makefile b/Makefile -index 05a5d06..fb1cfd6 100644 ---- a/Makefile -+++ b/Makefile -@@ -108,7 +108,7 @@ libbtrfs_objects = send-stream.o send-utils.o kernel-lib/rbtree.o btrfs-list.o \ - uuid-tree.o utils-lib.o rbtree-utils.o - libbtrfs_headers = send-stream.h send-utils.h send.h kernel-lib/rbtree.h btrfs-list.h \ - kernel-lib/crc32c.h kernel-lib/list.h kerncompat.h \ -- kernel-lib/radix-tree.h extent-cache.h \ -+ kernel-lib/radix-tree.h kernel-lib/sizes.h extent-cache.h \ - extent_io.h ioctl.h ctree.h btrfsck.h version.h - convert_objects = convert/main.o convert/common.o convert/source-fs.o \ - convert/source-ext2.o -diff --git a/ctree.h b/ctree.h -index 1d0622d..c8f771b 100644 ---- a/ctree.h -+++ b/ctree.h -@@ -34,7 +34,7 @@ - #include <btrfs/extent-cache.h> - #include <btrfs/extent_io.h> - #include <btrfs/ioctl.h> --#include <linux/sizes.h> -+#include <btrfs/sizes.h> - #endif /* BTRFS_FLAT_INCLUDES */ - - struct btrfs_root; diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.10-messages.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.10-messages.patch deleted file mode 100644 index afcc27896f61..000000000000 --- a/sys-fs/btrfs-progs/files/btrfs-progs-4.10-messages.patch +++ /dev/null @@ -1,34 +0,0 @@ -Fix missing __error symbol in libbtrfs.so.0. - -The easiest way to reproduce it is to try to build -btrfs-progs with LDFLAGS=-Wl,--no-undefined : - -btrfs-list.o: In function `lookup_ino_path': -btrfs-list.c:(.text+0x7d2): undefined reference to `__error' - -Reported-by: Denis Descheneaux -Bug: https://bugs.gentoo.org/show_bug.cgi?id=613890 -diff --git a/Makefile b/Makefile -index 67fbc48..05a5d06 100644 ---- a/Makefile -+++ b/Makefile -@@ -97,3 +97,3 @@ objects = ctree.o disk-io.o kernel-lib/radix-tree.o extent-tree.o print-tree.o \ - inode.o file.o find-root.o free-space-tree.o help.o send-dump.o \ -- fsfeatures.o messages.o -+ fsfeatures.o - cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \ -@@ -106,3 +106,3 @@ cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \ - libbtrfs_objects = send-stream.o send-utils.o kernel-lib/rbtree.o btrfs-list.o \ -- kernel-lib/crc32c.o \ -+ kernel-lib/crc32c.o messages.o \ - uuid-tree.o utils-lib.o rbtree-utils.o -@@ -448,3 +448,3 @@ test-ioctl: ioctl-test ioctl-test-32 ioctl-test-64 - --library-test: library-test.o messages.o $(libs_shared) -+library-test: library-test.o $(libs_shared) - @echo " [LD] $@" -@@ -454,3 +454,3 @@ library-test: library-test.o messages.o $(libs_shared) - --library-test.static: library-test.static.o messages.static.o $(libs_static) -+library-test.static: library-test.static.o $(libs_static) - @echo " [LD] $@" |