Added xen-4.8.2 fix
This commit is contained in:
parent
fb1c2f42b2
commit
21e2a4df9f
5
app-emulation/xen/Manifest
Normal file
5
app-emulation/xen/Manifest
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
AUX xen-4.6-efi.patch 1954 SHA256 6ac4fc1fc99e89a16838a54c8b0657a84caa296d739d1ce9443bf4f10cbe57db SHA512 361af33159cf49626e92d2815fd4422ea5b1d696a32ce2695ce75205fbbfb89d96b64a8af7332fffdc4a4390000bf52d3730403dfc2334af0da0bea59d58b689 WHIRLPOOL 2a2a306e8ab6c57c169b2adc46ac9e00208e8adf294e5da407406e392da0177c47e84bd21832147e665135ec618e2dd161f6f32c280d82c7f4583ff39bc532e2
|
||||||
|
AUX xen-4.8.0-coff-x86-64.patch 2044 SHA256 e90c1df0b8f00cddaf5bfba93c422f9d15a0380dc091ab48eaac81bfe52530ef SHA512 0b696b34d354af03c2b76db0485cd7cae539424d718b369ebd5f88d2ce4fb748d7e869ae6f6f68251eaf8a4da0122823947a8808283efdd8c914dc4bc8b77ebf WHIRLPOOL 474b01029f4e037ac35d7cbc1dc9ec62b40f5e4f5f3b890f22d49e6c0b25d3cb695c77219129e0da17869216ea9b3349f3a7ffa6718c3be858ad0e91741d3c0d
|
||||||
|
DIST xen-4.8.2-upstream-patches-2.tar.xz 38852 SHA256 12c1f1fd2adba22b923d2ee944e6e66794701393966f9e9e2079961e202f6d64 SHA512 536823eabf03e92585a8c5cde90ce502672dd1ec080b28b39411d6a778b899436a57bfb633f11c94d48d2f963848b7771e469f5ea53e84b580976f631f69cc5d WHIRLPOOL 5baf92709da895eccbe8b154c1d1cdf4c2f0faf5166ef2e4bbf32ca6899d8b88aa67ccd765a15a2f9a6d5200d4a1eb832775891d41c00a950855e5d1d4358e35
|
||||||
|
DIST xen-4.8.2.tar.gz 22522336 SHA256 cb1cc2f0985e3d8651215e5d24c1fcc3036994fa7cc495a5091a2c85ece2aff9 SHA512 7805531f73d23ecfff3439770e62d387f4254a444875670d53a0a739323e5d4d8f8fcc478f8936ee1ae8aff3e0229549e47c01c606365a8ce060dd5c503e87da WHIRLPOOL 8e54e79219f89640162673da471a02ee8a39bb884e2376a79a09226462903185b49a771fef51ceca54c4dd42a110ee1214db6dbf94235a156a17d6c597634c3d
|
||||||
|
EBUILD xen-4.8.2-r2.ebuild 4985 SHA256 3db78c062682a62cbc02a5c792532ef3faefa14d156817c72e5d2012cbb0236f SHA512 b846f341562e7eae25b668b9389ddd947868a848f53e5379909668bcf33a3420108cd7b229bbd67941bd7dd05d7f95fe6b3089eda03b3a2c9e6d56e932277484 WHIRLPOOL f78235e3727ea398cc8bd650a1b945730ee0d17bbbc31dc2d0cb49f75a17e22106934117df223096d6c3bbe68ca8c39f68933bf881d15ede1223d3c3072741a1
|
||||||
36
app-emulation/xen/files/xen-4.6-efi.patch
Normal file
36
app-emulation/xen/files/xen-4.6-efi.patch
Normal file
|
|
@ -0,0 +1,36 @@
|
||||||
|
diff --git a/xen/Makefile b/xen/Makefile
|
||||||
|
index 4c54e9b..a5cdccd 100644
|
||||||
|
--- a/xen/Makefile
|
||||||
|
+++ b/xen/Makefile
|
||||||
|
@@ -41,9 +41,15 @@ _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX)
|
||||||
|
_install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
|
||||||
|
[ -d $(D)$(BOOT_DIR) ] || $(INSTALL_DIR) $(D)$(BOOT_DIR)
|
||||||
|
$(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION)$(Z)
|
||||||
|
- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z)
|
||||||
|
- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z)
|
||||||
|
- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z)
|
||||||
|
+ if [ 'x$(EFI_VENDOR)' == 'x' ]; then \
|
||||||
|
+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
|
||||||
|
+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
|
||||||
|
+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
|
||||||
|
+ else \
|
||||||
|
+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
|
||||||
|
+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
|
||||||
|
+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
|
||||||
|
+ fi;
|
||||||
|
[ -d "$(D)$(DEBUG_DIR)" ] || $(INSTALL_DIR) $(D)$(DEBUG_DIR)
|
||||||
|
$(INSTALL_DATA) $(TARGET)-syms $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION)
|
||||||
|
if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \
|
||||||
|
diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
|
||||||
|
index 5f24951..4ec0ee2 100644
|
||||||
|
--- a/xen/arch/x86/Makefile
|
||||||
|
+++ b/xen/arch/x86/Makefile
|
||||||
|
@@ -116,7 +116,7 @@ $(TARGET)-syms: prelink.o xen.lds $(BASEDIR)/common/symbols-dummy.o
|
||||||
|
$(@D)/.$(@F).1.o -o $@
|
||||||
|
rm -f $(@D)/.$(@F).[0-9]*
|
||||||
|
|
||||||
|
-EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
|
||||||
|
+EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
|
||||||
|
EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug
|
||||||
|
EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20
|
||||||
|
EFI_LDFLAGS += --major-image-version=$(XEN_VERSION)
|
||||||
26
app-emulation/xen/files/xen-4.8.0-coff-x86-64.patch
Normal file
26
app-emulation/xen/files/xen-4.8.0-coff-x86-64.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
||||||
|
--- xen/arch/x86/Makefile_ORIGINAL 2016-12-09 08:00:35.187413472 -0800
|
||||||
|
+++ xen/arch/x86/Makefile 2016-12-09 08:05:26.275430987 -0800
|
||||||
|
@@ -174,20 +174,20 @@
|
||||||
|
$(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o $(BASEDIR)/common/symbols-dummy.o efi/mkreloc
|
||||||
|
$(foreach base, $(VIRT_BASE) $(ALT_BASE), \
|
||||||
|
$(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \
|
||||||
|
- $(BASEDIR)/common/symbols-dummy.o $(note_file) -o $(@D)/.$(@F).$(base).0 &&) :
|
||||||
|
+ $(BASEDIR)/common/symbols-dummy.o -b coff-x86-64 $(note_file) -o $(@D)/.$(@F).$(base).0 &&) :
|
||||||
|
$(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S
|
||||||
|
$(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \
|
||||||
|
| $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S
|
||||||
|
$(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o
|
||||||
|
$(foreach base, $(VIRT_BASE) $(ALT_BASE), \
|
||||||
|
$(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \
|
||||||
|
- $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file) -o $(@D)/.$(@F).$(base).1 &&) :
|
||||||
|
+ $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o -b coff-x86-64 $(note_file) -o $(@D)/.$(@F).$(base).1 &&) :
|
||||||
|
$(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S
|
||||||
|
$(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \
|
||||||
|
| $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S
|
||||||
|
$(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o
|
||||||
|
$(guard) $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \
|
||||||
|
- $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file) -o $@
|
||||||
|
+ $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o -b coff-x86-64 $(note_file) -o $@
|
||||||
|
if $(guard) false; then rm -f $@; echo 'EFI support disabled'; \
|
||||||
|
else $(NM) -pa --format=sysv $(@D)/$(@F) \
|
||||||
|
| $(BASEDIR)/tools/symbols --xensyms --sysv --sort >$(@D)/$(@F).map; fi
|
||||||
185
app-emulation/xen/xen-4.8.2-r2.ebuild
Normal file
185
app-emulation/xen/xen-4.8.2-r2.ebuild
Normal file
|
|
@ -0,0 +1,185 @@
|
||||||
|
# Copyright 1999-2017 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=6
|
||||||
|
|
||||||
|
PYTHON_COMPAT=( python2_7 )
|
||||||
|
|
||||||
|
inherit eutils flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
|
||||||
|
|
||||||
|
MY_PV=${PV/_/-}
|
||||||
|
MY_P=${PN}-${MY_PV}
|
||||||
|
|
||||||
|
if [[ $PV == *9999 ]]; then
|
||||||
|
inherit git-r3
|
||||||
|
KEYWORDS=""
|
||||||
|
EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
|
||||||
|
SRC_URI=""
|
||||||
|
else
|
||||||
|
KEYWORDS="amd64 ~arm -x86"
|
||||||
|
UPSTREAM_VER=2
|
||||||
|
SECURITY_VER=
|
||||||
|
GENTOO_VER=
|
||||||
|
|
||||||
|
[[ -n ${UPSTREAM_VER} ]] && \
|
||||||
|
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
|
||||||
|
[[ -n ${SECURITY_VER} ]] && \
|
||||||
|
SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
|
||||||
|
[[ -n ${GENTOO_VER} ]] && \
|
||||||
|
GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
|
||||||
|
SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
|
||||||
|
${UPSTREAM_PATCHSET_URI}
|
||||||
|
${SECURITY_PATCHSET_URI}
|
||||||
|
${GENTOO_PATCHSET_URI}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
DESCRIPTION="The Xen virtual machine monitor"
|
||||||
|
HOMEPAGE="http://xen.org/"
|
||||||
|
HOMEPAGE="https://www.xenproject.org"
|
||||||
|
LICENSE="GPL-2"
|
||||||
|
SLOT="0"
|
||||||
|
IUSE="custom-cflags debug efi flask"
|
||||||
|
|
||||||
|
DEPEND="${PYTHON_DEPS}
|
||||||
|
efi? ( >=sys-devel/binutils-2.22[multitarget] )
|
||||||
|
!efi? ( >=sys-devel/binutils-2.22 )"
|
||||||
|
RDEPEND=""
|
||||||
|
PDEPEND="~app-emulation/xen-tools-${PV}"
|
||||||
|
|
||||||
|
# no tests are available for the hypervisor
|
||||||
|
# prevent the silliness of /usr/lib/debug/usr/lib/debug files
|
||||||
|
# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
|
||||||
|
RESTRICT="test splitdebug strip"
|
||||||
|
|
||||||
|
# Approved by QA team in bug #144032
|
||||||
|
QA_WX_LOAD="boot/xen-syms-${PV}"
|
||||||
|
|
||||||
|
REQUIRED_USE="arm? ( debug )"
|
||||||
|
|
||||||
|
S="${WORKDIR}/${MY_P}"
|
||||||
|
|
||||||
|
pkg_setup() {
|
||||||
|
python-any-r1_pkg_setup
|
||||||
|
if [[ -z ${XEN_TARGET_ARCH} ]]; then
|
||||||
|
if use amd64; then
|
||||||
|
export XEN_TARGET_ARCH="x86_64"
|
||||||
|
elif use arm; then
|
||||||
|
export XEN_TARGET_ARCH="arm32"
|
||||||
|
elif use arm64; then
|
||||||
|
export XEN_TARGET_ARCH="arm64"
|
||||||
|
else
|
||||||
|
die "Unsupported architecture!"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if use flask ; then
|
||||||
|
export "XSM_ENABLE=y"
|
||||||
|
export "FLASK_ENABLE=y"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
# Upstream's patchset
|
||||||
|
if [[ -n ${UPSTREAM_VER} ]]; then
|
||||||
|
EPATCH_SUFFIX="patch" \
|
||||||
|
EPATCH_FORCE="yes" \
|
||||||
|
EPATCH_OPTS="-p1" \
|
||||||
|
epatch "${WORKDIR}"/patches-upstream
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Security patchset
|
||||||
|
if [[ -n ${SECURITY_VER} ]]; then
|
||||||
|
einfo "Try to apply Xen Security patch set"
|
||||||
|
# apply main xen patches
|
||||||
|
# Two parallel systems, both work side by side
|
||||||
|
# Over time they may concdense into one. This will suffice for now
|
||||||
|
EPATCH_SUFFIX="patch"
|
||||||
|
EPATCH_FORCE="yes"
|
||||||
|
|
||||||
|
source "${WORKDIR}"/patches-security/${PV}.conf
|
||||||
|
|
||||||
|
local i
|
||||||
|
for i in ${XEN_SECURITY_MAIN}; do
|
||||||
|
epatch "${WORKDIR}"/patches-security/xen/$i
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Gentoo's patchset
|
||||||
|
if [[ -n ${GENTOO_VER} ]]; then
|
||||||
|
EPATCH_SUFFIX="patch" \
|
||||||
|
EPATCH_FORCE="yes" \
|
||||||
|
epatch "${WORKDIR}"/patches-gentoo
|
||||||
|
fi
|
||||||
|
|
||||||
|
epatch "${FILESDIR}"/${PN}-4.6-efi.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-4.8.0-coff-x86-64.patch
|
||||||
|
|
||||||
|
# Drop .config
|
||||||
|
sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
|
||||||
|
|
||||||
|
if use efi; then
|
||||||
|
export EFI_VENDOR="gentoo"
|
||||||
|
export EFI_MOUNTPOINT="boot"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# if the user *really* wants to use their own custom-cflags, let them
|
||||||
|
if use custom-cflags; then
|
||||||
|
einfo "User wants their own CFLAGS - removing defaults"
|
||||||
|
# try and remove all the default custom-cflags
|
||||||
|
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
|
||||||
|
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||||
|
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||||
|
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||||
|
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||||
|
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||||
|
-i {} \; || die "failed to re-set custom-cflags"
|
||||||
|
fi
|
||||||
|
|
||||||
|
default
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
|
||||||
|
|
||||||
|
use debug && myopt="${myopt} debug=y"
|
||||||
|
|
||||||
|
if use custom-cflags; then
|
||||||
|
filter-flags -fPIE -fstack-protector
|
||||||
|
replace-flags -O3 -O2
|
||||||
|
else
|
||||||
|
unset CFLAGS
|
||||||
|
unset LDFLAGS
|
||||||
|
unset ASFLAGS
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
# Send raw LDFLAGS so that --as-needed works
|
||||||
|
emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
local myopt
|
||||||
|
use debug && myopt="${myopt} debug=y"
|
||||||
|
|
||||||
|
# The 'make install' doesn't 'mkdir -p' the subdirs
|
||||||
|
if use efi; then
|
||||||
|
mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
|
||||||
|
fi
|
||||||
|
|
||||||
|
emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
|
||||||
|
|
||||||
|
# make install likes to throw in some extra EFI bits if it built
|
||||||
|
use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
elog "Official Xen Guide:"
|
||||||
|
elog " https://wiki.gentoo.org/wiki/Xen"
|
||||||
|
|
||||||
|
use efi && einfo "The efi executable is installed in boot/efi/gentoo"
|
||||||
|
|
||||||
|
elog "You can optionally block the installation of /boot/xen-syms by an entry"
|
||||||
|
elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
|
||||||
|
elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue