re-merge of yocto build makefiles