]> xenbits.xensource.com Git - osstest/rumprun.git/commitdiff
Don't error if a rumpbake recipe is entry (can happen e.g. for cflags)
authorAntti Kantee <pooka@iki.fi>
Tue, 1 Sep 2015 11:01:50 +0000 (11:01 +0000)
committerAntti Kantee <pooka@iki.fi>
Tue, 1 Sep 2015 11:02:24 +0000 (11:02 +0000)
app-tools/rumpbake

index 06e9bcd5c319cd897c0489feddec941e95c1ffcb..bd80053780e59c12d56b92b7b5175ec071f7b75e 100755 (executable)
@@ -115,9 +115,14 @@ getoneinfo ()
 
        notesect=.note.rumprun.bakerecipe
        tmp="$(${READELF} -p ${notesect} ${bin} 2>/dev/null \
-           | sed -n 's/.*rumprun_'"${var}"': //p')"
+           | sed -n '/.*rumprun_'"${var}"': /p')"
        [ -n "${tmp}" ] \
            || die "Could not extract \"${var}\" from ${bin}.  Not rumprun bin?"
+
+       # now that we've verified the entry is present, reduce to
+       # contents (which may be empty)
+       tmp="${tmp#*rumprun_${var}: }"
+
        cvar=$(echo ${var} | tr '[a-z]' '[A-Z]')
 
        eval [ \"\${RUMPBAKE_${cvar}:=${tmp}}\" = \"${tmp}\" ] || \