From f5cbee214a04abac3c7bf1e1904f4767dee6a767 Mon Sep 17 00:00:00 2001 From: Antti Kantee Date: Tue, 1 Sep 2015 11:01:50 +0000 Subject: [PATCH] Don't error if a rumpbake recipe is entry (can happen e.g. for cflags) --- app-tools/rumpbake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app-tools/rumpbake b/app-tools/rumpbake index 06e9bcd..bd80053 100755 --- a/app-tools/rumpbake +++ b/app-tools/rumpbake @@ -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}\" ] || \ -- 2.39.5