summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-10-28 22:05:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-10-30 13:22:48 +0000
commit52a31bd5ba90713af82822047c3813afc31421f8 (patch)
treed4388109c02509e1059280079bbea8dcfda028c4 /meta
parent4b495d5bd9cc530b88df34b2f1954e28a3617e01 (diff)
downloadpoky-52a31bd5ba90713af82822047c3813afc31421f8.tar.gz
file: enable all built-in compression checkers
This allows re-enabling parallel file classification in rpm in particular, as otherwise libmagic calls out to external executables, which isn't implemented in a thread-safe way. (From OE-Core rev: 0515567a846adc5302384cb0a6bfcdb6dd1d8431) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/file/file_5.39.bb5
-rw-r--r--meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch27
2 files changed, 30 insertions, 2 deletions
diff --git a/meta/recipes-devtools/file/file_5.39.bb b/meta/recipes-devtools/file/file_5.39.bb
index 0dcc90548a..abaa8149a3 100644
--- a/meta/recipes-devtools/file/file_5.39.bb
+++ b/meta/recipes-devtools/file/file_5.39.bb
@@ -11,14 +11,15 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=0251eaec1188b20d9a72c502ecfdd
11DEPENDS = "file-replacement-native" 11DEPENDS = "file-replacement-native"
12DEPENDS_class-native = "bzip2-replacement-native" 12DEPENDS_class-native = "bzip2-replacement-native"
13 13
14SRC_URI = "git://github.com/file/file.git" 14SRC_URI = "git://github.com/file/file.git \
15 file://0001-src-compress.c-correct-header-define-for-xz-lzma.patch"
15 16
16SRCREV = "87731415de945660b00f02207d8e9d986ef9b82e" 17SRCREV = "87731415de945660b00f02207d8e9d986ef9b82e"
17S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
18 19
19inherit autotools update-alternatives 20inherit autotools update-alternatives
20 21
21PACKAGECONFIG ??= "zlib" 22PACKAGECONFIG ??= "bz2 lzma zlib"
22PACKAGECONFIG[bz2] = "--enable-bzlib, --disable-bzlib, bzip2" 23PACKAGECONFIG[bz2] = "--enable-bzlib, --disable-bzlib, bzip2"
23PACKAGECONFIG[lzma] = "--enable-xzlib, --disable-xzlib, xz" 24PACKAGECONFIG[lzma] = "--enable-xzlib, --disable-xzlib, xz"
24PACKAGECONFIG[zlib] = "--enable-zlib, --disable-zlib, zlib" 25PACKAGECONFIG[zlib] = "--enable-zlib, --disable-zlib, zlib"
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
new file mode 100644
index 0000000000..f8ba2f6153
--- /dev/null
+++ b/meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch
@@ -0,0 +1,27 @@
1From ffb6ebdb42590cb9f7d3f5177b7b820a9edc4c81 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Sun, 18 Oct 2020 23:40:42 +0200
4Subject: [PATCH] src/compress.c: correct header define for xz/lzma
5
6Upstream-Status: Submitted [https://github.com/file/file/pull/98]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 src/compress.c | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/src/compress.c b/src/compress.c
13index 67f21583..9670b72c 100644
14--- a/src/compress.c
15+++ b/src/compress.c
16@@ -71,7 +71,7 @@ typedef void (*sig_t)(int);
17 #include <bzlib.h>
18 #endif
19
20-#if defined(HAVE_XZLIB_H) && defined(XZLIBSUPPORT)
21+#if defined(HAVE_LZMA_H) && defined(XZLIBSUPPORT)
22 #define BUILTIN_XZLIB
23 #include <lzma.h>
24 #endif
25--
262.28.0
27