diff options
Diffstat (limited to 'recipes-extended')
-rw-r--r-- | recipes-extended/xen/xen-hypervisor.inc | 8 | ||||
-rw-r--r-- | recipes-extended/xen/xen-tools_git.bb | 4 | ||||
-rw-r--r-- | recipes-extended/xen/xen.inc | 6 | ||||
-rw-r--r-- | recipes-extended/xen/xen_git.bb | 4 |
4 files changed, 12 insertions, 10 deletions
diff --git a/recipes-extended/xen/xen-hypervisor.inc b/recipes-extended/xen/xen-hypervisor.inc index 81e361f1..6f3d24d0 100644 --- a/recipes-extended/xen/xen-hypervisor.inc +++ b/recipes-extended/xen/xen-hypervisor.inc @@ -48,6 +48,14 @@ do_configure() { 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() { oe_runmake xen PYTHON="${PYTHON}" \ EXTRA_CFLAGS_XEN_CORE="${EXTRA_CFLAGS_XEN_CORE}" diff --git a/recipes-extended/xen/xen-tools_git.bb b/recipes-extended/xen/xen-tools_git.bb index 8ff9c4c1..e733f1d6 100644 --- a/recipes-extended/xen/xen-tools_git.bb +++ b/recipes-extended/xen/xen-tools_git.bb @@ -1,5 +1,5 @@ -# master status on 2020-10-21 -SRCREV ?= "23ec1ebc8acbfd2bf06f6085a776f0db923f9fa9" +# master status on 2022-03-08 +SRCREV ?= "9d4a44380d273de22d5753883cbf5581795ff24d" XEN_REL ?= "4.16" XEN_BRANCH ?= "master" diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc index d3c7a7d4..a173f8f2 100644 --- a/recipes-extended/xen/xen.inc +++ b/recipes-extended/xen/xen.inc @@ -193,12 +193,6 @@ do_post_patch() { 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 # Allow all hypervisor settings in a defconfig diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/xen_git.bb index 20227e0a..3957de12 100644 --- a/recipes-extended/xen/xen_git.bb +++ b/recipes-extended/xen/xen_git.bb @@ -1,5 +1,5 @@ -# master status on 2020-10-21 -SRCREV ?= "23ec1ebc8acbfd2bf06f6085a776f0db923f9fa9" +# master status on 2022-03-08 +SRCREV ?= "9d4a44380d273de22d5753883cbf5581795ff24d" XEN_REL ?= "4.16" XEN_BRANCH ?= "master" |