Fixes [YOCTO #2808]
Moved some variables around to make better sense of how I
think it works.
(From yocto-docs rev: 2f40edbb792d56808482fdc3a1bf3d3457673546)
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>