Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
115 changes: 0 additions & 115 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions hermit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,4 @@ vsock = []

[build-dependencies]
cc = "1"
flate2 = "1"
home = "0.5"
ureq = "3"
tar = "0.4"
31 changes: 4 additions & 27 deletions hermit/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ use std::path::{Path, PathBuf};
use std::process::Command;
use std::{env, str};

use flate2::read::GzDecoder;
use tar::Archive;

fn main() {
let targets_hermit =
env::var_os("CARGO_CFG_TARGET_OS").is_some_and(|target_os| target_os == "hermit");
Expand All @@ -16,7 +13,7 @@ fn main() {
return;
}

let kernel_src = KernelSrc::local().unwrap_or_else(KernelSrc::download);
let kernel_src = KernelSrc::get();

kernel_src.build();

Expand All @@ -43,39 +40,19 @@ struct KernelSrc {
}

impl KernelSrc {
fn local() -> Option<Self> {
fn get() -> Self {
if let Some(src_dir) = env::var_os("HERMIT_MANIFEST_DIR") {
assert!(
!src_dir.is_empty(),
"HERMIT_MANIFEST_DIR is set to the empty string"
);
let src_dir = PathBuf::from(src_dir);
return Some(Self { src_dir });
return Self { src_dir };
}

let mut src_dir = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
src_dir.set_file_name("kernel");
src_dir.exists().then_some(Self { src_dir })
}

fn download() -> Self {
let version = "0.12.0";
let out_dir = out_dir();
let src_dir = out_dir.join(format!("kernel-{version}"));

if !src_dir.exists() {
let url =
format!("https://github.com/hermit-os/kernel/archive/refs/tags/v{version}.tar.gz");
let response = ureq::get(url.as_str())
.call()
.unwrap()
.into_body()
.into_reader();
let tar = GzDecoder::new(response);
let mut archive = Archive::new(tar);
archive.unpack(src_dir.parent().unwrap()).unwrap();
}

assert!(src_dir.exists(), "could not find kernel source");
Self { src_dir }
}

Expand Down