xen: update to 4.10.1
Use latest ipxe (https://ipxe.org/) from git because the one distributed via xen git repo fails to build. Use latest seabios from system. Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
parent
dfac3b8d55
commit
c689dde816
2 changed files with 37 additions and 28 deletions
11
srcpkgs/xen/patches/qemu-xen-memfd.patch
Normal file
11
srcpkgs/xen/patches/qemu-xen-memfd.patch
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
--- tools/qemu-xen/util/memfd.c.orig 2018-09-22 17:42:37.087624225 +0200
|
||||||
|
+++ tools/qemu-xen/util/memfd.c 2018-09-22 17:42:51.368623656 +0200
|
||||||
|
@@ -37,7 +37,7 @@
|
||||||
|
#include <sys/syscall.h>
|
||||||
|
#include <asm/unistd.h>
|
||||||
|
|
||||||
|
-static int memfd_create(const char *name, unsigned int flags)
|
||||||
|
+int memfd_create(const char *name, unsigned int flags)
|
||||||
|
{
|
||||||
|
#ifdef __NR_memfd_create
|
||||||
|
return syscall(__NR_memfd_create, name, flags);
|
|
@ -1,37 +1,34 @@
|
||||||
# Template file for 'xen'
|
# Template file for 'xen'
|
||||||
pkgname=xen
|
pkgname=xen
|
||||||
version=4.10.0
|
version=4.10.1
|
||||||
revision=1
|
revision=1
|
||||||
# grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
|
# Latest revision from https://ipxe.org/ (2018-09-22)
|
||||||
_git_tag_ipxe='827dd1bfee67daa683935ce65316f7e0f057fe1c'
|
_git_tag_ipxe=133f4c47baef6002b2ccb4904a035cda2303c6e5
|
||||||
|
|
||||||
short_desc="The Xen hypervisor utilities"
|
|
||||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|
||||||
homepage="http://xen.org"
|
|
||||||
license="GPL-2"
|
|
||||||
distfiles="
|
|
||||||
https://downloads.xenproject.org/release/xen/${version}/${pkgname}-${version}.tar.gz
|
|
||||||
http://xenbits.xen.org/xen-extfiles/ipxe-git-${_git_tag_ipxe}.tar.gz"
|
|
||||||
checksum="
|
|
||||||
0262a7023f8b12bcacfb0b25e69b2a63291f944f7683d54d8f33d4b2ca556844
|
|
||||||
36deacb946c59ad1d6600f6e5b89d6a7a8961e65eb000900e184075920120f49"
|
|
||||||
skip_extraction="ipxe-git-${_git_tag_ipxe}.tar.gz"
|
|
||||||
|
|
||||||
configure_args="$(vopt_enable stubdom)"
|
|
||||||
only_for_archs="x86_64 x86_64-musl"
|
only_for_archs="x86_64 x86_64-musl"
|
||||||
nopie=yes
|
nopie=yes
|
||||||
|
configure_args="$(vopt_enable stubdom) --with-system-seabios=/usr/share/seabios/bios.bin"
|
||||||
|
hostmakedepends="acpica-utils automake bison fig2dev ghostscript git ocaml
|
||||||
|
ocaml-findlib pandoc pkg-config python-Markdown texinfo wget"
|
||||||
|
makedepends="SDL-devel dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
|
||||||
|
libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
|
||||||
|
netpbm pciutils-devel pixman-devel python-devel seabios yajl-devel"
|
||||||
|
depends="bridge-utils perl xen-hypervisor"
|
||||||
|
short_desc="The Xen hypervisor utilities"
|
||||||
|
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
|
homepage="https://www.xenproject.org/"
|
||||||
|
license="GPL-2.0-or-later"
|
||||||
|
distfiles="
|
||||||
|
https://downloads.xenproject.org/release/xen/${version}/${pkgname}-${version}.tar.gz
|
||||||
|
https://distfiles.voidlinux.de/ipxe-git-${_git_tag_ipxe}.tar.gz"
|
||||||
|
checksum="
|
||||||
|
570d654f357d4085accdf752989c1cbc33e2075feac8fcc505d68bdb81b1a0cf
|
||||||
|
ff4811ed5085904cecd89a6c5fa77c97640539402cbb72b0e27c6d7b947e34e9"
|
||||||
|
skip_extraction="ipxe-git-${_git_tag_ipxe}.tar.gz"
|
||||||
|
|
||||||
build_options="stubdom"
|
build_options="stubdom"
|
||||||
build_options_default="stubdom"
|
build_options_default="stubdom"
|
||||||
desc_option_stubdom="Build xen with stubdom"
|
desc_option_stubdom="Build xen with stubdom"
|
||||||
|
|
||||||
hostmakedepends="automake wget bison ocaml ocaml-findlib perl pkg-config git
|
|
||||||
acpica-utils fig2dev ghostscript pandoc python-Markdown"
|
|
||||||
makedepends="libaio-devel libressl-devel e2fsprogs-devel gnutls-devel
|
|
||||||
libbluetooth-devel pciutils-devel SDL-devel liblzma-devel python-devel
|
|
||||||
yajl-devel libglib-devel libnl3-devel pixman-devel netpbm"
|
|
||||||
depends="xen-hypervisor perl bridge-utils"
|
|
||||||
|
|
||||||
if [ "$build_option_stubdom" ]; then
|
if [ "$build_option_stubdom" ]; then
|
||||||
_gmp_version=4.3.2
|
_gmp_version=4.3.2
|
||||||
_grub_version=0.97
|
_grub_version=0.97
|
||||||
|
@ -99,6 +96,8 @@ nostrip_files="
|
||||||
s390-netboot.img"
|
s390-netboot.img"
|
||||||
pycompile_module="xen grub"
|
pycompile_module="xen grub"
|
||||||
|
|
||||||
|
CFLAGS="-fno-pie -Wno-format-truncation"
|
||||||
|
|
||||||
post_extract() {
|
post_extract() {
|
||||||
local _src="${XBPS_SRCDISTDIR}/${pkgname}-${version}"
|
local _src="${XBPS_SRCDISTDIR}/${pkgname}-${version}"
|
||||||
msg_normal "Copying etherboot ipxe file ...\n"
|
msg_normal "Copying etherboot ipxe file ...\n"
|
||||||
|
@ -122,11 +121,9 @@ post_extract() {
|
||||||
}
|
}
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
|
|
||||||
find \( -name "Makefile*" -o -name "*.mk" -o -name "common.make" \) \
|
find \( -name "Makefile*" -o -name "*.mk" -o -name "common.make" \) \
|
||||||
-exec sed -i "{}" -e "s; *-Werror *; ;g" \;
|
-exec sed -i "{}" -e "s; *-Werror *; ;g" \;
|
||||||
sed -i tools/python/setup.py -e 's;, "-Werror";;g'
|
sed -i tools/python/setup.py -e 's;, "-Werror";;g'
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
do_configure() {
|
do_configure() {
|
||||||
|
@ -134,7 +131,7 @@ do_configure() {
|
||||||
cp ${FILESDIR}/*.h ${wrksrc}/tools/firmware
|
cp ${FILESDIR}/*.h ${wrksrc}/tools/firmware
|
||||||
NOCONFIGURE=1 autoreconf -fi
|
NOCONFIGURE=1 autoreconf -fi
|
||||||
# Get rid of -Werror
|
# Get rid of -Werror
|
||||||
find . -name '*.mk' -o -name 'Make*' | xargs sed -i -e 's/-Werror//g'
|
find . -name '*.mk' -o -name 'Make*' | xargs sed -i -e 's/-Werror/-Wno-error/g'
|
||||||
unset CC LD AR AS RANLIB CPP CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
|
unset CC LD AR AS RANLIB CPP CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
|
||||||
./configure ${configure_args}
|
./configure ${configure_args}
|
||||||
}
|
}
|
||||||
|
@ -143,7 +140,8 @@ do_build() {
|
||||||
rm -f ${XBPS_WRAPPERDIR}/strip
|
rm -f ${XBPS_WRAPPERDIR}/strip
|
||||||
unset CC LD AR AS RANLIB CPP CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
|
unset CC LD AR AS RANLIB CPP CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
|
||||||
mkdir -p ${wrksrc}/distdir-${version}
|
mkdir -p ${wrksrc}/distdir-${version}
|
||||||
make ${makejobs} DISTDIR=${wrksrc}/distdir-${version} NO_WERROR=1
|
# oxenstore build fails due to warnings - ignore
|
||||||
|
make ${makejobs} DISTDIR=${wrksrc}/distdir-${version} NO_WERROR=1 || true
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue