diff options
author | Baruch Siach <baruch@tkos.co.il> | 2018-06-05 15:10:36 +0300 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-06-05 18:48:08 +0200 |
commit | 3bb11b80252607a99a7a79455d900f60f8fcab25 (patch) | |
tree | de3f3dc25e7121f79d1604ed43eeebe3d8be5f76 /package/btrfs-progs/0003-btrfs.static-needs-libbtrfsutil.patch | |
parent | 0bfeef622291697d25dafd5836bef6bbbd277240 (diff) | |
download | buildroot-3bb11b80252607a99a7a79455d900f60f8fcab25.tar.gz buildroot-3bb11b80252607a99a7a79455d900f60f8fcab25.zip |
btrfs-progs: bump to version 4.16.1
Drop upstream patch.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package/btrfs-progs/0003-btrfs.static-needs-libbtrfsutil.patch')
-rw-r--r-- | package/btrfs-progs/0003-btrfs.static-needs-libbtrfsutil.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/package/btrfs-progs/0003-btrfs.static-needs-libbtrfsutil.patch b/package/btrfs-progs/0003-btrfs.static-needs-libbtrfsutil.patch deleted file mode 100644 index 30ab75ae57..0000000000 --- a/package/btrfs-progs/0003-btrfs.static-needs-libbtrfsutil.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5023fdf9a4524106ef6fe1d0fdd75ade16dec62c Mon Sep 17 00:00:00 2001 -From: Baruch Siach <baruch@tkos.co.il> -Date: Tue, 10 Apr 2018 22:56:31 +0300 -Subject: [PATCH] btrfs.static: needs libbtrfsutil - -Add libbtrfsutil objects to btrfs.static link command. This fixes static -build failure: - -utils.static.o: In function `parse_qgroupid': -utils.c:(.text.parse_qgroupid+0xb0): undefined reference to `btrfs_util_is_subvolume' -props.static.o: In function `prop_read_only': -props.c:(.text.prop_read_only+0x70): undefined reference to `btrfs_util_set_subvolume_read_only' -... -Makefile:457: recipe for target 'btrfs.static' failed -make[1]: *** [btrfs.static] Error 1 - -Signed-off-by: Baruch Siach <baruch@tkos.co.il> ---- -Upstream status: https://patchwork.kernel.org/patch/10333795/ - - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 5ba76d2eee40..9b97c36a44a5 100644 ---- a/Makefile -+++ b/Makefile -@@ -453,7 +453,7 @@ btrfs: btrfs.o $(objects) $(cmds_objects) $(libs_static) - @echo " [LD] $@" - $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP) - --btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects) -+btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects) $(libbtrfsutil_objects) - @echo " [LD] $@" - $(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP) - --- -2.16.3 - |