646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
From 7f802ceac03252ad5182ee8c69ebb01da24a307c Mon Sep 17 00:00:00 2001
|
|
From: Fernando Rodrigues <alpha@sigmasquadron.net>
|
|
Date: Fri, 4 Jul 2025 18:07:01 +0000
|
|
Subject: [PATCH 1/2] xen/Makefile: patch .efi output directory
|
|
|
|
This is necessary so the build does not fail when Xen tries to install
|
|
.efi files to $boot/efi/nixos and panics when the directory doesn't
|
|
exist. It also has the benefit of installing the files in a location
|
|
that is easier to access.
|
|
|
|
Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
|
|
|
|
diff --git a/xen/Makefile b/xen/Makefile
|
|
index 6bf0b0ea9e..907cd89f7e 100644
|
|
--- a/xen/Makefile
|
|
+++ b/xen/Makefile
|
|
@@ -527,6 +527,6 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
|
|
$(if $(efi-strip-opt), \
|
|
$(STRIP) $(efi-strip-opt) -p -o $(TARGET).efi.stripped $(TARGET).efi && \
|
|
- $(INSTALL_DATA) $(TARGET).efi.stripped $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi ||) \
|
|
- $(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \
|
|
+ $(INSTALL_DATA) $(TARGET).efi.stripped $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION).efi ||) \
|
|
+ $(INSTALL_DATA) $(TARGET).efi $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION).efi; \
|
|
elif [ "$(D)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(D))" ]; then \
|
|
echo 'EFI installation only partially done (EFI_VENDOR not set)' >&2; \
|
|
@@ -560,5 +560,5 @@ _uninstall:
|
|
rm -f $(D)$(EFI_DIR)/$(T).efi
|
|
if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \
|
|
- rm -f $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \
|
|
+ rm -f $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION).efi; \
|
|
fi
|
|
|
|
--
|
|
2.49.0
|
|
|