From da44d5175d58f9693d616fdf7293f4887f60be41 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 10 Nov 2016 09:57:32 +0100 Subject: [PATCH] btrfs-progs: update to 4.8.2. --- srcpkgs/btrfs-progs/patches/includes.patch | 39 ---------------------- srcpkgs/btrfs-progs/template | 4 +-- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 srcpkgs/btrfs-progs/patches/includes.patch diff --git a/srcpkgs/btrfs-progs/patches/includes.patch b/srcpkgs/btrfs-progs/patches/includes.patch deleted file mode 100644 index fed8192eb80..00000000000 --- a/srcpkgs/btrfs-progs/patches/includes.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/bitops.h b/bitops.h -index 323c571..7f30b06 100644 ---- bitops.h -+++ bitops.h -@@ -65,6 +65,9 @@ static inline unsigned long hweight_long(unsigned long w) - } - - #define BITOP_WORD(nr) ((nr) / BITS_PER_LONG) -+#ifndef __always_inline -+#define __always_inline inline __attribute__((always_inline)) -+#endif - - /** - * __ffs - find first bit in word. -diff --git a/kerncompat.h.orig b/kerncompat.h -index bb03194e127e..28f832a2e625 100644 ---- kerncompat.h -+++ kerncompat.h -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - - #define ptr_to_u64(x) ((u64)(uintptr_t)x) ---- rbtree.h -+++ rbtree.h -@@ -38,6 +38,10 @@ - extern "C" { - #endif - -+#ifndef __always_inline -+#define __always_inline inline __attribute__((always_inline)) -+#endif -+ - struct rb_node { - unsigned long __rb_parent_color; - struct rb_node *rb_right; diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template index a0dac1ced43..24b737bf1c4 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.7.3 +version=4.8.2 revision=1 wrksrc=${pkgname}-v${version} build_style=gnu-configure @@ -12,7 +12,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=90cd6f0ce5a8bed5fcd6ea8a70d81de4a038163035d48a9ae0339bbf51df771c +checksum=81c023f519c8565b23eddb90e6d0eec2be63ee52e440708e418539dbaa635c5f pre_configure() { NOCONFIGURE=1 ./autogen.sh