From 7a8167fa82621dd606260450b1e648e50a1d79ab Mon Sep 17 00:00:00 2001 From: Bertrand Marquis Date: Fri, 9 Oct 2020 13:31:13 +0100 Subject: xen: Fix x86_64 xen-tools installation Python related things are installed in /usr/lib and not /usr/lib64 even if xen-tools is built for x86_64 with multilib activated. Use nonarch_libdir variable for all python related files. Change-Id: I24e4336aaac4477efc5dc7426a6d9e909c98a6af Signed-off-by: Bertrand Marquis Signed-off-by: Bruce Ashfield --- recipes-extended/xen/xen-tools.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'recipes-extended') diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc index ace1a013..736a7662 100644 --- a/recipes-extended/xen/xen-tools.inc +++ b/recipes-extended/xen/xen-tools.inc @@ -247,8 +247,8 @@ RPROVIDES_${PN}-xenstored = "virtual/xenstored" FILES_${PN}-dbg += "\ ${libdir}/xen/bin/.debug \ - ${libdir}/${PYTHON_DIR}/site-packages/.debug \ - ${libdir}/${PYTHON_DIR}/site-packages/xen/lowlevel/.debug \ + ${nonarch_libdir}/${PYTHON_DIR}/site-packages/.debug \ + ${nonarch_libdir}/${PYTHON_DIR}/site-packages/xen/lowlevel/.debug \ ${libdir}/fs/xfs/.debug \ ${libdir}/fs/ufs/.debug \ ${libdir}/fs/ext2fs-lib/.debug \ @@ -261,8 +261,8 @@ FILES_${PN}-dbg += "\ ${libdir}exec/.debug \ ${libdir}/xen/libexec/.debug \ ${bindir}/.debug \ - ${libdir}/${PYTHON_DIR}/dist-packages/.debug \ - ${libdir}/${PYTHON_DIR}/dist-packages/xen/lowlevel/.debug \ + ${nonarch_libdir}/${PYTHON_DIR}/dist-packages/.debug \ + ${nonarch_libdir}/${PYTHON_DIR}/dist-packages/xen/lowlevel/.debug \ " FILES_${PN}-dev = "\ @@ -497,7 +497,7 @@ FILES_${PN}-pygrub = "\ " FILES_${PN}-python = "\ - ${libdir}/${PYTHON_DIR} \ + ${nonarch_libdir}/${PYTHON_DIR} \ " FILES_${PN}-remus = "\ -- cgit v1.2.3-54-g00ecf