Build and install HVM-related files. Good enough to boot the NetBSD 6.1 i386 CD and do a network install. Bump PKGREVISIONdiff -r1.3 -r1.4 pkgsrc/sysutils/xentools42/Makefile
(bouyer)
@@ -1,21 +1,21 @@ | @@ -1,21 +1,21 @@ | |||
1 | # $NetBSD: Makefile,v 1.3 2013/05/25 05:19:17 jnemeth Exp $ | 1 | # $NetBSD: Makefile,v 1.4 2013/05/26 20:27:43 bouyer Exp $ | |
2 | # | 2 | # | |
3 | # VERSION is set in version.mk as it is shared with other packages | 3 | # VERSION is set in version.mk as it is shared with other packages | |
4 | .include "version.mk" | 4 | .include "version.mk" | |
5 | 5 | |||
6 | DISTNAME= xen-${VERSION} | 6 | DISTNAME= xen-${VERSION} | |
7 | PKGNAME= xentools42-${VERSION} | 7 | PKGNAME= xentools42-${VERSION} | |
8 | PKGREVISION= 1 | 8 | PKGREVISION= 2 | |
9 | CATEGORIES= sysutils | 9 | CATEGORIES= sysutils | |
10 | MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ | 10 | MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ | |
11 | 11 | |||
12 | DISTFILES= ${DISTNAME}.tar.gz | 12 | DISTFILES= ${DISTNAME}.tar.gz | |
13 | DISTFILES+= ipxe-git-v${VERSION_IPXE}.tar.gz | 13 | DISTFILES+= ipxe-git-v${VERSION_IPXE}.tar.gz | |
14 | SITES.ipxe-git-v${VERSION_IPXE}.tar.gz += http://xenbits.xensource.com/xen-extfiles/ | 14 | SITES.ipxe-git-v${VERSION_IPXE}.tar.gz += http://xenbits.xensource.com/xen-extfiles/ | |
15 | 15 | |||
16 | MAINTAINER= pkgsrc-users@NetBSD.org | 16 | MAINTAINER= pkgsrc-users@NetBSD.org | |
17 | HOMEPAGE= http://xen.org/ | 17 | HOMEPAGE= http://xen.org/ | |
18 | COMMENT= Userland Tools for Xen 4.2.x | 18 | COMMENT= Userland Tools for Xen 4.2.x | |
19 | 19 | |||
20 | LICENSE= gnu-gpl-v2 | 20 | LICENSE= gnu-gpl-v2 | |
21 | 21 | |||
@@ -81,47 +81,76 @@ PY_PATCHPLIST= yes | @@ -81,47 +81,76 @@ PY_PATCHPLIST= yes | |||
81 | #PYTHON_PATCH_SCRIPTS+= xenmon/*.py | 81 | #PYTHON_PATCH_SCRIPTS+= xenmon/*.py | |
82 | #PYTHON_PATCH_SCRIPTS+= xentrace/xentrace_format | 82 | #PYTHON_PATCH_SCRIPTS+= xentrace/xentrace_format | |
83 | 83 | |||
84 | REPLACE_PYTHON+= misc/sbdf2devicepath misc/sxp-pretty misc/xen-bugtool | 84 | REPLACE_PYTHON+= misc/sbdf2devicepath misc/sxp-pretty misc/xen-bugtool | |
85 | REPLACE_PYTHON+= misc/xen-python-path misc/xen-ringwatch misc/xencons | 85 | REPLACE_PYTHON+= misc/xen-python-path misc/xen-ringwatch misc/xencons | |
86 | REPLACE_PYTHON+= misc/xend misc/xenpvnetboot misc/xensymoops misc/xm | 86 | REPLACE_PYTHON+= misc/xend misc/xenpvnetboot misc/xensymoops misc/xm | |
87 | REPLACE_PYTHON+= misc/xsview | 87 | REPLACE_PYTHON+= misc/xsview | |
88 | REPLACE_PYTHON+= python/xen/remus/*.py | 88 | REPLACE_PYTHON+= python/xen/remus/*.py | |
89 | REPLACE_PYTHON+= python/xen/util/*.py | 89 | REPLACE_PYTHON+= python/xen/util/*.py | |
90 | REPLACE_PYTHON+= python/xen/xend/*.py | 90 | REPLACE_PYTHON+= python/xen/xend/*.py | |
91 | REPLACE_PYTHON+= python/xen/xm/*.py | 91 | REPLACE_PYTHON+= python/xen/xm/*.py | |
92 | REPLACE_PYTHON+= xenmon/xenmon.py | 92 | REPLACE_PYTHON+= xenmon/xenmon.py | |
93 | 93 | |||
94 | SUBST_CLASSES+= perlpath | |||
95 | SUBST_STAGE.perlpath= pre-configure | |||
96 | SUBST_FILES.perlpath= tools/firmware/rombios/makesym.perl | |||
97 | SUBST_FILES.perlpath+= tools/qemu-xen-traditional/texi2pod.pl | |||
98 | SUBST_FILES.perlpath+= tools/examples/xeninfo.pl | |||
99 | SUBST_FILES.perlpath+= tools/include/xen-external/bsd-sys-queue-h-seddery | |||
100 | SUBST_FILES.perlpath+= tools/qemu-xen/scripts/texi2pod.pl | |||
101 | SUBST_FILES.perlpath+= tools/qemu-xen/scripts/get_maintainer.pl | |||
102 | SUBST_FILES.perlpath+= tools/qemu-xen/scripts/checkpatch.pl | |||
103 | SUBST_FILES.perlpath+= tools/xm-test/mkreport | |||
104 | SUBST_FILES.perlpath+= tools/libxl/libxl_save_msgs_gen.pl | |||
105 | SUBST_FILES.perlpath+= tools/libxl/check-libxl-api-rules | |||
106 | SUBST_FILES.perlpath+= ../../ipxe/src/Makefile | |||
107 | SUBST_FILES.perlpath+= ../../ipxe/src/drivers/infiniband/qib_genbits.pl | |||
108 | SUBST_FILES.perlpath+= ../../ipxe/src/include/gpxe/efi/import.pl | |||
109 | SUBST_FILES.perlpath+= ../../ipxe/src/util/catrom.pl | |||
110 | SUBST_FILES.perlpath+= ../../ipxe/src/util/diffsize.pl | |||
111 | SUBST_FILES.perlpath+= ../../ipxe/src/util/disrom.pl | |||
112 | SUBST_FILES.perlpath+= ../../ipxe/src/util/get-pci-ids | |||
113 | SUBST_FILES.perlpath+= ../../ipxe/src/util/licence.pl | |||
114 | SUBST_FILES.perlpath+= ../../ipxe/src/util/makerom.pl | |||
115 | SUBST_FILES.perlpath+= ../../ipxe/src/util/mergerom.pl | |||
116 | SUBST_FILES.perlpath+= ../../ipxe/src/util/modrom.pl | |||
117 | SUBST_FILES.perlpath+= ../../ipxe/src/util/padimg.pl | |||
118 | SUBST_FILES.perlpath+= ../../ipxe/src/util/parserom.pl | |||
119 | SUBST_FILES.perlpath+= ../../ipxe/src/util/sortobjdump.pl | |||
120 | SUBST_FILES.perlpath+= ../../ipxe/src/util/swapdevids.pl | |||
121 | SUBST_FILES.perlpath+= ../../ipxe/src/util/symcheck.pl | |||
122 | SUBST_SED.perlpath= -e "s|/usr/bin/perl|${PREFIX}/bin/perl|g" | |||
123 | ||||
94 | SUBST_CLASSES+= pathsvar | 124 | SUBST_CLASSES+= pathsvar | |
95 | SUBST_STAGE.pathsvar= pre-configure | 125 | SUBST_STAGE.pathsvar= pre-configure | |
96 | SUBST_FILES.pathsvar= Makefile \ | 126 | SUBST_FILES.pathsvar= Makefile \ | |
97 | examples/xend-config.sxp \ | 127 | examples/xend-config.sxp \ | |
98 | hotplug/Linux/init.d/sysconfig.xendomains \ | 128 | hotplug/Linux/init.d/sysconfig.xendomains \ | |
99 | python/xen/xend/XendOptions.py \ | 129 | python/xen/xend/XendOptions.py \ | |
100 | python/xen/xend/server/relocate.py \ | 130 | python/xen/xend/server/relocate.py \ | |
101 | python/xen/xend/tests/xend-config.sxp \ | 131 | python/xen/xend/tests/xend-config.sxp \ | |
102 | xenstore/xs_lib.c | 132 | xenstore/xs_lib.c | |
103 | SUBST_SED.pathsvar= -e "s|/var/lib|${VARBASE}/run|g" | 133 | SUBST_SED.pathsvar= -e "s|/var/lib|${VARBASE}/run|g" | |
104 | 134 | |||
105 | SUBST_CLASSES+= conf | 135 | SUBST_CLASSES+= conf | |
106 | SUBST_STAGE.conf= pre-configure | 136 | SUBST_STAGE.conf= pre-configure | |
107 | SUBST_FILES.conf+= python/xen/xm/create.py | 137 | SUBST_FILES.conf+= python/xen/xm/create.py | |
108 | SUBST_FILES.conf+= ocaml/xenstored/define.ml | 138 | SUBST_FILES.conf+= ocaml/xenstored/define.ml | |
109 | SUBST_SED.conf= -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" | 139 | SUBST_SED.conf= -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" | |
110 | 140 | |||
111 | .include "../../mk/bsd.prefs.mk" | 141 | .include "../../mk/bsd.prefs.mk" | |
112 | 142 | |||
113 | #XXX XEND_SCRIPTS= block vif-bridge vif-ip qemu-ifup hotplugpath.sh | 143 | XEND_SCRIPTS= block vif-bridge vif-ip qemu-ifup hotplugpath.sh | |
114 | XEND_SCRIPTS= block vif-bridge vif-ip hotplugpath.sh | |||
115 | 144 | |||
116 | .if ${OPSYS} == "NetBSD" | 145 | .if ${OPSYS} == "NetBSD" | |
117 | SUBST_CLASSES+= proc | 146 | SUBST_CLASSES+= proc | |
118 | SUBST_STAGE.proc= pre-configure | 147 | SUBST_STAGE.proc= pre-configure | |
119 | SUBST_FILES.proc= python/xen/xend/XendVnet.py | 148 | SUBST_FILES.proc= python/xen/xend/XendVnet.py | |
120 | SUBST_FILES.proc+= ocaml/xenstored/define.ml | 149 | SUBST_FILES.proc+= ocaml/xenstored/define.ml | |
121 | SUBST_SED.proc= -e "s|/proc|/kern|g" | 150 | SUBST_SED.proc= -e "s|/proc|/kern|g" | |
122 | PROCPATH= /kern | 151 | PROCPATH= /kern | |
123 | .else | 152 | .else | |
124 | PROCPATH= /proc | 153 | PROCPATH= /proc | |
125 | .endif | 154 | .endif | |
126 | 155 | |||
127 | SUBST_CLASSES+= procdev | 156 | SUBST_CLASSES+= procdev |
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.2 2013/05/25 05:19:17 jnemeth Exp $ | 1 | @comment $NetBSD: PLIST,v 1.3 2013/05/26 20:27:43 bouyer Exp $ | |
2 | bin/libxl-save-helper | 2 | bin/libxl-save-helper | |
3 | bin/lsevtchn | 3 | bin/lsevtchn | |
4 | bin/pygrub | 4 | bin/pygrub | |
5 | @comment bin/qemu-img-xen | 5 | bin/qemu-img-xen | |
6 | bin/readnotes | 6 | bin/readnotes | |
7 | bin/remus | 7 | bin/remus | |
8 | bin/xc_restore | 8 | bin/xc_restore | |
9 | bin/xc_save | 9 | bin/xc_save | |
10 | bin/xen-detect | 10 | bin/xen-detect | |
11 | bin/xencons | 11 | bin/xencons | |
12 | bin/xenconsole | 12 | bin/xenconsole | |
13 | bin/xenctx | 13 | bin/xenctx | |
14 | bin/xenpvnetboot | 14 | bin/xenpvnetboot | |
15 | bin/xenstore | 15 | bin/xenstore | |
16 | bin/xenstore-chmod | 16 | bin/xenstore-chmod | |
17 | bin/xenstore-control | 17 | bin/xenstore-control | |
18 | bin/xenstore-exists | 18 | bin/xenstore-exists | |
@@ -605,28 +605,33 @@ ${PYSITELIB}/xen/xm/shutdown.py | @@ -605,28 +605,33 @@ ${PYSITELIB}/xen/xm/shutdown.py | |||
605 | ${PYSITELIB}/xen/xm/shutdown.pyc | 605 | ${PYSITELIB}/xen/xm/shutdown.pyc | |
606 | ${PYSITELIB}/xen/xm/tests/__init__.py | 606 | ${PYSITELIB}/xen/xm/tests/__init__.py | |
607 | ${PYSITELIB}/xen/xm/tests/__init__.pyc | 607 | ${PYSITELIB}/xen/xm/tests/__init__.pyc | |
608 | ${PYSITELIB}/xen/xm/tests/test_create.py | 608 | ${PYSITELIB}/xen/xm/tests/test_create.py | |
609 | ${PYSITELIB}/xen/xm/tests/test_create.pyc | 609 | ${PYSITELIB}/xen/xm/tests/test_create.pyc | |
610 | ${PYSITELIB}/xen/xm/xenapi_create.py | 610 | ${PYSITELIB}/xen/xm/xenapi_create.py | |
611 | ${PYSITELIB}/xen/xm/xenapi_create.pyc | 611 | ${PYSITELIB}/xen/xm/xenapi_create.pyc | |
612 | ${PYSITELIB}/xen/xsview/__init__.py | 612 | ${PYSITELIB}/xen/xsview/__init__.py | |
613 | ${PYSITELIB}/xen/xsview/__init__.pyc | 613 | ${PYSITELIB}/xen/xsview/__init__.pyc | |
614 | ${PYSITELIB}/xen/xsview/main.py | 614 | ${PYSITELIB}/xen/xsview/main.py | |
615 | ${PYSITELIB}/xen/xsview/main.pyc | 615 | ${PYSITELIB}/xen/xsview/main.pyc | |
616 | ${PYSITELIB}/xen/xsview/xsviewer.py | 616 | ${PYSITELIB}/xen/xsview/xsviewer.py | |
617 | ${PYSITELIB}/xen/xsview/xsviewer.pyc | 617 | ${PYSITELIB}/xen/xsview/xsviewer.pyc | |
618 | @comment lib/xen/boot/hvmloader | 618 | lib/xen/boot/hvmloader | |
619 | @comment libexec/qemu-dm | 619 | libexec/qemu-dm | |
620 | libexec/qemu-ga | |||
621 | libexec/qemu-img | |||
622 | libexec/qemu-io | |||
623 | libexec/qemu-nbd | |||
624 | libexec/qemu-system-i386 | |||
620 | libexec/xenpaging | 625 | libexec/xenpaging | |
621 | man/man1/xentop.1 | 626 | man/man1/xentop.1 | |
622 | man/man1/xentrace_format.1 | 627 | man/man1/xentrace_format.1 | |
623 | man/man1/xl.1 | 628 | man/man1/xl.1 | |
624 | man/man1/xm.1 | 629 | man/man1/xm.1 | |
625 | man/man5/xend-config.sxp.5 | 630 | man/man5/xend-config.sxp.5 | |
626 | man/man5/xl.cfg.5 | 631 | man/man5/xl.cfg.5 | |
627 | man/man5/xl.conf.5 | 632 | man/man5/xl.conf.5 | |
628 | man/man5/xlcpupool.cfg.5 | 633 | man/man5/xlcpupool.cfg.5 | |
629 | man/man5/xmdomain.cfg.5 | 634 | man/man5/xmdomain.cfg.5 | |
630 | man/man8/xentrace.8 | 635 | man/man8/xentrace.8 | |
631 | sbin/blktapctrl | 636 | sbin/blktapctrl | |
632 | sbin/flask-get-bool | 637 | sbin/flask-get-bool | |
@@ -671,82 +676,144 @@ sbin/xsview | @@ -671,82 +676,144 @@ sbin/xsview | |||
671 | share/doc/xen/README.blktap | 676 | share/doc/xen/README.blktap | |
672 | share/doc/xen/README.xenmon | 677 | share/doc/xen/README.xenmon | |
673 | share/examples/rc.d/xen-watchdog | 678 | share/examples/rc.d/xen-watchdog | |
674 | share/examples/rc.d/xencommons | 679 | share/examples/rc.d/xencommons | |
675 | share/examples/rc.d/xend | 680 | share/examples/rc.d/xend | |
676 | share/examples/rc.d/xendomains | 681 | share/examples/rc.d/xendomains | |
677 | share/examples/xen/README | 682 | share/examples/xen/README | |
678 | share/examples/xen/README.incompatibilities | 683 | share/examples/xen/README.incompatibilities | |
679 | share/examples/xen/cpupool | 684 | share/examples/xen/cpupool | |
680 | share/examples/xen/formats | 685 | share/examples/xen/formats | |
681 | share/examples/xen/oxenstored.conf | 686 | share/examples/xen/oxenstored.conf | |
682 | share/examples/xen/scripts/block | 687 | share/examples/xen/scripts/block | |
683 | share/examples/xen/scripts/hotplugpath.sh | 688 | share/examples/xen/scripts/hotplugpath.sh | |
684 | @comment share/examples/xen/scripts/qemu-ifup | 689 | share/examples/xen/scripts/qemu-ifup | |
685 | share/examples/xen/scripts/vif-bridge | 690 | share/examples/xen/scripts/vif-bridge | |
686 | share/examples/xen/scripts/vif-ip | 691 | share/examples/xen/scripts/vif-ip | |
687 | share/examples/xen/xend-config.sxp | 692 | share/examples/xen/xend-config.sxp | |
688 | share/examples/xen/xend-pci-permissive.sxp | 693 | share/examples/xen/xend-pci-permissive.sxp | |
689 | share/examples/xen/xend-pci-quirks.sxp | 694 | share/examples/xen/xend-pci-quirks.sxp | |
690 | share/examples/xen/xl.conf | 695 | share/examples/xen/xl.conf | |
691 | share/examples/xen/xl.sh | 696 | share/examples/xen/xl.sh | |
692 | share/examples/xen/xlexample.hvm | 697 | share/examples/xen/xlexample.hvm | |
693 | share/examples/xen/xlexample.pvlinux | 698 | share/examples/xen/xlexample.pvlinux | |
694 | share/examples/xen/xm-config.xml | 699 | share/examples/xen/xm-config.xml | |
695 | share/examples/xen/xmexample.hvm | 700 | share/examples/xen/xmexample.hvm | |
696 | share/examples/xen/xmexample.hvm-stubdom | 701 | share/examples/xen/xmexample.hvm-stubdom | |
697 | share/examples/xen/xmexample.nbd | 702 | share/examples/xen/xmexample.nbd | |
698 | share/examples/xen/xmexample.pv-grub | 703 | share/examples/xen/xmexample.pv-grub | |
699 | share/examples/xen/xmexample.vti | 704 | share/examples/xen/xmexample.vti | |
700 | share/examples/xen/xmexample1 | 705 | share/examples/xen/xmexample1 | |
701 | share/examples/xen/xmexample2 | 706 | share/examples/xen/xmexample2 | |
702 | share/examples/xen/xmexample3 | 707 | share/examples/xen/xmexample3 | |
708 | share/qemu-xen/bamboo.dtb | |||
709 | share/qemu-xen/bios.bin | |||
710 | share/qemu-xen/keymaps/ar | |||
711 | share/qemu-xen/keymaps/common | |||
712 | share/qemu-xen/keymaps/da | |||
713 | share/qemu-xen/keymaps/de | |||
714 | share/qemu-xen/keymaps/de-ch | |||
715 | share/qemu-xen/keymaps/en-gb | |||
716 | share/qemu-xen/keymaps/en-us | |||
717 | share/qemu-xen/keymaps/es | |||
718 | share/qemu-xen/keymaps/et | |||
719 | share/qemu-xen/keymaps/fi | |||
720 | share/qemu-xen/keymaps/fo | |||
721 | share/qemu-xen/keymaps/fr | |||
722 | share/qemu-xen/keymaps/fr-be | |||
723 | share/qemu-xen/keymaps/fr-ca | |||
724 | share/qemu-xen/keymaps/fr-ch | |||
725 | share/qemu-xen/keymaps/hr | |||
726 | share/qemu-xen/keymaps/hu | |||
727 | share/qemu-xen/keymaps/is | |||
728 | share/qemu-xen/keymaps/it | |||
729 | share/qemu-xen/keymaps/ja | |||
730 | share/qemu-xen/keymaps/lt | |||
731 | share/qemu-xen/keymaps/lv | |||
732 | share/qemu-xen/keymaps/mk | |||
733 | share/qemu-xen/keymaps/modifiers | |||
734 | share/qemu-xen/keymaps/nl | |||
735 | share/qemu-xen/keymaps/nl-be | |||
736 | share/qemu-xen/keymaps/no | |||
737 | share/qemu-xen/keymaps/pl | |||
738 | share/qemu-xen/keymaps/pt | |||
739 | share/qemu-xen/keymaps/pt-br | |||
740 | share/qemu-xen/keymaps/ru | |||
741 | share/qemu-xen/keymaps/sl | |||
742 | share/qemu-xen/keymaps/sv | |||
743 | share/qemu-xen/keymaps/th | |||
744 | share/qemu-xen/keymaps/tr | |||
745 | share/qemu-xen/linuxboot.bin | |||
746 | share/qemu-xen/mpc8544ds.dtb | |||
747 | share/qemu-xen/multiboot.bin | |||
748 | share/qemu-xen/openbios-ppc | |||
749 | share/qemu-xen/openbios-sparc32 | |||
750 | share/qemu-xen/openbios-sparc64 | |||
751 | share/qemu-xen/palcode-clipper | |||
752 | share/qemu-xen/petalogix-ml605.dtb | |||
753 | share/qemu-xen/petalogix-s3adsp1800.dtb | |||
754 | share/qemu-xen/ppc_rom.bin | |||
755 | share/qemu-xen/pxe-e1000.rom | |||
756 | share/qemu-xen/pxe-eepro100.rom | |||
757 | share/qemu-xen/pxe-ne2k_pci.rom | |||
758 | share/qemu-xen/pxe-pcnet.rom | |||
759 | share/qemu-xen/pxe-rtl8139.rom | |||
760 | share/qemu-xen/pxe-virtio.rom | |||
761 | share/qemu-xen/s390-zipl.rom | |||
762 | share/qemu-xen/sgabios.bin | |||
763 | share/qemu-xen/slof.bin | |||
764 | share/qemu-xen/spapr-rtas.bin | |||
765 | share/qemu-xen/vgabios-cirrus.bin | |||
766 | share/qemu-xen/vgabios-qxl.bin | |||
767 | share/qemu-xen/vgabios-stdvga.bin | |||
768 | share/qemu-xen/vgabios-vmware.bin | |||
769 | share/qemu-xen/vgabios.bin | |||
703 | share/xen/create.dtd | 770 | share/xen/create.dtd | |
704 | @comment share/xen/qemu/bamboo.dtb | 771 | share/xen/qemu/bamboo.dtb | |
705 | @comment share/xen/qemu/bios.bin | 772 | share/xen/qemu/bios.bin | |
706 | @comment share/xen/qemu/keymaps/ar | 773 | share/xen/qemu/keymaps/ar | |
707 | @comment share/xen/qemu/keymaps/common | 774 | share/xen/qemu/keymaps/common | |
708 | @comment share/xen/qemu/keymaps/da | 775 | share/xen/qemu/keymaps/da | |
709 | @comment share/xen/qemu/keymaps/de | 776 | share/xen/qemu/keymaps/de | |
710 | @comment share/xen/qemu/keymaps/de-ch | 777 | share/xen/qemu/keymaps/de-ch | |
711 | @comment share/xen/qemu/keymaps/en-gb | 778 | share/xen/qemu/keymaps/en-gb | |
712 | @comment share/xen/qemu/keymaps/en-us | 779 | share/xen/qemu/keymaps/en-us | |
713 | @comment share/xen/qemu/keymaps/es | 780 | share/xen/qemu/keymaps/es | |
714 | @comment share/xen/qemu/keymaps/et | 781 | share/xen/qemu/keymaps/et | |
715 | @comment share/xen/qemu/keymaps/fi | 782 | share/xen/qemu/keymaps/fi | |
716 | @comment share/xen/qemu/keymaps/fo | 783 | share/xen/qemu/keymaps/fo | |
717 | @comment share/xen/qemu/keymaps/fr | 784 | share/xen/qemu/keymaps/fr | |
718 | @comment share/xen/qemu/keymaps/fr-be | 785 | share/xen/qemu/keymaps/fr-be | |
719 | @comment share/xen/qemu/keymaps/fr-ca | 786 | share/xen/qemu/keymaps/fr-ca | |
720 | @comment share/xen/qemu/keymaps/fr-ch | 787 | share/xen/qemu/keymaps/fr-ch | |
721 | @comment share/xen/qemu/keymaps/hr | 788 | share/xen/qemu/keymaps/hr | |
722 | @comment share/xen/qemu/keymaps/hu | 789 | share/xen/qemu/keymaps/hu | |
723 | @comment share/xen/qemu/keymaps/is | 790 | share/xen/qemu/keymaps/is | |
724 | @comment share/xen/qemu/keymaps/it | 791 | share/xen/qemu/keymaps/it | |
725 | @comment share/xen/qemu/keymaps/ja | 792 | share/xen/qemu/keymaps/ja | |
726 | @comment share/xen/qemu/keymaps/lt | 793 | share/xen/qemu/keymaps/lt | |
727 | @comment share/xen/qemu/keymaps/lv | 794 | share/xen/qemu/keymaps/lv | |
728 | @comment share/xen/qemu/keymaps/mk | 795 | share/xen/qemu/keymaps/mk | |
729 | @comment share/xen/qemu/keymaps/modifiers | 796 | share/xen/qemu/keymaps/modifiers | |
730 | @comment share/xen/qemu/keymaps/nl | 797 | share/xen/qemu/keymaps/nl | |
731 | @comment share/xen/qemu/keymaps/nl-be | 798 | share/xen/qemu/keymaps/nl-be | |
732 | @comment share/xen/qemu/keymaps/no | 799 | share/xen/qemu/keymaps/no | |
733 | @comment share/xen/qemu/keymaps/pl | 800 | share/xen/qemu/keymaps/pl | |
734 | @comment share/xen/qemu/keymaps/pt | 801 | share/xen/qemu/keymaps/pt | |
735 | @comment share/xen/qemu/keymaps/pt-br | 802 | share/xen/qemu/keymaps/pt-br | |
736 | @comment share/xen/qemu/keymaps/ru | 803 | share/xen/qemu/keymaps/ru | |
737 | @comment share/xen/qemu/keymaps/sl | 804 | share/xen/qemu/keymaps/sl | |
738 | @comment share/xen/qemu/keymaps/sv | 805 | share/xen/qemu/keymaps/sv | |
739 | @comment share/xen/qemu/keymaps/th | 806 | share/xen/qemu/keymaps/th | |
740 | @comment share/xen/qemu/keymaps/tr | 807 | share/xen/qemu/keymaps/tr | |
741 | @comment share/xen/qemu/openbios-ppc | 808 | share/xen/qemu/openbios-ppc | |
742 | @comment share/xen/qemu/openbios-sparc32 | 809 | share/xen/qemu/openbios-sparc32 | |
743 | @comment share/xen/qemu/openbios-sparc64 | 810 | share/xen/qemu/openbios-sparc64 | |
744 | @comment share/xen/qemu/ppc_rom.bin | 811 | share/xen/qemu/ppc_rom.bin | |
745 | @comment share/xen/qemu/pxe-e1000.bin | 812 | share/xen/qemu/pxe-e1000.bin | |
746 | @comment share/xen/qemu/pxe-ne2k_pci.bin | 813 | share/xen/qemu/pxe-ne2k_pci.bin | |
747 | @comment share/xen/qemu/pxe-pcnet.bin | 814 | share/xen/qemu/pxe-pcnet.bin | |
748 | @comment share/xen/qemu/pxe-rtl8139.bin | 815 | share/xen/qemu/pxe-rtl8139.bin | |
749 | @comment share/xen/qemu/vgabios-cirrus.bin | 816 | share/xen/qemu/vgabios-cirrus.bin | |
750 | @comment share/xen/qemu/vgabios.bin | 817 | share/xen/qemu/vgabios.bin | |
751 | @comment share/xen/qemu/video.x | 818 | share/xen/qemu/video.x | |
752 | @pkgdir share/examples/xen/auto | 819 | @pkgdir share/examples/xen/auto |
@@ -1,35 +1,37 @@ | @@ -1,35 +1,37 @@ | |||
1 | $NetBSD: distinfo,v 1.2 2013/05/25 05:19:17 jnemeth Exp $ | 1 | $NetBSD: distinfo,v 1.3 2013/05/26 20:27:43 bouyer Exp $ | |
2 | 2 | |||
3 | SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 | 3 | SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 | |
4 | RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 | 4 | RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 | |
5 | Size (ipxe-git-v1.0.0.tar.gz) = 1996881 bytes | 5 | Size (ipxe-git-v1.0.0.tar.gz) = 1996881 bytes | |
6 | SHA1 (xen-4.2.2.tar.gz) = b48cc7f375e9a5d65ff2d680f1b512dbea5a3b7c | 6 | SHA1 (xen-4.2.2.tar.gz) = b48cc7f375e9a5d65ff2d680f1b512dbea5a3b7c | |
7 | RMD160 (xen-4.2.2.tar.gz) = 925cb2abdd080254a5457d1b304f811036261ab6 | 7 | RMD160 (xen-4.2.2.tar.gz) = 925cb2abdd080254a5457d1b304f811036261ab6 | |
8 | Size (xen-4.2.2.tar.gz) = 15602746 bytes | 8 | Size (xen-4.2.2.tar.gz) = 15602746 bytes | |
9 | SHA1 (patch-.._.._ipxe_src_Makefile.housekeeping) = 5ec8020a9705b2f64096c2942473a8de4db578bb | |||
9 | SHA1 (patch-.._.._ipxe_src_arch_i386_include_librm.h) = 4549ac641b112321b4731a918d85219c3fce6808 | 10 | SHA1 (patch-.._.._ipxe_src_arch_i386_include_librm.h) = 4549ac641b112321b4731a918d85219c3fce6808 | |
11 | SHA1 (patch-.._.._ipxe_src_arch_i386_scripts_i386.lds) = 4c0cbb7f535be43e1b6f53c284340a8bafc37c0b | |||
10 | SHA1 (patch-.._.._ipxe_src_core_settings.c) = 240ff973757403b983f12b2cbed826584c4a8aba | 12 | SHA1 (patch-.._.._ipxe_src_core_settings.c) = 240ff973757403b983f12b2cbed826584c4a8aba | |
11 | SHA1 (patch-.._.._ipxe_src_net_tls.c) = c0cfbc2ab2b92c659c146601c4f80d58c951ca62 | 13 | SHA1 (patch-.._.._ipxe_src_net_tls.c) = 893c70515bc4cb0d4d9319fd94eddc4945f6a0b3 | |
12 | SHA1 (patch-.._Config.mk) = ec5ba76be10e43cb1b2d37686e35d5fb81d8de80 | 14 | SHA1 (patch-.._Config.mk) = ec5ba76be10e43cb1b2d37686e35d5fb81d8de80 | |
13 | SHA1 (patch-.._config_NetBSD.mk) = 90893326dcce4e3e2ef273f22ec5ddf5af0f7cd8 | 15 | SHA1 (patch-.._config_NetBSD.mk) = 90893326dcce4e3e2ef273f22ec5ddf5af0f7cd8 | |
14 | SHA1 (patch-.._config_StdGNU.mk) = 3f93999038bd9d25277803cd1d969dc5733b593f | 16 | SHA1 (patch-.._config_StdGNU.mk) = 3f93999038bd9d25277803cd1d969dc5733b593f | |
15 | SHA1 (patch-.._docs_man_xend-config.sxp.pod.5) = 36afc7b063f83adfe5b927ed0be586b102684020 | 17 | SHA1 (patch-.._docs_man_xend-config.sxp.pod.5) = 36afc7b063f83adfe5b927ed0be586b102684020 | |
16 | SHA1 (patch-.._docs_man_xl.cfg.pod.5) = b9d19131ffb8a917a92c9878b86ea3dbc16dc0c8 | 18 | SHA1 (patch-.._docs_man_xl.cfg.pod.5) = b9d19131ffb8a917a92c9878b86ea3dbc16dc0c8 | |
17 | SHA1 (patch-.._docs_man_xl.conf.pod.5) = 4009ff6aefb0a770ed42d096117dc97f8f55997f | 19 | SHA1 (patch-.._docs_man_xl.conf.pod.5) = 4009ff6aefb0a770ed42d096117dc97f8f55997f | |
18 | SHA1 (patch-.._docs_man_xl.pod.1) = bd6272abed11c60c7c5ae88ae54377a3bfb921ed | 20 | SHA1 (patch-.._docs_man_xl.pod.1) = bd6272abed11c60c7c5ae88ae54377a3bfb921ed | |
19 | SHA1 (patch-.._docs_man_xlcpupool.cfg.pod.5) = a693a79a1f1c16548f62f7da1fa58fa28030990f | 21 | SHA1 (patch-.._docs_man_xlcpupool.cfg.pod.5) = a693a79a1f1c16548f62f7da1fa58fa28030990f | |
20 | SHA1 (patch-.._docs_man_xm.pod.1) = 975b7570da4bf9fd9cb79539fbd36b8dfbcbd571 | 22 | SHA1 (patch-.._docs_man_xm.pod.1) = 975b7570da4bf9fd9cb79539fbd36b8dfbcbd571 | |
21 | SHA1 (patch-.._docs_man_xmdomain.cfg.pod.5) = 5563a72e203e789a86f4166c71ddb3fcff5215c6 | 23 | SHA1 (patch-.._docs_man_xmdomain.cfg.pod.5) = 5563a72e203e789a86f4166c71ddb3fcff5215c6 | |
22 | SHA1 (patch-Makefile) = 8476e65d5bdf257cdf09d98b90820c82cb0ff719 | 24 | SHA1 (patch-Makefile) = 37fbcd6d2f0279d4c04c91085b0e7f5611a5b92a | |
23 | SHA1 (patch-blktap_drivers_Makefile) = 0906a5ec3a7450fc987b01289e2560e60966d00d | 25 | SHA1 (patch-blktap_drivers_Makefile) = 0906a5ec3a7450fc987b01289e2560e60966d00d | |
24 | SHA1 (patch-configure) = 7bf4183efb76bded94a9519bf2737fb1240ab0e7 | 26 | SHA1 (patch-configure) = 7bf4183efb76bded94a9519bf2737fb1240ab0e7 | |
25 | SHA1 (patch-examples_Makefile) = 8e89fab7817785b32d79ec0cad3a2645c6981f01 | 27 | SHA1 (patch-examples_Makefile) = 8e89fab7817785b32d79ec0cad3a2645c6981f01 | |
26 | SHA1 (patch-examples_xend-config.sxp) = 5eb15470bff85d30b6d26d8fe094f59fc8e34175 | 28 | SHA1 (patch-examples_xend-config.sxp) = 5eb15470bff85d30b6d26d8fe094f59fc8e34175 | |
27 | SHA1 (patch-firmware_etherboot_Makefile) = 1cb31183853c6069dafe47db8430e0577b21408e | 29 | SHA1 (patch-firmware_etherboot_Makefile) = 1cb31183853c6069dafe47db8430e0577b21408e | |
28 | SHA1 (patch-firmware_etherboot_patches_boot__prompt__option.patch) = 7d14b60557b1e81de370b21544cd49643fa15f08 | 30 | SHA1 (patch-firmware_etherboot_patches_boot__prompt__option.patch) = 7d14b60557b1e81de370b21544cd49643fa15f08 | |
29 | SHA1 (patch-firmware_etherboot_patches_series) = cb653834fe14ff0b23fdfa525a20d3bcfe6e3819 | 31 | SHA1 (patch-firmware_etherboot_patches_series) = cb653834fe14ff0b23fdfa525a20d3bcfe6e3819 | |
30 | SHA1 (patch-firmware_hvmloader_Makefile) = 7d907fa33fa1f121b3d54116d905855529a020fd | 32 | SHA1 (patch-firmware_hvmloader_Makefile) = 7d907fa33fa1f121b3d54116d905855529a020fd | |
31 | SHA1 (patch-hotplug_NetBSD_Makefile) = ab91c41ef6bbdd7f7f3d992b9f81e43056a765e2 | 33 | SHA1 (patch-hotplug_NetBSD_Makefile) = ab91c41ef6bbdd7f7f3d992b9f81e43056a765e2 | |
32 | SHA1 (patch-hotplug_NetBSD_vif-bridge) = 663d0117612730960fd610b863d863d3abeea460 | 34 | SHA1 (patch-hotplug_NetBSD_vif-bridge) = 663d0117612730960fd610b863d863d3abeea460 | |
33 | SHA1 (patch-hotplug_NetBSD_vif-ip) = c8fa179f58f1e550ab64901afd4fca53c3d11ceb | 35 | SHA1 (patch-hotplug_NetBSD_vif-ip) = c8fa179f58f1e550ab64901afd4fca53c3d11ceb | |
34 | SHA1 (patch-hotplug_common_Makefile) = 288b1fe2565c1d4ded551bf159c068504ecab470 | 36 | SHA1 (patch-hotplug_common_Makefile) = 288b1fe2565c1d4ded551bf159c068504ecab470 | |
35 | SHA1 (patch-include_xen-sys_NetBSD_gntdev.h) = 25c99a428fda6dee709888ddbcfdcfef5f654564 | 37 | SHA1 (patch-include_xen-sys_NetBSD_gntdev.h) = 25c99a428fda6dee709888ddbcfdcfef5f654564 | |
@@ -48,14 +50,18 @@ SHA1 (patch-python_xen_xm_create.py) = 7 | @@ -48,14 +50,18 @@ SHA1 (patch-python_xen_xm_create.py) = 7 | |||
48 | SHA1 (patch-qemu-xen-traditional_Makefile) = 0fcd7d5342269e87f14ff76be05d8757151438bc | 50 | SHA1 (patch-qemu-xen-traditional_Makefile) = 0fcd7d5342269e87f14ff76be05d8757151438bc | |
49 | SHA1 (patch-qemu-xen-traditional_block-raw-posix.c) = 6376edcc57313c2ffe9bb3d88043d160d1f644ec | 51 | SHA1 (patch-qemu-xen-traditional_block-raw-posix.c) = 6376edcc57313c2ffe9bb3d88043d160d1f644ec | |
50 | SHA1 (patch-qemu-xen-traditional_configure) = 8b14e6932441d0666092ef4f63d0acd99db0df51 | 52 | SHA1 (patch-qemu-xen-traditional_configure) = 8b14e6932441d0666092ef4f63d0acd99db0df51 | |
51 | SHA1 (patch-qemu-xen-traditional_hw_e1000.c) = a8faf95491867c19471690ae98df93ff1d73114a | 53 | SHA1 (patch-qemu-xen-traditional_hw_e1000.c) = a8faf95491867c19471690ae98df93ff1d73114a | |
52 | SHA1 (patch-qemu-xen-traditional_hw_ide.c) = d562c36627e861658e7a1d52514e59368871cbdb | 54 | SHA1 (patch-qemu-xen-traditional_hw_ide.c) = d562c36627e861658e7a1d52514e59368871cbdb | |
53 | SHA1 (patch-qemu-xen-traditional_hw_pass-through.c) = d1f3a1842c595e2d261b997bac02bb71de41eaac | 55 | SHA1 (patch-qemu-xen-traditional_hw_pass-through.c) = d1f3a1842c595e2d261b997bac02bb71de41eaac | |
54 | SHA1 (patch-qemu-xen-traditional_hw_pass-through.h) = 765cfbb30bdcf9c212bd7f9aa00d19d723da496e | 56 | SHA1 (patch-qemu-xen-traditional_hw_pass-through.h) = 765cfbb30bdcf9c212bd7f9aa00d19d723da496e | |
55 | SHA1 (patch-qemu-xen-traditional_hw_piix4acpi.c) = bd89d2da04e2b816a097d4eb6d18936e5fe6bceb | 57 | SHA1 (patch-qemu-xen-traditional_hw_piix4acpi.c) = bd89d2da04e2b816a097d4eb6d18936e5fe6bceb | |
56 | SHA1 (patch-qemu-xen-traditional_hw_pt-graphics.c) = 5484b9ec7d673502d73b0e4802969940eacad218 | 58 | SHA1 (patch-qemu-xen-traditional_hw_pt-graphics.c) = 5484b9ec7d673502d73b0e4802969940eacad218 | |
57 | SHA1 (patch-qemu-xen-traditional_hw_pt-msi.c) = 7281d62de494fbbb6508818c9f8c5cfc212c77d8 | 59 | SHA1 (patch-qemu-xen-traditional_hw_pt-msi.c) = 7281d62de494fbbb6508818c9f8c5cfc212c77d8 | |
58 | SHA1 (patch-qemu-xen-traditional_hw_pt-msi.h) = a33b6ed927db0204c25a9f6ff1bb8870c765f8ad | 60 | SHA1 (patch-qemu-xen-traditional_hw_pt-msi.h) = a33b6ed927db0204c25a9f6ff1bb8870c765f8ad | |
59 | SHA1 (patch-qemu-xen-traditional_i386-dm_hookstarget.mak) = 7d526e8a9a0b0daf7215c54a036f7a3306291589 | 61 | SHA1 (patch-qemu-xen-traditional_i386-dm_hookstarget.mak) = 7d526e8a9a0b0daf7215c54a036f7a3306291589 | |
60 | SHA1 (patch-qemu-xen-traditional_xen-hooks.mak) = 7acec9c981d18e1b659efc1d8e7c5c3b90d45411 | 62 | SHA1 (patch-qemu-xen-traditional_xen-hooks.mak) = 7acec9c981d18e1b659efc1d8e7c5c3b90d45411 | |
63 | SHA1 (patch-qemu-xen_audio_audio.c) = 95f7417cec027239e9591b8def632d9344f42e05 | |||
64 | SHA1 (patch-qemu-xen_fpu_softfloat-specialize.h) = 791aeac1642101cbe2b15bf7ec189765c370f1a2 | |||
65 | SHA1 (patch-qemu-xen_ioport.c) = 3dde5877f35396015d28eb2bb318ad2f79e6b4f8 | |||
66 | SHA1 (patch-qemu-xen_memory.c) = e4e39a0d02195e3b04d97af04d4aa31ff379b73e | |||
61 | SHA1 (patch-xentrace_Makefile) = 9b53ba4a809dad7a1de34c8fa0dbe493d7256ada | 67 | SHA1 (patch-xentrace_Makefile) = 9b53ba4a809dad7a1de34c8fa0dbe493d7256ada |
$NetBSD: patch-.._.._ipxe_src_Makefile.housekeeping,v 1.1 2013/05/26 20:27:43 bouyer Exp $
--- ../../ipxe/src/Makefile.housekeeping.orig 2013-05-26 19:35:55.000000000 +0200
+++ ../../ipxe/src/Makefile.housekeeping 2013-05-26 19:38:52.000000000 +0200
@@ -160,8 +160,8 @@
Q :=
QM := @\#
else
-Q := @
-QM := @
+Q :=
+QM := @\#
endif
###############################################################################
@@ -575,7 +575,7 @@
# --defsym pci_vendor=0x1186 --defsym pci_device=0x1300")
#
TGT_LD_FLAGS = $(foreach SYM,$(TGT_LD_PREFIX) $(TGT_LD_DRIVERS) obj_config,\
- -u $(SYM) --defsym check_$(SYM)=$(SYM) ) \
+ -u $(SYM) ) \
$(patsubst %,--defsym %,$(TGT_LD_IDS))
# Calculate makerom flags for the specific target
$NetBSD: patch-.._.._ipxe_src_arch_i386_scripts_i386.lds,v 1.1 2013/05/26 20:27:43 bouyer Exp $
--- ../../ipxe/src/arch/i386/scripts/i386.lds.orig 2013-05-26 18:59:26.000000000 +0200
+++ ../../ipxe/src/arch/i386/scripts/i386.lds 2013-05-26 18:59:31.000000000 +0200
@@ -161,7 +161,7 @@
*
*/
- PROVIDE ( _max_align = 16 );
+ _max_align = DEFINED ( _max_align ) ? _max_align : 16;
. = 0;
. = ALIGN ( _max_align );
$NetBSD: patch-qemu-xen_audio_audio.c,v 1.1 2013/05/26 20:27:43 bouyer Exp $
--- qemu-xen/audio/audio.c.orig 2013-05-26 20:24:36.000000000 +0200
+++ qemu-xen/audio/audio.c 2013-05-26 20:24:39.000000000 +0200
@@ -1162,6 +1162,7 @@
return 0;
}
+#undef read
bytes = sw->hw->pcm_ops->read (sw, buf, size);
return bytes;
}
$NetBSD: patch-qemu-xen_fpu_softfloat-specialize.h,v 1.1 2013/05/26 20:27:43 bouyer Exp $
--- qemu-xen/fpu/softfloat-specialize.h.orig 2013-05-26 21:19:30.000000000 +0200
+++ qemu-xen/fpu/softfloat-specialize.h 2013-05-26 21:20:25.000000000 +0200
@@ -89,8 +89,8 @@
#define floatx80_default_nan_low LIT64( 0xC000000000000000 )
#endif
-const floatx80 floatx80_default_nan = make_floatx80(floatx80_default_nan_high,
- floatx80_default_nan_low);
+const floatx80 floatx80_default_nan = { .high = floatx80_default_nan_high,
+ .low = floatx80_default_nan_low};
/*----------------------------------------------------------------------------
| The pattern for a default generated quadruple-precision NaN. The `high' and
@@ -104,8 +104,8 @@
#define float128_default_nan_low LIT64( 0x0000000000000000 )
#endif
-const float128 float128_default_nan = make_float128(float128_default_nan_high,
- float128_default_nan_low);
+const float128 float128_default_nan = {.high = float128_default_nan_high,
+ .low = float128_default_nan_low};
/*----------------------------------------------------------------------------
| Raises the exceptions specified by `flags'. Floating-point traps can be
$NetBSD: patch-qemu-xen_ioport.c,v 1.1 2013/05/26 20:27:43 bouyer Exp $
--- qemu-xen/ioport.c.orig 2013-05-26 20:28:24.000000000 +0200
+++ qemu-xen/ioport.c 2013-05-26 20:28:28.000000000 +0200
@@ -177,6 +177,7 @@
return 0;
}
+#undef read
static uint32_t ioport_readb_thunk(void *opaque, uint32_t addr)
{
IORange *ioport = opaque;
$NetBSD: patch-qemu-xen_memory.c,v 1.1 2013/05/26 20:27:43 bouyer Exp $
--- qemu-xen/memory.c.orig 2013-05-26 20:31:37.000000000 +0200
+++ qemu-xen/memory.c 2013-05-26 20:31:22.000000000 +0200
@@ -237,6 +237,7 @@
}
}
+#undef read
static void memory_region_read_accessor(void *opaque,
target_phys_addr_t addr,
uint64_t *value,
@@ -1,18 +1,26 @@ | @@ -1,18 +1,26 @@ | |||
1 | $NetBSD: patch-.._.._ipxe_src_net_tls.c,v 1.1 2013/05/15 06:58:50 jnemeth Exp $ | 1 | $NetBSD: patch-.._.._ipxe_src_net_tls.c,v 1.2 2013/05/26 20:27:43 bouyer Exp $ | |
2 | 2 | |||
3 | --- ../../ipxe/src/net/tls.c.orig 2013-03-25 18:53:57.000000000 +0000 | 3 | --- ../../ipxe/src/net/tls.c.orig 2010-02-02 17:12:44.000000000 +0100 | |
4 | +++ ../../ipxe/src/net/tls.c | 4 | +++ ../../ipxe/src/net/tls.c 2013-05-26 20:05:24.000000000 +0200 | |
5 | @@ -650,18 +650,22 @@ static int tls_send_client_key_exchange | 5 | @@ -29,6 +29,7 @@ | |
6 | #include <stdarg.h> | |||
7 | #include <string.h> | |||
8 | #include <errno.h> | |||
9 | +#include <alloca.h> | |||
10 | #include <byteswap.h> | |||
11 | #include <gpxe/hmac.h> | |||
12 | #include <gpxe/md5.h> | |||
13 | @@ -650,18 +651,22 @@ | |||
6 | RSA_CTX *rsa_ctx; | 14 | RSA_CTX *rsa_ctx; | |
7 | RSA_pub_key_new ( &rsa_ctx, tls->rsa.modulus, tls->rsa.modulus_len, | 15 | RSA_pub_key_new ( &rsa_ctx, tls->rsa.modulus, tls->rsa.modulus_len, | |
8 | tls->rsa.exponent, tls->rsa.exponent_len ); | 16 | tls->rsa.exponent, tls->rsa.exponent_len ); | |
9 | + size_t elen = rsa_ctx->num_octets; | 17 | + size_t elen = rsa_ctx->num_octets; | |
10 | struct { | 18 | struct { | |
11 | uint32_t type_length; | 19 | uint32_t type_length; | |
12 | uint16_t encrypted_pre_master_secret_len; | 20 | uint16_t encrypted_pre_master_secret_len; | |
13 | - uint8_t encrypted_pre_master_secret[rsa_ctx->num_octets]; | 21 | - uint8_t encrypted_pre_master_secret[rsa_ctx->num_octets]; | |
14 | - } __attribute__ (( packed )) key_xchg; | 22 | - } __attribute__ (( packed )) key_xchg; | |
15 | - | 23 | - | |
16 | - memset ( &key_xchg, 0, sizeof ( key_xchg ) ); | 24 | - memset ( &key_xchg, 0, sizeof ( key_xchg ) ); | |
17 | - key_xchg.type_length = ( cpu_to_le32 ( TLS_CLIENT_KEY_EXCHANGE ) | | 25 | - key_xchg.type_length = ( cpu_to_le32 ( TLS_CLIENT_KEY_EXCHANGE ) | | |
18 | - htonl ( sizeof ( key_xchg ) - | 26 | - htonl ( sizeof ( key_xchg ) - | |
@@ -24,45 +32,45 @@ $NetBSD: patch-.._.._ipxe_src_net_tls.c, | @@ -24,45 +32,45 @@ $NetBSD: patch-.._.._ipxe_src_net_tls.c, | |||
24 | + size_t klen = sizeof(*key_xchg) + elen; | 32 | + size_t klen = sizeof(*key_xchg) + elen; | |
25 | + | 33 | + | |
26 | + key_xchg = alloca(klen); | 34 | + key_xchg = alloca(klen); | |
27 | + | 35 | + | |
28 | + memset ( key_xchg, 0, klen ); | 36 | + memset ( key_xchg, 0, klen ); | |
29 | + key_xchg->type_length = ( cpu_to_le32 ( TLS_CLIENT_KEY_EXCHANGE ) | | 37 | + key_xchg->type_length = ( cpu_to_le32 ( TLS_CLIENT_KEY_EXCHANGE ) | | |
30 | + htonl ( klen - | 38 | + htonl ( klen - | |
31 | + sizeof ( key_xchg->type_length ) ) ); | 39 | + sizeof ( key_xchg->type_length ) ) ); | |
32 | + key_xchg->encrypted_pre_master_secret_len | 40 | + key_xchg->encrypted_pre_master_secret_len | |
33 | + = htons ( elen ); | 41 | + = htons ( elen ); | |
34 | 42 | |||
35 | /* FIXME: Hack alert */ | 43 | /* FIXME: Hack alert */ | |
36 | DBGC ( tls, "RSA encrypting plaintext, modulus, exponent:\n" ); | 44 | DBGC ( tls, "RSA encrypting plaintext, modulus, exponent:\n" ); | |
37 | @@ -671,14 +675,13 @@ static int tls_send_client_key_exchange | 45 | @@ -671,14 +676,13 @@ | |
38 | DBGC_HD ( tls, tls->rsa.exponent, tls->rsa.exponent_len ); | 46 | DBGC_HD ( tls, tls->rsa.exponent, tls->rsa.exponent_len ); | |
39 | RSA_encrypt ( rsa_ctx, ( const uint8_t * ) &tls->pre_master_secret, | 47 | RSA_encrypt ( rsa_ctx, ( const uint8_t * ) &tls->pre_master_secret, | |
40 | sizeof ( tls->pre_master_secret ), | 48 | sizeof ( tls->pre_master_secret ), | |
41 | - key_xchg.encrypted_pre_master_secret, 0 ); | 49 | - key_xchg.encrypted_pre_master_secret, 0 ); | |
42 | + key_xchg->encrypted_pre_master_secret, 0 ); | 50 | + key_xchg->encrypted_pre_master_secret, 0 ); | |
43 | DBGC ( tls, "RSA encrypt done. Ciphertext:\n" ); | 51 | DBGC ( tls, "RSA encrypt done. Ciphertext:\n" ); | |
44 | - DBGC_HD ( tls, &key_xchg.encrypted_pre_master_secret, | 52 | - DBGC_HD ( tls, &key_xchg.encrypted_pre_master_secret, | |
45 | - sizeof ( key_xchg.encrypted_pre_master_secret ) ); | 53 | - sizeof ( key_xchg.encrypted_pre_master_secret ) ); | |
46 | + DBGC_HD ( tls, &key_xchg->encrypted_pre_master_secret, elen ); | 54 | + DBGC_HD ( tls, &key_xchg->encrypted_pre_master_secret, elen ); | |
47 | RSA_free ( rsa_ctx ); | 55 | RSA_free ( rsa_ctx ); | |
48 | 56 | |||
49 | 57 | |||
50 | - return tls_send_handshake ( tls, &key_xchg, sizeof ( key_xchg ) ); | 58 | - return tls_send_handshake ( tls, &key_xchg, sizeof ( key_xchg ) ); | |
51 | + return tls_send_handshake ( tls, key_xchg, klen ); | 59 | + return tls_send_handshake ( tls, key_xchg, klen ); | |
52 | } | 60 | } | |
53 | 61 | |||
54 | /** | 62 | /** | |
55 | @@ -802,12 +805,12 @@ static int tls_new_server_hello ( struct | 63 | @@ -802,12 +806,12 @@ | |
56 | uint8_t session_id_len; | 64 | uint8_t session_id_len; | |
57 | char next[0]; | 65 | char next[0]; | |
58 | } __attribute__ (( packed )) *hello_a = data; | 66 | } __attribute__ (( packed )) *hello_a = data; | |
59 | + size_t slen = hello_a->session_id_len; | 67 | + size_t slen = hello_a->session_id_len; | |
60 | struct { | 68 | struct { | |
61 | - uint8_t session_id[hello_a->session_id_len]; | 69 | - uint8_t session_id[hello_a->session_id_len]; | |
62 | uint16_t cipher_suite; | 70 | uint16_t cipher_suite; | |
63 | uint8_t compression_method; | 71 | uint8_t compression_method; | |
64 | char next[0]; | 72 | char next[0]; | |
65 | - } __attribute__ (( packed )) *hello_b = ( void * ) &hello_a->next; | 73 | - } __attribute__ (( packed )) *hello_b = ( void * ) &hello_a->next; | |
66 | + } __attribute__ (( packed )) *hello_b = ( void * ) ((uint8_t *)&hello_a->next + slen); | 74 | + } __attribute__ (( packed )) *hello_b = ( void * ) ((uint8_t *)&hello_a->next + slen); | |
67 | void *end = hello_b->next; | 75 | void *end = hello_b->next; | |
68 | int rc; | 76 | int rc; |
@@ -1,52 +1,33 @@ | @@ -1,52 +1,33 @@ | |||
1 | $NetBSD: patch-Makefile,v 1.1 2013/05/15 06:58:50 jnemeth Exp $ | 1 | $NetBSD: patch-Makefile,v 1.2 2013/05/26 20:27:43 bouyer Exp $ | |
2 | 2 | |||
3 | --- Makefile.orig 2012-12-17 15:00:09.000000000 +0000 | 3 | --- Makefile.orig 2013-04-23 18:42:55.000000000 +0200 | |
4 | +++ Makefile | 4 | +++ Makefile 2013-05-26 18:33:32.000000000 +0200 | |
5 | @@ -15,28 +15,29 @@ SUBDIRS-y += examples | 5 | @@ -18,15 +18,16 @@ | |
6 | SUBDIRS-y += hotplug | 6 | SUBDIRS-$(CONFIG_X86) += firmware | |
7 | SUBDIRS-y += xentrace | |||
8 | SUBDIRS-$(CONFIG_XCUTILS) += xcutils | |||
9 | -SUBDIRS-$(CONFIG_X86) += firmware | |||
10 | +#XXX SUBDIRS-$(CONFIG_X86) += firmware | |||
11 | SUBDIRS-y += console | 7 | SUBDIRS-y += console | |
12 | SUBDIRS-y += xenmon | 8 | SUBDIRS-y += xenmon | |
13 | -SUBDIRS-$(VTPM_TOOLS) += vtpm_manager | 9 | -SUBDIRS-$(VTPM_TOOLS) += vtpm_manager | |
14 | -SUBDIRS-$(VTPM_TOOLS) += vtpm | 10 | -SUBDIRS-$(VTPM_TOOLS) += vtpm | |
15 | +#XXX SUBDIRS-$(VTPM_TOOLS) += vtpm_manager | 11 | +#XXX SUBDIRS-$(VTPM_TOOLS) += vtpm_manager | |
16 | +#XXX SUBDIRS-$(VTPM_TOOLS) += vtpm | 12 | +#XXX SUBDIRS-$(VTPM_TOOLS) += vtpm | |
17 | SUBDIRS-y += xenstat | 13 | SUBDIRS-y += xenstat | |
18 | SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio) | 14 | SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio) | |
19 | SUBDIRS-$(CONFIG_Linux) += memshr | 15 | SUBDIRS-$(CONFIG_Linux) += memshr | |
20 | SUBDIRS-$(CONFIG_Linux) += blktap | 16 | SUBDIRS-$(CONFIG_Linux) += blktap | |
21 | SUBDIRS-$(CONFIG_Linux) += blktap2 | 17 | SUBDIRS-$(CONFIG_Linux) += blktap2 | |
22 | SUBDIRS-$(CONFIG_NetBSD) += $(SUBDIRS-libaio) | 18 | SUBDIRS-$(CONFIG_NetBSD) += $(SUBDIRS-libaio) | |
23 | -SUBDIRS-$(CONFIG_NetBSD) += blktap2 | 19 | -SUBDIRS-$(CONFIG_NetBSD) += blktap2 | |
24 | +SUBDIRS-$(CONFIG_NetBSD) += blktap | 20 | +SUBDIRS-$(CONFIG_NetBSD) += blktap | |
25 | +#SUBDIRS-$(CONFIG_NetBSD) += blktap2 | 21 | +#SUBDIRS-$(CONFIG_NetBSD) += blktap2 | |
26 | SUBDIRS-$(CONFIG_NetBSD) += xenbackendd | 22 | SUBDIRS-$(CONFIG_NetBSD) += xenbackendd | |
27 | SUBDIRS-y += libfsimage | 23 | SUBDIRS-y += libfsimage | |
28 | SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen | 24 | SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen | |
29 | SUBDIRS-$(CONFIG_Linux) += libvchan | 25 | @@ -44,7 +45,7 @@ | |
30 | ||||
31 | -# do not recurse in to a dir we are about to delete | |||
32 | -ifneq "$(MAKECMDGOALS)" "distclean" | |||
33 | -SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-traditional-dir | |||
34 | -SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-dir | |||
35 | -endif | |||
36 | +#XXX # do not recurse in to a dir we are about to delete | |||
37 | +#XXX ifneq "$(MAKECMDGOALS)" "distclean" | |||
38 | +#XXX SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-traditional-dir | |||
39 | +#XXX SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-dir | |||
40 | +#XXX endif | |||
41 | ||||
42 | SUBDIRS-y += xenpmd | |||
43 | SUBDIRS-y += libxl | |||
44 | @@ -44,7 +45,7 @@ SUBDIRS-y += remus | |||
45 | SUBDIRS-$(CONFIG_X86) += xenpaging | 26 | SUBDIRS-$(CONFIG_X86) += xenpaging | |
46 | SUBDIRS-$(CONFIG_X86) += debugger/gdbsx | 27 | SUBDIRS-$(CONFIG_X86) += debugger/gdbsx | |
47 | SUBDIRS-$(CONFIG_X86) += debugger/kdd | 28 | SUBDIRS-$(CONFIG_X86) += debugger/kdd | |
48 | -SUBDIRS-$(CONFIG_TESTS) += tests | 29 | -SUBDIRS-$(CONFIG_TESTS) += tests | |
49 | +#XXX SUBDIRS-$(CONFIG_TESTS) += tests | 30 | +#XXX SUBDIRS-$(CONFIG_TESTS) += tests | |
50 | 31 | |||
51 | # These don't cross-compile | 32 | # These don't cross-compile | |
52 | ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH)) | 33 | ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH)) |