diff options
author | Doug Goldstein <cardoe@cardoe.com> | 2017-01-02 22:47:51 -0600 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-01-04 22:29:39 -0500 |
commit | af093a5b899e6793cb6a30202eed1a4bff465cc1 (patch) | |
tree | 123d2681cff16639011e10802337665a41f39085 | |
parent | 888ad3398852540d44929f811e5a29fca36f4f78 (diff) | |
download | meta-virtualization-af093a5b899e6793cb6a30202eed1a4bff465cc1.tar.gz |
xen: sync packages and fixes from master
Sync the latest list of packages and installed files from master along
with a handful of compilation bug fixes.
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r-- | recipes-extended/xen/xen.inc | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc index de8c1686..429a05a9 100644 --- a/recipes-extended/xen/xen.inc +++ b/recipes-extended/xen/xen.inc | |||
@@ -151,6 +151,7 @@ PACKAGES = "\ | |||
151 | ${PN}-base \ | 151 | ${PN}-base \ |
152 | ${PN}-blktap \ | 152 | ${PN}-blktap \ |
153 | ${PN}-console \ | 153 | ${PN}-console \ |
154 | ${PN}-cpuid \ | ||
154 | ${PN}-dbg \ | 155 | ${PN}-dbg \ |
155 | ${PN}-dev \ | 156 | ${PN}-dev \ |
156 | ${PN}-devd \ | 157 | ${PN}-devd \ |
@@ -196,6 +197,7 @@ PACKAGES = "\ | |||
196 | ${PN}-libxenvchan-dev \ | 197 | ${PN}-libxenvchan-dev \ |
197 | ${PN}-libxlutil \ | 198 | ${PN}-libxlutil \ |
198 | ${PN}-libxlutil-dev \ | 199 | ${PN}-libxlutil-dev \ |
200 | ${PN}-livepatch \ | ||
199 | ${PN}-misc \ | 201 | ${PN}-misc \ |
200 | ${PN}-pygrub \ | 202 | ${PN}-pygrub \ |
201 | ${PN}-python \ | 203 | ${PN}-python \ |
@@ -369,6 +371,10 @@ FILES_${PN}-console = "\ | |||
369 | ${sbindir}/xenconsoled \ | 371 | ${sbindir}/xenconsoled \ |
370 | " | 372 | " |
371 | 373 | ||
374 | FILES_${PN}-cpuid = "\ | ||
375 | ${bindir}/xen-cpuid \ | ||
376 | " | ||
377 | |||
372 | FILES_${PN}-devd = "\ | 378 | FILES_${PN}-devd = "\ |
373 | ${sysconfdir}/init.d/xendriverdomain \ | 379 | ${sysconfdir}/init.d/xendriverdomain \ |
374 | " | 380 | " |
@@ -399,6 +405,10 @@ FILES_${PN}-kdd = "\ | |||
399 | ${sbindir}/kdd \ | 405 | ${sbindir}/kdd \ |
400 | " | 406 | " |
401 | 407 | ||
408 | FILES_${PN}-livepatch += " \ | ||
409 | ${sbindir}/xen-livepatch \ | ||
410 | " | ||
411 | |||
402 | FILES_${PN}-misc = "\ | 412 | FILES_${PN}-misc = "\ |
403 | ${bindir}/xencons \ | 413 | ${bindir}/xencons \ |
404 | ${bindir}/xencov_split \ | 414 | ${bindir}/xencov_split \ |
@@ -527,6 +537,7 @@ FILES_${PN}-remus = "\ | |||
527 | " | 537 | " |
528 | 538 | ||
529 | FILES_${PN}-scripts-network = " \ | 539 | FILES_${PN}-scripts-network = " \ |
540 | ${sysconfdir}/xen/scripts/colo-proxy-setup \ | ||
530 | ${sysconfdir}/xen/scripts/network-bridge \ | 541 | ${sysconfdir}/xen/scripts/network-bridge \ |
531 | ${sysconfdir}/xen/scripts/network-nat \ | 542 | ${sysconfdir}/xen/scripts/network-nat \ |
532 | ${sysconfdir}/xen/scripts/network-route \ | 543 | ${sysconfdir}/xen/scripts/network-route \ |
@@ -544,6 +555,7 @@ FILES_${PN}-scripts-block = " \ | |||
544 | ${sysconfdir}/xen/scripts/blktap \ | 555 | ${sysconfdir}/xen/scripts/blktap \ |
545 | ${sysconfdir}/xen/scripts/block \ | 556 | ${sysconfdir}/xen/scripts/block \ |
546 | ${sysconfdir}/xen/scripts/block-common.sh \ | 557 | ${sysconfdir}/xen/scripts/block-common.sh \ |
558 | ${sysconfdir}/xen/scripts/block-dummy \ | ||
547 | ${sysconfdir}/xen/scripts/block-enbd \ | 559 | ${sysconfdir}/xen/scripts/block-enbd \ |
548 | ${sysconfdir}/xen/scripts/block-iscsi \ | 560 | ${sysconfdir}/xen/scripts/block-iscsi \ |
549 | ${sysconfdir}/xen/scripts/block-nbd \ | 561 | ${sysconfdir}/xen/scripts/block-nbd \ |
@@ -667,6 +679,7 @@ FILES_${PN}-xm = "\ | |||
667 | FILES_${PN}-xencommons += "\ | 679 | FILES_${PN}-xencommons += "\ |
668 | ${sysconfdir}/default/xencommons \ | 680 | ${sysconfdir}/default/xencommons \ |
669 | ${sysconfdir}/init.d/xencommons \ | 681 | ${sysconfdir}/init.d/xencommons \ |
682 | ${sysconfdir}/xen/scripts/launch-xenstore \ | ||
670 | ${systemd_unitdir}/modules-load.d/xen.conf \ | 683 | ${systemd_unitdir}/modules-load.d/xen.conf \ |
671 | ${systemd_unitdir}/system/proc-xen.mount \ | 684 | ${systemd_unitdir}/system/proc-xen.mount \ |
672 | ${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service \ | 685 | ${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service \ |
@@ -744,9 +757,11 @@ export XEN_OS = "Linux" | |||
744 | 757 | ||
745 | # this is used for the header (#!${bindir}/python) of the install python scripts | 758 | # this is used for the header (#!${bindir}/python) of the install python scripts |
746 | export PYTHONPATH="${bindir}/python" | 759 | export PYTHONPATH="${bindir}/python" |
760 | export ac_cv_path_PYTHONPATH="${bindir}/python" | ||
747 | 761 | ||
748 | # seabios forcefully sets HOSTCC to CC - fixup to allow it to build native conf executable | 762 | # xen and seabios require HOSTCC and HOSTCXX set to cross-compile |
749 | export HOSTCC="${BUILD_CC}" | 763 | export HOSTCC="${BUILD_CC}" |
764 | export HOSTCXX="${BUILD_CXX}" | ||
750 | 765 | ||
751 | # make xen requires CROSS_COMPILE set by hand as it does not abide by ./configure | 766 | # make xen requires CROSS_COMPILE set by hand as it does not abide by ./configure |
752 | export CROSS_COMPILE="${TARGET_PREFIX}" | 767 | export CROSS_COMPILE="${TARGET_PREFIX}" |
@@ -837,6 +852,9 @@ do_configure() { | |||
837 | } | 852 | } |
838 | 853 | ||
839 | do_compile() { | 854 | do_compile() { |
855 | # workaround for build bug when CFLAGS is exported | ||
856 | # https://www.mail-archive.com/xen-devel@lists.xen.org/msg67822.html | ||
857 | unset CFLAGS | ||
840 | oe_runmake | 858 | oe_runmake |
841 | } | 859 | } |
842 | 860 | ||