btrfs-progs: update to 4.10.1.
This commit is contained in:
parent
92db076a8d
commit
7d8db37b99
|
@ -1,43 +0,0 @@
|
||||||
--- utils.c 2015-11-20 01:15:32.227019383 +0100
|
|
||||||
+++ utils.c 2015-11-20 01:16:59.419971215 +0100
|
|
||||||
@@ -1208,13 +1208,19 @@ static int resolve_loop_device(const cha
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
FILE *f;
|
|
||||||
+ struct stat stat_buf;
|
|
||||||
char fmt[20];
|
|
||||||
char p[PATH_MAX];
|
|
||||||
char real_loop_dev[PATH_MAX];
|
|
||||||
|
|
||||||
if (!realpath(loop_dev, real_loop_dev))
|
|
||||||
return -errno;
|
|
||||||
- snprintf(p, PATH_MAX, "/sys/block/%s/loop/backing_file", strrchr(real_loop_dev, '/'));
|
|
||||||
+
|
|
||||||
+ if (stat(real_loop_dev, &stat_buf) || !S_ISBLK(stat_buf.st_mode))
|
|
||||||
+ return -errno;
|
|
||||||
+
|
|
||||||
+ snprintf(p, PATH_MAX, "/sys/dev/block/%d:%d/loop/backing_file",
|
|
||||||
+ major(stat_buf.st_rdev), minor(stat_buf.st_rdev));
|
|
||||||
if (!(f = fopen(p, "r"))) {
|
|
||||||
if (errno == ENOENT)
|
|
||||||
/*
|
|
||||||
--- mkfs/common.c.orig 2017-03-08 13:23:24.000000000 +0000
|
|
||||||
+++ mkfs/common.c 2017-03-09 06:24:26.356552024 +0000
|
|
||||||
@@ -18,6 +18,7 @@
|
|
||||||
#include <uuid/uuid.h>
|
|
||||||
#include <blkid/blkid.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
+#include <limits.h>
|
|
||||||
#include "ctree.h"
|
|
||||||
#include "disk-io.h"
|
|
||||||
#include "volumes.h"
|
|
||||||
--- convert/source-ext2.c.orig 2017-03-08 13:23:24.000000000 +0000
|
|
||||||
+++ convert/source-ext2.c 2017-03-09 06:27:45.991562323 +0000
|
|
||||||
@@ -16,6 +16,7 @@
|
|
||||||
|
|
||||||
#if BTRFSCONVERT_EXT2
|
|
||||||
|
|
||||||
+#include <linux/limits.h>
|
|
||||||
#include "kerncompat.h"
|
|
||||||
#include "disk-io.h"
|
|
||||||
#include "transaction.h"
|
|
|
@ -1,22 +0,0 @@
|
||||||
--- Makefile.orig 2017-03-08 13:23:24.000000000 +0000
|
|
||||||
+++ Makefile 2017-03-16 07:25:49.899943196 +0000
|
|
||||||
@@ -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 kernel-lib/sizes.h extent-cache.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
|
|
||||||
--- ctree.h.orig 2017-03-08 13:23:24.000000000 +0000
|
|
||||||
+++ ctree.h 2017-03-16 07:27:27.249948219 +0000
|
|
||||||
@@ -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;
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'btrfs-progs'
|
# Template file for 'btrfs-progs'
|
||||||
pkgname=btrfs-progs
|
pkgname=btrfs-progs
|
||||||
version=4.10
|
version=4.10.1
|
||||||
revision=3
|
revision=1
|
||||||
wrksrc=${pkgname}-v${version}
|
wrksrc=${pkgname}-v${version}
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--disable-backtrace"
|
configure_args="--disable-backtrace"
|
||||||
|
@ -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=44cbcca39af70dad5a8bf0343fca48f7aaa1aeae0eefac5003688452b3155cda
|
checksum=6c16b642f085d203fdcb3873f002a67a6cb839528b2a5ad7f2bd04c525101a1a
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
NOCONFIGURE=1 ./autogen.sh
|
NOCONFIGURE=1 ./autogen.sh
|
||||||
|
|
Loading…
Reference in New Issue