Skip to content

builder: Fix false positive flash map errors #601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
m-gorecki merged 1 commit into from
Jun 28, 2025
Merged

builder: Fix false positive flash map errors #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions newt/builder/targetbuild.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,16 @@ func NewTargetTester(target *target.Target,
injectedSettings: cfgv.NewSettings(nil),
}

if err := t.ensureResolved(); err != nil {
if err := t.ensureResolved(false); err != nil {
return nil, err
}

if err := t.bspPkg.Reload(t.res.Cfg.SettingValues()); err != nil {
return nil, err
}

t.res.Cfg.DetectErrors(bspPkg.FlashMap)

return t, nil
}

Expand Down Expand Up @@ -174,7 +176,7 @@ func (t *TargetBuilder) resolveTransientPkgs(lps []*pkg.LocalPackage) {
}
}

func (t *TargetBuilder) ensureResolved() error {
func (t *TargetBuilder) ensureResolved(detectErr bool) error {
if t.res != nil {
return nil
}
Expand Down Expand Up @@ -238,7 +240,7 @@ func (t *TargetBuilder) ensureResolved() error {

var err error
t.res, err = resolve.ResolveFull(
loaderSeeds, appSeeds, t.injectedSettings, t.bspPkg.FlashMap)
loaderSeeds, appSeeds, t.injectedSettings, t.bspPkg.FlashMap, detectErr)
if err != nil {
return err
}
Expand Down Expand Up @@ -267,15 +269,15 @@ func (t *TargetBuilder) ensureResolved() error {
}

func (t *TargetBuilder) Resolve() (*resolve.Resolution, error) {
if err := t.ensureResolved(); err != nil {
if err := t.ensureResolved(true); err != nil {
return nil, err
}

return t.res, nil
}

func (t *TargetBuilder) validateAndWriteCfg() error {
if err := t.ensureResolved(); err != nil {
if err := t.ensureResolved(true); err != nil {
return err
}

Expand Down Expand Up @@ -384,7 +386,7 @@ func (t *TargetBuilder) extraADirs() []string {
}

func (t *TargetBuilder) PrepBuild() error {
if err := t.ensureResolved(); err != nil {
if err := t.ensureResolved(true); err != nil {
return err
}

Expand Down Expand Up @@ -836,15 +838,15 @@ func (t *TargetBuilder) MaxImgSizes() []int {
}

func (t *TargetBuilder) CreateDepGraph() (DepGraph, error) {
if err := t.ensureResolved(); err != nil {
if err := t.ensureResolved(true); err != nil {
return nil, err
}

return depGraph(t.res.MasterSet)
}

func (t *TargetBuilder) CreateRevdepGraph() (DepGraph, error) {
if err := t.ensureResolved(); err != nil {
if err := t.ensureResolved(true); err != nil {
return nil, err
}

Expand Down
11 changes: 8 additions & 3 deletions newt/resolve/resolve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1168,7 +1168,8 @@ func ResolveFull(
loaderSeeds []*pkg.LocalPackage,
appSeeds []*pkg.LocalPackage,
injectedSettings *cfgv.Settings,
flashMap flashmap.FlashMap) (*Resolution, error) {
flashMap flashmap.FlashMap,
detectErr bool) (*Resolution, error) {

// First, calculate syscfg and determine which package provides each
// required API. Syscfg and APIs are project-wide; that is, they are
Expand Down Expand Up @@ -1239,7 +1240,9 @@ func ResolveFull(
if loaderSeeds == nil {
res.AppSet.Rpkgs = r.rpkgSlice()
res.LoaderSet = nil
res.Cfg.DetectErrors(flashMap)
if detectErr == true {
res.Cfg.DetectErrors(flashMap)
}
return res, nil
}

Expand Down Expand Up @@ -1290,7 +1293,9 @@ func ResolveFull(
return nil, err
}

res.Cfg.DetectErrors(flashMap)
if detectErr == true {
res.Cfg.DetectErrors(flashMap)
}

return res, nil
}
Expand Down
Loading