diff options
author | wangmy <wangmy@fujitsu.com> | 2021-04-08 13:40:50 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-04-18 11:29:05 +0100 |
commit | ae73c5fa666c0e0a7d1d7a04acd6246542b744aa (patch) | |
tree | 48fe3731dae9d1ab86a11f9d16f3b652ba756282 /meta/recipes-devtools | |
parent | e1780ccfc89e9ff4e260276f28ffa0bb8e9b44e1 (diff) | |
download | openembedded-core-contrib-ae73c5fa666c0e0a7d1d7a04acd6246542b744aa.tar.gz |
file: upgrade 5.39 -> 5.40
0001-src-compress.c-correct-header-define-for-xz-lzma.patch
removed since it is included in 5.40
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/file/file_5.40.bb (renamed from meta/recipes-devtools/file/file_5.39.bb) | 5 | ||||
-rw-r--r-- | meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch | 27 |
2 files changed, 2 insertions, 30 deletions
diff --git a/meta/recipes-devtools/file/file_5.39.bb b/meta/recipes-devtools/file/file_5.40.bb index abaa8149a3..ec79839bd2 100644 --- a/meta/recipes-devtools/file/file_5.39.bb +++ b/meta/recipes-devtools/file/file_5.40.bb @@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=0251eaec1188b20d9a72c502ecfdd DEPENDS = "file-replacement-native" DEPENDS_class-native = "bzip2-replacement-native" -SRC_URI = "git://github.com/file/file.git \ - file://0001-src-compress.c-correct-header-define-for-xz-lzma.patch" +SRC_URI = "git://github.com/file/file.git" -SRCREV = "87731415de945660b00f02207d8e9d986ef9b82e" +SRCREV = "f49fda6f52a9477d817dbd9c06afab02daf025f8" S = "${WORKDIR}/git" inherit autotools update-alternatives diff --git a/meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch b/meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch deleted file mode 100644 index f8ba2f6153..0000000000 --- a/meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ffb6ebdb42590cb9f7d3f5177b7b820a9edc4c81 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Sun, 18 Oct 2020 23:40:42 +0200 -Subject: [PATCH] src/compress.c: correct header define for xz/lzma - -Upstream-Status: Submitted [https://github.com/file/file/pull/98] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - src/compress.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/compress.c b/src/compress.c -index 67f21583..9670b72c 100644 ---- a/src/compress.c -+++ b/src/compress.c -@@ -71,7 +71,7 @@ typedef void (*sig_t)(int); - #include <bzlib.h> - #endif - --#if defined(HAVE_XZLIB_H) && defined(XZLIBSUPPORT) -+#if defined(HAVE_LZMA_H) && defined(XZLIBSUPPORT) - #define BUILTIN_XZLIB - #include <lzma.h> - #endif --- -2.28.0 - |