Skip to content

Conversation

@manuelh-dev
Copy link

Merge Checklist
  • Followed patch format from upstream recommendation: https://github.com/kata-containers/community/blob/main/CONTRIBUTING.md#patch-format
    • Included a single commit in a given PR - at least unless there are related commits and each makes sense as a change on its own.
  • Aware about the PR to be merged using "create a merge commit" rather than "squash and merge" (or similar)
  • genPolicy only: Ensured the tool still builds on Windows
  • The upstream/missing label (or upstream/not-needed) has been set on the PR.
Summary

Cherry-picking changes made upstream. Will help make progress with: #204

Test Methodology

Upstream CI

Manuel Huber added 2 commits July 11, 2024 23:05
For docker-based builds only install Rust when necessary.
Further, execute the detect Rust version check only when
intending to install Rust.
As of today, this is the case when we intend to build the
agent during rootfs build.

Signed-off-by: Manuel Huber <[email protected]>
We set the VERSION variable consistently across Makefiles to
'unknown'  if the file is empty or not present.
We also use git commands consistently for calculating the COMMIT,
COMMIT_NO variables, not erroring out when building outside of
a git repository.
In create_summary_file we also account for a missing/empty VERSION
file.
This makes e.g. the UVM build process in an environment where we
build outside of git with a minimal/reduced set of files smoother.

Signed-off-by: Manuel Huber <[email protected]>
@manuelh-dev manuelh-dev added the upstream/merged PRs that have been merged upstream label Jul 11, 2024
@manuelh-dev manuelh-dev requested review from a team as code owners July 11, 2024 23:08
@manuelh-dev manuelh-dev changed the title Cherry-pick upstream #9825: osbuilder: allow rootfs builds w/o git or version file deps Cherry-pick upstream PR #9825: osbuilder: allow rootfs builds w/o git or version file deps Jul 11, 2024
@manuelh-dev manuelh-dev merged commit e7cb0d1 into msft-main Jul 15, 2024
@manuelh-dev manuelh-dev deleted the mahuber/cherry-pick-upstr branch June 18, 2025 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

upstream/merged PRs that have been merged upstream

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants