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 2019/06/10 23:55:37 UTC
[mynewt-imgmod] 08/09: Depend on latest mynewt.apache.org/newt
This is an automated email from the ASF dual-hosted git repository.
ccollins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-imgmod.git
commit 0dc0104f127e0e0c8199143fdceb8c10a212a3aa
Author: Christopher Collins <cc...@apache.org>
AuthorDate: Wed May 29 10:10:58 2019 -0700
Depend on latest mynewt.apache.org/newt
---
cli/mfg_cmds.go | 6 +++---
go.mod | 2 +-
go.sum | 2 ++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/cli/mfg_cmds.go b/cli/mfg_cmds.go
index a89902b..afc8461 100644
--- a/cli/mfg_cmds.go
+++ b/cli/mfg_cmds.go
@@ -28,12 +28,12 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
+ "mynewt.apache.org/imgmod/imfg"
"mynewt.apache.org/newt/artifact/flash"
"mynewt.apache.org/newt/artifact/manifest"
"mynewt.apache.org/newt/artifact/mfg"
"mynewt.apache.org/newt/artifact/misc"
"mynewt.apache.org/newt/artifact/sec"
- "mynewt.apache.org/imgmod/imfg"
"mynewt.apache.org/newt/util"
)
@@ -220,7 +220,7 @@ func runJoinCmd(cmd *cobra.Command, args []string) {
"Error reading source mfg directory: %s", err.Error()))
}
for _, info := range infos {
- if info.Name() != mfg.MFG_IMG_FILENAME {
+ if info.Name() != mfg.MFG_BIN_IMG_FILENAME {
src := splitDir + "/mfg/" + info.Name()
dst := outDir + "/" + info.Name()
if info.IsDir() {
@@ -239,7 +239,7 @@ func runJoinCmd(cmd *cobra.Command, args []string) {
ImgmodUsage(nil, err)
}
- binPath := fmt.Sprintf("%s/%s", outDir, mfg.MFG_IMG_FILENAME)
+ binPath := fmt.Sprintf("%s/%s", outDir, mfg.MFG_BIN_IMG_FILENAME)
if err := WriteFile(finalBin, binPath); err != nil {
ImgmodUsage(nil, err)
}
diff --git a/go.mod b/go.mod
index a8820c4..a1505df 100644
--- a/go.mod
+++ b/go.mod
@@ -3,5 +3,5 @@ module mynewt.apache.org/imgmod
require (
github.com/sirupsen/logrus v1.4.0
github.com/spf13/cobra v0.0.3
- mynewt.apache.org/newt v0.0.0-20190314184600-c5632c20daf3
+ mynewt.apache.org/newt v0.0.0-20190529170335-75b2c282a77d
)
diff --git a/go.sum b/go.sum
index d545ff0..ef709dd 100644
--- a/go.sum
+++ b/go.sum
@@ -27,3 +27,5 @@ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTu
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
mynewt.apache.org/newt v0.0.0-20190314184600-c5632c20daf3 h1:U9HanOWwCKSPTCZu7ti0MlmMlkWpTiR856BR2bRzHaU=
mynewt.apache.org/newt v0.0.0-20190314184600-c5632c20daf3/go.mod h1:lFsPYOHxMMWA11pydOeh0GVFiXtx0A9VnzOQ6SiRR88=
+mynewt.apache.org/newt v0.0.0-20190529170335-75b2c282a77d h1:dnv0EBSSD88NahC0Pow+5DOH7gy4D5xj5n1iCIxA2NY=
+mynewt.apache.org/newt v0.0.0-20190529170335-75b2c282a77d/go.mod h1:lFsPYOHxMMWA11pydOeh0GVFiXtx0A9VnzOQ6SiRR88=