[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7871/8267] kernel-fitimage: unbreak UBOOT_ENTRYSYMBOL support

[Emmanuele Bassi <ebassi src gnome org>]

commit c3ba13c44b75164fc74c1f5294f387dd5bb7be55
Author: André Draszik <adraszik tycoint com>
Date:   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.
    
    (From OE-Core rev: 9d2ec9c046c4a9c6a842d28133d40639f5a65297)
    
    Signed-off-by: André Draszik <adraszik tycoint com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/kernel-fitimage.bbclass |    4 ++--
 1 files 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}