Unverified Commit 05c5a73f authored by Rick van Schijndel's avatar Rick van Schijndel Committed by GitHub
Browse files

Merge pull request #324693 from SigmaSquadron/xen-4.18 

xen: 4.15 -> {4.16,4.17,4.18,4.19}
parents fc27807b 8d4151a1

pkgs/applications/qubes/qubes-core-vchan-xen/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -28,8 +28,9 @@ stdenv.mkDerivation rec { 
    description = "Libraries required for the higher-level Qubes daemons and tools";

    homepage = "https://qubes-os.org";

    license = licenses.gpl2Plus;

    maintainers = with maintainers; [ _0x4A6F ];

    maintainers = [ ];

    platforms = platforms.linux;

    broken = true;

  };



}

pkgs/applications/virtualization/xen/0000-fix-install-python.4.15.patch

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
tools/python/install-wrap script brakes shebangs patching, disable



diff --git a/tools/Rules.mk b/tools/Rules.mk

index 444e5bacdd..c99ea959ff 100644

--- a/tools/Rules.mk

+++ b/tools/Rules.mk

@@ -135,8 +135,7 @@ CFLAGS += $(CFLAGS-y)

 

 CFLAGS += $(EXTRA_CFLAGS_XEN_TOOLS)

 

-INSTALL_PYTHON_PROG = \

-	$(XEN_ROOT)/tools/python/install-wrap "$(PYTHON_PATH)" $(INSTALL_PROG)

+INSTALL_PYTHON_PROG = $(INSTALL_PROG)

 

 %.opic: %.c

 	$(CC) $(CPPFLAGS) -DPIC $(CFLAGS) $(CFLAGS_$*.opic) -fPIC -c -o $@ $< $(APPEND_CFLAGS)

pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
diff -uNr a/src/Kconfig b/src/Kconfig

--- a/src/Kconfig	2015-08-31 10:15:13.231134858 +0200

+++ b/src/Kconfig	2015-08-31 10:14:24.039180178 +0200

@@ -144,13 +144,13 @@

     config ATA_DMA

         depends on ATA

         bool "ATA DMA"

-        default n

+        default y

         help

             Detect and try to use ATA bus mastering DMA controllers.

     config ATA_PIO32

         depends on ATA

         bool "ATA 32bit PIO"

-        default n

+        default y

         help

             Use 32bit PIO accesses on ATA (minor optimization on PCI transfers).

     config AHCI

pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.4.15.patch

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile

index b6567c4127..83defeee95 100644

--- a/xen/arch/x86/Makefile

+++ b/xen/arch/x86/Makefile

@@ -124,11 +124,11 @@ ifneq ($(efi-y),)

 export XEN_BUILD_EFI := $(shell $(CC) $(XEN_CFLAGS) -c efi/check.c -o efi/check.o 2>/dev/null && echo y)

 # Check if the linker supports PE.

 EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10 --strip-debug

-XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(LD) $(EFI_LDFLAGS) -o efi/check.efi efi/check.o 2>/dev/null && echo y))

+XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(EFI_LD) $(EFI_LDFLAGS) -o efi/check.efi efi/check.o 2>/dev/null && echo y))

 CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI

 # Check if the linker produces fixups in PE by default (we need to disable it doing so for now).

 XEN_NO_PE_FIXUPS := $(if $(XEN_BUILD_EFI), \

-                         $(shell $(LD) $(EFI_LDFLAGS) --disable-reloc-section -o efi/check.efi efi/check.o 2>/dev/null && \

+                         $(shell $(EFI_LD) $(EFI_LDFLAGS) --disable-reloc-section -o efi/check.efi efi/check.o 2>/dev/null && \

                                  echo --disable-reloc-section))

 endif

 

@@ -217,20 +217,20 @@ note_file_option ?= $(note_file)

 ifeq ($(XEN_BUILD_PE),y)

 $(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o efi/mkreloc

 	$(foreach base, $(VIRT_BASE) $(ALT_BASE), \

-	          $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \

+	          $(EFI_LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \

 	                $(BASEDIR)/common/symbols-dummy.o $(note_file_option) -o $(@D)/.$(@F).$(base).0 &&) :

 	efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S

 	$(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \

 		| $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S

 	$(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o

 	$(foreach base, $(VIRT_BASE) $(ALT_BASE), \

-	          $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \

+	          $(EFI_LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \

 	                $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file_option) -o $(@D)/.$(@F).$(base).1 &&) :

 	efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S

 	$(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \

 		| $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S

 	$(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o

-	$(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \

+	$(EFI_LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \

 	                $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file_option) -o $@

 	$(NM) -pa --format=sysv $(@D)/$(@F) \

 		| $(BASEDIR)/tools/symbols --all-symbols --xensyms --sysv --sort >$(@D)/$(@F).map

pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.4.15.patch

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
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: