]> code.ossystems Code Review - openembedded-core.git/commit
devtool: sdk-update: reset git metadata on update
authorStephano Cetola <stephano.cetola@linux.intel.com>
Fri, 15 Apr 2016 16:40:29 +0000 (09:40 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 18 Apr 2016 15:27:45 +0000 (16:27 +0100)
commit4657bc9d165e51981e034e73e7b92552e873eef7
treeea5db75fc94a46b518f02db1e18bff398f2b4c91
parent65db0a29be91a157522cf02ebb21961b8ba55759
devtool: sdk-update: reset git metadata on update

Replace git pull with fetch and reset to avoid the merge logic in the
event that the layers repo in the published SDK we're updating to isn't
fast-forward merge from the local repo.

Also add gitignore and committer info during publish to avoid errors and
to be sure that the first commit has a dummy user in it.

[ YOCTO #9368 ]

Signed-off-by: Stephano Cetola <stephano.cetola@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
scripts/lib/devtool/sdk.py
scripts/oe-publish-sdk