Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=63cfd85cef5262dbc6451ab0d03e92866f56d15f

commit 63cfd85cef5262dbc6451ab0d03e92866f56d15f
Author: DeX77 <[email protected]>
Date:   Wed Mar 15 15:26:18 2017 +0100

btrfs-progs-4.10-2-x86_64

* fix useage of private kernel headers (thx crazy)

diff --git a/source/base/btrfs-progs/FrugalBuild 
b/source/base/btrfs-progs/FrugalBuild
index 988384a..b12fe9e 100644
--- a/source/base/btrfs-progs/FrugalBuild
+++ b/source/base/btrfs-progs/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=btrfs-progs
pkgver=4.10
-pkgrel=1
+pkgrel=2
pkgdesc="Utilities for managing btrfs filesystems."
url="https://btrfs.wiki.kernel.org";
depends=('e2fsprogs>=1.43.4-3' 'lzo>=2.09-5')
@@ -15,8 +15,9 @@ options=('scriptlet')
_F_archive_grepv="rc"
Fpkgversep="-v"
up2date="Flasttar 
https://www.kernel.org/pub/linux/kernel/people/kdave/$pkgname/";
-source=(http://www.kernel.org/pub/linux/kernel/people/kdave/$pkgname/$pkgname-v$pkgver.tar.xz)
-signatures=("${source[0]/.xz/.sign}")
+source=(http://www.kernel.org/pub/linux/kernel/people/kdave/$pkgname/$pkgname-v$pkgver.tar.xz
 \
+       no_private_kernel_headers.patch )
+signatures=("${source[0]/.xz/.sign}" '')
Fconfopts+=" --bindir=/sbin"

# optimization OK
diff --git a/source/base/btrfs-progs/no_private_kernel_headers.patch 
b/source/base/btrfs-progs/no_private_kernel_headers.patch
new file mode 100644
index 0000000..df1fac1
--- /dev/null
+++ b/source/base/btrfs-progs/no_private_kernel_headers.patch
@@ -0,0 +1,24 @@
+diff -Naur btrfs-progs-v4.10/ctree.h btrfs-progs-v4.10-p/ctree.h
+--- btrfs-progs-v4.10/ctree.h  2017-03-08 14:23:24.000000000 +0100
++++ btrfs-progs-v4.10-p/ctree.h        2017-03-15 15:13:26.765989563 +0100
+@@ -34,7 +34,7 @@
+ #include <btrfs/extent-cache.h>
+ #include <btrfs/extent_io.h>
+ #include <btrfs/ioctl.h>
+-#include <linux/sizes.h>
++#include <btrfs/sizes.h>
+ #endif /* BTRFS_FLAT_INCLUDES */
+
+ struct btrfs_root;
+diff -Naur btrfs-progs-v4.10/Makefile btrfs-progs-v4.10-p/Makefile
+--- btrfs-progs-v4.10/Makefile 2017-03-08 14:23:24.000000000 +0100
++++ btrfs-progs-v4.10-p/Makefile       2017-03-15 15:12:43.734828807 +0100
+@@ -108,7 +108,7 @@
+                  uuid-tree.o utils-lib.o rbtree-utils.o
+ libbtrfs_headers = send-stream.h send-utils.h send.h kernel-lib/rbtree.h 
btrfs-list.h \
+              kernel-lib/crc32c.h kernel-lib/list.h kerncompat.h \
+-             kernel-lib/radix-tree.h extent-cache.h \
++             kernel-lib/radix-tree.h extent-cache.h kernel-lib/sizes.h \
+              extent_io.h ioctl.h ctree.h btrfsck.h version.h
+ convert_objects = convert/main.o convert/common.o convert/source-fs.o \
+                 convert/source-ext2.o
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to