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.

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

Jump to bottom

build: backport of new flavor build system #593

Merged
merged 20 commits into from
May 6, 2024
Merged

build: backport of new flavor build system #593

merged 20 commits into from
May 6, 2024

Conversation

c-po
Copy link
Member

@c-po c-po commented May 5, 2024 •
edited
Loading

Change Summary

Manual backport of relevant PRs from current to introduce the new flavor supporting build system in sagitta

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

Component(s) name

Build scripts

Proposed changes

How to test

sudo VYOS_TEMPLATE_DIR=/vyos/vyos-build/packages/vyos-1x/data/templates ./build-vyos-image vmware

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

dmbaturin and others added 19 commits May 5, 2024 14:51
@dmbaturin @c-po
build script: T5711: copy version.json to the ISO image in addition t…
125aab4 
…o the SquashFS image

(cherry picked from commit f31701f)
@dmbaturin @c-po
chore: T671: remove unused scripts and references to them
64d4406 
(cherry picked from commit 5dcb6b7)
@dmbaturin @c-po
build script: T3664: fix handling of missing or malformed flavor files
75c8f62 
(cherry picked from commit 65b0321)
@dmbaturin @c-po
build flavors: T3664: reimplement Dell VEP flavors using the new system
0f54ee8 
(cherry picked from commit b35eb63)
@dmbaturin @c-po
build scripts: T3664: move image build scripts to a dedicated directory
df058a2 
to avoid a mix of image build scripts and ancilliary scripts in the same directory

(cherry picked from commit 750819b)
@dmbaturin @c-po
build: T3664: add support for building non-ISO flavors
249a595 
(cherry picked from commit a896176)
@jestabro @c-po
Account for the working dir below the root in git invocation
7c88ff5 
Signed-off-by: Daniil Baturin <daniil@vyos.io>
(cherry picked from commit 7fa66c7)
@dmbaturin @c-po
build: T3664: filter out non-TOML files from the build flavor dir
f257039 
to avoid mistakenly listing auixilliary files like README
as flavors

(cherry picked from commit c072689)
@dmbaturin @c-po
build: T3664: add a sanity check for image_format
0d3031a 
and normalize it to a list if only one format is specified

(cherry picked from commit 72c7c7f)
@jestabro @c-po
fix path to versions file
535908b 
Signed-off-by: Daniil Baturin <daniil@vyos.io>
(cherry picked from commit ed7bcbd)
@dmbaturin @c-po
docker: T3664: add dependencies for raw disk building
2b6a2bf 
(cherry picked from commit c535510)
@dmbaturin @c-po
build: T3664: add a parameterized make rule for build targets
1cddaf2 
to simplify the now-rather-tricky build script invocation

(cherry picked from commit 2928865)
@dmbaturin @c-po
build: T3664: correct the parameterized make rule
139bd4a 
(cherry picked from commit 008bb50)
@dmbaturin @c-po
build: T3664: move sudo out of the make target
d91bfd3 
to avoid permission problems

(cherry picked from commit abb5b51)
@dmbaturin @c-po
build: T3664: add vyos-1x repo as packages/vyos-1x submodule
80e03e6 
(cherry picked from commit 425f78f)
@dmbaturin @c-po
build: T3664: adjust the vyos-1x submodule path in scripts
4315571 
(cherry picked from commit ec42af7)
@dmbaturin @c-po
build: T3664: typo fixes and small refactoring
78819c0 
(cherry picked from commit f6b0809)
@dmbaturin @c-po
build: T3664: fail the build on external command errors
d3696d8 
(cherry picked from commit 7dfd923)
@jestabro @c-po
build: T3664: clone vyos-1x under build dir instead of as submodule
3e3f218 
(cherry picked from commit a90809e)
@c-po c-po requested a review from a team May 5, 2024 13:14
@c-po c-po self-assigned this May 5, 2024
@c-po c-po requested review from dmbaturin, sarthurdev, zdc, jestabro and sever-sever and removed request for a team May 5, 2024 13:14
@c-po c-po changed the base branch from current to sagitta May 5, 2024 13:14
@github-actions github-actions bot added the sagitta VyOS 1.4 LTS label May 5, 2024
@c-po c-po removed the current label May 6, 2024
@c-po c-po merged commit 6a8b976 into vyos:sagitta May 6, 2024
3 checks passed
@c-po c-po deleted the flavor-backport branch July 4, 2024 11:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sever-sever sever-sever sever-sever approved these changes

@dmbaturin dmbaturin dmbaturin approved these changes

@sarthurdev sarthurdev Awaiting requested review from sarthurdev sarthurdev is a code owner automatically assigned from vyos/reviewers

@zdc zdc Awaiting requested review from zdc zdc is a code owner automatically assigned from vyos/reviewers

@jestabro jestabro Awaiting requested review from jestabro jestabro is a code owner automatically assigned from vyos/reviewers

Assignees

@c-po c-po

Labels
sagitta VyOS 1.4 LTS
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@c-po @dmbaturin @sever-sever @jestabro