[PATCH] recipes-bsp/efibootguard: handle multilib configurations

13 views
Skip to first unread message

Cedric_H...@mentor.com

unread,
Oct 26, 2017, 11:41:17 AM10/26/17
to efibootg...@googlegroups.com, Cedric Hombourger
From: Cedric Hombourger <Cedric_H...@mentor.com>

Configurations with multilib enabled may see libraries and efi
binaries shipped in a different folder (e.g. /usr/lib64 instead
of /usr/lib). Use ${libdir} and other variables to remove as
many hard-coded paths as possible.

Signed-off-by: Cedric Hombourger <Cedric_H...@mentor.com>
---
recipes-bsp/efibootguard/efibootguard.bb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes-bsp/efibootguard/efibootguard.bb b/recipes-bsp/efibootguard/efibootguard.bb
index 99340fa..4f8f816 100644
--- a/recipes-bsp/efibootguard/efibootguard.bb
+++ b/recipes-bsp/efibootguard/efibootguard.bb
@@ -38,11 +38,11 @@ EXTRA_OECONF = "--with-gnuefi-sys-dir=${STAGING_DIR_HOST} \
--with-gnuefi-lds-dir=${STAGING_LIBDIR} \
--with-gnuefi-lib-dir=${STAGING_LIBDIR}"

-FILES_${PN}-tools = "/usr/bin"
+FILES_${PN}-tools = "${bindir}"
FILES_${PN}-tools-dbg = "/usr/src/debug"
-FILES_${PN}-tools-staticdev = "/usr/lib/lib*.a"
-FILES_${PN}-tools-dev = "/usr/include/*"
-FILES_${PN}-efi = "/usr/lib/efibootguard"
+FILES_${PN}-tools-staticdev = "${libdir}/lib*.a"
+FILES_${PN}-tools-dev = "${includedir}/${BPN}"
+FILES_${PN}-efi = "${libdir}/${BPN}"

do_deploy () {
install ${B}/efibootguard*.efi ${DEPLOYDIR}
--
2.7.4

Jan Kiszka

unread,
Oct 30, 2017, 5:15:30 AM10/30/17
to Cedric_H...@mentor.com, efibootg...@googlegroups.com
Thanks, looks good to me. Applied to next.

Jan

--
Siemens AG, Corporate Technology, CT RDA ITP SES-DE
Corporate Competence Center Embedded Linux

Cedric Hombourger

unread,
Nov 3, 2017, 9:01:02 AM11/3/17
to EFI Boot Guard
Thanks Jan!
Reply all
Reply to author
Forward
0 new messages