diff --git a/utils/btrfs-progs/Makefile b/utils/btrfs-progs/Makefile index 9c62d2ffca..0db5d69cad 100644 --- a/utils/btrfs-progs/Makefile +++ b/utils/btrfs-progs/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=btrfs-progs -PKG_VERSION:=5.16.1 +PKG_VERSION:=6.0.1 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/kdave/btrfs-progs -PKG_HASH:=3da4da5361cf86bddda80edb4c4f30ea076cb4ebec29904fa08afc930ef9e1a8 +PKG_HASH:=b5316fff1d811e2ad3a067973109eb912bb0d92805735625fd8b82e700201c48 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION) PKG_MAINTAINER:=Karel Kočí diff --git a/utils/btrfs-progs/patches/010-64bit.patch b/utils/btrfs-progs/patches/010-64bit.patch deleted file mode 100644 index 51d6609576..0000000000 --- a/utils/btrfs-progs/patches/010-64bit.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b5159062f079d451f23d7f2a0e7d9e2f84934f94 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Sat, 29 Jan 2022 17:09:56 -0800 -Subject: [PATCH] btrfs-progs: fix 64-bit mips and powerpc types - -The kernel uses 'unsigned long' for u64 specifically for ppc64 and -mips64. - -Remove asm/types.h include as it will get included properly later. - -Fixe -Wformat warnings. - -Signed-off-by: Rosen Penev -Signed-off-by: David Sterba ---- - cmds/receive-dump.c | 1 - - kerncompat.h | 5 +++++ - 2 files changed, 5 insertions(+), 1 deletion(-) - ---- a/cmds/receive-dump.c -+++ b/cmds/receive-dump.c -@@ -31,7 +31,6 @@ - #include - #include - #include --#include - #include - #include "common/utils.h" - #include "cmds/commands.h" ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -19,6 +19,11 @@ - #ifndef __KERNCOMPAT_H__ - #define __KERNCOMPAT_H__ - -+#ifndef __SANE_USERSPACE_TYPES__ -+/* For PPC64 to get LL64 types */ -+#define __SANE_USERSPACE_TYPES__ -+#endif -+ - #include - #include - #include