This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-newt.git
The following commit(s) were added to refs/heads/master by this push:
new 65a52c4 syscfg: Always use full repo name in syscfg.h defs
65a52c4 is described below
commit 65a52c48e9b9fb85b6a63e3fb9ebd118c6d9d470
Author: Andrzej Kaczmarek <[email protected]>
AuthorDate: Mon Oct 3 10:10:05 2022 +0200
syscfg: Always use full repo name in syscfg.h defs
CI builds have either mynewt-core or mynewt-nimble used as local
repository so the repo name is omitted in syscfg.h package defs. This
causes build issues since defines do not match those generated in
generic configuration, i.e. local project is used as local repo.
To avoid issues in future we'll always use full repo name for defs in
syscfg.h, this way those are stable regardless of repo location.
Note: repository name for local repo is the project name and it
overrides repository.yml name, if any.
---
newt/syscfg/syscfg.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/newt/syscfg/syscfg.go b/newt/syscfg/syscfg.go
index b504a1d..29a20da 100644
--- a/newt/syscfg/syscfg.go
+++ b/newt/syscfg/syscfg.go
@@ -1592,7 +1592,7 @@ func sanitizePkgName(name string) string {
func writePackages(lpkgs []*pkg.LocalPackage, w io.Writer) {
pkgs := []string{}
for _, lpkg := range lpkgs {
- pkgs = append(pkgs, sanitizePkgName(lpkg.FullName()))
+ pkgs = append(pkgs, sanitizePkgName(lpkg.NameWithRepo()))
}
sort.Strings(pkgs)
