
Bring r6 procedures into alignment with updates on r5
Fix substitutions in unexpandable contexts.
|prereq| > |prefix| as required.
Signed-off-by: Ron Stone <ronald.stone@windriver.com>
Change-Id: I4a13d8cb447c014f311228943551e117f8f3b773
(cherry picked from commit 6abab2e712
)