diff options
-rw-r--r-- | recipes-extended/xen/xen.inc | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc index 9e354596..03ec935f 100644 --- a/recipes-extended/xen/xen.inc +++ b/recipes-extended/xen/xen.inc | |||
@@ -333,7 +333,7 @@ FILES_${PN}-flask = "\ | |||
333 | ${sbindir}/flask-loadpolicy \ | 333 | ${sbindir}/flask-loadpolicy \ |
334 | ${sbindir}/flask-set-bool \ | 334 | ${sbindir}/flask-set-bool \ |
335 | ${sbindir}/flask-setenforce \ | 335 | ${sbindir}/flask-setenforce \ |
336 | /boot/xenpolicy.24 \ | 336 | /boot/xenpolicy-${PV} \ |
337 | " | 337 | " |
338 | 338 | ||
339 | FILES_${PN}-gdbsx = "\ | 339 | FILES_${PN}-gdbsx = "\ |
@@ -715,6 +715,15 @@ EXTRA_OECONF += " \ | |||
715 | --disable-ocamltools \ | 715 | --disable-ocamltools \ |
716 | " | 716 | " |
717 | 717 | ||
718 | # check for XSM in package config to allow XSM_ENABLE to be set | ||
719 | python () { | ||
720 | pkgconfig = d.getVar('PACKAGECONFIG', True) | ||
721 | if ('xsm') in pkgconfig.split(): | ||
722 | d.setVar('XSM_ENABLED', '1') | ||
723 | else: | ||
724 | d.setVar('XSM_ENABLED', '0') | ||
725 | } | ||
726 | |||
718 | do_configure() { | 727 | do_configure() { |
719 | # no stubs-32.h in our 64-bit sysroot - hack it into tools/include/gnu | 728 | # no stubs-32.h in our 64-bit sysroot - hack it into tools/include/gnu |
720 | if ! test -f ${STAGING_DIR_TARGET}/usr/include/gnu/stubs-32.h ; then | 729 | if ! test -f ${STAGING_DIR_TARGET}/usr/include/gnu/stubs-32.h ; then |
@@ -727,6 +736,11 @@ do_configure() { | |||
727 | fi | 736 | fi |
728 | fi | 737 | fi |
729 | 738 | ||
739 | #./configure --enable-xsm does not set XSM_ENABLE must be done manually | ||
740 | if [ "${XSM_ENABLED}" = "1" ]; then | ||
741 | echo "XSM_ENABLE := y" > ${S}/.config | ||
742 | fi | ||
743 | |||
730 | # do configure | 744 | # do configure |
731 | oe_runconf | 745 | oe_runconf |
732 | } | 746 | } |