[YOCTO #8962]
Signed-off-by: Aníbal Limón <anibal.li...@linux.intel.com>
---
upgradehelper.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/upgradehelper.py b/upgradehelper.py
index 6732fb2..41f81c1 100755
--- a/upgradehelper.py
+++ b/upgradehelper.py
@@ -674,6 +674,10 @@ class UniverseUpdater(Updater):
line.split(',')[4]]
def _update_master(self):
+ if self.opts['layer_mode'] == 'yes':
+ I(" Sync poky master ...")
+ self.poky_git.pull()
+
I(" Drop all uncommited changes (including untracked) ...")
self.git.reset_hard()
self.git.clean_untracked()
@@ -683,7 +687,10 @@ class UniverseUpdater(Updater):
self.git.delete_branch("upgrades")
except Error:
pass
- I(" Sync master ...")
+ if self.opts['layer_mode'] == 'yes':
+ I(" Sync %s master ..." % self.opts['layer_name'])
+ else:
+ I(" Sync poky master ...")
self.git.pull()
self.git.create_branch("upgrades")
--
2.1.4
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
