Skip to content

Conversation

@nickwitten
Copy link
Contributor

  • Embed the sub-image hashes in the correct binary
  • Always run cargo build for the control image. Previously if the output binary is present and there are changes in the source code, the recipe won't be run.
  • Use cargo build in workspace context, not package context. This ensures that the binary isn't rebuilt between control-board--control and control-board--control--run targets without source changes.
  • Pass argument to embed_img_hash.py for target binary path so that the script works for other control-board targets

@nickwitten nickwitten force-pushed the dev/nick/makefile-fixes branch 5 times, most recently from 77b8b5c to 176f2cc Compare December 8, 2025 05:11
@nickwitten
Copy link
Contributor Author

@guyfleeman these fixes are ready to go in my opinion.

Copy link
Contributor

@guyfleeman guyfleeman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

print(f"embed_git_status.py - WARNING - Unable to embed hash of '{img_path}' into '{embed_img_path}'")
print(traceback.format_exc())
except Exception:
return False
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Useful to print the exception contents?

args = parser.parse_args()
target_bin = Path(args.bin)
if not target_bin.exists():
print(f"embed_git_status.py - ERROR - Could not find target binary at path '{target_bin}'")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit space below and newline after exit(1)

@nickwitten nickwitten force-pushed the dev/nick/makefile-fixes branch from 176f2cc to 15c68e9 Compare December 10, 2025 03:24
@nickwitten nickwitten merged commit d3afe03 into main Dec 10, 2025
3 checks passed
@nickwitten nickwitten deleted the dev/nick/makefile-fixes branch December 10, 2025 04:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants