jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

btrfs-progs: update to 4.3.1.

Browse source
This commit is contained in:
Juan RP 2015-11-22 09:27:26 +01:00
parent e7de09101d
commit 31db7d2062
3 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
srcpkgs/btrfs-progs/patches/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch Normal file
View file

@ -0,0 +1,11 @@
--- chunk-recover.c.orig
+++ chunk-recover.c
@@ -883,7 +883,7 @@
for (i = 0; i < devidx; i++) {
if (dev_scans[i].bytenr == -1)
continue;
- ret = pthread_tryjoin_np(t_scans[i],
+ ret = pthread_join(t_scans[i],
(void **)&t_rets[i]);
if (ret == EBUSY) {
all_done = 0;

22
srcpkgs/btrfs-progs/patches/musl-compat.patch
View file

@ -1,6 +1,6 @@
--- utils.c --- utils.c 2015-11-20 01:15:32.227019383 +0100
+++ utils.c +++ utils.c 2015-11-20 01:16:59.419971215 +0100
@@ -833,13 +833,19 @@ @@ -1208,13 +1208,19 @@ static int resolve_loop_device(const cha
{ {
int ret; int ret;
FILE *f; FILE *f;
@ -12,12 +12,12 @@
if (!realpath(loop_dev, real_loop_dev)) if (!realpath(loop_dev, real_loop_dev))
return -errno; return -errno;
- snprintf(p, PATH_MAX, "/sys/block/%s/loop/backing_file", strrchr(real_loop_dev, '/')); - snprintf(p, PATH_MAX, "/sys/block/%s/loop/backing_file", strrchr(real_loop_dev, '/'));
+
+ if (stat(real_loop_dev, &stat_buf) || !S_ISBLK(stat_buf.st_mode))
+ return -errno;
+ +
+ snprintf(p, PATH_MAX, "/sys/dev/block/%d:%d/loop/backing_file", + if (stat(real_loop_dev, &stat_buf) || !S_ISBLK(stat_buf.st_mode))
+ major(stat_buf.st_rdev), minor(stat_buf.st_rdev)); + return -errno;
if (!(f = fopen(p, "r"))) +
return -errno; + snprintf(p, PATH_MAX, "/sys/dev/block/%d:%d/loop/backing_file",
+ major(stat_buf.st_rdev), minor(stat_buf.st_rdev));
if (!(f = fopen(p, "r"))) {
if (errno == ENOENT)
/*

7
srcpkgs/btrfs-progs/template
View file

@ -1,8 +1,7 @@
# Template file for 'btrfs-progs' # Template file for 'btrfs-progs'
pkgname=btrfs-progs pkgname=btrfs-progs
reverts=20141006.4.0.1_1 version=4.3.1
version=4.1.2 revision=1
revision=2
wrksrc=${pkgname}-v${version} wrksrc=${pkgname}-v${version}
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-backtrace" configure_args="--disable-backtrace"
@ -13,7 +12,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2" license="GPL-2"
homepage="http://btrfs.wiki.kernel.org/" homepage="http://btrfs.wiki.kernel.org/"
distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz" distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
checksum=62db60c6a0868afb6302112cea54c756873bc30b826696b167ec03ecd61b2f12 checksum=0cb5ff15deed01cdf5a77f3f61b7dc9d2cd6787bcf6b6b7dcef424d16e8afd3a
pre_configure() { pre_configure() {
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh