diff options
| -rw-r--r-- | meta/recipes-core/ovmf/ovmf/0002-ovmf-update-path-to-native-BaseTools.patch | 22 | ||||
| -rw-r--r-- | meta/recipes-core/ovmf/ovmf_git.bb | 23 |
2 files changed, 19 insertions, 26 deletions
diff --git a/meta/recipes-core/ovmf/ovmf/0002-ovmf-update-path-to-native-BaseTools.patch b/meta/recipes-core/ovmf/ovmf/0002-ovmf-update-path-to-native-BaseTools.patch index 94ae5d4496e..95a407e1b3e 100644 --- a/meta/recipes-core/ovmf/ovmf/0002-ovmf-update-path-to-native-BaseTools.patch +++ b/meta/recipes-core/ovmf/ovmf/0002-ovmf-update-path-to-native-BaseTools.patch @@ -1,22 +1,24 @@ -From 9e632e3f9edd09632cc877dff6ea57608f979aab Mon Sep 17 00:00:00 2001 -From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> +From bc2ba0b30896a52e632cdf13f95b9900816e9d6a Mon Sep 17 00:00:00 2001 +From: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com> Date: Thu, 9 Jun 2016 02:23:01 -0700 -Subject: [PATCH] ovmf: update path to native BaseTools +Subject: [PATCH 1/7] ovmf: update path to native BaseTools BaseTools is a set of utilities to build EDK-based firmware. These utilities are used during the build process. Thus, they need to be built natively. When cross-compiling, we need to provide a path to the location of these -tools. The BBAKE_EDK_TOOLS_PATH string is used as a pattern to be replaced -with the appropriate location before building. +tools. We now directly point it to $STAGING_BINDIR_NATIVE which will be +expanded before building. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com> -Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> -Upstream-Status: Pending --- OvmfPkg/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh -index eb5eb73..9058fca 100755 +index 6821552..55922c5 100755 --- a/OvmfPkg/build.sh +++ b/OvmfPkg/build.sh @@ -30,7 +30,7 @@ then @@ -24,10 +26,10 @@ index eb5eb73..9058fca 100755 # export EDK_TOOLS_PATH=`pwd`/../BaseTools # This version is for the tools source in edk2 - export EDK_TOOLS_PATH=`pwd`/BaseTools -+ export EDK_TOOLS_PATH=BBAKE_EDK_TOOLS_PATH/BaseTools ++ export EDK_TOOLS_PATH=$STAGING_BINDIR_NATIVE/edk2_basetools/BaseTools echo $EDK_TOOLS_PATH source edksetup.sh BaseTools else -- -2.8.1 +2.7.4 diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index 8750b3c528d..cc93ff4b42a 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb @@ -13,12 +13,12 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[secureboot] = ",,," SRC_URI = "git://github.com/tianocore/edk2.git;branch=master \ - file://0001-ia32-Dont-use-pie.patch \ - file://0002-ovmf-update-path-to-native-BaseTools.patch \ - file://0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ - file://0004-ovmf-enable-long-path-file.patch \ - file://VfrCompile-increase-path-length-limit.patch \ - file://no-stack-protector-all-archs.patch \ + file://0001-ia32-Dont-use-pie.patch \ + file://0002-ovmf-update-path-to-native-BaseTools.patch \ + file://0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ + file://0004-ovmf-enable-long-path-file.patch \ + file://VfrCompile-increase-path-length-limit.patch \ + file://no-stack-protector-all-archs.patch \ " UPSTREAM_VERSION_UNKNOWN = "1" @@ -58,21 +58,12 @@ COMPATIBLE_HOST='(i.86|x86_64).*' OVMF_SECURE_BOOT_EXTRA_FLAGS ??= "" OVMF_SECURE_BOOT_FLAGS = "-DSECURE_BOOT_ENABLE=TRUE ${OVMF_SECURE_BOOT_EXTRA_FLAGS}" -do_patch[postfuncs] += "fix_basetools_location" -fix_basetools_location () { -} -fix_basetools_location_class-target() { - # Replaces the fake path inserted by 0002-ovmf-update-path-to-native-BaseTools.patch. - # Necessary for finding the actual BaseTools from ovmf-native. - sed -i -e 's#BBAKE_EDK_TOOLS_PATH#${STAGING_BINDIR_NATIVE}/${EDK_TOOLS_DIR}#' ${S}/OvmfPkg/build.sh -} - do_patch[postfuncs] += "fix_iasl" fix_iasl() { } fix_iasl_class-native() { # iasl is not installed under /usr/bin when building with OE. - sed -i -e 's#/usr/bin/iasl#${STAGING_BINDIR_NATIVE}/iasl#' ${S}/BaseTools/Conf/tools_def.template + sed -i -e 's#/usr/bin/iasl#$STAGING_BINDIR_NATIVE/iasl#' ${S}/BaseTools/Conf/tools_def.template } # Inject CC and friends into the build. LINKER already is in GNUmakefile. |