edit recipes-distro and conf
Merge branch '2.1' of https://github.com/oe-alliance/oe-alliance-core into 2.1