diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/icu/icu/0001-pkgdata-increase-command-buffer-size.patch | 46 | ||||
-rw-r--r-- | meta/recipes-support/icu/icu_68.2.bb | 1 |
2 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-support/icu/icu/0001-pkgdata-increase-command-buffer-size.patch b/meta/recipes-support/icu/icu/0001-pkgdata-increase-command-buffer-size.patch new file mode 100644 index 0000000000..a5483568bb --- /dev/null +++ b/meta/recipes-support/icu/icu/0001-pkgdata-increase-command-buffer-size.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From ab6b1acdeed76899f8227c38ab7e7675c7673ff1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Joe Slater <joe.slater@windriver.com> | ||
3 | Date: Thu, 5 Aug 2021 09:23:48 -0700 | ||
4 | Subject: [PATCH 1/1] pkgdata: increase command buffer size | ||
5 | |||
6 | Make cmd LARGE_BUFFER_SIZE to avoid pathname truncation | ||
7 | when install paths are longer than about 150 characters. | ||
8 | |||
9 | https://unicode-org.atlassian.net/browse/ICU-21702 has been | ||
10 | created to address this issue and error reporting. | ||
11 | |||
12 | Upstream-Status: Submitted [ICU-21702 opened] | ||
13 | |||
14 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
15 | --- | ||
16 | source/tools/pkgdata/pkgdata.cpp | 6 +++--- | ||
17 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
18 | |||
19 | diff --git a/source/tools/pkgdata/pkgdata.cpp b/source/tools/pkgdata/pkgdata.cpp | ||
20 | index 5ab682e..d4b70ef 100644 | ||
21 | --- a/tools/pkgdata/pkgdata.cpp | ||
22 | +++ b/tools/pkgdata/pkgdata.cpp | ||
23 | @@ -1131,17 +1131,17 @@ normal_symlink_mode: | ||
24 | |||
25 | static int32_t pkg_installLibrary(const char *installDir, const char *targetDir, UBool noVersion) { | ||
26 | int32_t result = 0; | ||
27 | - char cmd[SMALL_BUFFER_MAX_SIZE]; | ||
28 | + char cmd[LARGE_BUFFER_MAX_SIZE]; | ||
29 | |||
30 | auto ret = snprintf(cmd, | ||
31 | - SMALL_BUFFER_MAX_SIZE, | ||
32 | + LARGE_BUFFER_MAX_SIZE, | ||
33 | "cd %s && %s %s %s%s%s", | ||
34 | targetDir, | ||
35 | pkgDataFlags[INSTALL_CMD], | ||
36 | libFileNames[LIB_FILE_VERSION], | ||
37 | installDir, PKGDATA_FILE_SEP_STRING, libFileNames[LIB_FILE_VERSION]); | ||
38 | (void)ret; | ||
39 | - U_ASSERT(0 <= ret && ret < SMALL_BUFFER_MAX_SIZE); | ||
40 | + U_ASSERT(0 <= ret && ret < LARGE_BUFFER_MAX_SIZE); | ||
41 | |||
42 | result = runCommand(cmd); | ||
43 | |||
44 | -- | ||
45 | 2.29.2 | ||
46 | |||
diff --git a/meta/recipes-support/icu/icu_68.2.bb b/meta/recipes-support/icu/icu_68.2.bb index 1ca87feee4..130212d245 100644 --- a/meta/recipes-support/icu/icu_68.2.bb +++ b/meta/recipes-support/icu/icu_68.2.bb | |||
@@ -107,6 +107,7 @@ SRC_URI = "${BASE_SRC_URI};name=code \ | |||
107 | file://filter.json \ | 107 | file://filter.json \ |
108 | file://fix-install-manx.patch \ | 108 | file://fix-install-manx.patch \ |
109 | file://0001-icu-Added-armeb-support.patch \ | 109 | file://0001-icu-Added-armeb-support.patch \ |
110 | file://0001-pkgdata-increase-command-buffer-size.patch \ | ||
110 | " | 111 | " |
111 | 112 | ||
112 | SRC_URI_append_class-target = "\ | 113 | SRC_URI_append_class-target = "\ |