lede-packages-rs

git clone git://archive.git.mtrnord.blog/MTRNord/lede-packages-rs.git
Log | Files | Refs | README | LICENSE

commit 656f2eb5a779ac40c818b322ce7d9059e147bad7
parent 89f3a24a3f906a4783d2aa6335f2108f32ed765a
Author: Daniel Golle <daniel@makrotopia.org>
Date:   Tue, 19 Apr 2016 14:02:39 +0200

btrfs-progs: update to version 4.5.1

musl pthread patch imported from alpinelinux.org

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

Diffstat:
Mutils/btrfs-progs/Makefile | 6+++---
Autils/btrfs-progs/patches/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch | 11+++++++++++
2 files changed, 14 insertions(+), 3 deletions(-)

diff --git 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 <daniel@makrotopia.org> 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 @@ -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;