commit: a360306f395aa771e5e4515062ab91f1dbb0374a
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 15:27:51 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 15:27:51 2021 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a360306f
Bump btrfs-progs to v5.11
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
patches/btrfs-progs/{5.10.1 => 5.11}/btrfs-honor-LDFLAGS.patch | 4 ++--
patches/btrfs-progs/{5.10.1 => 5.11}/btrfs-lzo-via-pkgconfig.patch | 0
patches/btrfs-progs/{5.10.1 => 5.11}/btrfs-m4.patch | 0
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/patches/btrfs-progs/5.10.1/btrfs-honor-LDFLAGS.patch
b/patches/btrfs-progs/5.11/btrfs-honor-LDFLAGS.patch
similarity index 63%
rename from patches/btrfs-progs/5.10.1/btrfs-honor-LDFLAGS.patch
rename to patches/btrfs-progs/5.11/btrfs-honor-LDFLAGS.patch
index 7a770a3..48e967d 100644
--- a/patches/btrfs-progs/5.10.1/btrfs-honor-LDFLAGS.patch
+++ b/patches/btrfs-progs/5.11/btrfs-honor-LDFLAGS.patch
@@ -3,10 +3,10 @@
@@ -130,7 +130,7 @@ LIBBTRFS_LIBS = $(LIBS_BASE) $(LIBS_CRYPTO)
# Static compilation flags
- STATIC_CFLAGS = $(CFLAGS) -ffunction-sections -fdata-sections -DSTATICBUILD=1
+ STATIC_CFLAGS = $(CFLAGS) -ffunction-sections -fdata-sections
-STATIC_LDFLAGS = -static -Wl,--gc-sections
+STATIC_LDFLAGS = $(LDFLAGS) -static -Wl,--gc-sections
STATIC_LIBS = $(STATIC_LIBS_BASE)
- # Static build with libmount print some warnings due to usage of UID/GID
+ # don't use FORTIFY with sparse because glibc with FORTIFY can
diff --git a/patches/btrfs-progs/5.10.1/btrfs-lzo-via-pkgconfig.patch
b/patches/btrfs-progs/5.11/btrfs-lzo-via-pkgconfig.patch
similarity index 100%
rename from patches/btrfs-progs/5.10.1/btrfs-lzo-via-pkgconfig.patch
rename to patches/btrfs-progs/5.11/btrfs-lzo-via-pkgconfig.patch
diff --git a/patches/btrfs-progs/5.10.1/btrfs-m4.patch
b/patches/btrfs-progs/5.11/btrfs-m4.patch
similarity index 100%
rename from patches/btrfs-progs/5.10.1/btrfs-m4.patch
rename to patches/btrfs-progs/5.11/btrfs-m4.patch
