Remove PXE feature, build PXE code with UEFI

Author: jasoncouture

Diff for: Cargo.toml

@@ -40,10 +40,9 @@ bootloader-x86_64-bios-common = { version = "0.11.0", path = "bios/common" }
 
 
 [features]
-default = ["bios", "uefi", "pxe"]
+default = ["bios", "uefi"]
 bios = ["mbrman"]
 uefi = ["gpt"]
-pxe = ["uefi"]
 
 [dependencies]
 anyhow = "1.0.32"

Diff for: build.rs

@@ -6,13 +6,13 @@ use std::{
 const BOOTLOADER_VERSION: &str = env!("CARGO_PKG_VERSION");
 
 fn main() {
-    #[cfg(any(feature = "uefi", feature = "pxe"))]
+    #[cfg(feature = "uefi")]
     uefi_main();
     #[cfg(feature = "bios")]
     bios_main();
 }
 
-#[cfg(all(any(feature = "uefi", feature = "pxe"), not(docsrs_dummy_build)))]
+#[cfg(all(feature = "uefi", not(docsrs_dummy_build)))]
 fn uefi_main() {
     let out_dir = PathBuf::from(std::env::var("OUT_DIR").unwrap());
     let uefi_path = build_uefi_bootloader(&out_dir);
@@ -49,7 +49,7 @@ fn bios_main() {
     );
 }
 
-#[cfg(all(any(feature = "uefi", feature = "pxe"), not(docsrs_dummy_build)))]
+#[cfg(all(feature = "uefi", not(docsrs_dummy_build)))]
 fn build_uefi_bootloader(out_dir: &Path) -> PathBuf {
     let cargo = std::env::var("CARGO").unwrap_or_else(|_| "cargo".into());
     let mut cmd = Command::new(cargo);
@@ -277,9 +277,7 @@ fn convert_elf_to_bin(elf_path: PathBuf) -> PathBuf {
 // dummy implementations because docsrs builds have no network access
 
 #[cfg(all(feature = "uefi", docsrs_dummy_build))]
-fn uefi_main() {
-    // stub
-}
+fn uefi_main() {}
 
 #[cfg(all(feature = "bios", docsrs_dummy_build))]
 fn bios_main() {}

Diff for: src/lib.rs

@@ -136,7 +136,7 @@ impl<'a> DiskImageBuilder<'a> {
         Ok(())
     }
 
-    #[cfg(all(feature = "uefi", feature = "pxe"))]
+    #[cfg(feature = "uefi")]
     /// Create a folder containing the needed files for UEFI TFTP/PXE booting.
     pub fn create_uefi_tftp_folder(&self, tftp_path: &Path) -> anyhow::Result<()> {
         const UEFI_TFTP_BOOT_FILENAME: &str = "bootloader";

Diff for: tests/runner/src/lib.rs

@@ -1,6 +1,6 @@
 use std::{
     io::Write,
-    path::{Path, PathBuf},
+    path::Path,
     process::Command,
 };