diff options
| author | prspkt <prspkt@protonmail.com> | 2019-02-15 07:51:50 +0200 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2019-02-20 13:51:27 +0000 |
| commit | f71481d86bf22b433ae1db704f489af76daa5f27 (patch) | |
| tree | 85b12809b98a5fa70c1c67fb07473843edf690f7 /main | |
| parent | bf94fe726e658c7944e10f2b38d14fa68ca642da (diff) | |
| download | aports-f71481d86bf22b433ae1db704f489af76daa5f27.tar.bz2 aports-f71481d86bf22b433ae1db704f489af76daa5f27.tar.xz | |
main/btrfs-progs: upgrade to 4.20.1
Diffstat (limited to 'main')
| -rw-r--r-- | main/btrfs-progs/APKBUILD | 11 | ||||
| -rw-r--r-- | main/btrfs-progs/includes.patch | 26 | ||||
| -rw-r--r-- | main/btrfs-progs/musl-compat.patch | 24 |
3 files changed, 3 insertions, 58 deletions
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD index ac00d2cb9b..870eaceafb 100644 --- a/main/btrfs-progs/APKBUILD +++ b/main/btrfs-progs/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=btrfs-progs -pkgver=4.19.1 +pkgver=4.20.1 pkgrel=0 pkgdesc="BTRFS filesystem utilities" url="https://btrfs.wiki.kernel.org" @@ -14,10 +14,7 @@ makedepends="$depends_dev acl-dev asciidoc attr-dev autoconf automake e2fsprogs- libtool lzo-dev py3-setuptools python3-dev util-linux-dev xmlto zlib-dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion:bashcomp:noarch py3-$pkgname:py3 $pkgname-libs $pkgname-extra" -source="https://www.kernel.org/pub/linux/kernel/people/kdave/$pkgname/$pkgname-v$pkgver.tar.xz - includes.patch - musl-compat.patch - " +source="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/$pkgname-v$pkgver.tar.xz" builddir="$srcdir/$pkgname-v$pkgver" prepare() { @@ -76,6 +73,4 @@ extra() { rmdir "$subpkgdir"/usr/lib } -sha512sums="834b0a16216437301637d44561fd265db167b7084de7d43d36802907645627d955421c1f5c46f0eb72d85f8b8d70905e5f6c0d539a34693704aa188085dfeec4 btrfs-progs-v4.19.1.tar.xz -6a41cdb5dae1983ff0682e152a00007b9a5d03e835195ec4f6ff1005ffceea9178cee672ef1d03c029941d3764b021f6c49b3b82cc4fd383920bdf4faed88d2a includes.patch -056704aa07433e5ae3e5158c668aec7535318613f84cebd4c70237aa253e5585d529cb535203ec6578e3ad9fc9f863e1cf498bb30deeec2d6d557d9318d3e947 musl-compat.patch" +sha512sums="66f9abdc65bd97ef4a4c6eb9aac252604b7250216c8d9fcf54e9657aff74a2b2b1af465ac7cc68de71bfe1fd86219259cacd27ec2eb96f044ba0c8af2b72e8a2 btrfs-progs-v4.20.1.tar.xz" diff --git a/main/btrfs-progs/includes.patch b/main/btrfs-progs/includes.patch deleted file mode 100644 index ac3f835664..0000000000 --- a/main/btrfs-progs/includes.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/bitops.h b/bitops.h -index 323c571..7f30b06 100644 ---- a/kernel-lib/bitops.h -+++ b/kernel-lib/bitops.h -@@ -69,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 ---- a/kerncompat.h -+++ b/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) diff --git a/main/btrfs-progs/musl-compat.patch b/main/btrfs-progs/musl-compat.patch deleted file mode 100644 index 511a268dba..0000000000 --- a/main/btrfs-progs/musl-compat.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -upr btrfs-progs-v4.3.1.orig/utils.c btrfs-progs-v4.3.1/utils.c ---- btrfs-progs-v4.3.1.orig/utils.c 2015-11-20 01:15:32.227019383 +0100 -+++ btrfs-progs-v4.3.1/utils.c 2015-11-20 01:16:59.419971215 +0100 -@@ -679,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) - /* |