Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3879846749ae761869f50171526df331eba87abe
commit 3879846749ae761869f50171526df331eba87abe Author: crazy <[email protected]> Date: Mon Oct 31 02:17:56 2016 +0100 btrfs-progs-4.8.2-1-x86_64 * Version bump diff --git a/source/base/btrfs-progs/FrugalBuild b/source/base/btrfs-progs/FrugalBuild index 388a573..35c27b2 100644 --- a/source/base/btrfs-progs/FrugalBuild +++ b/source/base/btrfs-progs/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: James Buren <[email protected]> pkgname=btrfs-progs -pkgver=4.8.1 -pkgrel=2 +pkgver=4.8.2 +pkgrel=1 pkgdesc="Utilities for managing btrfs filesystems." url="https://btrfs.wiki.kernel.org"; depends=('e2fsprogs>=1.43.3-2' 'lzo>=2.09-5') @@ -15,9 +15,8 @@ options=('scriptlet') _F_archive_grepv="rc" Fpkgversep="-v" up2date="Flasttar https://www.kernel.org/pub/linux/kernel/people/kdave/$pkgname/"; -source=(http://ftp.kernel.org/pub/linux/kernel/people/kdave/$pkgname/$pkgname-v$pkgver.tar.xz \ - btrfs-progs-4.8.1-fix-ioctl.h.patch ) -signatures=("${source[0]/.xz/.sign}" '') +source=(http://ftp.kernel.org/pub/linux/kernel/people/kdave/$pkgname/$pkgname-v$pkgver.tar.xz) +signatures=("${source[0]/.xz/.sign}") Fconfopts+=" --bindir=/sbin" # optimization OK diff --git a/source/base/btrfs-progs/btrfs-progs-4.8.1-fix-ioctl.h.patch b/source/base/btrfs-progs/btrfs-progs-4.8.1-fix-ioctl.h.patch deleted file mode 100644 index 61b60c7..0000000 --- a/source/base/btrfs-progs/btrfs-progs-4.8.1-fix-ioctl.h.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 3ddbf895db678fb40f7513bac9dbc36fd4095693 -Author: Sergei Trofimovich <[email protected]> -Date: Mon Oct 24 09:08:53 2016 +0100 - - ioctl.h: add missing kernel compatibility header for BUILD_ASSERT - - Header breakage noticed by cynede. Reproducible as: - - $ gcc -c /usr/include/btrfs/ioctl.h -o /tmp/a.o - /usr/include/btrfs/ioctl.h:42:14: error: expected declaration specifiers or '...' before 'sizeof' - BUILD_ASSERT(sizeof(struct btrfs_ioctl_vol_args) == 4096); - ^~~~~~ - - Basically gcc tries to say us BUILD_ASSERT is not visible. - - BUILD_ASSERT lives in kerncompat.h which this change adds. - - Signed-off-by: Sergei Trofimovich <[email protected]> - -diff --git a/ioctl.h b/ioctl.h -index a7235c0..abea7ed 100644 ---- a/ioctl.h -+++ b/ioctl.h -@@ -26,6 +26,12 @@ extern "C" { - #include <asm/types.h> - #include <linux/ioctl.h> - -+#if BTRFS_FLAT_INCLUDES -+#include "kerncompat.h" -+#else -+#include <btrfs/kerncompat.h> -+#endif /* BTRFS_FLAT_INCLUDES */ -+ - #ifndef __user - #define __user - #endif _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
