summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-11-18 15:28:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-21 23:08:20 +0000
commitcd09d796021b429e65cef36590aed7b4173181a7 (patch)
treeedda5a8550f25978c213a32551dab7f4ffe59b15 /scripts
parent6a1c7f9e57c8662315caec30b166bcc1c87a7882 (diff)
downloadpoky-cd09d796021b429e65cef36590aed7b4173181a7.tar.gz
Revert "devtool/standard.py: Not filtering devtool workspace for devtool finish"
This reverts commit 41d225f4a37d02e9f79bdbfb79caac8cd3d291ce. Unfortunately this change broke 'devtool upgrade' functionality, causing 'devtool finish' to write out an upgraded recipe that no longer includes the original upstream source in SRC_URI. (From OE-Core rev: 2d6e55192dba0bf7f6e23e5ab5b3dbc68835bb28) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/devtool/standard.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 8d9c1a3022..1c0cd8ab51 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -2021,7 +2021,7 @@ def finish(args, config, basepath, workspace):
2021 remove_work=args.remove_work 2021 remove_work=args.remove_work
2022 tinfoil = setup_tinfoil(basepath=basepath, tracking=True) 2022 tinfoil = setup_tinfoil(basepath=basepath, tracking=True)
2023 try: 2023 try:
2024 rd = parse_recipe(config, tinfoil, args.recipename, True, False) 2024 rd = parse_recipe(config, tinfoil, args.recipename, True)
2025 if not rd: 2025 if not rd:
2026 return 1 2026 return 1
2027 2027