Browse Source

btrfs-progs: update to version 4.5.1

musl pthread patch imported from alpinelinux.org

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Daniel Golle 8 years ago
parent
commit
656f2eb5a7

+ 3
- 3
utils/btrfs-progs/Makefile View File

@@ -8,12 +8,12 @@
8 8
 include $(TOPDIR)/rules.mk
9 9
 
10 10
 PKG_NAME:=btrfs-progs
11
-PKG_VERSION:=3.19.1
12
-PKG_RELEASE:=4
11
+PKG_VERSION:=4.5.1
12
+PKG_RELEASE:=1
13 13
 
14 14
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.xz
15 15
 PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/kdave/btrfs-progs/
16
-PKG_MD5SUM:=ec3b3c99df18633ddc9e41f0680c5a51
16
+PKG_MD5SUM:=31be62e9a772f297669b2ee14dc85c27
17 17
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
18 18
 
19 19
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>

+ 11
- 0
utils/btrfs-progs/patches/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch View File

@@ -0,0 +1,11 @@
1
+--- btrfs-progs-v4.2.3/chunk-recover.c
2
++++ btrfs-progs-v4.2.3/chunk-recover.c.new
3
+@@ -883,7 +883,7 @@
4
+ 		for (i = 0; i < devidx; i++) {
5
+ 			if (dev_scans[i].bytenr == -1)
6
+ 				continue;
7
+-			ret = pthread_tryjoin_np(t_scans[i],
8
++			ret = pthread_join(t_scans[i],
9
+ 						 (void **)&t_rets[i]);
10
+ 			if (ret == EBUSY) {
11
+ 				all_done = 0;