iso-building: merge upstream changes of recipes.

Signed-off-by: Zhao Chao <zhaochao1984@gmail.com>