diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2014-04-25 10:24:18 +0200 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2014-04-25 10:24:18 +0200 |
| commit | 0c8e046d2e19f8805b44bceb9ba0760c31e6a3d5 (patch) | |
| tree | 84859c78bbf87a2ce272cecf47cf53c1b99b672b | |
| parent | 9442591da295418edfbe10d08f66cf5e69484b42 (diff) | |
| download | aports-0c8e046d2e19f8805b44bceb9ba0760c31e6a3d5.tar.bz2 aports-0c8e046d2e19f8805b44bceb9ba0760c31e6a3d5.tar.xz | |
main/btrfs-progs: upgrade to 3.14.1
| -rw-r--r-- | main/btrfs-progs/APKBUILD | 39 | ||||
| -rw-r--r-- | main/btrfs-progs/includes.patch | 26 |
2 files changed, 50 insertions, 15 deletions
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD index 7b5e4d1e68..2768f448a1 100644 --- a/main/btrfs-progs/APKBUILD +++ b/main/btrfs-progs/APKBUILD @@ -1,21 +1,26 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=btrfs-progs -pkgver=0.20_rc1 -_ver=${pkgver/_rc/-rc} +pkgver=3.14.1 pkgrel=0 pkgdesc="Tools for the btrfs" url="https://btrfs.wiki.kernel.org/" arch="all" -license="GPL" -depends= -makedepends="util-linux-dev bash attr-dev acl-dev e2fsprogs-dev zlib-dev" +license="GPL2" +depends="" +makedepends="util-linux-dev bash attr-dev acl-dev e2fsprogs-dev zlib-dev lzo-dev" install= -subpackages="$pkgname-doc" -source="https://www.kernel.org/pub/linux/kernel/people/mason/btrfs-progs/btrfs-progs-v$_ver.tar.xz" +subpackages="$pkgname-doc $pkgname-dev" +source="https://www.kernel.org/pub/linux/kernel/people/mason/btrfs-progs/btrfs-progs-v${pkgver}.tar.xz + includes.patch" -_builddir="$srcdir"/$pkgname-v$_ver +_builddir="$srcdir"/$pkgname-v$pkgver prepare() { cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done } build() { @@ -25,13 +30,17 @@ build() { package() { cd "$_builddir" - make prefix=/usr mandir=/usr/share/man DESTDIR="$pkgdir" install + make prefix=/usr mandir=/usr/share/man DESTDIR="$pkgdir" install || return 1 +} - # remove the 2 lines below (and this) if there is no init.d script - # install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname - # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname +dev() { + default_dev || return 1 + mv "$pkgdir"/usr/lib/*.so* "$subpkgdir"/usr/lib } -md5sums="b152503b9f1a9f577293fa37b1312310 btrfs-progs-v0.20-rc1.tar.xz" -sha256sums="ba969a90b4ae53fca9ba179469d47d194a29f25254612a91c6a12b473f94ee13 btrfs-progs-v0.20-rc1.tar.xz" -sha512sums="92f7a1b7c2c8c7f8be6d7dcb284b97251a97893b201353de28e28f65b01a8517bdf576a0b02e7f8f30f9b8056c0b2985998c0f87c6e9da236899488133a862de btrfs-progs-v0.20-rc1.tar.xz" +md5sums="761d07cfe5b468ec733e90a57b413e5c btrfs-progs-v3.14.1.tar.xz +e6e23724e95b3684631385c0f2898cad includes.patch" +sha256sums="19e83ff22c0ee3c01d10369cf7c37f1927f1307389d371744000dfbb4344dbea btrfs-progs-v3.14.1.tar.xz +e4a7f8b749f11e5b7074c014a169cee83c73a7a06f53e3f9ba18e3b7d433e027 includes.patch" +sha512sums="65c5ae6dc8302a8ca2b18c1b3d776462e9ac583e5e059574512056f92390fbf02c83e8c5ce5ae929e1ed46a84bf8a1768774c4b7283241fb1c0512ebd264cfd0 btrfs-progs-v3.14.1.tar.xz +64d9ae9dd3c080a69f80fcd2986f096b881bbfb7c415abfbf7538b334a926da440c4098014a3d8f87a862524c21bc6654a98b5afde3939cefd40b8b4708f9ca1 includes.patch" diff --git a/main/btrfs-progs/includes.patch b/main/btrfs-progs/includes.patch new file mode 100644 index 0000000000..ae69dae492 --- /dev/null +++ b/main/btrfs-progs/includes.patch @@ -0,0 +1,26 @@ +diff --git a/bitops.h b/bitops.h +index 323c571..7f30b06 100644 +--- a/bitops.h ++++ b/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 b/kerncompat.h +index 1fc2b34..e7d3ca5 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> + + #ifndef READ + #define READ 0 |