Skip to content

Commit

Permalink
xen: rewrite build expression to be more modular, support upstream qe…
Browse files Browse the repository at this point in the history
…mu and seabios

Also:

* provides a bunch of build options
* documents build options config in longDescription
* provides a bunch of predefined packages and documents them some more
* sources' hashes stay the same
  • Loading branch information
oxij committed Mar 5, 2017
1 parent 1c8940a commit 916fa0a
Show file tree
Hide file tree
Showing 6 changed files with 523 additions and 294 deletions.
16 changes: 16 additions & 0 deletions pkgs/applications/virtualization/xen/0000-fix-install-python.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
tools/python/install-wrap script brakes shebangs patching, disable

diff --git a/tools/Rules.mk b/tools/Rules.mk
index 87a56dc..a7da869 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -90,8 +90,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)
27 changes: 27 additions & 0 deletions pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
hack to make etherboot use prefetched ipxe

diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile
index a0578d2..64428a0 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)))

@@ -36,9 +37,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

0 comments on commit 916fa0a

Please sign in to comment.