Skip to contentSkip to conversation

package/f2fs-tools: bump version to 1.14.0

PATCH New Norbert Lange 2 participants 2 messages Sep 14, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/f2fs-tools: bump version to 1.14.0

Remove upstreamed patches.

---
 ...-Makefile.am-fix-build-without-blkid.patch |  30 ---
 .../0002-fsck.f2fs-correct-return-value.patch | 195 ------------------
 package/f2fs-tools/f2fs-tools.hash            |   2 +-
 package/f2fs-tools/f2fs-tools.mk              |   2 +-
 4 files changed, 2 insertions(+), 227 deletions(-)
 delete mode 100644 package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch
 delete mode 100644 package/f2fs-tools/0002-fsck.f2fs-correct-return-value.patch
package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch deleted +0 -30
deleted file mode 100644
index aac60e70b6..0000000000
@@ -1,30 +0,0 @@
-From 7727b6fe0897849d4fc8f75a48326e902f0ab8b2 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Sun, 22 Sep 2019 10:06:35 +0200
-Subject: [PATCH] mkfs/Makefile.am: fix build without blkid
-
-Commit d56232bc1640e2a3ffc412faff42cd8e77dbb8dd hardcoded -lblkid in
-libf2fs_format_la_LDFLAGS which breaks the build with --without-blkid
-option so use ${libblkid_LIBS} instead
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
----
- mkfs/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am
-index cae2f93..83e2389 100644
---- a/mkfs/Makefile.am
-+++ b/mkfs/Makefile.am
-@@ -12,7 +12,7 @@ lib_LTLIBRARIES = libf2fs_format.la
- libf2fs_format_la_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c
- libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD
- libf2fs_format_la_CPPFLAGS = -I$(top_srcdir)/include
--libf2fs_format_la_LDFLAGS = -lblkid -luuid -L$(top_builddir)/lib -lf2fs \
-+libf2fs_format_la_LDFLAGS = ${libblkid_LIBS} -luuid -L$(top_builddir)/lib -lf2fs \
- 	-version-info $(FMT_CURRENT):$(FMT_REVISION):$(FMT_AGE)
- 
- install-exec-hook:
--- 
-2.23.0
-
package/f2fs-tools/0002-fsck.f2fs-correct-return-value.patch deleted +0 -195

195 lines not on this page · raw message

package/f2fs-tools/f2fs-tools.hash +1 -1
index 4eb4d14709..dedd884957 100644
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 b39d3ae9224267aab0070b5f17d91d0c5143f6d960166a27f6b11c8c87072c7d  f2fs-tools-1.13.0.tar.gz
+sha256 619263d4e2022152a1472c1d912eaae104f20bd227ce0bb9d41d1d6608094bd1  f2fs-tools-1.14.0.tar.gz
 sha256 662abb3a8a80b36ae7036c289dd1e03b361ee5dd2e6fd5211d0d8d029146449f  COPYING
package/f2fs-tools/f2fs-tools.mk +1 -1
index a9536dc8e7..ced283d25d 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-F2FS_TOOLS_VERSION = 1.13.0
+F2FS_TOOLS_VERSION = 1.14.0
 F2FS_TOOLS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot
 F2FS_TOOLS_CONF_ENV = ac_cv_file__git=no
 F2FS_TOOLS_DEPENDENCIES = host-pkgconf util-linux
Signature · 1 line
2.28.0
#1 lore raw

PATCH 1/1 package/f2fs-tools: bump version to 1.14.0

Quoted 11 lines · On Mon, 14 Sep 2020 16:46:04 +0200 Norbert Lange <[email protected]> wrote:

Remove upstreamed patches.

---
 ...-Makefile.am-fix-build-without-blkid.patch |  30 ---
 .../0002-fsck.f2fs-correct-return-value.patch | 195 ------------------
 package/f2fs-tools/f2fs-tools.hash            |   2 +-
 package/f2fs-tools/f2fs-tools.mk              |   2 +-
 4 files changed, 2 insertions(+), 227 deletions(-)
 delete mode 100644 package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch
 delete mode 100644 package/f2fs-tools/0002-fsck.f2fs-correct-return-value.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com