You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2017/03/06 21:16:58 UTC
[24/50] [abbrv] incubator-mynewt-newt git commit: MYNEWT-527;
allow build machine OS dependent overrides in bsp.yml.
MYNEWT-527; allow build machine OS dependent overrides in bsp.yml.
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/0558e33c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/0558e33c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/0558e33c
Branch: refs/heads/master
Commit: 0558e33c20f5be3551571bc65de9348d0eebb782
Parents: 5cb84eb
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Mon Feb 27 21:02:51 2017 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Mon Feb 27 21:02:51 2017 -0800
----------------------------------------------------------------------
newt/pkg/bsp_package.go | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/0558e33c/newt/pkg/bsp_package.go
----------------------------------------------------------------------
diff --git a/newt/pkg/bsp_package.go b/newt/pkg/bsp_package.go
index 572255c..146347f 100644
--- a/newt/pkg/bsp_package.go
+++ b/newt/pkg/bsp_package.go
@@ -20,6 +20,7 @@
package pkg
import (
+ "runtime"
"strings"
"mynewt.apache.org/newt/newt/flash"
@@ -101,6 +102,13 @@ func (bsp *BspPackage) resolveLinkerScriptSetting(
func (bsp *BspPackage) Reload(features map[string]bool) error {
var err error
+ if features == nil {
+ features = map[string]bool{
+ strings.ToUpper(runtime.GOOS): true,
+ }
+ } else {
+ features[strings.ToUpper(runtime.GOOS)] = true
+ }
bsp.BspV, err = util.ReadConfig(bsp.BasePath(),
strings.TrimSuffix(BSP_YAML_FILENAME, ".yml"))
if err != nil {
@@ -131,7 +139,6 @@ func (bsp *BspPackage) Reload(features map[string]bool) error {
if err != nil {
return err
}
-
bsp.DebugScript, err = bsp.resolvePathSetting(
features, "bsp.debugscript")
if err != nil {