Hi Robert / all, This patchset finally got merged. I tweaked some of the commit messages, messages and comments but otherwise they went in unchanged. Thanks for sorting out these issues!
Cheers, Paul On Friday, 23 June 2017 9:44:59 AM CEST Robert Yang wrote: > * V5 > - Fix Paul's comments > - Add REMOVE_LAYER_DEPENDENCIES = False to settings, the > _add_dependency() will check and remove dependencies which is not in > conf/layer.conf when True (WARN when False).. > > * V4 > - Add an option -i to update_layer.py to get initial layer value (dependencies, > versions and so on), update.py doesn't use tinfoil any more since tinfoil > before morty can't be shutdown totally if the process is not exited, this was > why splitted update_layer.py from update.py. > - Squash 11 patches (v3) into 10, since two of them have overlap. > > * V3: > - Better error messages when required collections not found > - Delete layerbranch for non-existed branch > - update_layer.py: remove --update-dependencies > > * V2: > - Remove "import bb" from update.py to avoid causing confusions when switch branches. > > * V1: > - The "-a ACTUAL_BRANCH" is a litle different from what we had talked, now it > respects "-l" and "-b", we can use -l to specify layers or default to all, > and it requires "-b" to work, only one branch is supported in a run, for example: > > $ update.py -b master -a branch_20170526 > All the layers which have branch master and actual_branch branch_20170526 > will be updated to branch_20170526. > > $ update.py -b master -l meta-oe -a branch_20170526 > Only meta-oe layer will be updated. > > $ update.py -b master -l bitbake -a branch_20170526 > The bitbake's bitbake_branch will be updated. > > // Robert > > The following changes since commit b958a991caa947fde2ccb073e3cb7924e162562d: > > layerindex/views: support querying by layer name (2017-06-15 16:04:14 +0200) > > are available in the git repository at: > > git://git.pokylinux.org/poky-contrib rbt/layerindex-10fixes > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/ layerindex-10fixes > > Robert Yang (10): > update.py: update actual branch for layer and bitbake > layerconfparse.py: remove unused layerbranch from parse_layer() > utils.py: add REMOVE_LAYER_DEPENDENCIES to remove dependencies > update_layer.py: set layerbranch's collection before add_dependencies > recipeparse.py: restore cwd when the parsing is done > update.py: update layers orderly > update_layer.py: remove --update-dependencies > update_layer.py: move the location of transaction.atomic() > update.py: add -p to git fetch > update_layer.py: delete layerbranch for non-existed branch > > layerindex/layerconfparse.py | 2 +- > layerindex/recipeparse.py | 3 + > layerindex/tools/import_layer.py | 2 +- > layerindex/update.py | 186 +++++++++++++++++++++++++++++ +--------- > layerindex/update_layer.py | 99 +++++++++------------ > layerindex/utils.py | 71 ++++++++++++++- > settings.py | 3 + > 7 files changed, 263 insertions(+), 103 deletions(-) > > -- Paul Eggleton Intel Open Source Technology Centre -- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
