mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-21 13:13:33 +00:00
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
EFI_MOUNTPOINT is conventionally /boot/efi or /boot/EFI or something
|
|
like that, and (on my machine) has directories within that called
|
|
{Boot, nixos, gummiboot}.
|
|
|
|
This patch does two things:
|
|
|
|
1) Xen apparently wants to put files in
|
|
$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR) - we remove the duplicate 'efi' name
|
|
because I can't see why we have it
|
|
|
|
2) Ensures the said directory exists
|
|
|
|
|
|
diff --git a/xen/Makefile b/xen/Makefile
|
|
index acb2d28891..d0763fbbe7 100644
|
|
--- a/xen/Makefile
|
|
+++ b/xen/Makefile
|
|
@@ -289,7 +289,9 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
|
|
ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi; \
|
|
ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T).efi; \
|
|
if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \
|
|
- $(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \
|
|
+ [ -d $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR) ] || \
|
|
+ $(INSTALL_DIR) $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR) ;\
|
|
+ $(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR)/$(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; \
|
|
fi; \
|
|
@@ -319,7 +321,7 @@ _uninstall:
|
|
rm -f $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map
|
|
rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi
|
|
rm -f $(D)$(EFI_DIR)/$(T).efi
|
|
- rm -f $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi
|
|
+ rm -f $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi
|
|
|
|
.PHONY: _debug
|
|
_debug:
|