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

ref(bao_recipe): update local/remote srcs assignment #7

Merged
merged 1 commit into from
Feb 23, 2024
+11 −71
Merged

ref(bao_recipe): update local/remote srcs assignment #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions pkgs/bao/bao_local.nix → pkgs/bao/bao.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
, fetchurl
, rsync
, toolchain
, bao_srcs_path
, bao_srcs_path ? " "
, bao_cfg_repo
, bao_cfg
, platform_cfg
Expand All @@ -23,7 +23,16 @@ stdenv.mkDerivation rec {
plat_arch = platform_cfg.platforms-arch.${platform};
plat_toolchain = platform_cfg.platforms-toolchain.${platform};

srcs = bao_srcs_path;
srcs = if bao_srcs_path == " " || bao_srcs_path == null then
fetchFromGitHub {
owner = "bao-project";
repo = "bao-hypervisor";
rev = "0575782359132465128491ab2fa44c16e76b57f8"; # branch: demo
sha256 = "sha256-pCsVpSOuCCQ86HbLbyGpi6nHi5dxa7hbQIuoemE/fSA=";
}
else
bao_srcs_path;


nativeBuildInputs = [ toolchain guests ]; #build time dependencies
buildInputs = [ rsync ];
Expand All @@ -37,7 +46,6 @@ stdenv.mkDerivation rec {
mkdir -p $out/guests

rsync -r $srcs/ $out/srcs
# cp -r ${srcs}/* $out/srcs
cp -r ${bao_cfg_repo}/* $out/configs
for guest in ${toString guests}; do
cp $guest/bin/*.bin $out/guests/
Expand Down
68 changes: 0 additions & 68 deletions pkgs/bao/bao_remote.nix
View file
Open in desktop

This file was deleted.

Loading