feat: Added wrapper crate for including ipxe binaries
This commit is contained in:
@@ -0,0 +1,3 @@
|
||||
[submodule "ipxe/ipxe"]
|
||||
path = ipxe/ipxe
|
||||
url = git@github.com:rkubes/ipxe
|
||||
Generated
+34
@@ -166,6 +166,12 @@ dependencies = [
|
||||
"serde_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "build-print"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d8e6738dfb11354886f890621b4a34c0b177f75538023f7100b608ab9adbd66b"
|
||||
|
||||
[[package]]
|
||||
name = "bumpalo"
|
||||
version = "3.20.3"
|
||||
@@ -292,6 +298,7 @@ dependencies = [
|
||||
"clap_complete",
|
||||
"futures",
|
||||
"gix-discover",
|
||||
"ipxe",
|
||||
"minijinja",
|
||||
"netascii",
|
||||
"num_enum",
|
||||
@@ -1017,6 +1024,25 @@ dependencies = [
|
||||
"icu_properties",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "include_dir"
|
||||
version = "0.7.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd"
|
||||
dependencies = [
|
||||
"include_dir_macros",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "include_dir_macros"
|
||||
version = "0.7.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "2.14.2"
|
||||
@@ -1033,6 +1059,14 @@ version = "2.12.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0"
|
||||
|
||||
[[package]]
|
||||
name = "ipxe"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"build-print",
|
||||
"include_dir",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "is_terminal_polyfill"
|
||||
version = "1.70.2"
|
||||
|
||||
+2
-1
@@ -7,7 +7,7 @@ publish = ["infra"]
|
||||
license = "GPL-3.0-or-later"
|
||||
|
||||
[workspace]
|
||||
members = ["xtask"]
|
||||
members = ["ipxe", "xtask"]
|
||||
|
||||
[workspace.dependencies]
|
||||
schemars = { version = "1.2.2", features = ["semver1"] }
|
||||
@@ -35,6 +35,7 @@ serde_json = { workspace = true }
|
||||
serde_yaml = "0.9.34"
|
||||
thiserror = "2.0.21"
|
||||
tokio = { version = "1.52.1", features = ["full"] }
|
||||
ipxe = { path = "./ipxe" }
|
||||
|
||||
[lib]
|
||||
test = false
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
[package]
|
||||
name = "ipxe"
|
||||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
|
||||
[build-dependencies]
|
||||
build-print = "1.0.1"
|
||||
|
||||
[dependencies]
|
||||
include_dir = "0.7.4"
|
||||
@@ -0,0 +1,57 @@
|
||||
use std::env;
|
||||
use std::path::PathBuf;
|
||||
use std::process::{Command, Stdio};
|
||||
|
||||
use build_print::error;
|
||||
|
||||
fn main() {
|
||||
let manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap())
|
||||
.canonicalize()
|
||||
.unwrap();
|
||||
let src_dir = manifest_dir.join("ipxe").join("src");
|
||||
|
||||
let mut command = Command::new("make");
|
||||
command
|
||||
.stdout(Stdio::piped())
|
||||
.current_dir(&src_dir)
|
||||
.env_remove("DEBUG")
|
||||
.env_remove("PROFILE")
|
||||
.args([
|
||||
"-j",
|
||||
&std::thread::available_parallelism()
|
||||
.unwrap()
|
||||
.get()
|
||||
.to_string(),
|
||||
])
|
||||
.arg(format!(
|
||||
"EMBED={}",
|
||||
manifest_dir
|
||||
.join("src")
|
||||
.join("embed.ipxe")
|
||||
.to_string_lossy(),
|
||||
));
|
||||
|
||||
let files = ["bin/ipxe.pxe", "bin-x86_64-efi/ipxe.efi"].map(PathBuf::from);
|
||||
for file in &files {
|
||||
command.arg(file);
|
||||
}
|
||||
|
||||
let output = command.output().unwrap();
|
||||
if !output.status.success() {
|
||||
error!("{}", String::from_utf8_lossy(&output.stderr));
|
||||
}
|
||||
|
||||
let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap())
|
||||
.canonicalize()
|
||||
.unwrap()
|
||||
.join("ipxe");
|
||||
|
||||
std::fs::remove_dir_all(&out_dir).ok();
|
||||
for file in &files {
|
||||
let input = src_dir.join(file);
|
||||
let output = out_dir.join(file.file_name().unwrap());
|
||||
|
||||
std::fs::create_dir_all(output.parent().unwrap()).unwrap();
|
||||
std::fs::copy(input, output).unwrap();
|
||||
}
|
||||
}
|
||||
Submodule
+1
Submodule ipxe/ipxe added at 8892af68a2
@@ -0,0 +1,5 @@
|
||||
#!ipxe
|
||||
|
||||
dhcp
|
||||
|
||||
echo "Hello, World!"
|
||||
@@ -0,0 +1,3 @@
|
||||
use include_dir::{Dir, include_dir};
|
||||
|
||||
pub static IPXE_DIR: Dir<'_> = include_dir!("$OUT_DIR/ipxe");
|
||||
+5
-1
@@ -11,6 +11,7 @@ use crete::tftp::ServerError;
|
||||
use crete::{get_configs_path, get_repo_path, set_repo_path, tftp};
|
||||
use futures::StreamExt;
|
||||
use futures::future::join_all;
|
||||
use ipxe::IPXE_DIR;
|
||||
use minijinja::context;
|
||||
use regex::Regex;
|
||||
use thiserror::Error;
|
||||
@@ -115,7 +116,10 @@ async fn main() -> Result<(), Error> {
|
||||
let re = re.clone();
|
||||
|
||||
async move {
|
||||
if let Some(caps) = re.captures(&filename) {
|
||||
const IPXE_PATTERN: &str = "ipxe/";
|
||||
if let Some(filename) = filename.strip_prefix(IPXE_PATTERN) {
|
||||
Some(IPXE_DIR.get_file(filename)?.contents().to_owned())
|
||||
} else if let Some(caps) = re.captures(&filename) {
|
||||
let cluster = &caps["cluster"];
|
||||
let node = &caps["node"];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user