aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2021-03-13 16:27:51 +0100
committerThomas Deutschmann <whissi@gentoo.org>2021-03-13 16:27:51 +0100
commita360306f395aa771e5e4515062ab91f1dbb0374a (patch)
tree04fba74ee9a6d6cf26d9c4fa6c46bf1ef60a5b24
parentinitrd.scripts: Add trim() function (diff)
downloadgenkernel-a360306f395aa771e5e4515062ab91f1dbb0374a.tar.gz
genkernel-a360306f395aa771e5e4515062ab91f1dbb0374a.tar.bz2
genkernel-a360306f395aa771e5e4515062ab91f1dbb0374a.zip
Bump btrfs-progs to v5.11
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rw-r--r--patches/btrfs-progs/5.11/btrfs-honor-LDFLAGS.patch (renamed from patches/btrfs-progs/5.10.1/btrfs-honor-LDFLAGS.patch)4
-rw-r--r--patches/btrfs-progs/5.11/btrfs-lzo-via-pkgconfig.patch (renamed from patches/btrfs-progs/5.10.1/btrfs-lzo-via-pkgconfig.patch)0
-rw-r--r--patches/btrfs-progs/5.11/btrfs-m4.patch (renamed from patches/btrfs-progs/5.10.1/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
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
index b1bf436..b1bf436 100644
--- a/patches/btrfs-progs/5.10.1/btrfs-lzo-via-pkgconfig.patch
+++ b/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
index 7543640..7543640 100644
--- a/patches/btrfs-progs/5.10.1/btrfs-m4.patch
+++ b/patches/btrfs-progs/5.11/btrfs-m4.patch