Skip to content
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.

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

chore: merge the yocto scripts into yocto manifest #17

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

MoeMahhouk
Copy link
Collaborator

This commit integrates the yocto-scripts repository directly into yocto-manifests, consolidating all build configurations under a shared config_files directory.

Key changes:

  • Create config_files/ directory with profile-specific subdirectories:
    • tdx-base/: basic image configuration
    • tdx-bob/: searcher node configuration
    • tdx-rbuilder/: reth/lighthouse node configuration
  • Move common Makefile to config_files/
  • Update manifest XMLs to reference config_files paths:
    • Point copyfile operations to profile-specific configurations
    • Maintain consistent path references
  • Keep profile-specific layer configurations isolated

The consolidation simplifies our repository management while maintaining clear separation between different build profiles. Each profile maintains its own setup script and patches, enabling independent builds

@MoeMahhouk MoeMahhouk requested a review from Ruteri December 9, 2024 18:17
tdx-base.xml Outdated
<project remote="flashbots" revision="tdx" name="yocto-scripts" path="srcs/yocto-scripts">
<copyfile dest="setup" src="setup"/>
<copyfile dest="Makefile" src="Makefile"/>
<project remote="flashbots" revision="merge-scripts" name="yocto-manifests" path="srcs/yocto-manifests">
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This will change to revision main instead later. But for testing purposes, I set it up to this branch to check it out first

Copy link
Collaborator

@Ruteri Ruteri left a comment

Choose a reason for hiding this comment

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

I like the refactor, esp the readmes :)
I'd update this repo's main readme to point to the downstream readmes, and to say a word about where to find what

Separately, config_files doesn't quite seem to fit. images/ maybe, or definitions or something with build

@@ -0,0 +1,14 @@
.PHONY: build gen-measurements

build:
Copy link
Collaborator

Choose a reason for hiding this comment

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

Does it make sense to have this in config_files?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I had it first for each of the products separately. But I noticed that they all have the same Makefile as a common and use it. So I put it outside instead.
I can create a directory called common and put it in there instead. 🤔

@MoeMahhouk
Copy link
Collaborator Author

MoeMahhouk commented Dec 9, 2024

I'd update this repo's main readme to point to the downstream readmes, and to say a word about where to find what

Good Idea, I will update it

Separately, config_files doesn't quite seem to fit. images/ maybe, or definitions or something with build

I had it first called profiles but then I thought that it actually only contains setup script and patch files. I have no strong opinion on renaming it if we have better naming

@MoeMahhouk MoeMahhouk marked this pull request as ready for review December 10, 2024 12:20
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.

2 participants