From 656f2eb5a779ac40c818b322ce7d9059e147bad7 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 19 Apr 2016 14:02:39 +0200 Subject: [PATCH] btrfs-progs: update to version 4.5.1 musl pthread patch imported from alpinelinux.org Signed-off-by: Daniel Golle --- utils/btrfs-progs/Makefile | 6 +++--- ...e-pthread_join-instead-of-pthread_tryjoin_np.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 utils/btrfs-progs/patches/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch diff --git a/utils/btrfs-progs/Makefile b/utils/btrfs-progs/Makefile index 49ad35116..5fc816767 100644 --- a/utils/btrfs-progs/Makefile +++ b/utils/btrfs-progs/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=btrfs-progs -PKG_VERSION:=3.19.1 -PKG_RELEASE:=4 +PKG_VERSION:=4.5.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/kdave/btrfs-progs/ -PKG_MD5SUM:=ec3b3c99df18633ddc9e41f0680c5a51 +PKG_MD5SUM:=31be62e9a772f297669b2ee14dc85c27 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION) PKG_MAINTAINER:=Daniel Golle 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 new file mode 100644 index 000000000..a19e07f87 --- /dev/null +++ b/utils/btrfs-progs/patches/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch @@ -0,0 +1,11 @@ +--- btrfs-progs-v4.2.3/chunk-recover.c ++++ btrfs-progs-v4.2.3/chunk-recover.c.new +@@ -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;