xen: update to 4.14.0
This commit is contained in:
Jürgen Buchmüller
parent
045de8761e
commit
155d4848ed
|
|
@ -473,10 +473,12 @@ libprocesscore.so.9 libksysguard-5.18.90_1
|
|||
liblsofui.so.9 libksysguard-5.18.90_1
|
||||
libKSysGuardSensorFaces.so.1 libksysguard-5.18.90_1
|
||||
libKWaylandServer.so.5 kwayland-server-5.18.90_1
|
||||
libxenctrl.so.4.10 xen-libs-4.10.0_1
|
||||
libxenguest.so.4.10 xen-libs-4.10.0_1
|
||||
libxlutil.so.4.10 xen-libs-4.10.0_1
|
||||
libxenlight.so.4.10 xen-libs-4.10.0_1
|
||||
libxenctrl.so.4.14 xen-libs-4.14.0_1
|
||||
libxenfsimage.so.4.14 xen-libs-4.14.0_1
|
||||
libxenguest.so.4.14 xen-libs-4.14.0_1
|
||||
libxenhypfs.so.1 xen-libs-4.14.0_1
|
||||
libxlutil.so.4.14 xen-libs-4.14.0_1
|
||||
libxenlight.so.4.14 xen-libs-4.14.0_1
|
||||
libxenevtchn.so.1 xen-libs-4.10.0_1
|
||||
libxengnttab.so.1 xen-libs-4.10.0_1
|
||||
libxendevicemodel.so.1 xen-libs-4.10.0_1
|
||||
|
|
@ -485,9 +487,9 @@ libxentoolcore.so.1 xen-libs-4.10.0_1
|
|||
libxenstore.so.3.0 xen-libs-4.10.0_1
|
||||
libxentoollog.so.1 xen-libs-4.10.0_1
|
||||
libxencall.so.1 xen-libs-4.10.0_1
|
||||
libxenvchan.so.4.10 xen-libs-4.10.0_1
|
||||
libxenvchan.so.4.14 xen-libs-4.14.0_1
|
||||
libfsimage.so.1.0 xen-libs-4.10.0_1
|
||||
libxenstat.so.0 xen-libs-4.10.0_1
|
||||
libxenstat.so.4.14 xen-libs-4.14.0_1
|
||||
libfam.so.0 gamin-0.1.10_1
|
||||
libgamin-1.so.0 gamin-0.1.10_1
|
||||
libKF5SyntaxHighlighting.so.5 syntax-highlighting-5.29.0_1
|
||||
|
|
|
|||
|
|
@ -1,16 +1,20 @@
|
|||
# Template file for 'xen'
|
||||
pkgname=xen
|
||||
version=4.10.4
|
||||
revision=5
|
||||
version=4.14.0
|
||||
revision=1
|
||||
# grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
|
||||
_git_tag_ipxe=356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d
|
||||
_git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
|
||||
# TODO: arm / aarch64
|
||||
archs="x86_64*"
|
||||
configure_args="$(vopt_enable stubdom) --with-system-seabios=/usr/share/seabios/bios.bin"
|
||||
hostmakedepends="acpica-utils automake bison fig2dev gettext ghostscript git
|
||||
ocaml ocaml-findlib pandoc pkg-config python-Markdown tar texinfo wget"
|
||||
makedepends="SDL-devel dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
|
||||
build_style=gnu-configure
|
||||
configure_args="$(vopt_enable stubdom) --disable-systemd
|
||||
--with-system-seabios=/usr/share/seabios/bios.bin
|
||||
--with-sysconfig-leaf-dir=conf.d --with-rundir=/run"
|
||||
hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
|
||||
ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
|
||||
makedepends="SDL-devel dev86 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"
|
||||
netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
|
||||
depends="bridge-utils perl xen-hypervisor"
|
||||
short_desc="Xen hypervisor utilities"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
|
|
@ -18,12 +22,11 @@ license="GPL-2.0-or-later"
|
|||
homepage="https://www.xenproject.org/"
|
||||
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"
|
||||
https://github.com/ipxe/ipxe/archive/${_git_tag_ipxe}.tar.gz"
|
||||
checksum="
|
||||
904f7b19caf59ad8f795c4b5100010aa7ffb063ebf3a6bec40c18f3dd6c9f346
|
||||
251e5516d7de470c434ae5c393aacca2b61fb24d93770592a4a20add60b785c4"
|
||||
skip_extraction="ipxe-git-${_git_tag_ipxe}.tar.gz"
|
||||
nopie=yes
|
||||
06839f68ea7620669dbe8b67861213223cc2a7d02ced61b56e5249c50e87f035
|
||||
4850691d6f196eaf4d6210f2de01383251b3ea1b928141da9ce28c0b06a90938"
|
||||
skip_extraction="${_git_tag_ipxe}.tar.gz"
|
||||
|
||||
build_options="stubdom"
|
||||
build_options_default="stubdom"
|
||||
|
|
@ -38,7 +41,7 @@ if [ "$build_option_stubdom" ]; then
|
|||
_newlib_version=1.16.0
|
||||
_libpci_version=2.2.9
|
||||
_tpmemu_version=0.7.4
|
||||
_ocaml_version=3.11.0
|
||||
_ocaml_version=4.02.0
|
||||
distfiles+="
|
||||
http://xenbits.xen.org/xen-extfiles/gmp-${_gmp_version}.tar.bz2
|
||||
http://xenbits.xen.org/xen-extfiles/grub-${_grub_version}.tar.gz
|
||||
|
|
@ -58,7 +61,7 @@ if [ "$build_option_stubdom" ]; then
|
|||
db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07
|
||||
f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24
|
||||
4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459
|
||||
ecdd4f8473ab0dee5d3acb5c0a31a4c1dd6aa12179895cf1903dd0f455c43a4f"
|
||||
dbbcbd72a29a51206677a606ea09dfec83ae25cbbf52dee90306bc04812cd034"
|
||||
skip_extraction+="
|
||||
gmp-${_gmp_version}.tar.bz2
|
||||
grub-${_grub_version}.tar.gz
|
||||
|
|
@ -71,39 +74,53 @@ if [ "$build_option_stubdom" ]; then
|
|||
ocaml-${_ocaml_version}.tar.gz"
|
||||
fi
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
x86_64-musl) makedepends+=" argp-standalone dev86";;
|
||||
x86_64) makedepends+=" gcc-multilib dev86";;
|
||||
esac
|
||||
if [ "$XBPS_TARGET_LIBC" = musl ]; then
|
||||
makedepends+=" argp-standalone"
|
||||
else
|
||||
makedepends+=" gcc-multilib"
|
||||
fi
|
||||
|
||||
make_dirs="
|
||||
/var/lib/xenstored 755 root root
|
||||
/var/lib/xen/xenpaging 755 root root
|
||||
/var/xen/dump 755 root root
|
||||
/etc/xen/auto 755 root root"
|
||||
/var/lib/xenstored 755 root root
|
||||
/var/lib/xen/xenpaging 755 root root
|
||||
/var/xen/dump 755 root root
|
||||
/etc/xen/auto 755 root root"
|
||||
conf_files="
|
||||
/etc/default/xendomains
|
||||
/etc/default/xencommons
|
||||
/etc/xen/xl.conf"
|
||||
/etc/conf.d/xendomains
|
||||
/etc/conf.d/xencommons
|
||||
/etc/xen/xl.conf"
|
||||
nostrip_files="
|
||||
u-boot.e500
|
||||
openbios-ppc
|
||||
openbios-sparc32
|
||||
openbios-sparc64
|
||||
palcode-clipper
|
||||
s390-ccw.img
|
||||
s390-netboot.img"
|
||||
|
||||
CFLAGS="-fno-pie -Wno-format-truncation"
|
||||
hppa-firmware.img
|
||||
u-boot.e500
|
||||
openbios-ppc
|
||||
openbios-sparc32
|
||||
openbios-sparc64
|
||||
palcode-clipper
|
||||
s390-ccw.img
|
||||
s390-netboot.img"
|
||||
ignore_elf_files="
|
||||
/usr/share/xen/qemu/openbios-ppc
|
||||
/usr/share/xen/qemu/openbios-sparc64
|
||||
/usr/share/xen/qemu/openbios-sparc32"
|
||||
|
||||
post_extract() {
|
||||
local _src="${XBPS_SRCDISTDIR}/${pkgname}-${version}"
|
||||
msg_normal "Copying etherboot ipxe file ...\n"
|
||||
cp -v "${_src}/ipxe-git-${_git_tag_ipxe}.tar.gz" \
|
||||
tools/firmware/etherboot/ipxe.tar.gz
|
||||
|
||||
msg_normal "Extracting etherboot ipxe files ...\n"
|
||||
mkdir tools/firmware/etherboot/ipxe
|
||||
tar --strip-components=1 -x \
|
||||
-f ${_src}/${_git_tag_ipxe}.tar.gz \
|
||||
-C tools/firmware/etherboot/ipxe/
|
||||
# Create a tarball w/o the git tag
|
||||
tar -czf tools/firmware/etherboot/ipxe.tar.gz \
|
||||
-C tools/firmware/etherboot/ ipxe
|
||||
|
||||
if [ "$build_option_stubdom" ]; then
|
||||
# Patch a patch
|
||||
vsed -i stubdom/grub.patches/99minios \
|
||||
-e"/RAW_ADDR/s/(int) grub_scratch_mem/(long) grub_scratch_mem/"
|
||||
mkdir -p stubdom/mini-os-x86_64-grub/{arch/x86,console,lib,xenbus}
|
||||
msg_normal "Copying stubdom files ...\n"
|
||||
mkdir -p stubdom
|
||||
cp -pv \
|
||||
${_src}/grub-${_grub_version}.tar.gz \
|
||||
${_src}/gmp-${_gmp_version}.tar.bz2 \
|
||||
|
|
@ -118,34 +135,28 @@ post_extract() {
|
|||
fi
|
||||
}
|
||||
|
||||
pre_configure() {
|
||||
do_configure() {
|
||||
unset AR OBJCOPY RANLIB CC LD CFLAGS LDFLAGS
|
||||
find \( -name "Makefile*" -o -name "*.mk" -o -name "common.make" \) \
|
||||
-exec sed -i "{}" -e "s; *-Werror *; ;g" \;
|
||||
vsed -i tools/python/setup.py -e 's;, "-Werror";;g'
|
||||
}
|
||||
|
||||
do_configure() {
|
||||
# Silence a stream edit for dependencies
|
||||
vsed -i Config.mk -e 's;sed ";@&;'
|
||||
cp -a ${FILESDIR}/*.h ${wrksrc}/tools/firmware
|
||||
rm -f ${XBPS_WRAPPERDIR}/strip
|
||||
cp ${FILESDIR}/*.h ${wrksrc}/tools/firmware
|
||||
NOCONFIGURE=1 autoreconf -fi
|
||||
# Get rid of -Werror
|
||||
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
|
||||
./autogen.sh
|
||||
./configure ${configure_args}
|
||||
}
|
||||
|
||||
do_build() {
|
||||
unset AR OBJCOPY RANLIB CC LD CFLAGS LDFLAGS
|
||||
rm -f ${XBPS_WRAPPERDIR}/strip
|
||||
unset CC LD AR AS RANLIB CPP CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
|
||||
mkdir -p ${wrksrc}/distdir-${version}
|
||||
# oxenstore build fails due to warnings - ignore
|
||||
make ${makejobs} DISTDIR=${wrksrc}/distdir-${version} NO_WERROR=1 || true
|
||||
make ${makejobs} dist
|
||||
}
|
||||
|
||||
do_install() {
|
||||
rm -f ${XBPS_WRAPPERDIR}/strip
|
||||
unset CC LD AR AS RANLIB CPP CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
|
||||
make ${makejobs} DESTDIR=${DESTDIR} NO_WERROR=1 install install-docs
|
||||
unset AR OBJCOPY RANLIB CC LD CFLAGS LDFLAGS
|
||||
make ${makejobs} DESTDIR=${DESTDIR} install install-docs
|
||||
|
||||
# Move example config files into correct directory.
|
||||
vmkdir usr/share/examples/xen
|
||||
|
|
|
|||
Loading…
Reference in a new issue