Rebase ghaf release 24.06 #52
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
buianhhuy96
commented
Jul 12, 2024
buianhhuy96
commented
- Update flake.lock to ghaf 24.06
- Modify config-processor to use ghaf modules
- Rename microvm interface id from "vm-" to "tap-"
- Simplify some configs due to updated nixpkgs
- Adapt app changes to new version: lisgd, squeekboard
- Remove upstream package overlay which caused error in previous build
- Remove local golang, go-app is now built with nixpkgs.buildGoModules
- Issue remained: fmo-dci warning and added unused (not working) audiovm
jsvapiav
reviewed
Jul 12, 2024
config-processor-installers.nix
Outdated
| @@ -97,7 +98,7 @@ let | |||
| isoImage.squashfsCompression = "lz4"; | |||
| } | |||
| ] | |||
| ++ (import "${ghafOS}/modules/module-list.nix") | |||
| #++ (import "${ghafOS}/modules/module-list.nix") | |||
flake.nix
Outdated
| @@ -64,7 +55,7 @@ | |||
|
|
|||
| imports = [ | |||
| ./hydrajobs/flake-module.nix | |||
| ./modules/flake-module.nix | |||
| ./modules/flake-module.nix | |||
There was a problem hiding this comment.
unnecessary space at the end of string
| @@ -114,6 +114,8 @@ in { | |||
| after = [ | |||
| "docker.service" | |||
| "docker.socket" | |||
| # WAR: warning: fmo-dci.service is ordered after 'network-online.target' | |||
| # but doesn't depend on it | |||
There was a problem hiding this comment.
Need to create a Jira ticket for that and put its number here.
There was a problem hiding this comment.
Created FMO-44 and commented
| @@ -21,12 +11,9 @@ buildGo121Module { | |||
| }; | |||
| tags = [ "prod" ]; | |||
| patches = [./remove-test.patch]; | |||
| vendorSha256 = "sha256-9/twQyt6SVXWTRypt1FIWsRQxQEWFBkdi8eR+/xYNqg=="; | |||
| vendorHash = "sha256-18p7l1otlviZNlM0UlCgW/US5YckBYcY/OEJoJIsIM0="; | |||
There was a problem hiding this comment.
Are we update RA version here? It seems that we should not do that?
There was a problem hiding this comment.
This is the updated hash code due to golang (buildGoModule in nixpkgs) updated.
RA version is not changed.
| (import "${ghafOS}/modules/microvm/networking.nix") | ||
| (import "${ghafOS}/modules/microvm/virtualization/microvm/microvm-host.nix") | ||
|
|
||
| # WAR: ghaf mainline has audiovm hardcoded. This causes audiovm defined here |
There was a problem hiding this comment.
Need to create a Jira ticket for that. And put its number here.
There was a problem hiding this comment.
Created FMO-43 and commented
buianhhuy96
force-pushed
the
rebase_ghaf_release_2406
branch
from
aba7bb6
to
4254b9a
Compare
buianhhuy96
force-pushed
the
rebase_ghaf_release_2406
branch
from
4254b9a
to
1539e3f
Compare
- Update flake.lock to ghaf 24.06 - Modify config-processor to use ghaf modules - Rename microvm interface id from "vm-*" to "tap-*" - Simplify some configs due to updated nixpkgs - Adapt app changes to new version: lisgd, squeekboard - Remove upstream package overlay which caused error in previous build - Remove local golang, go-app is now built with nixpkgs.buildGoModules - Issue remained: fmo-dci warning and added unused (not working) audiovm Signed-off-by: Anh Huy Bui <[email protected]>
buianhhuy96
force-pushed
the
rebase_ghaf_release_2406
branch
from
1539e3f
to
cee8b6e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.