[oe-commits] [openembedded-core] 10/18: kernel-fitimage: unbreak UBOOT_ENTRYSYMBOL support

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit af8efa8f11be45c369d198d6707d1539feb4248c
Author: André Draszik <adraszik at tycoint.com>
AuthorDate: Wed Sep 20 10:41:54 2017 +0100

    kernel-fitimage: unbreak UBOOT_ENTRYSYMBOL support
    
    - vmlinux is located in ${B}, not ${S}.
    - parsing of nm output got broken completely in commit
      b406a89935f148779569fa3770776e009dd51f13 ("kernel-fitimage: add
      initramfs support"), commit ec755d2524fcbd9dfded23a576f25c990d405a6c
      in yocto
    
    While at it, make awk exit on match to save a few CPU cycles.
    
    Signed-off-by: André Draszik <adraszik at tycoint.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/kernel-fitimage.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 6f1b766..5583b44 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -97,8 +97,8 @@ fitimage_emit_section_kernel() {
 
 	ENTRYPOINT=${UBOOT_ENTRYPOINT}
 	if [ -n "${UBOOT_ENTRYSYMBOL}" ]; then
-		ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
-			awk '$4=="${UBOOT_ENTRYSYMBOL}" {print $2}'`
+		ENTRYPOINT=`${HOST_PREFIX}nm vmlinux | \
+			awk '$3=="${UBOOT_ENTRYSYMBOL}" {print "0x"$1;exit}'`
 	fi
 
 	cat << EOF >> ${1}

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.