* [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/, sys-fs/btrfs-progs/files/
@ 2016-10-24 8:20 Sergei Trofimovich
0 siblings, 0 replies; 11+ messages in thread
From: Sergei Trofimovich @ 2016-10-24 8:20 UTC (permalink / raw
To: gentoo-commits
commit: 8f2e4d09c5d8aedc0bc1950a0289621adae48291
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 24 08:20:00 2016 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Oct 24 08:20:21 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f2e4d09
sys-fs/btrfs-progs: fix missing depends of ioctl.h
Reported-by: Mikhail Pukhlikov <cynede <AT> gentoo.org>
Package-Manager: portage-2.3.2
...gs-4.8.1.ebuild => btrfs-progs-4.8.1-r1.ebuild} | 2 ++
.../files/btrfs-progs-4.8.1-fix-ioctl.h | 36 ++++++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.8.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.8.1-r1.ebuild
similarity index 98%
rename from sys-fs/btrfs-progs/btrfs-progs-4.8.1.ebuild
rename to sys-fs/btrfs-progs/btrfs-progs-4.8.1-r1.ebuild
index 7f648be..b508b57 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.8.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.8.1-r1.ebuild
@@ -58,6 +58,8 @@ if [[ ${PV} == 9999 ]]; then
DEPEND+=" sys-devel/gnuconfig"
fi
+PATCHES=("${FILESDIR}"/${P}-fix-ioctl.h)
+
src_prepare() {
default
if [[ ${PV} == 9999 ]]; then
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.8.1-fix-ioctl.h b/sys-fs/btrfs-progs/files/btrfs-progs-4.8.1-fix-ioctl.h
new file mode 100644
index 00000000..61b60c7
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-4.8.1-fix-ioctl.h
@@ -0,0 +1,36 @@
+commit 3ddbf895db678fb40f7513bac9dbc36fd4095693
+Author: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Mon Oct 24 09:08:53 2016 +0100
+
+ ioctl.h: add missing kernel compatibility header for BUILD_ASSERT
+
+ Header breakage noticed by cynede. Reproducible as:
+
+ $ gcc -c /usr/include/btrfs/ioctl.h -o /tmp/a.o
+ /usr/include/btrfs/ioctl.h:42:14: error: expected declaration specifiers or '...' before 'sizeof'
+ BUILD_ASSERT(sizeof(struct btrfs_ioctl_vol_args) == 4096);
+ ^~~~~~
+
+ Basically gcc tries to say us BUILD_ASSERT is not visible.
+
+ BUILD_ASSERT lives in kerncompat.h which this change adds.
+
+ Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+
+diff --git a/ioctl.h b/ioctl.h
+index a7235c0..abea7ed 100644
+--- a/ioctl.h
++++ b/ioctl.h
+@@ -26,6 +26,12 @@ extern "C" {
+ #include <asm/types.h>
+ #include <linux/ioctl.h>
+
++#if BTRFS_FLAT_INCLUDES
++#include "kerncompat.h"
++#else
++#include <btrfs/kerncompat.h>
++#endif /* BTRFS_FLAT_INCLUDES */
++
+ #ifndef __user
+ #define __user
+ #endif
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/, sys-fs/btrfs-progs/files/
@ 2017-03-31 20:53 Sergei Trofimovich
0 siblings, 0 replies; 11+ messages in thread
From: Sergei Trofimovich @ 2017-03-31 20:53 UTC (permalink / raw
To: gentoo-commits
commit: 60dd05244af80e39bafe998ca0ee3847ebb7fdfe
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 20:52:44 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 20:53:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60dd0524
sys-fs/btrfs-progs: bump up to 4.10.2
Package-Manager: Portage-2.3.5, Repoman-2.3.2
sys-fs/btrfs-progs/Manifest | 2 +-
...gs-4.10-r1.ebuild => btrfs-progs-4.10.2.ebuild} | 5 ----
| 32 --------------------
.../files/btrfs-progs-4.10-messages.patch | 34 ----------------------
4 files changed, 1 insertion(+), 72 deletions(-)
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 2862dc80298..17b03c66810 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
similarity index 96%
rename from sys-fs/btrfs-progs/btrfs-progs-4.10-r1.ebuild
rename to sys-fs/btrfs-progs/btrfs-progs-4.10.2.ebuild
index 663141c9409..397d271d38c 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 414c0995e41..00000000000
--- 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 afcc27896f6..00000000000
--- 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] $@"
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/, sys-fs/btrfs-progs/files/
@ 2018-04-12 9:42 Sergei Trofimovich
0 siblings, 0 replies; 11+ messages in thread
From: Sergei Trofimovich @ 2018-04-12 9:42 UTC (permalink / raw
To: gentoo-commits
commit: 665fca34ff359676b9ebe0f855f3716ad85be312
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 12 09:41:38 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Apr 12 09:41:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=665fca34
sys-fs/btrfs-progs: fix btrfs.static linking, bug #652966
btrfs.static was not linked against internal libbtrfsutil:
https://www.spinics.net/lists/linux-btrfs/msg76763.html
This caused link failure due to unresolved symbols.
Reported-by: Attila Tóth
Closes: https://bugs.gentoo.org/652966
Package-Manager: Portage-2.3.28, Repoman-2.3.9
sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild | 4 ++++
.../files/btrfs-progs-4.16-static-linkage.patch | 27 ++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild
index 0936ade7591..8d3f9db2dd2 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild
@@ -72,6 +72,10 @@ fi
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+PATCHES=(
+ "${FILESDIR}"/${P}-static-linkage.patch
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.16-static-linkage.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.16-static-linkage.patch
new file mode 100644
index 00000000000..b8a7d8b79f0
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-4.16-static-linkage.patch
@@ -0,0 +1,27 @@
+https://www.spinics.net/lists/linux-btrfs/msg76763.html
+Reported-by: Attila Tóth
+Bug: https://bugs.gentoo.org/652966
+diff --git a/Makefile b/Makefile
+index 5ba76d2..dc3a31a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -264,6 +264,7 @@ static_libbtrfs_objects = $(patsubst %.o, %.static.o, $(libbtrfs_objects))
+ static_convert_objects = $(patsubst %.o, %.static.o, $(convert_objects))
+ static_mkfs_objects = $(patsubst %.o, %.static.o, $(mkfs_objects))
+ static_image_objects = $(patsubst %.o, %.static.o, $(image_objects))
++static_libbtrfsutil_objects = $(patsubst %.o, %.static.o, $(libbtrfsutil_objects))
+
+ libs_shared = libbtrfs.so.0.1 libbtrfsutil.so.$(libbtrfsutil_version)
+ libs_static = libbtrfs.a libbtrfsutil.a
+@@ -453,7 +454,7 @@ btrfs: btrfs.o $(objects) $(cmds_objects) $(libs_static)
+ @echo " [LD] $@"
+ $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP)
+
+-btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects)
++btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects) $(static_libbtrfsutil_objects)
+ @echo " [LD] $@"
+ $(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP)
+
+--
+2.17.0
+
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/, sys-fs/btrfs-progs/files/
@ 2018-08-06 17:58 Mike Gilbert
0 siblings, 0 replies; 11+ messages in thread
From: Mike Gilbert @ 2018-08-06 17:58 UTC (permalink / raw
To: gentoo-commits
commit: 4c6e73df9d616d5c472c276dd5bef70efea02907
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 6 17:58:09 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Aug 6 17:58:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c6e73df
sys-fs/btrfs-progs: install uncompressed man pages
Closes: https://bugs.gentoo.org/662920
Package-Manager: Portage-2.3.44_p5_p421668, Repoman-2.3.10_p20_p421668
...rogs-4.17.ebuild => btrfs-progs-4.17-r1.ebuild} | 4 ++
.../btrfs-progs/files/btrfs-progs-man-no-gz.patch | 64 ++++++++++++++++++++++
2 files changed, 68 insertions(+)
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.17.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.17-r1.ebuild
similarity index 98%
rename from sys-fs/btrfs-progs/btrfs-progs-4.17.ebuild
rename to sys-fs/btrfs-progs/btrfs-progs-4.17-r1.ebuild
index 0936ade7591..b11eba1014a 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.17.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.17-r1.ebuild
@@ -72,6 +72,10 @@ fi
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+PATCHES=(
+ "${FILESDIR}"/btrfs-progs-man-no-gz.patch
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch b/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch
new file mode 100644
index 00000000000..aeb187baaf4
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch
@@ -0,0 +1,64 @@
+From 0a319cad0f002c2dfd44cffc1de0a26cf270560f Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 6 Aug 2018 11:26:54 -0400
+Subject: [PATCH] Install uncompressed man pages
+
+Bug: https://bugs.gentoo.org/662920
+---
+ Documentation/Makefile.in | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in
+index 184647c4..c4c843cb 100644
+--- a/Documentation/Makefile.in
++++ b/Documentation/Makefile.in
+@@ -37,9 +37,9 @@ MAN3_TXT += btrfs-ioctl.asciidoc
+ MAN_TXT = $(MAN3_TXT) $(MAN8_TXT) $(MAN5_TXT)
+ MAN_XML = $(patsubst %.asciidoc,%.xml,$(MAN_TXT))
+ MAN_HTML = $(patsubst %.asciidoc,%.html,$(MAN_TXT))
+-GZ_MAN3 = $(patsubst %.asciidoc,%.3.gz,$(MAN3_TXT))
+-GZ_MAN5 = $(patsubst %.asciidoc,%.5.gz,$(MAN5_TXT))
+-GZ_MAN8 = $(patsubst %.asciidoc,%.8.gz,$(MAN8_TXT))
++MAN3 = $(patsubst %.asciidoc,%.3,$(MAN3_TXT))
++MAN5 = $(patsubst %.asciidoc,%.5,$(MAN5_TXT))
++MAN8 = $(patsubst %.asciidoc,%.8,$(MAN8_TXT))
+
+ mandir ?= $(prefix)/share/man
+ man3dir = $(mandir)/man3
+@@ -86,9 +86,9 @@ endif
+
+ all: man
+ man: man3 man5 man8
+-man3: $(GZ_MAN3)
+-man5: $(GZ_MAN5)
+-man8: $(GZ_MAN8)
++man3: $(MAN3)
++man5: $(MAN5)
++man8: $(MAN8)
+ html: $(MAN_HTML)
+
+ install: install-man
+@@ -96,15 +96,15 @@ install: install-man
+ install-man: man
+ $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
+ $(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
+- $(INSTALL) -m 644 $(GZ_MAN5) $(DESTDIR)$(man5dir)
++ $(INSTALL) -m 644 $(MAN5) $(DESTDIR)$(man5dir)
+ # the source file name of btrfs.5 clashes with section 8 page, but we
+ # want to keep the code generic
+- $(MV) $(DESTDIR)$(man5dir)/btrfs-man5.5.gz $(DESTDIR)$(man5dir)/btrfs.5.gz
+- $(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir)
+- $(LN_S) -f btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz
++ $(MV) $(DESTDIR)$(man5dir)/btrfs-man5.5 $(DESTDIR)$(man5dir)/btrfs.5
++ $(INSTALL) -m 644 $(MAN8) $(DESTDIR)$(man8dir)
++ $(LN_S) -f btrfs-check.8 $(DESTDIR)$(man8dir)/btrfsck.8
+
+ uninstall:
+- cd $(DESTDIR)$(man8dir); rm -f btrfs-check.8.gz $(GZ_MAN8)
++ cd $(DESTDIR)$(man8dir); rm -f btrfs-check.8 $(MAN8)
+ $(RMDIR) -p --ignore-fail-on-non-empty $(DESTDIR)$(man8dir)
+
+ clean:
+--
+2.18.0
+
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/, sys-fs/btrfs-progs/files/
@ 2018-11-10 21:45 Sergei Trofimovich
0 siblings, 0 replies; 11+ messages in thread
From: Sergei Trofimovich @ 2018-11-10 21:45 UTC (permalink / raw
To: gentoo-commits
commit: e2c6fa0a4d2c2e75aa2e76c9f6d3d68314f4d989
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 10 21:44:53 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Nov 10 21:45:04 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2c6fa0a
sys-fs/btrfs-progs: fix build failure on big-endian platforms
Reported-by: ernsteiswuerfel
Bug: https://bugs.gentoo.org/670741
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild | 4 ++++
.../files/btrfs-progs-4.19-be-bswap.patch | 24 ++++++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
index 04d53839609..c0e82c0a114 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
@@ -72,6 +72,10 @@ fi
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+PATCHES=(
+ "${FILESDIR}"/${P}-be-bswap.patch
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch
new file mode 100644
index 00000000000..b91b3204085
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch
@@ -0,0 +1,24 @@
+Fix build failure on big-endian platforms.
+
+Reported-by: ernsteiswuerfel
+Bug: https://bugs.gentoo.org/670741
+--- a/kernel-lib/bitops.h
++++ b/kernel-lib/bitops.h
+@@ -180,5 +180,5 @@ static inline unsigned long ext2_swab(const unsigned long y)
+ #if BITS_PER_LONG == 64
+- return (unsigned long) bswap64((u64) y);
++ return (unsigned long) bswap_64((u64) y);
+ #elif BITS_PER_LONG == 32
+- return (unsigned long) bswap32((u32) y);
++ return (unsigned long) bswap_32((u32) y);
+ #else
+@@ -220,3 +220,3 @@ static inline unsigned long _find_next_bit_le(const unsigned long *addr1,
+
+-unsigned long find_next_zero_bit_le(const void *addr, unsigned long size,
++static inline unsigned long find_next_zero_bit_le(const void *addr, unsigned long size,
+ unsigned long offset)
+@@ -227,3 +227,3 @@ unsigned long find_next_zero_bit_le(const void *addr, unsigned long size,
+
+-unsigned long find_next_bit_le(const void *addr, unsigned long size,
++static inline unsigned long find_next_bit_le(const void *addr, unsigned long size,
+ unsigned long offset)
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/, sys-fs/btrfs-progs/files/
@ 2021-01-16 19:28 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2021-01-16 19:28 UTC (permalink / raw
To: gentoo-commits
commit: 968b2681112a794d3dc2aaad7f99843683516edf
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 16 19:28:19 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jan 16 19:28:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=968b2681
sys-fs/btrfs-progs: Removed old
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-fs/btrfs-progs/Manifest | 2 -
sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild | 125 --------------------
sys-fs/btrfs-progs/btrfs-progs-5.7.ebuild | 129 ---------------------
.../files/btrfs-progs-4.19-be-bswap.patch | 24 ----
4 files changed, 280 deletions(-)
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 55569b7911f..57f02eca17a 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,5 +1,3 @@
-DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b098108f7363fc3c015d73bf9afcda9d579831fe0e324125893cdb2510873d052522b15843c461e640a546900e535ce76 SHA512 e5abf637a9c811973422ca05a5530f6cd18263013d141277e2a70099cf8ab7e0eb8781df56368da4321c90f21d1022ad852b661adc4877e9a9ba5c60ccbefdee
DIST btrfs-progs-v5.10-rc1.tar.xz 2203156 BLAKE2B 55f63cd5fecc06f1004848f0bec4ba6dea3476a2b8b0a133d32e13b895ce305af1f9125126a937675649541c4f93fdd64689dfa2660764027216aa0e048116fa SHA512 50fe512beaf3459c520ca76896f1c12958a59e7837538e8bcad09acea9b92495baa435d321fa272e55f21a06c1799e0240747091abd44ae3bc717052c59cae82
DIST btrfs-progs-v5.4.1.tar.xz 2107476 BLAKE2B 1ea58f49b0f8185e944010804e544643a2eafeea58fecb480b13095c362350c218f0602fbb43a96705a81befe88ec3e3abe35cc90d4732006479b059aa7fed32 SHA512 56381b37036aecea61b758fb4971abfeda24a387bb3a828f7d54eb068982a37763a8ebe2bcc6be61d6a8bc2057dddcd4754325b236e14d8ec02e58cf711f192f
-DIST btrfs-progs-v5.7.tar.xz 2182728 BLAKE2B 47573baa26cde058003b402dadba28f278b4b3ffd270d002ab8fd72d94ee41d3fdfb3d36c0c579e24ea6afae4b2dea2ca704d9dd809fcd10fbc146d63d48980c SHA512 72c3af13ca589f2e0b96cb7602319035ef8aab6ee224fff3544a5d0bfc013a66552dde4533ec5e64696d404b8905431cd0f25367c40fd34ea39be7c0ed8c2d16
DIST btrfs-progs-v5.9.tar.xz 2189724 BLAKE2B 3692e058e5e52c2a3684548d0b0ca94a9101a66dc8951266a49a71b6848b7f0cce8ade0e914ae8b71345021750e7d20742af13aec69aef7d52e3030fca289529 SHA512 38db047198ab0467d3fe235f7e8e1fd14ade00dd0b182588220c5f5e4b598efbdcd30a3d5d56cf0a0ed8a902d2374af0927eb7f3720cd761172c7291a2a65c94
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
deleted file mode 100644
index 12bf7464341..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit bash-completion-r1 python-single-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
- MY_PV="v${PV/_/-}"
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
- SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
- S="${WORKDIR}"/${PN}-${MY_PV}
-else
- WANT_LIBTOOL=none
- inherit autotools git-r3
- EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
- EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
- dev-libs/lzo:2=
- sys-apps/util-linux:0=[static-libs(+)?]
- sys-libs/zlib:0=
- convert? (
- sys-fs/e2fsprogs:0=
- sys-libs/e2fsprogs-libs:0=
- reiserfs? (
- >=sys-fs/reiserfsprogs-3.6.27
- )
- )
- python? ( ${PYTHON_DEPS} )
- zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
- convert? ( sys-apps/acl )
- >=app-text/asciidoc-8.6.0
- app-text/docbook-xml-dtd:4.5
- app-text/xmlto
- python? (
- $(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
- ')
- )
- static? (
- dev-libs/lzo:2[static-libs(+)]
- sys-apps/util-linux:0[static-libs(+)]
- sys-libs/zlib:0[static-libs(+)]
- convert? (
- sys-fs/e2fsprogs:0[static-libs(+)]
- sys-libs/e2fsprogs-libs:0[static-libs(+)]
- reiserfs? (
- >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
- )
- )
- zstd? ( app-arch/zstd:0[static-libs(+)] )
- )
-"
-
-if [[ ${PV} == 9999 ]]; then
- DEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-be-bswap.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- if [[ ${PV} == 9999 ]]; then
- AT_M4DIR=m4 eautoreconf
- mkdir config || die
- local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
- [[ -e ${automakedir} ]] || die "Could not locate automake directory"
- ln -s "${automakedir}"/install-sh config/install-sh || die
- ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
- ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- --bindir="${EPREFIX}"/sbin
- $(use_enable convert)
- $(use_enable elibc_glibc backtrace)
- $(use_enable python)
- $(use_enable static-libs static)
- $(use_enable zstd)
- --with-convert=ext2$(usex reiserfs ',reiserfs' '')
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- emake V=1 all $(usev static)
-}
-
-src_install() {
- local makeargs=(
- $(usex python install_python '')
- $(usex static install-static '')
- )
- emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
- newbashcomp btrfs-completion btrfs
- use python && python_optimize
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.7.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.7.ebuild
deleted file mode 100644
index 81e4dc34e2d..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-5.7.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit bash-completion-r1 python-single-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
- MY_PV="v${PV/_/-}"
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
- SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
- S="${WORKDIR}/${PN}-${MY_PV}"
-else
- WANT_LIBTOOL=none
- inherit autotools git-r3
- EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
- EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert doc python reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
- dev-libs/lzo:2=
- sys-apps/util-linux:0=[static-libs(+)?]
- sys-libs/zlib:0=
- convert? (
- sys-fs/e2fsprogs:0=
- sys-libs/e2fsprogs-libs:0=
- reiserfs? (
- >=sys-fs/reiserfsprogs-3.6.27
- )
- )
- python? ( ${PYTHON_DEPS} )
- zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
- convert? ( sys-apps/acl )
- python? (
- $(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
- ')
- )
- static? (
- dev-libs/lzo:2[static-libs(+)]
- sys-apps/util-linux:0[static-libs(+)]
- sys-libs/zlib:0[static-libs(+)]
- convert? (
- sys-fs/e2fsprogs:0[static-libs(+)]
- sys-libs/e2fsprogs-libs:0[static-libs(+)]
- reiserfs? (
- >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
- )
- )
- zstd? ( app-arch/zstd:0[static-libs(+)] )
- )
-"
-BDEPEND="
- doc? (
- || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
- app-text/docbook-xml-dtd:4.5
- app-text/xmlto
- )
-"
-
-if [[ ${PV} == 9999 ]]; then
- DEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- if [[ ${PV} == 9999 ]]; then
- AT_M4DIR=m4 eautoreconf
- mkdir config || die
- local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
- [[ -e ${automakedir} ]] || die "Could not locate automake directory"
- ln -s "${automakedir}"/install-sh config/install-sh || die
- ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
- ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- --bindir="${EPREFIX}"/sbin
- $(use_enable convert)
- $(use_enable doc documentation)
- $(use_enable elibc_glibc backtrace)
- $(use_enable python)
- $(use_enable static-libs static)
- $(use_enable zstd)
- --with-convert=ext2$(usex reiserfs ',reiserfs' '')
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- emake V=1 all $(usev static)
-}
-
-src_install() {
- local makeargs=(
- $(usex python install_python '')
- $(usex static install-static '')
- )
- emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
- newbashcomp btrfs-completion btrfs
- use python && python_optimize
-
- # install prebuilt subset of manuals
- use doc || doman Documentation/*.[58]
-}
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch
deleted file mode 100644
index b91b3204085..00000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix build failure on big-endian platforms.
-
-Reported-by: ernsteiswuerfel
-Bug: https://bugs.gentoo.org/670741
---- a/kernel-lib/bitops.h
-+++ b/kernel-lib/bitops.h
-@@ -180,5 +180,5 @@ static inline unsigned long ext2_swab(const unsigned long y)
- #if BITS_PER_LONG == 64
-- return (unsigned long) bswap64((u64) y);
-+ return (unsigned long) bswap_64((u64) y);
- #elif BITS_PER_LONG == 32
-- return (unsigned long) bswap32((u32) y);
-+ return (unsigned long) bswap_32((u32) y);
- #else
-@@ -220,3 +220,3 @@ static inline unsigned long _find_next_bit_le(const unsigned long *addr1,
-
--unsigned long find_next_zero_bit_le(const void *addr, unsigned long size,
-+static inline unsigned long find_next_zero_bit_le(const void *addr, unsigned long size,
- unsigned long offset)
-@@ -227,3 +227,3 @@ unsigned long find_next_zero_bit_le(const void *addr, unsigned long size,
-
--unsigned long find_next_bit_le(const void *addr, unsigned long size,
-+static inline unsigned long find_next_bit_le(const void *addr, unsigned long size,
- unsigned long offset)
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/, sys-fs/btrfs-progs/files/
@ 2021-12-31 2:50 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2021-12-31 2:50 UTC (permalink / raw
To: gentoo-commits
commit: c1e70e74d97b9cccca55f9f8321f81916d0d1870
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 31 02:49:26 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 31 02:50:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e70e74
sys-fs/btrfs-progs: drop unnecessary musl patch
Adjusted linux-headers patch instead.
Bug: https://bugs.gentoo.org/830277
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild | 4 ---
.../files/5.15-musl-const.h-include.patch | 34 ----------------------
2 files changed, 38 deletions(-)
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
index 01b66383b662..64cc91680915 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
@@ -79,10 +79,6 @@ fi
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-PATCHES=(
- "${FILESDIR}"/5.15-musl-const.h-include.patch
-)
-
pkg_setup() {
use python && python-single-r1_pkg_setup
}
diff --git a/sys-fs/btrfs-progs/files/5.15-musl-const.h-include.patch b/sys-fs/btrfs-progs/files/5.15-musl-const.h-include.patch
deleted file mode 100644
index a9156ade4b79..000000000000
--- a/sys-fs/btrfs-progs/files/5.15-musl-const.h-include.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://cgit.openembedded.org/openembedded-core/plain/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch?id=fd8989db25c674ca65389a2d41bf5b447e8794be
-
-From: Bruce Ashfield <bruce.ashfield@gmail.com>
-Date: Fri, 18 Jun 2021 11:10:36 -0400
-Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+
- headers
-
-btrfs-tools compile fails with mips, musl and 5.12+ headers.
-
-The definition of __ALIGN_KERNEL has moved in 5.12+ kernels, so we
-add an explicit include of const.h to pickup the macro:
-
- | make: *** [Makefile:595: mkfs.btrfs] Error 1
- | make: *** Waiting for unfinished jobs....
- | libbtrfs.a(volumes.o): in function `dev_extent_search_start':
- | /usr/src/debug/btrfs-tools/5.12.1-r0/git/kernel-shared/volumes.c:464: undefined reference to `__ALIGN_KERNEL'
- | collect2: error: ld returned 1 exit status
-
-This is safe for older kernel's as well, since the header still
-exists, and is valid to include.
-
-Upstream-status: OE Specific [mips64 + musl + libc-headers]
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---- a/kerncompat.h
-+++ b/kerncompat.h
-@@ -30,6 +30,7 @@
- #include <linux/types.h>
- #include <linux/kernel.h>
- #include <stdint.h>
-+#include <linux/const.h>
-
- #include <features.h>
-
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/, sys-fs/btrfs-progs/files/
@ 2023-01-05 0:28 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-01-05 0:28 UTC (permalink / raw
To: gentoo-commits
commit: 205c9c405c1182613231e3564c678fb4855ac308
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 5 00:27:31 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 5 00:27:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=205c9c40
sys-fs/btrfs-progs: fix installed headers
Closes: https://bugs.gentoo.org/888579
Closes: https://bugs.gentoo.org/889694
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/btrfs-progs/btrfs-progs-6.1.1-r1.ebuild | 154 +++++++++++++++++++++
.../files/btrfs-progs-6.1.1-ioctl-fix.patch | 87 ++++++++++++
2 files changed, 241 insertions(+)
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.1.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.1.1-r1.ebuild
new file mode 100644
index 000000000000..e9f08a83a90e
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.1.1-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 2008-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 python-single-r1 udev
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+ MY_PV="v${PV/_/-}"
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ fi
+
+ S="${WORKDIR}"/${PN}-${MY_PV}
+else
+ EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
+ EGIT_BRANCH="devel"
+ WANT_LIBTOOL="none"
+ inherit autotools git-r3
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert python +man reiserfs static static-libs udev +zstd"
+# Could support it with just !systemd => eudev, see mdadm, but let's
+# see if someone asks for it first.
+REQUIRED_USE="static? ( !udev )"
+
+# Tries to mount repaired filesystems
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/lzo:2=
+ sys-apps/util-linux:=[static-libs(+)?]
+ sys-libs/zlib:=
+ convert? (
+ sys-fs/e2fsprogs:=
+ reiserfs? (
+ >=sys-fs/reiserfsprogs-3.6.27
+ )
+ )
+ python? ( ${PYTHON_DEPS} )
+ udev? ( virtual/libudev:= )
+ zstd? ( app-arch/zstd:= )
+"
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-5.10
+ convert? ( sys-apps/acl )
+ python? (
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')
+ )
+ static? (
+ dev-libs/lzo:2[static-libs(+)]
+ sys-apps/util-linux:0[static-libs(+)]
+ sys-libs/zlib:0[static-libs(+)]
+ convert? (
+ sys-fs/e2fsprogs[static-libs(+)]
+ reiserfs? (
+ >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
+ )
+ )
+ zstd? ( app-arch/zstd[static-libs(+)] )
+ )
+"
+BDEPEND="virtual/pkgconfig
+ man? ( dev-python/sphinx )"
+
+if [[ ${PV} == 9999 ]]; then
+ BDEPEND+=" sys-devel/gnuconfig"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-ioctl-fix.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == 9999 ]]; then
+ AT_M4DIR="m4" eautoreconf
+
+ mkdir config || die
+ local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+ [[ -e ${automakedir} ]] || die "Could not locate automake directory"
+
+ ln -s "${automakedir}"/install-sh config/install-sh || die
+ ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
+ ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ --bindir="${EPREFIX}"/sbin
+
+ --enable-lzo
+ --disable-experimental
+ $(use_enable convert)
+ $(use_enable man documentation)
+ $(use_enable elibc_glibc backtrace)
+ $(use_enable python)
+ $(use_enable static-libs static)
+ $(use_enable udev libudev)
+ $(use_enable zstd)
+
+ # Could support libgcrypt, libsodium, libkcapi
+ --with-crypto=builtin
+ --with-convert=ext2$(usex reiserfs ',reiserfs' '')
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ emake V=1 all $(usev static)
+}
+
+src_install() {
+ local makeargs=(
+ $(usex python install_python '')
+ $(usex static install-static '')
+ )
+
+ emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+
+ newbashcomp btrfs-completion btrfs
+
+ use python && python_optimize
+}
+
+pkg_postinst() {
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-6.1.1-ioctl-fix.patch b/sys-fs/btrfs-progs/files/btrfs-progs-6.1.1-ioctl-fix.patch
new file mode 100644
index 000000000000..d8149b6220ef
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-6.1.1-ioctl-fix.patch
@@ -0,0 +1,87 @@
+https://bugs.gentoo.org/888579
+https://bugs.gentoo.org/889694
+https://github.com/kdave/btrfs-progs/issues/566
+https://github.com/kdave/btrfs-progs/commit/27bb4f6819df6ad7771e089e1fd3f1bd1163e437
+
+From 27bb4f6819df6ad7771e089e1fd3f1bd1163e437 Mon Sep 17 00:00:00 2001
+From: David Sterba <dsterba@suse.com>
+Date: Wed, 4 Jan 2023 16:34:51 +0100
+Subject: [PATCH] btrfs-progs: libbtrfs: revert to v6.0.2 ioctl.h
+
+The file ioctl.h has been copied to libbtrfs in 5fc1d0cd64ee
+("btrfs-progs: copy ioctl.h into libbtrfs") but that was after changes
+to the btrfs_qgroup_limit in 03451430de7c ("btrfs-progs: rename qgroup
+items to match the kernel naming scheme"). This caused build breakage
+but hasn't been fixed in v6.1.1.
+
+Revert the contents of libbtrfs/ioctl.h to be completely just v6.0.2
+though the other changes may not be needed, it's the version we know
+works.
+
+Issue: #566
+Signed-off-by: David Sterba <dsterba@suse.com>
+--- a/libbtrfs/ioctl.h
++++ b/libbtrfs/ioctl.h
+@@ -71,10 +71,10 @@ BUILD_ASSERT(sizeof(struct btrfs_ioctl_vol_args) == 4096);
+
+ struct btrfs_qgroup_limit {
+ __u64 flags;
+- __u64 max_rfer;
+- __u64 max_excl;
+- __u64 rsv_rfer;
+- __u64 rsv_excl;
++ __u64 max_referenced;
++ __u64 max_exclusive;
++ __u64 rsv_referenced;
++ __u64 rsv_exclusive;
+ };
+ BUILD_ASSERT(sizeof(struct btrfs_qgroup_limit) == 40);
+
+@@ -192,6 +192,7 @@ BUILD_ASSERT(sizeof(struct btrfs_ioctl_dev_replace_status_params) == 48);
+ #define BTRFS_IOCTL_DEV_REPLACE_CMD_START 0
+ #define BTRFS_IOCTL_DEV_REPLACE_CMD_STATUS 1
+ #define BTRFS_IOCTL_DEV_REPLACE_CMD_CANCEL 2
++#define BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_RESULT -1
+ #define BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR 0
+ #define BTRFS_IOCTL_DEV_REPLACE_RESULT_NOT_STARTED 1
+ #define BTRFS_IOCTL_DEV_REPLACE_RESULT_ALREADY_STARTED 2
+@@ -934,6 +935,38 @@ enum btrfs_err_code {
+ BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET,
+ };
+
++/* An error code to error string mapping for the kernel
++* error codes
++*/
++static inline char *btrfs_err_str(enum btrfs_err_code err_code)
++{
++ switch (err_code) {
++ case BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET:
++ return "unable to go below two devices on raid1";
++ case BTRFS_ERROR_DEV_RAID1C3_MIN_NOT_MET:
++ return "unable to go below three devices on raid1c3";
++ case BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET:
++ return "unable to go below four devices on raid1c4";
++ case BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET:
++ return "unable to go below four/two devices on raid10";
++ case BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET:
++ return "unable to go below two devices on raid5";
++ case BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET:
++ return "unable to go below three devices on raid6";
++ case BTRFS_ERROR_DEV_TGT_REPLACE:
++ return "unable to remove the dev_replace target dev";
++ case BTRFS_ERROR_DEV_MISSING_NOT_FOUND:
++ return "no missing devices found to remove";
++ case BTRFS_ERROR_DEV_ONLY_WRITABLE:
++ return "unable to remove the only writeable device";
++ case BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS:
++ return "add/delete/balance/replace/resize operation "
++ "in progress";
++ default:
++ return NULL;
++ }
++}
++
+ #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \
+ struct btrfs_ioctl_vol_args)
+ #define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, \
+
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/, sys-fs/btrfs-progs/files/
@ 2023-05-05 7:04 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-05-05 7:04 UTC (permalink / raw
To: gentoo-commits
commit: 31b1d615b09499b60cbe6bc4394445d787d1ddfa
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 5 07:03:37 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 5 07:04:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31b1d615
sys-fs/btrfs-progs: drop 5.15.1, 6.0.2, 6.1.1-r1, 6.1.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/btrfs-progs/Manifest | 4 -
sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild | 135 ------------------
sys-fs/btrfs-progs/btrfs-progs-6.0.2.ebuild | 150 --------------------
sys-fs/btrfs-progs/btrfs-progs-6.1.1-r1.ebuild | 154 ---------------------
sys-fs/btrfs-progs/btrfs-progs-6.1.2.ebuild | 150 --------------------
.../files/btrfs-progs-5.18.1-glibc-2.36.patch | 31 -----
.../files/btrfs-progs-6.1.1-ioctl-fix.patch | 87 ------------
7 files changed, 711 deletions(-)
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 5bd52a6b3751..af38496978d4 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,7 +1,3 @@
-DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549
-DIST btrfs-progs-v6.0.2.tar.xz 2321220 BLAKE2B 391bd9dcc7ae2d40c339eb9b7fb466624c3f122149af640bc0ca73abfc85ca7bd076976d47ce2d4eab64fb3b9b1309e3446acdd78ba77e5cb583b939710f8b6c SHA512 8e01fa6e3373d95a8e8577003ceb94722e4dfdf24110bfea79191a9862daf5e6580d72e898fdea134b5e86beeda32948eed572072f7906226189c6f1ac8615e3
-DIST btrfs-progs-v6.1.1.tar.xz 2329864 BLAKE2B f3f15829af88f83cdabca30b61dd0e53fc0913615028eac9501204adec5a5beb8654b037617a73bac96c901835a83e8c08d478b8b496518512fea3714e604cfc SHA512 996045bebc441eba269eb5159d6d13c7b1471ba88039389ef221f57d03c535647a5716e23e7a17a20efb4012003f58b4b768f66af633abbdc1fe481192ca1ace
-DIST btrfs-progs-v6.1.2.tar.xz 2329940 BLAKE2B d2c86b0077e0269353ac70d948b948dd2984beec0e4225529adb0099a9cfe5d778a893bedc822168141ce29679f66500e32bdf3af8973bef5696657685ebf712 SHA512 0b02502f9f0902b7db04817fcfbaa4f6155035d47dd908c4c1faa86e4677e302d069756bb0935db7c88f0859c0f9ef87975b2777be7ad7f4d2389d2e95c1ff82
DIST btrfs-progs-v6.1.3.tar.xz 2333984 BLAKE2B 71543f5be282a289fbc92f78b89b25e4162c3cbd2d3cf2e8564791f86c6f933f61c03ba93aeca029689be6284988ff35a47f25a6523f15be47f3e7ce9b5c0c4b SHA512 7c40d8bc3fcef0b2a7bf4be7d52923015b5b11c3f14bfc550ffa95a47d673f640b7deb840fee22fb7cc2743b6098fb12b5caea586fbf0972a1bc9a7606f3f375
DIST btrfs-progs-v6.2.1.tar.xz 2415064 BLAKE2B 8ea7d9815e34c569dd82e53dc1f982c820265521708c7c41dc587646362b300edf938e940b52508e301874269ea5ebb96605f4a1046d096678257463ced53b03 SHA512 2a485d8c8b3091af27e91751cabe61306388526de3c1c51543708888ddee1bb26ebfe70c3b4cd6686b173d313c98c30168fee18723dadc7b4c00e10c502da169
DIST btrfs-progs-v6.2.2.tar.xz 2437300 BLAKE2B b3d0de668baf771ff08c59d20407525be841b06747b771efc013b0c2d1d24ed03caf472b7c9b03499f60140f6f84e2edbcb690cba503a7eb8037af038de79d52 SHA512 967e1c1a6b956a4e11a794aad090d1cf370fd98e4186525ccfbbbc9ae3f2bb66ace1d684730f93c558403b7ac1c991aec3d04d07548b19ee1516352a069431db
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
deleted file mode 100644
index c0b46407d1c2..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 2008-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit bash-completion-r1 python-single-r1 udev
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
- MY_PV="v${PV/_/-}"
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
- SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
- S="${WORKDIR}/${PN}-${MY_PV}"
-else
- WANT_LIBTOOL=none
- inherit autotools git-r3
- EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
- EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert doc python reiserfs static static-libs +zstd"
-
-RESTRICT="test" # tries to mount repaired filesystems
-
-RDEPEND="
- dev-libs/lzo:2=
- sys-apps/util-linux:0=[static-libs(+)?]
- sys-libs/zlib:0=
- convert? (
- sys-fs/e2fsprogs:=
- reiserfs? (
- >=sys-fs/reiserfsprogs-3.6.27
- )
- )
- python? ( ${PYTHON_DEPS} )
- zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-5.10
- convert? ( sys-apps/acl )
- python? (
- $(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')
- )
- static? (
- dev-libs/lzo:2[static-libs(+)]
- sys-apps/util-linux:0[static-libs(+)]
- sys-libs/zlib:0[static-libs(+)]
- convert? (
- sys-fs/e2fsprogs[static-libs(+)]
- reiserfs? (
- >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
- )
- )
- zstd? ( app-arch/zstd:0[static-libs(+)] )
- )
-"
-BDEPEND="
- doc? (
- || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
- app-text/docbook-xml-dtd:4.5
- app-text/xmlto
- )
-"
-
-if [[ ${PV} == 9999 ]]; then
- BDEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/btrfs-progs-5.18.1-glibc-2.36.patch"
- )
- default
- if [[ ${PV} == 9999 ]]; then
- AT_M4DIR=m4 eautoreconf
- mkdir config || die
- local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
- [[ -e ${automakedir} ]] || die "Could not locate automake directory"
- ln -s "${automakedir}"/install-sh config/install-sh || die
- ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
- ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- --bindir="${EPREFIX}"/sbin
- $(use_enable convert)
- $(use_enable doc documentation)
- $(use_enable elibc_glibc backtrace)
- $(use_enable python)
- $(use_enable static-libs static)
- $(use_enable zstd)
- --with-convert=ext2$(usex reiserfs ',reiserfs' '')
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- emake V=1 all $(usev static)
-}
-
-src_install() {
- local makeargs=(
- $(usex python install_python '')
- $(usex static install-static '')
- )
- emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
- newbashcomp btrfs-completion btrfs
- use python && python_optimize
-
- # install prebuilt subset of manuals
- use doc || doman Documentation/*.[58]
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.0.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.0.2.ebuild
deleted file mode 100644
index 3e995e27b35a..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.0.2.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2008-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit bash-completion-r1 python-single-r1 udev
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
- MY_PV="v${PV/_/-}"
- SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-
- if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
- fi
-
- S="${WORKDIR}"/${PN}-${MY_PV}
-else
- EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
- EGIT_BRANCH="devel"
- WANT_LIBTOOL="none"
- inherit autotools git-r3
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python +man reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev )"
-
-# Tries to mount repaired filesystems
-RESTRICT="test"
-
-RDEPEND="
- dev-libs/lzo:2=
- sys-apps/util-linux:=[static-libs(+)?]
- sys-libs/zlib:=
- convert? (
- sys-fs/e2fsprogs:=
- reiserfs? (
- >=sys-fs/reiserfsprogs-3.6.27
- )
- )
- python? ( ${PYTHON_DEPS} )
- udev? ( virtual/libudev:= )
- zstd? ( app-arch/zstd:= )
-"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-5.10
- convert? ( sys-apps/acl )
- python? (
- $(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')
- )
- static? (
- dev-libs/lzo:2[static-libs(+)]
- sys-apps/util-linux:0[static-libs(+)]
- sys-libs/zlib:0[static-libs(+)]
- convert? (
- sys-fs/e2fsprogs[static-libs(+)]
- reiserfs? (
- >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
- )
- )
- zstd? ( app-arch/zstd[static-libs(+)] )
- )
-"
-BDEPEND="virtual/pkgconfig
- man? ( dev-python/sphinx )"
-
-if [[ ${PV} == 9999 ]]; then
- BDEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- if [[ ${PV} == 9999 ]]; then
- AT_M4DIR="m4" eautoreconf
-
- mkdir config || die
- local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
- [[ -e ${automakedir} ]] || die "Could not locate automake directory"
-
- ln -s "${automakedir}"/install-sh config/install-sh || die
- ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
- ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- --bindir="${EPREFIX}"/sbin
-
- --enable-lzo
- --disable-experimental
- $(use_enable convert)
- $(use_enable man documentation)
- $(use_enable elibc_glibc backtrace)
- $(use_enable python)
- $(use_enable static-libs static)
- $(use_enable udev libudev)
- $(use_enable zstd)
-
- # Could support libgcrypt, libsodium, libkcapi
- --with-crypto=builtin
- --with-convert=ext2$(usex reiserfs ',reiserfs' '')
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- emake V=1 all $(usev static)
-}
-
-src_install() {
- local makeargs=(
- $(usex python install_python '')
- $(usex static install-static '')
- )
-
- emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-
- newbashcomp btrfs-completion btrfs
-
- use python && python_optimize
-}
-
-pkg_postinst() {
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.1.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.1.1-r1.ebuild
deleted file mode 100644
index 214f572bea44..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.1.1-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 2008-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit bash-completion-r1 python-single-r1 udev
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
- MY_PV="v${PV/_/-}"
- SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-
- if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
- fi
-
- S="${WORKDIR}"/${PN}-${MY_PV}
-else
- EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
- EGIT_BRANCH="devel"
- WANT_LIBTOOL="none"
- inherit autotools git-r3
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python +man reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev )"
-
-# Tries to mount repaired filesystems
-RESTRICT="test"
-
-RDEPEND="
- dev-libs/lzo:2=
- sys-apps/util-linux:=[static-libs(+)?]
- sys-libs/zlib:=
- convert? (
- sys-fs/e2fsprogs:=
- reiserfs? (
- >=sys-fs/reiserfsprogs-3.6.27
- )
- )
- python? ( ${PYTHON_DEPS} )
- udev? ( virtual/libudev:= )
- zstd? ( app-arch/zstd:= )
-"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-5.10
- convert? ( sys-apps/acl )
- python? (
- $(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')
- )
- static? (
- dev-libs/lzo:2[static-libs(+)]
- sys-apps/util-linux:0[static-libs(+)]
- sys-libs/zlib:0[static-libs(+)]
- convert? (
- sys-fs/e2fsprogs[static-libs(+)]
- reiserfs? (
- >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
- )
- )
- zstd? ( app-arch/zstd[static-libs(+)] )
- )
-"
-BDEPEND="virtual/pkgconfig
- man? ( dev-python/sphinx )"
-
-if [[ ${PV} == 9999 ]]; then
- BDEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-ioctl-fix.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- if [[ ${PV} == 9999 ]]; then
- AT_M4DIR="m4" eautoreconf
-
- mkdir config || die
- local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
- [[ -e ${automakedir} ]] || die "Could not locate automake directory"
-
- ln -s "${automakedir}"/install-sh config/install-sh || die
- ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
- ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- --bindir="${EPREFIX}"/sbin
-
- --enable-lzo
- --disable-experimental
- $(use_enable convert)
- $(use_enable man documentation)
- $(use_enable elibc_glibc backtrace)
- $(use_enable python)
- $(use_enable static-libs static)
- $(use_enable udev libudev)
- $(use_enable zstd)
-
- # Could support libgcrypt, libsodium, libkcapi
- --with-crypto=builtin
- --with-convert=ext2$(usex reiserfs ',reiserfs' '')
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- emake V=1 all $(usev static)
-}
-
-src_install() {
- local makeargs=(
- $(usex python install_python '')
- $(usex static install-static '')
- )
-
- emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-
- newbashcomp btrfs-completion btrfs
-
- use python && python_optimize
-}
-
-pkg_postinst() {
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.1.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.1.2.ebuild
deleted file mode 100644
index 3e995e27b35a..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.1.2.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2008-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit bash-completion-r1 python-single-r1 udev
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
- MY_PV="v${PV/_/-}"
- SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-
- if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
- fi
-
- S="${WORKDIR}"/${PN}-${MY_PV}
-else
- EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
- EGIT_BRANCH="devel"
- WANT_LIBTOOL="none"
- inherit autotools git-r3
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python +man reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev )"
-
-# Tries to mount repaired filesystems
-RESTRICT="test"
-
-RDEPEND="
- dev-libs/lzo:2=
- sys-apps/util-linux:=[static-libs(+)?]
- sys-libs/zlib:=
- convert? (
- sys-fs/e2fsprogs:=
- reiserfs? (
- >=sys-fs/reiserfsprogs-3.6.27
- )
- )
- python? ( ${PYTHON_DEPS} )
- udev? ( virtual/libudev:= )
- zstd? ( app-arch/zstd:= )
-"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-5.10
- convert? ( sys-apps/acl )
- python? (
- $(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')
- )
- static? (
- dev-libs/lzo:2[static-libs(+)]
- sys-apps/util-linux:0[static-libs(+)]
- sys-libs/zlib:0[static-libs(+)]
- convert? (
- sys-fs/e2fsprogs[static-libs(+)]
- reiserfs? (
- >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
- )
- )
- zstd? ( app-arch/zstd[static-libs(+)] )
- )
-"
-BDEPEND="virtual/pkgconfig
- man? ( dev-python/sphinx )"
-
-if [[ ${PV} == 9999 ]]; then
- BDEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- if [[ ${PV} == 9999 ]]; then
- AT_M4DIR="m4" eautoreconf
-
- mkdir config || die
- local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
- [[ -e ${automakedir} ]] || die "Could not locate automake directory"
-
- ln -s "${automakedir}"/install-sh config/install-sh || die
- ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
- ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- --bindir="${EPREFIX}"/sbin
-
- --enable-lzo
- --disable-experimental
- $(use_enable convert)
- $(use_enable man documentation)
- $(use_enable elibc_glibc backtrace)
- $(use_enable python)
- $(use_enable static-libs static)
- $(use_enable udev libudev)
- $(use_enable zstd)
-
- # Could support libgcrypt, libsodium, libkcapi
- --with-crypto=builtin
- --with-convert=ext2$(usex reiserfs ',reiserfs' '')
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- emake V=1 all $(usev static)
-}
-
-src_install() {
- local makeargs=(
- $(usex python install_python '')
- $(usex static install-static '')
- )
-
- emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-
- newbashcomp btrfs-completion btrfs
-
- use python && python_optimize
-}
-
-pkg_postinst() {
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-5.18.1-glibc-2.36.patch b/sys-fs/btrfs-progs/files/btrfs-progs-5.18.1-glibc-2.36.patch
deleted file mode 100644
index 52671ea6c357..000000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-5.18.1-glibc-2.36.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/kdave/btrfs-progs/commit/46eb32a019834b0a49ae9744db1a921aaa6a3d63
-
-From 46eb32a019834b0a49ae9744db1a921aaa6a3d63 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 25 Jul 2022 11:58:35 -0700
-Subject: [PATCH] btrfs-progs: use linux mount.h instead of sys/mount.h
-
-This file includes linux/fs.h which includes linux/mount.h and with
-glibc 2.36 linux/mount.h and glibc mount.h are not compatible [1]
-therefore try to avoid including both headers
-
-[1] https://sourceware.org/glibc/wiki/Release/2.36
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- common/device-utils.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/common/device-utils.c b/common/device-utils.c
-index 617b67462..25a4fb8c4 100644
---- a/common/device-utils.c
-+++ b/common/device-utils.c
-@@ -15,7 +15,6 @@
- */
-
- #include <sys/ioctl.h>
--#include <sys/mount.h>
- #include <sys/statfs.h>
- #include <sys/types.h>
- #include <stdio.h>
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-6.1.1-ioctl-fix.patch b/sys-fs/btrfs-progs/files/btrfs-progs-6.1.1-ioctl-fix.patch
deleted file mode 100644
index d8149b6220ef..000000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-6.1.1-ioctl-fix.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-https://bugs.gentoo.org/888579
-https://bugs.gentoo.org/889694
-https://github.com/kdave/btrfs-progs/issues/566
-https://github.com/kdave/btrfs-progs/commit/27bb4f6819df6ad7771e089e1fd3f1bd1163e437
-
-From 27bb4f6819df6ad7771e089e1fd3f1bd1163e437 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Wed, 4 Jan 2023 16:34:51 +0100
-Subject: [PATCH] btrfs-progs: libbtrfs: revert to v6.0.2 ioctl.h
-
-The file ioctl.h has been copied to libbtrfs in 5fc1d0cd64ee
-("btrfs-progs: copy ioctl.h into libbtrfs") but that was after changes
-to the btrfs_qgroup_limit in 03451430de7c ("btrfs-progs: rename qgroup
-items to match the kernel naming scheme"). This caused build breakage
-but hasn't been fixed in v6.1.1.
-
-Revert the contents of libbtrfs/ioctl.h to be completely just v6.0.2
-though the other changes may not be needed, it's the version we know
-works.
-
-Issue: #566
-Signed-off-by: David Sterba <dsterba@suse.com>
---- a/libbtrfs/ioctl.h
-+++ b/libbtrfs/ioctl.h
-@@ -71,10 +71,10 @@ BUILD_ASSERT(sizeof(struct btrfs_ioctl_vol_args) == 4096);
-
- struct btrfs_qgroup_limit {
- __u64 flags;
-- __u64 max_rfer;
-- __u64 max_excl;
-- __u64 rsv_rfer;
-- __u64 rsv_excl;
-+ __u64 max_referenced;
-+ __u64 max_exclusive;
-+ __u64 rsv_referenced;
-+ __u64 rsv_exclusive;
- };
- BUILD_ASSERT(sizeof(struct btrfs_qgroup_limit) == 40);
-
-@@ -192,6 +192,7 @@ BUILD_ASSERT(sizeof(struct btrfs_ioctl_dev_replace_status_params) == 48);
- #define BTRFS_IOCTL_DEV_REPLACE_CMD_START 0
- #define BTRFS_IOCTL_DEV_REPLACE_CMD_STATUS 1
- #define BTRFS_IOCTL_DEV_REPLACE_CMD_CANCEL 2
-+#define BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_RESULT -1
- #define BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR 0
- #define BTRFS_IOCTL_DEV_REPLACE_RESULT_NOT_STARTED 1
- #define BTRFS_IOCTL_DEV_REPLACE_RESULT_ALREADY_STARTED 2
-@@ -934,6 +935,38 @@ enum btrfs_err_code {
- BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET,
- };
-
-+/* An error code to error string mapping for the kernel
-+* error codes
-+*/
-+static inline char *btrfs_err_str(enum btrfs_err_code err_code)
-+{
-+ switch (err_code) {
-+ case BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET:
-+ return "unable to go below two devices on raid1";
-+ case BTRFS_ERROR_DEV_RAID1C3_MIN_NOT_MET:
-+ return "unable to go below three devices on raid1c3";
-+ case BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET:
-+ return "unable to go below four devices on raid1c4";
-+ case BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET:
-+ return "unable to go below four/two devices on raid10";
-+ case BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET:
-+ return "unable to go below two devices on raid5";
-+ case BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET:
-+ return "unable to go below three devices on raid6";
-+ case BTRFS_ERROR_DEV_TGT_REPLACE:
-+ return "unable to remove the dev_replace target dev";
-+ case BTRFS_ERROR_DEV_MISSING_NOT_FOUND:
-+ return "no missing devices found to remove";
-+ case BTRFS_ERROR_DEV_ONLY_WRITABLE:
-+ return "unable to remove the only writeable device";
-+ case BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS:
-+ return "add/delete/balance/replace/resize operation "
-+ "in progress";
-+ default:
-+ return NULL;
-+ }
-+}
-+
- #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \
- struct btrfs_ioctl_vol_args)
- #define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, \
-
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/, sys-fs/btrfs-progs/files/
@ 2023-09-02 16:21 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-09-02 16:21 UTC (permalink / raw
To: gentoo-commits
commit: d9348359b2180d3a08f7f0e15ee5b702213dd0ab
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 2 16:21:00 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 2 16:21:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9348359
sys-fs/btrfs-progs: add 6.5
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/btrfs-progs/Manifest | 1 +
sys-fs/btrfs-progs/btrfs-progs-6.5.ebuild | 167 +++++++++++++++++++++
...6.5-avoid-textrel-crc32c-pcl-intel-asm_64.patch | 44 ++++++
3 files changed, 212 insertions(+)
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index daec932d880d..9a38f44eb96a 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,3 +1,4 @@
DIST btrfs-progs-v6.3.1.tar.xz 3155540 BLAKE2B 5f8ec51f11d705bb4ada2e000143933484bae2f3a5dedb5c1abac37950de44fa0fa762cc09012ca6702b96591264027b28c17392303db414a5651657cb086c7c SHA512 a567a02f565a44dd06f54b3fd03187d259235eedf8033457368add217c87b2304e8c80ca5e2a35bdffc14e43b6889361183c6dcd5e2f4ad6fe7bfc5eb4127e65
DIST btrfs-progs-v6.3.2.tar.xz 3160148 BLAKE2B e6815eeb90c1dbf9a6c4a5aa72262c18b2031a9305efc9024b1fe7b770a256e1d4cb3b01646a0a523f0e26af2d499382bf42420385c56593ace515a6c225f54d SHA512 d8580250994b3e399babec4478515686f1e3cc2e4fc01ccbc7b00a51b6131452d209cb7f43dbbac5375286546d182fcdf7884bbc1a8ad6889c3f15d85ba8f8d5
DIST btrfs-progs-v6.3.3.tar.xz 3163112 BLAKE2B 76714da94e1cd733df4198b736c31b32d4cfb6779985036610651a267fcf92299c140f99f2372278cafcb02f651413c069314195b7bd44d56ddf60eb60e5532d SHA512 e72791fd91cc9a93aaab72bf8c36f9d7e2608315ccb3b0474ca0c1e1893465b2c7145ce523216accb0d02c4dd0fd13597702ce6a8b9c2ac137cd9bce3c5a4347
+DIST btrfs-progs-v6.5.tar.xz 3178048 BLAKE2B 502d8cebab1d35d8d69eb76212476e323d9f19a9d32eb304acaeb1fc27bfff3ca801fcebc4c19ce7db16ed0114b3c794814157075872c2fd1d8b1d32d740e346 SHA512 7e1578b1f82549f77b55341c20a973da52018b1539da46f92e4a9d9804906ce5e00312c8a02a6047373e4435e661b2e5fc18f5dfbf2d0563cdf62c40de6a4436
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.5.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.5.ebuild
new file mode 100644
index 000000000000..483d5e5b5feb
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.5.ebuild
@@ -0,0 +1,167 @@
+# Copyright 2008-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit bash-completion-r1 python-single-r1 udev
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+ MY_PV="v${PV/_/-}"
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ fi
+
+ S="${WORKDIR}"/${PN}-${MY_PV}
+else
+ EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
+ EGIT_BRANCH="devel"
+ WANT_LIBTOOL="none"
+ inherit autotools git-r3
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert python +man reiserfs static static-libs udev +zstd"
+# Could support it with just !systemd => eudev, see mdadm, but let's
+# see if someone asks for it first.
+REQUIRED_USE="static? ( !udev )"
+
+# Tries to mount repaired filesystems
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/lzo:2=
+ sys-apps/util-linux:=[static-libs(+)?]
+ sys-libs/zlib:=
+ convert? (
+ sys-fs/e2fsprogs:=
+ reiserfs? (
+ >=sys-fs/reiserfsprogs-3.6.27
+ )
+ )
+ python? ( ${PYTHON_DEPS} )
+ udev? ( virtual/libudev:= )
+ zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+ ${RDEPEND}
+ >=sys-kernel/linux-headers-5.10
+ convert? ( sys-apps/acl )
+ python? (
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')
+ )
+ static? (
+ dev-libs/lzo:2[static-libs(+)]
+ sys-apps/util-linux:0[static-libs(+)]
+ sys-libs/zlib:0[static-libs(+)]
+ convert? (
+ sys-fs/e2fsprogs[static-libs(+)]
+ reiserfs? (
+ >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
+ )
+ )
+ zstd? ( app-arch/zstd[static-libs(+)] )
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+ man? ( dev-python/sphinx )
+"
+
+if [[ ${PV} == 9999 ]]; then
+ BDEPEND+=" sys-devel/gnuconfig"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.5-avoid-textrel-crc32c-pcl-intel-asm_64.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == 9999 ]]; then
+ AT_M4DIR="m4" eautoreconf
+
+ mkdir config || die
+ local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+ [[ -e ${automakedir} ]] || die "Could not locate automake directory"
+
+ ln -s "${automakedir}"/install-sh config/install-sh || die
+ ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
+ ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ --bindir="${EPREFIX}"/sbin
+
+ --enable-lzo
+ --disable-experimental
+ $(use_enable convert)
+ $(use_enable man documentation)
+ $(use_enable elibc_glibc backtrace)
+ $(use_enable python)
+ $(use_enable static-libs static)
+ $(use_enable udev libudev)
+ $(use_enable zstd)
+
+ # Could support libgcrypt, libsodium, libkcapi
+ --with-crypto=builtin
+ --with-convert=ext2$(usex reiserfs ',reiserfs' '')
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ emake V=1 all $(usev static)
+}
+
+src_test() {
+ emake -j1 -C tests V=1 test
+
+ if use python ; then
+ cd libbtrfsutil/python || die
+
+ local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}"
+ ${EPYTHON} -m unittest tests/test_*.py || die "Tests failed with ${EPYTHON}"
+ fi
+}
+
+src_install() {
+ local makeargs=(
+ $(usev python install_python)
+ $(usev static install-static)
+ )
+
+ emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+
+ newbashcomp btrfs-completion btrfs
+
+ use python && python_optimize
+}
+
+pkg_postinst() {
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-6.5-avoid-textrel-crc32c-pcl-intel-asm_64.patch b/sys-fs/btrfs-progs/files/btrfs-progs-6.5-avoid-textrel-crc32c-pcl-intel-asm_64.patch
new file mode 100644
index 000000000000..40a9bbeff8f6
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-6.5-avoid-textrel-crc32c-pcl-intel-asm_64.patch
@@ -0,0 +1,44 @@
+See https://github.com/kdave/btrfs-progs/commit/992be8b50a65974e52a484911e72bc5a5e1b412c.
+
+With binutils-2.41[hardened], one gets:
+```
+/usr/lib/gcc/x86_64-pc-linux-gnu/13/../../../../x86_64-pc-linux-gnu/bin/ld: crypto/crc32c-pcl-intel-asm_64.o: warning: relocation in read-only section `.rodata'
+/usr/lib/gcc/x86_64-pc-linux-gnu/13/../../../../x86_64-pc-linux-gnu/bin/ld: read-only segment has dynamic relocations
+collect2: error: ld returned 1 exit status
+make: *** [Makefile:660: btrfs-map-logical] Error 1
+```
+
+But it's a textrel and a warning anyway even without hardened.
+
+Disable it for now until it gets fixed properly upstream.
+--- a/Makefile
++++ b/Makefile
+@@ -387,7 +387,7 @@ endif
+
+ ifeq ($(TARGET_CPU),x86_64)
+ # FIXME: linkage is broken on musl for some reason
+-ifeq ($(HAVE_GLIBC),1)
++ifeq (0,1)
+ CRYPTO_OBJECTS += crypto/crc32c-pcl-intel-asm_64.o
+ ASFLAGS += -fPIC
+ endif
+--- a/crypto/crc32c.c
++++ b/crypto/crc32c.c
+@@ -18,7 +18,7 @@ static uint32_t (*crc_function)(uint32_t crc, unsigned char const *data, uint32_
+
+ #ifdef __x86_64__
+
+-#ifdef __GLIBC__
++#if 0
+
+ /* asmlinkage */ unsigned int crc_pcl(const unsigned char *buffer, int len, unsigned int crc_init);
+ static unsigned int crc32c_pcl(uint32_t crc, unsigned char const *data, uint32_t len) {
+@@ -95,7 +95,7 @@ void crc32c_init_accel(void)
+ * now.
+ */
+ if (0) {
+-#ifdef __GLIBC__
++#if 0
+ } else if (cpu_has_feature(CPU_FLAG_SSE42)) {
+ /* printf("CRC32C: pcl\n"); */
+ crc_function = crc32c_pcl;
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/, sys-fs/btrfs-progs/files/
@ 2023-11-05 20:37 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-11-05 20:37 UTC (permalink / raw
To: gentoo-commits
commit: 0857fb0eb7f899970b8bcd787e521e351c1502af
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 5 20:37:17 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 5 20:37:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0857fb0e
sys-fs/btrfs-progs: fix bad ioctl definition in 6.6
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/btrfs-progs/btrfs-progs-6.6-r2.ebuild | 167 +++++++++++++++++++++
.../files/btrfs-progs-6.6-fix-ioctl-typo.patch | 32 ++++
2 files changed, 199 insertions(+)
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.6-r2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.6-r2.ebuild
new file mode 100644
index 000000000000..4b34fe4eb69e
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.6-r2.ebuild
@@ -0,0 +1,167 @@
+# Copyright 2008-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit bash-completion-r1 python-single-r1 udev
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+ MY_PV="v${PV/_/-}"
+ # XXX: Drop .respun after 6.6
+ # https://lore.kernel.org/linux-btrfs/20231103201408.GN11264@twin.jikos.cz/T/#u
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz -> ${PN}-${MY_PV}.respun.tar.xz"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ fi
+
+ S="${WORKDIR}"/${PN}-${MY_PV}
+else
+ EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
+ EGIT_BRANCH="devel"
+ WANT_LIBTOOL="none"
+ inherit autotools git-r3
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert python +man reiserfs static static-libs udev +zstd"
+# Could support it with just !systemd => eudev, see mdadm, but let's
+# see if someone asks for it first.
+REQUIRED_USE="static? ( !udev ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Tries to mount repaired filesystems
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/lzo:2=
+ sys-apps/util-linux:=[static-libs(+)?]
+ sys-libs/zlib:=
+ convert? (
+ sys-fs/e2fsprogs:=
+ reiserfs? (
+ >=sys-fs/reiserfsprogs-3.6.27
+ )
+ )
+ python? ( ${PYTHON_DEPS} )
+ udev? ( virtual/libudev:= )
+ zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+ ${RDEPEND}
+ >=sys-kernel/linux-headers-5.10
+ convert? ( sys-apps/acl )
+ python? (
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')
+ )
+ static? (
+ dev-libs/lzo:2[static-libs(+)]
+ sys-apps/util-linux:0[static-libs(+)]
+ sys-libs/zlib:0[static-libs(+)]
+ convert? (
+ sys-fs/e2fsprogs[static-libs(+)]
+ reiserfs? (
+ >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
+ )
+ )
+ zstd? ( app-arch/zstd[static-libs(+)] )
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+ man? ( dev-python/sphinx )
+"
+
+if [[ ${PV} == 9999 ]]; then
+ BDEPEND+=" sys-devel/gnuconfig"
+fi
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.6-fix-ioctl-typo.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == 9999 ]]; then
+ AT_M4DIR="m4" eautoreconf
+
+ mkdir config || die
+ local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+ [[ -e ${automakedir} ]] || die "Could not locate automake directory"
+
+ ln -s "${automakedir}"/install-sh config/install-sh || die
+ ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
+ ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ --bindir="${EPREFIX}"/sbin
+
+ --enable-lzo
+ --disable-experimental
+ $(use_enable convert)
+ $(use_enable man documentation)
+ $(use_enable elibc_glibc backtrace)
+ $(use_enable python)
+ $(use_enable static-libs static)
+ $(use_enable udev libudev)
+ $(use_enable zstd)
+
+ # Could support libgcrypt, libsodium, libkcapi
+ --with-crypto=builtin
+ --with-convert=ext2$(usex reiserfs ',reiserfs' '')
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ emake V=1 all $(usev static)
+}
+
+src_test() {
+ emake -j1 -C tests V=1 test
+
+ if use python ; then
+ cd libbtrfsutil/python || die
+
+ local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}"
+ ${EPYTHON} -m unittest tests/test_*.py || die "Tests failed with ${EPYTHON}"
+ fi
+}
+
+src_install() {
+ local makeargs=(
+ $(usev python install_python)
+ $(usev static install-static)
+ )
+
+ emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+
+ newbashcomp btrfs-completion btrfs
+
+ use python && python_optimize
+}
+
+pkg_postinst() {
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-6.6-fix-ioctl-typo.patch b/sys-fs/btrfs-progs/files/btrfs-progs-6.6-fix-ioctl-typo.patch
new file mode 100644
index 000000000000..a06b6bac6754
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-6.6-fix-ioctl-typo.patch
@@ -0,0 +1,32 @@
+https://github.com/kdave/btrfs-progs/pull/706
+
+From 027a08d659033e3b892760bfd4c19c6db9e9fa3f Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 5 Nov 2023 20:13:07 +0000
+Subject: [PATCH] kernel-shared/uapi/btrfs.h: fix BTRFS_IOC_SCAN_DEV
+
+Without the change `BTRFS_IOC_SCAN_DEV` aliased with `BTRFS_IOC_FORGET_DEV`.
+It's a regression introduced in fcd9142b6 "btrfs-progs: docs: formatting,
+fixups, updates".
+
+It manifests as a sudden device disappearance when device is scanned:
+
+ machine # [ 4.095032] Btrfs loaded, crc32c=crc32c-intel, zoned=no, fsverity=no
+ machine # ERROR: device scan failed on '/dev/vdb': No such file or directory
+ machine # ERROR: device scan failed on '/dev/vdc': No such file or directory
+ (finished: must succeed: mkfs.btrfs -d raid0 /dev/vdb /dev/vdc, in 10.31 seconds)
+
+Reported-by: Atemu <atemu.main@gmail.com>
+Bug: https://github.com/NixOS/nixpkgs/issues/265668
+--- a/kernel-shared/uapi/btrfs.h
++++ b/kernel-shared/uapi/btrfs.h
+@@ -1171,7 +1171,7 @@ enum btrfs_err_code {
+ struct btrfs_ioctl_vol_args)
+ #define BTRFS_IOC_RESIZE _IOW(BTRFS_IOCTL_MAGIC, 3, \
+ struct btrfs_ioctl_vol_args)
+-#define BTRFS_IOC_SCAN_DEV _IOW(BTRFS_IOCTL_MAGIC, 5, \
++#define BTRFS_IOC_SCAN_DEV _IOW(BTRFS_IOCTL_MAGIC, 4, \
+ struct btrfs_ioctl_vol_args)
+ #define BTRFS_IOC_FORGET_DEV _IOW(BTRFS_IOCTL_MAGIC, 5, \
+ struct btrfs_ioctl_vol_args)
+
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-11-05 20:37 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-05 20:37 [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/, sys-fs/btrfs-progs/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-09-02 16:21 Sam James
2023-05-05 7:04 Sam James
2023-01-05 0:28 Sam James
2021-12-31 2:50 Sam James
2021-01-16 19:28 Lars Wendler
2018-11-10 21:45 Sergei Trofimovich
2018-08-06 17:58 Mike Gilbert
2018-04-12 9:42 Sergei Trofimovich
2017-03-31 20:53 Sergei Trofimovich
2016-10-24 8:20 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox