diff options
| author | Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | 2019-10-26 04:14:21 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-10-26 02:41:33 -0700 |
| commit | 0d7a2b1c305649125a8b81109df49dd94dd44018 (patch) | |
| tree | 8b07e6b13427a0ed961c545ff19783f00f93984e | |
| parent | 144382667105b94b8dfb552e966dec1c21b8a50a (diff) | |
| download | meta-openembedded-0d7a2b1c305649125a8b81109df49dd94dd44018.tar.gz | |
f2fs-tools: upgrade 1.11.0 -> 1.13.0
1) Upgrade f2fs-tools from 1.11.0 to 1.13.0.
2) Remove patch 0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch as there is no AC_CHECK_FILE in configure.ac.
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch | 32 | ||||
| -rw-r--r-- | meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb (renamed from meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb) | 5 |
2 files changed, 2 insertions, 35 deletions
diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch deleted file mode 100644 index cf844bf878..0000000000 --- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From 3b3c6e6376babcd9a0b0db312b0e1e3bb3ab833e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Sven Ebenfeld <sven.ebenfeld@vaillant.de> | ||
| 3 | Date: Wed, 26 Nov 2014 10:36:44 +0100 | ||
| 4 | Subject: [PATCH] Remove AC_CHECK_FILE for cross compilation | ||
| 5 | |||
| 6 | --- | ||
| 7 | configure.ac | 7 +------ | ||
| 8 | 1 file changed, 1 insertion(+), 6 deletions(-) | ||
| 9 | |||
| 10 | diff --git a/configure.ac b/configure.ac | ||
| 11 | index 0111e72..8c286d4 100644 | ||
| 12 | --- a/configure.ac | ||
| 13 | +++ b/configure.ac | ||
| 14 | @@ -20,14 +20,9 @@ AC_DEFINE([F2FS_MINOR_VERSION], m4_bpatsubst(f2fs_tools_version, | ||
| 15 | [\([0-9]*\).\([0-9]*\)\(\w\|\W\)*], [\2]), | ||
| 16 | [Minor version for f2fs-tools]) | ||
| 17 | |||
| 18 | -AC_CHECK_FILE(.git, | ||
| 19 | - AC_DEFINE([F2FS_TOOLS_DATE], | ||
| 20 | - "m4_bpatsubst(f2fs_tools_gitdate, | ||
| 21 | - [\([0-9-]*\)\(\w\|\W\)*], [\1])", | ||
| 22 | - [f2fs-tools date based on Git commits]), | ||
| 23 | AC_DEFINE([F2FS_TOOLS_DATE], | ||
| 24 | "f2fs_tools_date", | ||
| 25 | - [f2fs-tools date based on Source releases])) | ||
| 26 | + [f2fs-tools date based on Source releases]) | ||
| 27 | |||
| 28 | AC_CONFIG_SRCDIR([config.h.in]) | ||
| 29 | AC_CONFIG_HEADER([config.h]) | ||
| 30 | -- | ||
| 31 | 1.8.1.rc3 | ||
| 32 | |||
diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb index 2240049d44..870281b951 100644 --- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb +++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb | |||
| @@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3" | |||
| 7 | # to provide libuuid | 7 | # to provide libuuid |
| 8 | DEPENDS = "util-linux" | 8 | DEPENDS = "util-linux" |
| 9 | 9 | ||
| 10 | # v1.11.0 | 10 | # v1.13.0 |
| 11 | SRCREV = "b98fab3666e498c2e27ad9dcda6874c9b683f06b" | 11 | SRCREV = "284f77f0075a16a2ad1f3b0fb89b7f64a1bc755d" |
| 12 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git \ | 12 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git \ |
| 13 | file://0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch \ | ||
| 14 | file://0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch \ | 13 | file://0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch \ |
| 15 | " | 14 | " |
| 16 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
