rumprun-bake: use libexec/readelf -- it's always available

Saves from having to set $READELF if host readelf is not
called "readelf".

diff --git a/app-tools/Makefile b/app-tools/Makefile
index 82331525d1e665e2bdce12f957243fcadd163fff..4caf7e3db8e7139d4bf6705240c2d660927d3003 100644 (file)
--- a/app-tools/Makefile
+++ b/app-tools/Makefile
@@ -58,6 +58,7 @@ MACHDIR:= rumprun-${MACHINE_GNU_ARCH}-${PLATFORM}
 LIBEXEC_CC:= $(subst ${BRSOURCEDIR},${BRLIBEXECDEST},${CC})
 LIBEXEC_CXX:= $(subst ${BRSOURCEDIR},${BRLIBEXECDEST},${CXX})
 LIBEXEC_OBJCOPY:= ${BRLIBEXECDEST}/${MACHINE_GNU_PLATFORM}-objcopy
+LIBEXEC_READELF:= ${BRLIBEXECDEST}/${MACHINE_GNU_PLATFORM}-readelf
 
 TOOLS_CC := ${RRDEST}/bin/$(TOOLTUPLE)-${_CCVARIANT}
 TOOLS_CXX := ${RRDEST}/bin/$(TOOLTUPLE)-${_CXXVARIANT}
@@ -71,6 +72,7 @@ ${TOOLOBJ}/${2}: ${1} Makefile ${TOOLOBJ}
                -e 's#!LIBEXEC_CC!#$(LIBEXEC_CC)#g;'                    \
                -e 's#!LIBEXEC_CXX!#$(LIBEXEC_CXX)#g;'                  \
                -e 's#!LIBEXEC_OBJCOPY!#$(LIBEXEC_OBJCOPY)#g;'          \
+               -e 's#!LIBEXEC_READELF!#$(LIBEXEC_READELF)#g;'          \
                -e 's#!TOOLS_CC!#$(TOOLS_CC)#g;'                        \
                -e 's#!TOOLS_CXX!#$(TOOLS_CXX)#g;'                      \
                -e 's#!MACHINE_GNU_ARCH!#$(MACHINE_GNU_ARCH)#g;'        \

diff --git a/app-tools/rumprun-bake.in b/app-tools/rumprun-bake.in
index 129e86ec3e0b44bead91718edbc3598a1a6c783e..47a1ea48a3198e058548546f0c80a18829c8ca98 100644 (file)
--- a/app-tools/rumprun-bake.in
+++ b/app-tools/rumprun-bake.in
@@ -31,7 +31,6 @@ _RUMPBAKE_VERSION=20150930
 # rumprun-bake: script for final stage linking ("baking") of a unikernel image
 #
 
-: ${READELF:=readelf}
 unset runcmd
 
 if [ "$(basename $0)" = "rumpbake" ]; then
@@ -273,7 +272,7 @@ _getoneinfo ()
        unset tmp
 
        notesect=.note.rumprun.bakerecipe
-       tmp="$(${READELF} -p ${notesect} ${bin} 2>/dev/null \
+       tmp="$(!LIBEXEC_READELF! -p ${notesect} ${bin} 2>/dev/null \
            | sed -n '/.*rumprun_'"${var}"': /p')"
        [ -n "${tmp}" ] \
            || _die "Could not extract \"${var}\" from ${bin}. Not rumprun bin?"
@@ -336,10 +335,6 @@ OUTPUT="${2}"
 [ $# -gt 2 ] || _usage
 shift 2
 
-# We need readelf to extract the ELF note with the baking recipe.
-# Just any readelf will do, but we need one.
-type ${READELF} >/dev/null 2>&1 \
-    || _die 'Cannot find ${READELF}. Set $READELF env variable'
 unset RUMPBAKE_BACKINGCC
 unset RUMPBAKE_TUPLE
 unset RUMPBAKE_CFLAGS