poky/scripts/lib/devtool
Vincent Kriek 99d16e4c35 devtool: sync: Fix Execution error
When executing devtool sync on a recipe that was extract with devtool
extract earlier the following error occured:

    Traceback (most recent call last):
    [...]
    bb.process.ExecutionError: Execution of 'git fetch file:///home/vin/projects/poky/build/tmp/work/all-poky-linux/netbase/6.4/devtooltmp-figt1jmr/workdir/netbase devtool:devtool' failed with exit code 128:
    fatal: refusing to fetch into branch 'refs/heads/devtool' checked out at '/home/vin/projects/poky/build/netbase-src'

Fix this by adding --update-head-ok and --force to git fetch so it will
override the current head even if it is checked out and has changes.
Possible existing changes in the devtool branch can be retrieved by
checking out the devtool.bak branch

(From OE-Core rev: ee712c8b3c32fedd6af0521d2e34ea655f8cd5ca)

Signed-off-by: Vincent Kriek <vincent@coelebs.dev>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 4c89b061003a0f4143c6d3838e39fc2643edc8d6)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
2024-06-19 08:34:58 -07:00
..
ide_plugins devtool: ide-sdk prefer sources from workspace 2024-02-27 11:38:46 +00:00
__init__.py devtool: Make use of oe.patch.GitApplyTree.commitIgnored() 2024-02-19 16:03:22 +00:00
build_image.py Convert to new override syntax 2021-08-02 15:44:10 +01:00
build_sdk.py devtool/build_sdk: Drop unused imports 2023-09-18 08:53:10 +01:00
build.py devtool: build: Also run deploy for devtool build if applicable 2019-08-21 21:52:59 +01:00
deploy.py devtool: refactor deploy-target 2024-02-02 10:38:28 +00:00
export.py meta/lib+scripts: Convert to SPDX license headers 2019-05-09 16:31:55 +01:00
ide_sdk.py devtool: ide-sdk prefer sources from workspace 2024-02-27 11:38:46 +00:00
import.py meta/lib+scripts: Convert to SPDX license headers 2019-05-09 16:31:55 +01:00
menuconfig.py meta: remove True option to getVar and getVarFlag calls (again) 2023-02-02 09:50:02 +00:00
package.py meta/lib+scripts: Convert to SPDX license headers 2019-05-09 16:31:55 +01:00
runqemu.py meta/lib+scripts: Convert to SPDX license headers 2019-05-09 16:31:55 +01:00
sdk.py build-sysroots: target or native sysroot population need to be selected explicitly 2023-09-09 12:04:55 +01:00
search.py package/scripts: Fix FILES_INFO handling 2021-08-17 09:53:04 +01:00
standard.py devtool: sync: Fix Execution error 2024-06-19 08:34:58 -07:00
upgrade.py lib/oe/patch: Use git notes to store the filenames for the patches 2024-02-19 16:03:22 +00:00
utilcmds.py meta/lib+scripts: Convert to SPDX license headers 2019-05-09 16:31:55 +01:00