diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-12-01 11:15:54 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-12-01 11:16:42 +0100 |
| commit | fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb (patch) | |
| tree | fd6edbe93b19b167b105897e3de6a7c11eac4f9c /package/btrfs-progs | |
| parent | 9a5434fbfc98a0c427c880b167b8ca3499b44e87 (diff) | |
| parent | 9b47f40bb29d9be34afabfb423bab0ad45cbc11f (diff) | |
Merge branch 'next'
Conflicts:
Makefile
package/flac/0001-fix-altivec-logic.patch
package/grantlee/Config.in
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/btrfs-progs')
| -rw-r--r-- | package/btrfs-progs/btrfs-progs.hash | 2 | ||||
| -rw-r--r-- | package/btrfs-progs/btrfs-progs.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index 0f207b254..f030c176e 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 6c01579c7b858c175aaed6b3b087dadaa38efb8e590a6928f1afe86bb8faaaab btrfs-progs-v3.17.1.tar.xz +sha256 50ecc724a41a6ec9e37a0fbb134d336bdafd7fa24ec69de0c591c211da4456c6 btrfs-progs-v3.17.2.tar.xz diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 7122df1b0..b13f227f3 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 3.17.1 +BTRFS_PROGS_VERSION = 3.17.2 BTRFS_PROGS_SITE = https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = acl attr e2fsprogs lzo util-linux zlib |