* this commit seems no longer true for current version of xen:
  commit a0964e2044cb1ccdd4f64173658ce7602257ff48
  Author: Christopher Clark <[email protected]>
  Date:   Tue Feb 25 16:16:00 2020 -0800

    xen, xen-tools: separate COMPATIBLE_HOST for hypervisor and tools

    The tools have broader platform compatibility than the hypervisor.

* xen-tools are failing to build for qemux86 as shown in:
  http://errors.yoctoproject.org/Errors/Details/575367/

  make[8]: Entering directory 
'TOPDIR/tmp-glibc/work/core2-32-oe-linux/xen-tools/4.14+stableAUTOINC+ad844aa352-r0/git/tools/firmware/xen-dir/xen-root/xen'
  echo "*** Xen x86/32 target no longer supported!"
  *** Xen x86/32 target no longer supported!
  make[8]: Leaving directory 
'TOPDIR/tmp-glibc/work/core2-32-oe-linux/xen-tools/4.14+stableAUTOINC+ad844aa352-r0/git/tools/firmware/xen-dir/xen-root/xen'
  ln -sf xen-root/xen/xen xen-shim
  ln -sf xen-root/xen/xen-syms xen-shim-syms
  ...
  install: cannot stat 'xen-dir/xen-shim': No such file or directory
  make[4]: *** [Makefile:51: install] Error 1

  revert the commit and also drop i686 from map_xen_arch

Signed-off-by: Martin Jansa <[email protected]>
---
 recipes-extended/xen/xen-arch.inc       | 3 +--
 recipes-extended/xen/xen-hypervisor.inc | 3 ---
 recipes-extended/xen/xen-python2.bb     | 3 ---
 recipes-extended/xen/xen-tools.inc      | 2 --
 recipes-extended/xen/xen.inc            | 2 ++
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/recipes-extended/xen/xen-arch.inc 
b/recipes-extended/xen/xen-arch.inc
index fb0093e..9676045 100644
--- a/recipes-extended/xen/xen-arch.inc
+++ b/recipes-extended/xen/xen-arch.inc
@@ -8,8 +8,7 @@ def map_xen_arch(a, d):
     import re
     valid_archs = d.getVar('valid_xen_archs').split()
 
-    if   re.match("i.86", a):        return "x86_32"
-    elif re.match("x86.64", a):      return "x86_64"
+    if re.match("x86.64", a):      return "x86_64"
     elif re.match("arm.*", a):       return "arm32"
     elif re.match("aarch64.*", a):   return "arm64"
     elif a in valid_archs:           return a
diff --git a/recipes-extended/xen/xen-hypervisor.inc 
b/recipes-extended/xen/xen-hypervisor.inc
index 916bd3c..d8e57e2 100644
--- a/recipes-extended/xen/xen-hypervisor.inc
+++ b/recipes-extended/xen/xen-hypervisor.inc
@@ -6,9 +6,6 @@ DESCRIPTION = "The Xen hypervisor"
 # this allows for varying the target architecture or toolchain used
 # to build the different components. eg. 32-bit tools and a 64-bit hypervisor.
 
-# The Xen hypervisor has a narrower compatible platform range than the Xen 
tools
-COMPATIBLE_HOST = '(x86_64.*).*-linux|aarch64.*-linux|arm-.*-linux-gnueabi'
-
 inherit deploy python3native cml1
 
 PACKAGES = " \
diff --git a/recipes-extended/xen/xen-python2.bb 
b/recipes-extended/xen/xen-python2.bb
index ad3c1fd..08d8e92 100644
--- a/recipes-extended/xen/xen-python2.bb
+++ b/recipes-extended/xen/xen-python2.bb
@@ -6,9 +6,6 @@ SECTION = "console/tools"
 
 SRCREV ?= "a5fcafbfbee55261853fba07149c1c795f2baf58"
 
-# The same restriction as xen-tools.inc, because of the dependency on 
xen-tools-xentrace from xen-tools-xentrace-format
-COMPATIBLE_HOST = 
'i686-.*-linux|(x86_64.*).*-linux|aarch64.*-linux|arm-.*-linux-gnueabi'
-
 XEN_REL ?= "4.12"
 XEN_BRANCH ?= "stable-4.12"
 
diff --git a/recipes-extended/xen/xen-tools.inc 
b/recipes-extended/xen/xen-tools.inc
index 722c503..35d0c58 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -1,8 +1,6 @@
 SUMMARY = "Xen hypervisor tools"
 DESCRIPTION = "Tools and utility software for the Xen hypervisor"
 
-COMPATIBLE_HOST = 
'i686-.*-linux|(x86_64.*).*-linux|aarch64.*-linux|arm-.*-linux-gnueabi'
-
 inherit setuptools3 update-rc.d systemd deploy
 require xen-blktap.inc
 
diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
index 9e8fcad..8277939 100644
--- a/recipes-extended/xen/xen.inc
+++ b/recipes-extended/xen/xen.inc
@@ -2,6 +2,8 @@ HOMEPAGE = "http://xen.org";
 LICENSE = "GPLv2"
 SECTION = "console/tools"
 
+COMPATIBLE_HOST = '(x86_64.*).*-linux|aarch64.*-linux|arm-.*-linux-gnueabi'
+
 inherit autotools-brokensep
 
 require xen-arch.inc
-- 
2.30.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6308): 
https://lists.yoctoproject.org/g/meta-virtualization/message/6308
Mute This Topic: https://lists.yoctoproject.org/mt/81840959/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to