Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5154 from neheb/patch-5

Browse source 
btrfs-progs: Update to 4.13.3
This commit is contained in:
champtar 2017-11-22 14:55:54 -08:00 committed by GitHub
commit 27d31a2596
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
utils/btrfs-progs/Makefile
View file

@ -8,12 +8,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=btrfs-progs PKG_NAME:=btrfs-progs
PKG_VERSION:=4.13.2 PKG_VERSION:=4.13.3
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/kdave/btrfs-progs/ 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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

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

@ -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;