MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

xen: Override CC and CPP in make command line

Browse Source 
After 4.16 release, Xen build system has been changed significantly.
When building latest status of Xen it was observed that commit
317c98cb91 broke the hypervisor build on arm32 due to the change in
handling Rules.mk that xen.inc modifies to override CC and CPP.

In order to fix the issue this patch moves overriding CC and CPP from
Rules.mk to make command line by adding them to EXTRA_OEMAKE:arm.

Take the opportunity to bump SRCREV of xen_git.bb and xen-tools_git.bb
to the current status of master.

Signed-off-by: Michal Orzel <michal.orzel@arm.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Michal Orzel 2022-03-09 11:09:06 +00:00 committed by Bruce Ashfield
parent 2dc502a269
commit ca4601a54a
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
recipes-extended/xen/xen-hypervisor.inc
View File

@ -48,6 +48,14 @@ do_configure() {
fi fi
} }
# The hypervisor binary for arm must not be built with the hard floating point
# ABI. Override CC and CPP when invoking make so that they do not contain
# TUNE_CCARGS.
EXTRA_OEMAKE:arm += "CC='${CCACHE}${HOST_PREFIX}gcc ${TOOLCHAIN_OPTIONS} \
${CC_REPRODUCIBLE_OPTIONS}' \
CPP='${CCACHE}${HOST_PREFIX}gcc -E ${TOOLCHAIN_OPTIONS} \
${CC_REPRODUCIBLE_OPTIONS}'"
do_compile() { do_compile() {
oe_runmake xen PYTHON="${PYTHON}" \ oe_runmake xen PYTHON="${PYTHON}" \
EXTRA_CFLAGS_XEN_CORE="${EXTRA_CFLAGS_XEN_CORE}" EXTRA_CFLAGS_XEN_CORE="${EXTRA_CFLAGS_XEN_CORE}"

4
recipes-extended/xen/xen-tools_git.bb
View File

@ -1,5 +1,5 @@
# master status on 2020-10-21 # master status on 2022-03-08
SRCREV ?= "23ec1ebc8acbfd2bf06f6085a776f0db923f9fa9" SRCREV ?= "9d4a44380d273de22d5753883cbf5581795ff24d"
XEN_REL ?= "4.16" XEN_REL ?= "4.16"
XEN_BRANCH ?= "master" XEN_BRANCH ?= "master"

6
recipes-extended/xen/xen.inc
View File

@ -193,12 +193,6 @@ do_post_patch() {
fi fi
} }
do_post_patch:append:arm() {
# The hypervisor binary must not be built with the hard floating point ABI.
echo "CC := \$(filter-out ${TUNE_CCARGS},\$(CC))" >> ${S}/xen/arch/arm/Rules.mk
echo "CPP := \$(filter-out ${TUNE_CCARGS},\$(CPP))" >> ${S}/xen/arch/arm/Rules.mk
}
addtask post_patch after do_patch before do_configure addtask post_patch after do_patch before do_configure
# Allow all hypervisor settings in a defconfig # Allow all hypervisor settings in a defconfig

4
recipes-extended/xen/xen_git.bb
View File

@ -1,5 +1,5 @@
# master status on 2020-10-21 # master status on 2022-03-08
SRCREV ?= "23ec1ebc8acbfd2bf06f6085a776f0db923f9fa9" SRCREV ?= "9d4a44380d273de22d5753883cbf5581795ff24d"
XEN_REL ?= "4.16" XEN_REL ?= "4.16"
XEN_BRANCH ?= "master" XEN_BRANCH ?= "master"