You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/11/10 22:38:27 UTC

[15/50] incubator-mynewt-newt git commit: newt - Fix spurious bsp mismatch err for rmt repos

newt - Fix spurious bsp mismatch err for rmt repos


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/commit/bc70c6a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/bc70c6a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/bc70c6a6

Branch: refs/heads/master
Commit: bc70c6a6f380953ccc7aa2274d260df6579209f7
Parents: afae040
Author: Christopher Collins <cc...@apache.org>
Authored: Fri Oct 28 11:01:22 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Fri Oct 28 11:01:55 2016 -0700

----------------------------------------------------------------------
 newt/mfg/load.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/bc70c6a6/newt/mfg/load.go
----------------------------------------------------------------------
diff --git a/newt/mfg/load.go b/newt/mfg/load.go
index 0ed9bad..d8e660f 100644
--- a/newt/mfg/load.go
+++ b/newt/mfg/load.go
@@ -267,7 +267,7 @@ func Load(basePkg *pkg.LocalPackage) (*MfgImage, error) {
 				"split image mode (%s is a split build)", imgTarget.Name())
 		}
 
-		if imgTarget.BspName != mi.bsp.Name() {
+		if imgTarget.Bsp() != mi.bsp.LocalPackage {
 			return nil, mi.loadError(
 				"image target \"%s\" specified conflicting BSP; "+
 					"boot loader uses %s, image uses %s",