[yocto] [meta-security][PATCH 4/6] tpm2-tcti-uefi: fix configure arguments

[Dmitry Eremin-Solenikov]

From: Dmitry Eremin-Solenikov <dmitry_eremin-solenikov at mentor.com>

Pass correct location of EFI's crt0 and ld script thus removing the need
to patch configure.ac.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin-solenikov at mentor.com>
---
 .../files/configure_oe_fixup.patch            | 27 -------------------
 .../tpm2-tcti-uefi/tpm2-tcti-uefi_0.9.9.bb    | 10 +++++--
 2 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 meta-tpm/recipes-tpm2/tpm2-tcti-uefi/files/configure_oe_fixup.patch

diff --git a/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/files/configure_oe_fixup.patch b/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/files/configure_oe_fixup.patch
deleted file mode 100644
index 8a216cd45eff..000000000000
--- a/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/files/configure_oe_fixup.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Upstream-Status: OE specific
-Signed-off-by: Armin Kuster <akuster808 at gmail.com>
-
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac
-+++ git/configure.ac
-@@ -84,9 +84,6 @@ AC_ARG_WITH([efi-lds],
-             AS_HELP_STRING([--with-efi-lds=LDS_PATH],[Path to gnu-efi lds file.]),
-             [],
-             [with_efi_lds="/usr/lib/elf_${ARCH}_efi.lds"])
--AC_CHECK_FILE(["${with_efi_lds}"],
--              [],
--              [AC_MSG_ERROR([Missing file: ${with_efi_lds}.])])
- EXTRA_LDFLAGS="-L /usr/lib -L /usr/lib64 -Wl,--script=${with_efi_lds}"
- 
- # path to object file from gnu-efi
-@@ -94,9 +91,6 @@ AC_ARG_WITH([efi-crt0],
-             AS_HELP_STRING([--with-efi-crt0=OBJ_PATH],[Path to gnu-efi crt0 object file.]),
-             [],
-             [with_efi_crt0="/usr/lib/crt0-efi-${ARCH}.o"])
--AC_CHECK_FILE(["${with_efi_crt0}"],
--              [],
--              [AC_MSG_ERROR([Missing ${with_efi_crt0} file.])])
- EXTRA_LDLIBS="${with_efi_crt0}"
- 
- # check for efi and gnuefi libraries
diff --git a/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/tpm2-tcti-uefi_0.9.9.bb b/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/tpm2-tcti-uefi_0.9.9.bb
index 983f72ebeb68..ed9b7e1ddc8e 100644
--- a/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/tpm2-tcti-uefi_0.9.9.bb
+++ b/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/tpm2-tcti-uefi_0.9.9.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da"
 DEPENDS = "libtss2-dev gnu-efi-native gnu-efi pkgconfig autoconf-archive-native"
 
 SRC_URI = "git://github.com/tpm2-software/tpm2-tcti-uefi.git \
-           file://configure_oe_fixup.patch \
           "
 SRCREV = "7baf1eebfeb56a896bdd5d677fb24377d619eb9d"
 
@@ -13,6 +12,13 @@ S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
+EFI_ARCH_x86 = "ia32"
+EFI_ARCH_x86-64 = "x86_64"
+
 COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
-EXTRA_OECONF_append = " --with-efi-includedir=${STAGING_INCDIR}/efi --with-efi-lds=${STAGING_LIBDIR_NATIVE}/"
+EXTRA_OECONF_append = "\
+    --with-efi-includedir=${STAGING_INCDIR}/efi \
+    --with-efi-crt0=${STAGING_LIBDIR_NATIVE}/crt0-efi-${EFI_ARCH}.o \
+    --with-efi-lds=${STAGING_LIBDIR_NATIVE}/elf_${EFI_ARCH}_efi.lds \
+"
 RDEPENDS_${PN} = "gnu-efi"
-- 
2.20.1