From 2a3d72e58fb7c563222c0afd64b18ba764775bc0 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Sun, 3 Jan 2021 13:49:12 +0800 Subject: f2fs-tools: upgrade 1.13.0 -> 1.14.0 * Drop 0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch since it has been merged upstream. * Add UPSTREAM_CHECK_GITTAGREGEX to check the correct latest version. Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- ...-Use-srcdir-prefix-to-denote-include-path.patch | 29 ---------------------- .../recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb | 19 -------------- .../recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb | 19 ++++++++++++++ 3 files changed, 19 insertions(+), 48 deletions(-) delete mode 100644 meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch delete mode 100644 meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb create mode 100644 meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch deleted file mode 100644 index 0a3261b4e7..0000000000 --- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0fb9d6bc25e903f7831a38468845ea143fb5afd5 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 11 Aug 2018 18:49:03 -0700 -Subject: [PATCH] f2fs-tools: Use srcdir prefix to denote include path - -This helps builds when builddir != srcdir - -Upstream-Status: Submitted [https://lkml.org/lkml/2018/8/12/1] -Signed-off-by: Khem Raj ---- - tools/sg_write_buffer/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/sg_write_buffer/Makefile.am b/tools/sg_write_buffer/Makefile.am -index 922c328..19c438d 100644 ---- a/tools/sg_write_buffer/Makefile.am -+++ b/tools/sg_write_buffer/Makefile.am -@@ -1,7 +1,7 @@ - ## Makefile.am - - if LINUX --AM_CPPFLAGS = -I./include -+AM_CPPFLAGS = -I$(srcdir)/include - AM_CFLAGS = -Wall - sbin_PROGRAMS = sg_write_buffer - sg_write_buffer_SOURCES = sg_write_buffer.c \ --- -2.18.0 - diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb deleted file mode 100644 index 98bd478f32..0000000000 --- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Tools for Flash-Friendly File System (F2FS)" -HOMEPAGE = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3" - -# to provide libuuid -DEPENDS = "util-linux" - -# v1.13.0 -SRCREV = "284f77f0075a16a2ad1f3b0fb89b7f64a1bc755d" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git \ - file://0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch \ - " -S = "${WORKDIR}/git" - -inherit pkgconfig autotools - -BBCLASSEXTEND = "native" diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb new file mode 100644 index 0000000000..d0b299f0b3 --- /dev/null +++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "Tools for Flash-Friendly File System (F2FS)" +HOMEPAGE = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3" + +# to provide libuuid +DEPENDS = "util-linux" + +SRCREV = "d41dcbdf46dc3841cd0a0507e6573e38cb6c55bb" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git \ + " +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +inherit pkgconfig autotools + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf