Skip to content

Commit

Permalink
syscfg: Always use full repo name in syscfg.h defs
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
andrzej-kaczmarek committed Oct 3, 2022
1 parent 438d9b5 commit 65a52c4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion newt/syscfg/syscfg.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 65a52c4

Please sign in to comment.