summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2017-02-23 18:38:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-01 11:17:45 +0000
commit7186e265c6a456ed33e071abc33fbf26a7b7ffe8 (patch)
treeffa59cdea41ceb99b04f7b2175b43509116d01a8
parentb9824b1cecd8dec1bef43687c1c02e3c9721a9e5 (diff)
downloadpoky-7186e265c6a456ed33e071abc33fbf26a7b7ffe8.tar.gz
ovmf: increase path length limit
The VfrCompile tool has a hard-coded maximum length for path names which turned out to be too small by around 20 characters in the Yocto autobuilder setup. Increasing the maximum by a factor of 4 is relatively easy and makes the problem less likely. (From OE-Core rev: ea296ab42a7a65055657b950d8248d94f0ac56f1) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/ovmf/ovmf/VfrCompile-increase-path-length-limit.patch33
-rw-r--r--meta/recipes-core/ovmf/ovmf_git.bb1
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-core/ovmf/ovmf/VfrCompile-increase-path-length-limit.patch b/meta/recipes-core/ovmf/ovmf/VfrCompile-increase-path-length-limit.patch
new file mode 100644
index 0000000000..bb12d8beba
--- /dev/null
+++ b/meta/recipes-core/ovmf/ovmf/VfrCompile-increase-path-length-limit.patch
@@ -0,0 +1,33 @@
1From c7722d10c7bcf6be0adcf54abb1d406599dd7914 Mon Sep 17 00:00:00 2001
2From: Patrick Ohly <patrick.ohly@intel.com>
3Date: Fri, 24 Feb 2017 01:40:02 +0100
4Subject: [PATCH] VfrCompile: increase path length limit
5
6The VfrCompile tool has a hard-coded maximum length for path names
7which turned out to be too small by around 20 characters in the Yocto
8autobuilder setup. Increasing the maximum by a factor of 4 is
9relatively easy and makes the problem less likely.
10
11Upstream-Status: Inappropriate [configuration]
12
13Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
14---
15 BaseTools/Source/C/VfrCompile/EfiVfr.h | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/BaseTools/Source/C/VfrCompile/EfiVfr.h b/BaseTools/Source/C/VfrCompile/EfiVfr.h
19index d187902..9ad4a7b 100644
20--- a/BaseTools/Source/C/VfrCompile/EfiVfr.h
21+++ b/BaseTools/Source/C/VfrCompile/EfiVfr.h
22@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
23 #include "Common/UefiInternalFormRepresentation.h"
24 #include "Common/MdeModuleHii.h"
25
26-#define MAX_PATH 255
27+#define MAX_PATH 1023
28 #define MAX_VFR_LINE_LEN 4096
29
30 #define EFI_IFR_MAX_LENGTH 0xFF
31--
322.1.4
33
diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb
index 6b3a597dfd..a658c9d115 100644
--- a/meta/recipes-core/ovmf/ovmf_git.bb
+++ b/meta/recipes-core/ovmf/ovmf_git.bb
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/tianocore/edk2.git;branch=master \
14 file://0001-BaseTools-Force-tools-variables-to-host-toolchain.patch \ 14 file://0001-BaseTools-Force-tools-variables-to-host-toolchain.patch \
15 file://0002-ovmf-update-path-to-native-BaseTools.patch \ 15 file://0002-ovmf-update-path-to-native-BaseTools.patch \
16 file://0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ 16 file://0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \
17 file://VfrCompile-increase-path-length-limit.patch \
17 " 18 "
18 19
19SRC_URI_append_class-target = " \ 20SRC_URI_append_class-target = " \