btrfs-progs: Update to 4.13.3

Tested on ramips (mt7621)

Signed-off-by: Rosen Penev <redacted>

diff --git a/utils/btrfs-progs/Makefile b/utils/btrfs-progs/Makefile
index ec3f88d6eed42cfcc95d307407d994f9e3d9e14e..89df1f7f7d8bec4db77d5f04ac34ebbe6dd96a17 100644 (file)
--- a/utils/btrfs-progs/Makefile
+++ b/utils/btrfs-progs/Makefile
@@ -8,12 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=btrfs-progs
-PKG_VERSION:=4.13.2
+PKG_VERSION:=4.13.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/kdave/btrfs-progs/
-PKG_HASH:=75c7331f1306495dfffabe542ef6c5539808f0cdaebdf14fa8b7ab09c59448bd
+PKG_HASH:=805bdb0031c21a0a5d2ba295a8c9bdd8ba831a68c3fa801aab85677ec902d783
+PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com>
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
 
 PKG_LICENSE:=GPL-2.0

diff --git a/utils/btrfs-progs/patches/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch b/utils/btrfs-progs/patches/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch
deleted file mode 100644 (file)
index 90b56b4..0000000
--- a/utils/btrfs-progs/patches/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/chunk-recover.c
-+++ b/chunk-recover.c
-@@ -887,7 +887,7 @@ static int scan_devices(struct recover_c
-               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;