Unverified Commit 1d70ba2c authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #121513 from radhus/xen-4.15-pr 

xen: add 4.15 version
parents b611afeb a9926eb5

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

0 → 100644
+16 −0
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-fix-ipxe-src.4.15.patch

0 → 100644
+27 −0
Original line number Diff line number Diff line 
hack to make etherboot use prefetched ipxe



diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile

index ed9e11305f..979a3acea8 100644

--- a/tools/firmware/etherboot/Makefile

+++ b/tools/firmware/etherboot/Makefile

@@ -16,6 +16,7 @@ IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz

 

 D=ipxe

 T=ipxe.tar.gz

+G=ipxe.git

 

 ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS)))

 ROM = $D/src/bin/ipxe.bin

@@ -41,9 +42,9 @@ $T:

 	fi

 	mv _$T $T

 

-$D/src/arch/i386/Makefile: $T Config

-	rm -rf $D

-	gzip -dc $T | tar xf -

+$D/src/arch/i386/Makefile: $G Config

+	mkdir $D

+	cp -a $G/* $D

 	for i in $$(cat patches/series) ; do                 \

 	    patch -d $D -p1 --quiet <patches/$$i || exit 1 ; \

 	done