summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-05-22 11:29:54 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-27 17:06:34 +0100
commitc6dbd6c52857eb1e59246f337a2d4ab0f3990453 (patch)
tree4971ade8ee8afd72db4db03cd0630d32dbe41cca /meta
parent919d8bd05660cab012a6725a89cb5a0d78a36460 (diff)
downloadpoky-c6dbd6c52857eb1e59246f337a2d4ab0f3990453.tar.gz
squashfs-tools: Mark as incompatible with musl
Silently ignoring FNM_EXTMATCH makes fnmatch() behave different from what callers expect. Mark as incompatible with musl instead of risking broken runtime behaviour. The practical consequences should be small since what is used in OE is mainly squashfs-tools-native. (From OE-Core rev: c9aed6a84c0a33fee8a52603b22cc2b78928eb5f) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch46
-rw-r--r--meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb3
2 files changed, 3 insertions, 46 deletions
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch b/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch
index 0ce7b4e8ce..87c1e8cac0 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch
@@ -1,39 +1,8 @@
1Define FNM_EXTMATCH if not defined its glibc specific define
2include missing sys/stat.h for stat* function declarations 1include missing sys/stat.h for stat* function declarations
3 2
4Upstream-Status: Pending 3Upstream-Status: Pending
5Signed-off-by: Khem Raj <raj.khem@gmail.com> 4Signed-off-by: Khem Raj <raj.khem@gmail.com>
6 5
7Index: squashfs-tools/action.c
8===================================================================
9--- squashfs-tools.orig/action.c
10+++ squashfs-tools/action.c
11@@ -44,6 +44,10 @@
12 #include "action.h"
13 #include "error.h"
14
15+#if !defined(FNM_EXTMATCH)
16+#define FNM_EXTMATCH 0
17+#endif
18+
19 /*
20 * code to parse actions
21 */
22Index: squashfs-tools/mksquashfs.c
23===================================================================
24--- squashfs-tools.orig/mksquashfs.c
25+++ squashfs-tools/mksquashfs.c
26@@ -1261,6 +1261,10 @@ void write_dir(squashfs_inode *inode, st
27 dir_size + 3, directory_block, directory_offset, NULL, NULL,
28 dir, 0);
29
30+#if !defined(FNM_EXTMATCH)
31+#define FNM_EXTMATCH 0
32+#endif
33+
34 #ifdef SQUASHFS_TRACE
35 {
36 unsigned char *dirp;
37Index: squashfs-tools/pseudo.c 6Index: squashfs-tools/pseudo.c
38=================================================================== 7===================================================================
39--- squashfs-tools.orig/pseudo.c 8--- squashfs-tools.orig/pseudo.c
@@ -46,18 +15,3 @@ Index: squashfs-tools/pseudo.c
46 #include <ctype.h> 15 #include <ctype.h>
47 16
48 #include "pseudo.h" 17 #include "pseudo.h"
49Index: squashfs-tools/unsquashfs.c
50===================================================================
51--- squashfs-tools.orig/unsquashfs.c
52+++ squashfs-tools/unsquashfs.c
53@@ -42,6 +42,10 @@
54 #include <sys/sysmacros.h>
55 #endif
56
57+#ifndef FNM_EXTMATCH
58+#define FNM_EXTMATCH 0
59+#endif
60+
61 struct cache *fragment_cache, *data_cache;
62 struct queue *to_reader, *to_inflate, *to_writer, *from_writer;
63 pthread_t *thread, *inflator_thread;
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
index 5a8b5f77bd..dc1568a77c 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
@@ -19,6 +19,9 @@ SRC_URI[lzma.sha256sum] = "c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e
19 19
20S = "${WORKDIR}/git/squashfs-tools" 20S = "${WORKDIR}/git/squashfs-tools"
21 21
22# needs FNM_EXTMATCH
23COMPATIBLE_HOST_libc-musl = 'null'
24
22EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}" 25EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}"
23 26
24PACKAGECONFIG ??= "gzip xz lzo lz4 lzma xattr" 27PACKAGECONFIG ??= "gzip xz lzo lz4 lzma xattr"