btrfs-progs: update to 4.8.2.

This commit is contained in:
Michael Gehring 2016-11-10 09:57:32 +01:00
parent f433633bc0
commit da44d5175d
2 changed files with 2 additions and 41 deletions

View File

@ -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 <assert.h>
#include <stddef.h>
#include <linux/types.h>
+#include <linux/limits.h>
#include <stdint.h>
#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;

View File

@ -1,6 +1,6 @@
# Template file for 'btrfs-progs' # Template file for 'btrfs-progs'
pkgname=btrfs-progs pkgname=btrfs-progs
version=4.7.3 version=4.8.2
revision=1 revision=1
wrksrc=${pkgname}-v${version} wrksrc=${pkgname}-v${version}
build_style=gnu-configure build_style=gnu-configure
@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2" license="GPL-2"
homepage="http://btrfs.wiki.kernel.org/" homepage="http://btrfs.wiki.kernel.org/"
distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz" distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
checksum=90cd6f0ce5a8bed5fcd6ea8a70d81de4a038163035d48a9ae0339bbf51df771c checksum=81c023f519c8565b23eddb90e6d0eec2be63ee52e440708e418539dbaa635c5f
pre_configure() { pre_configure() {
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh