From 3af279ea96962815b4ee2fa7b69a52488aa73bf7 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Fri, 2 Feb 2018 18:28:26 -0200 Subject: [PATCH] btrfs-progs: update to 4.15. --- srcpkgs/btrfs-progs/patches/musl.patch | 10 ++++++++++ srcpkgs/btrfs-progs/template | 8 ++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/srcpkgs/btrfs-progs/patches/musl.patch b/srcpkgs/btrfs-progs/patches/musl.patch index d6d9a05475..c82e4ae89b 100644 --- a/srcpkgs/btrfs-progs/patches/musl.patch +++ b/srcpkgs/btrfs-progs/patches/musl.patch @@ -8,3 +8,13 @@ #define CONV_IMAGE_SUBVOL_OBJECTID BTRFS_FIRST_FREE_OBJECTID +--- mkfs/main.c ++++ mkfs/main.c +@@ -26,6 +26,7 @@ + #include + /* #include included via androidcompat.h */ + #include ++#include /* for PATH_MAX */ + #include + #include + #include diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template index f280c28610..4876194675 100644 --- a/srcpkgs/btrfs-progs/template +++ b/srcpkgs/btrfs-progs/template @@ -1,6 +1,6 @@ # Template file for 'btrfs-progs' pkgname=btrfs-progs -version=4.14.1 +version=4.15 revision=1 wrksrc=${pkgname}-v${version} build_style=gnu-configure @@ -13,7 +13,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://btrfs.wiki.kernel.org/" distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz" -checksum=90c5b3a73d0a5194754bb148d362b4d2b0755527324c4e9d9fa0b4c15bb354dd +checksum=9e3528c60c76970b73297ea4b01bdc23a70c39c82d540b61cf07a7c0612339e9 make_check_target="test" pre_configure() { @@ -30,6 +30,10 @@ pre_check() { # This test requires fallocate but the testsuite detection methods still can't # detect it properly so it keeps failing even when util-linux is added to checkdepends mv tests/fsck-tests/025-file-extents/test.sh{,.broken} + + # This one requires perl regex on grep binary which is disabled it fails with + # grep: support for the -P option is not compiled into this --disable-perl-regexp binary + mv tests/mkfs-tests/013-reserved-1M-for-single/test.sh{,.broken} } post_install() {