diff options
author | bouyer <bouyer@pkgsrc.org> | 2013-05-26 20:27:43 +0000 |
---|---|---|
committer | bouyer <bouyer@pkgsrc.org> | 2013-05-26 20:27:43 +0000 |
commit | cd4708e05572ef47322ee59ee70bb0104037572a (patch) | |
tree | 8b71c91014cc415d34553a519ff950967684439a | |
parent | 6b4ec6b2f24a6d15b708181b210eba230e196dd0 (diff) | |
download | pkgsrc-cd4708e05572ef47322ee59ee70bb0104037572a.tar.gz |
Build and install HVM-related files. Good enough to boot the NetBSD 6.1
i386 CD and do a network install.
Bump PKGREVISION
-rw-r--r-- | sysutils/xentools42/Makefile | 37 | ||||
-rw-r--r-- | sysutils/xentools42/PLIST | 173 | ||||
-rw-r--r-- | sysutils/xentools42/distinfo | 12 | ||||
-rw-r--r-- | sysutils/xentools42/patches/patch-.._.._ipxe_src_Makefile.housekeeping | 24 | ||||
-rw-r--r-- | sysutils/xentools42/patches/patch-.._.._ipxe_src_arch_i386_scripts_i386.lds | 13 | ||||
-rw-r--r-- | sysutils/xentools42/patches/patch-.._.._ipxe_src_net_tls.c | 20 | ||||
-rw-r--r-- | sysutils/xentools42/patches/patch-Makefile | 31 | ||||
-rw-r--r-- | sysutils/xentools42/patches/patch-qemu-xen_audio_audio.c | 12 | ||||
-rw-r--r-- | sysutils/xentools42/patches/patch-qemu-xen_fpu_softfloat-specialize.h | 26 | ||||
-rw-r--r-- | sysutils/xentools42/patches/patch-qemu-xen_ioport.c | 12 | ||||
-rw-r--r-- | sysutils/xentools42/patches/patch-qemu-xen_memory.c | 12 |
11 files changed, 281 insertions, 91 deletions
diff --git a/sysutils/xentools42/Makefile b/sysutils/xentools42/Makefile index cfe61099e2a..d240e591ede 100644 --- a/sysutils/xentools42/Makefile +++ b/sysutils/xentools42/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.3 2013/05/25 05:19:17 jnemeth Exp $ +# $NetBSD: Makefile,v 1.4 2013/05/26 20:27:43 bouyer Exp $ # # VERSION is set in version.mk as it is shared with other packages .include "version.mk" DISTNAME= xen-${VERSION} PKGNAME= xentools42-${VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ @@ -91,6 +91,36 @@ REPLACE_PYTHON+= python/xen/xend/*.py REPLACE_PYTHON+= python/xen/xm/*.py REPLACE_PYTHON+= xenmon/xenmon.py +SUBST_CLASSES+= perlpath +SUBST_STAGE.perlpath= pre-configure +SUBST_FILES.perlpath= tools/firmware/rombios/makesym.perl +SUBST_FILES.perlpath+= tools/qemu-xen-traditional/texi2pod.pl +SUBST_FILES.perlpath+= tools/examples/xeninfo.pl +SUBST_FILES.perlpath+= tools/include/xen-external/bsd-sys-queue-h-seddery +SUBST_FILES.perlpath+= tools/qemu-xen/scripts/texi2pod.pl +SUBST_FILES.perlpath+= tools/qemu-xen/scripts/get_maintainer.pl +SUBST_FILES.perlpath+= tools/qemu-xen/scripts/checkpatch.pl +SUBST_FILES.perlpath+= tools/xm-test/mkreport +SUBST_FILES.perlpath+= tools/libxl/libxl_save_msgs_gen.pl +SUBST_FILES.perlpath+= tools/libxl/check-libxl-api-rules +SUBST_FILES.perlpath+= ../../ipxe/src/Makefile +SUBST_FILES.perlpath+= ../../ipxe/src/drivers/infiniband/qib_genbits.pl +SUBST_FILES.perlpath+= ../../ipxe/src/include/gpxe/efi/import.pl +SUBST_FILES.perlpath+= ../../ipxe/src/util/catrom.pl +SUBST_FILES.perlpath+= ../../ipxe/src/util/diffsize.pl +SUBST_FILES.perlpath+= ../../ipxe/src/util/disrom.pl +SUBST_FILES.perlpath+= ../../ipxe/src/util/get-pci-ids +SUBST_FILES.perlpath+= ../../ipxe/src/util/licence.pl +SUBST_FILES.perlpath+= ../../ipxe/src/util/makerom.pl +SUBST_FILES.perlpath+= ../../ipxe/src/util/mergerom.pl +SUBST_FILES.perlpath+= ../../ipxe/src/util/modrom.pl +SUBST_FILES.perlpath+= ../../ipxe/src/util/padimg.pl +SUBST_FILES.perlpath+= ../../ipxe/src/util/parserom.pl +SUBST_FILES.perlpath+= ../../ipxe/src/util/sortobjdump.pl +SUBST_FILES.perlpath+= ../../ipxe/src/util/swapdevids.pl +SUBST_FILES.perlpath+= ../../ipxe/src/util/symcheck.pl +SUBST_SED.perlpath= -e "s|/usr/bin/perl|${PREFIX}/bin/perl|g" + SUBST_CLASSES+= pathsvar SUBST_STAGE.pathsvar= pre-configure SUBST_FILES.pathsvar= Makefile \ @@ -110,8 +140,7 @@ SUBST_SED.conf= -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" .include "../../mk/bsd.prefs.mk" -#XXX XEND_SCRIPTS= block vif-bridge vif-ip qemu-ifup hotplugpath.sh -XEND_SCRIPTS= block vif-bridge vif-ip hotplugpath.sh +XEND_SCRIPTS= block vif-bridge vif-ip qemu-ifup hotplugpath.sh .if ${OPSYS} == "NetBSD" SUBST_CLASSES+= proc diff --git a/sysutils/xentools42/PLIST b/sysutils/xentools42/PLIST index c7266af1c7f..812d9f3f4d8 100644 --- a/sysutils/xentools42/PLIST +++ b/sysutils/xentools42/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 2013/05/25 05:19:17 jnemeth Exp $ +@comment $NetBSD: PLIST,v 1.3 2013/05/26 20:27:43 bouyer Exp $ bin/libxl-save-helper bin/lsevtchn bin/pygrub -@comment bin/qemu-img-xen +bin/qemu-img-xen bin/readnotes bin/remus bin/xc_restore @@ -615,8 +615,13 @@ ${PYSITELIB}/xen/xsview/main.py ${PYSITELIB}/xen/xsview/main.pyc ${PYSITELIB}/xen/xsview/xsviewer.py ${PYSITELIB}/xen/xsview/xsviewer.pyc -@comment lib/xen/boot/hvmloader -@comment libexec/qemu-dm +lib/xen/boot/hvmloader +libexec/qemu-dm +libexec/qemu-ga +libexec/qemu-img +libexec/qemu-io +libexec/qemu-nbd +libexec/qemu-system-i386 libexec/xenpaging man/man1/xentop.1 man/man1/xentrace_format.1 @@ -681,7 +686,7 @@ share/examples/xen/formats share/examples/xen/oxenstored.conf share/examples/xen/scripts/block share/examples/xen/scripts/hotplugpath.sh -@comment share/examples/xen/scripts/qemu-ifup +share/examples/xen/scripts/qemu-ifup share/examples/xen/scripts/vif-bridge share/examples/xen/scripts/vif-ip share/examples/xen/xend-config.sxp @@ -700,53 +705,115 @@ share/examples/xen/xmexample.vti share/examples/xen/xmexample1 share/examples/xen/xmexample2 share/examples/xen/xmexample3 +share/qemu-xen/bamboo.dtb +share/qemu-xen/bios.bin +share/qemu-xen/keymaps/ar +share/qemu-xen/keymaps/common +share/qemu-xen/keymaps/da +share/qemu-xen/keymaps/de +share/qemu-xen/keymaps/de-ch +share/qemu-xen/keymaps/en-gb +share/qemu-xen/keymaps/en-us +share/qemu-xen/keymaps/es +share/qemu-xen/keymaps/et +share/qemu-xen/keymaps/fi +share/qemu-xen/keymaps/fo +share/qemu-xen/keymaps/fr +share/qemu-xen/keymaps/fr-be +share/qemu-xen/keymaps/fr-ca +share/qemu-xen/keymaps/fr-ch +share/qemu-xen/keymaps/hr +share/qemu-xen/keymaps/hu +share/qemu-xen/keymaps/is +share/qemu-xen/keymaps/it +share/qemu-xen/keymaps/ja +share/qemu-xen/keymaps/lt +share/qemu-xen/keymaps/lv +share/qemu-xen/keymaps/mk +share/qemu-xen/keymaps/modifiers +share/qemu-xen/keymaps/nl +share/qemu-xen/keymaps/nl-be +share/qemu-xen/keymaps/no +share/qemu-xen/keymaps/pl +share/qemu-xen/keymaps/pt +share/qemu-xen/keymaps/pt-br +share/qemu-xen/keymaps/ru +share/qemu-xen/keymaps/sl +share/qemu-xen/keymaps/sv +share/qemu-xen/keymaps/th +share/qemu-xen/keymaps/tr +share/qemu-xen/linuxboot.bin +share/qemu-xen/mpc8544ds.dtb +share/qemu-xen/multiboot.bin +share/qemu-xen/openbios-ppc +share/qemu-xen/openbios-sparc32 +share/qemu-xen/openbios-sparc64 +share/qemu-xen/palcode-clipper +share/qemu-xen/petalogix-ml605.dtb +share/qemu-xen/petalogix-s3adsp1800.dtb +share/qemu-xen/ppc_rom.bin +share/qemu-xen/pxe-e1000.rom +share/qemu-xen/pxe-eepro100.rom +share/qemu-xen/pxe-ne2k_pci.rom +share/qemu-xen/pxe-pcnet.rom +share/qemu-xen/pxe-rtl8139.rom +share/qemu-xen/pxe-virtio.rom +share/qemu-xen/s390-zipl.rom +share/qemu-xen/sgabios.bin +share/qemu-xen/slof.bin +share/qemu-xen/spapr-rtas.bin +share/qemu-xen/vgabios-cirrus.bin +share/qemu-xen/vgabios-qxl.bin +share/qemu-xen/vgabios-stdvga.bin +share/qemu-xen/vgabios-vmware.bin +share/qemu-xen/vgabios.bin share/xen/create.dtd -@comment share/xen/qemu/bamboo.dtb -@comment share/xen/qemu/bios.bin -@comment share/xen/qemu/keymaps/ar -@comment share/xen/qemu/keymaps/common -@comment share/xen/qemu/keymaps/da -@comment share/xen/qemu/keymaps/de -@comment share/xen/qemu/keymaps/de-ch -@comment share/xen/qemu/keymaps/en-gb -@comment share/xen/qemu/keymaps/en-us -@comment share/xen/qemu/keymaps/es -@comment share/xen/qemu/keymaps/et -@comment share/xen/qemu/keymaps/fi -@comment share/xen/qemu/keymaps/fo -@comment share/xen/qemu/keymaps/fr -@comment share/xen/qemu/keymaps/fr-be -@comment share/xen/qemu/keymaps/fr-ca -@comment share/xen/qemu/keymaps/fr-ch -@comment share/xen/qemu/keymaps/hr -@comment share/xen/qemu/keymaps/hu -@comment share/xen/qemu/keymaps/is -@comment share/xen/qemu/keymaps/it -@comment share/xen/qemu/keymaps/ja -@comment share/xen/qemu/keymaps/lt -@comment share/xen/qemu/keymaps/lv -@comment share/xen/qemu/keymaps/mk -@comment share/xen/qemu/keymaps/modifiers -@comment share/xen/qemu/keymaps/nl -@comment share/xen/qemu/keymaps/nl-be -@comment share/xen/qemu/keymaps/no -@comment share/xen/qemu/keymaps/pl -@comment share/xen/qemu/keymaps/pt -@comment share/xen/qemu/keymaps/pt-br -@comment share/xen/qemu/keymaps/ru -@comment share/xen/qemu/keymaps/sl -@comment share/xen/qemu/keymaps/sv -@comment share/xen/qemu/keymaps/th -@comment share/xen/qemu/keymaps/tr -@comment share/xen/qemu/openbios-ppc -@comment share/xen/qemu/openbios-sparc32 -@comment share/xen/qemu/openbios-sparc64 -@comment share/xen/qemu/ppc_rom.bin -@comment share/xen/qemu/pxe-e1000.bin -@comment share/xen/qemu/pxe-ne2k_pci.bin -@comment share/xen/qemu/pxe-pcnet.bin -@comment share/xen/qemu/pxe-rtl8139.bin -@comment share/xen/qemu/vgabios-cirrus.bin -@comment share/xen/qemu/vgabios.bin -@comment share/xen/qemu/video.x +share/xen/qemu/bamboo.dtb +share/xen/qemu/bios.bin +share/xen/qemu/keymaps/ar +share/xen/qemu/keymaps/common +share/xen/qemu/keymaps/da +share/xen/qemu/keymaps/de +share/xen/qemu/keymaps/de-ch +share/xen/qemu/keymaps/en-gb +share/xen/qemu/keymaps/en-us +share/xen/qemu/keymaps/es +share/xen/qemu/keymaps/et +share/xen/qemu/keymaps/fi +share/xen/qemu/keymaps/fo +share/xen/qemu/keymaps/fr +share/xen/qemu/keymaps/fr-be +share/xen/qemu/keymaps/fr-ca +share/xen/qemu/keymaps/fr-ch +share/xen/qemu/keymaps/hr +share/xen/qemu/keymaps/hu +share/xen/qemu/keymaps/is +share/xen/qemu/keymaps/it +share/xen/qemu/keymaps/ja +share/xen/qemu/keymaps/lt +share/xen/qemu/keymaps/lv +share/xen/qemu/keymaps/mk +share/xen/qemu/keymaps/modifiers +share/xen/qemu/keymaps/nl +share/xen/qemu/keymaps/nl-be +share/xen/qemu/keymaps/no +share/xen/qemu/keymaps/pl +share/xen/qemu/keymaps/pt +share/xen/qemu/keymaps/pt-br +share/xen/qemu/keymaps/ru +share/xen/qemu/keymaps/sl +share/xen/qemu/keymaps/sv +share/xen/qemu/keymaps/th +share/xen/qemu/keymaps/tr +share/xen/qemu/openbios-ppc +share/xen/qemu/openbios-sparc32 +share/xen/qemu/openbios-sparc64 +share/xen/qemu/ppc_rom.bin +share/xen/qemu/pxe-e1000.bin +share/xen/qemu/pxe-ne2k_pci.bin +share/xen/qemu/pxe-pcnet.bin +share/xen/qemu/pxe-rtl8139.bin +share/xen/qemu/vgabios-cirrus.bin +share/xen/qemu/vgabios.bin +share/xen/qemu/video.x @pkgdir share/examples/xen/auto diff --git a/sysutils/xentools42/distinfo b/sysutils/xentools42/distinfo index da9e567ca11..dbe45df8842 100644 --- a/sysutils/xentools42/distinfo +++ b/sysutils/xentools42/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2013/05/25 05:19:17 jnemeth Exp $ +$NetBSD: distinfo,v 1.3 2013/05/26 20:27:43 bouyer Exp $ SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 @@ -6,9 +6,11 @@ Size (ipxe-git-v1.0.0.tar.gz) = 1996881 bytes SHA1 (xen-4.2.2.tar.gz) = b48cc7f375e9a5d65ff2d680f1b512dbea5a3b7c RMD160 (xen-4.2.2.tar.gz) = 925cb2abdd080254a5457d1b304f811036261ab6 Size (xen-4.2.2.tar.gz) = 15602746 bytes +SHA1 (patch-.._.._ipxe_src_Makefile.housekeeping) = 5ec8020a9705b2f64096c2942473a8de4db578bb SHA1 (patch-.._.._ipxe_src_arch_i386_include_librm.h) = 4549ac641b112321b4731a918d85219c3fce6808 +SHA1 (patch-.._.._ipxe_src_arch_i386_scripts_i386.lds) = 4c0cbb7f535be43e1b6f53c284340a8bafc37c0b SHA1 (patch-.._.._ipxe_src_core_settings.c) = 240ff973757403b983f12b2cbed826584c4a8aba -SHA1 (patch-.._.._ipxe_src_net_tls.c) = c0cfbc2ab2b92c659c146601c4f80d58c951ca62 +SHA1 (patch-.._.._ipxe_src_net_tls.c) = 893c70515bc4cb0d4d9319fd94eddc4945f6a0b3 SHA1 (patch-.._Config.mk) = ec5ba76be10e43cb1b2d37686e35d5fb81d8de80 SHA1 (patch-.._config_NetBSD.mk) = 90893326dcce4e3e2ef273f22ec5ddf5af0f7cd8 SHA1 (patch-.._config_StdGNU.mk) = 3f93999038bd9d25277803cd1d969dc5733b593f @@ -19,7 +21,7 @@ SHA1 (patch-.._docs_man_xl.pod.1) = bd6272abed11c60c7c5ae88ae54377a3bfb921ed SHA1 (patch-.._docs_man_xlcpupool.cfg.pod.5) = a693a79a1f1c16548f62f7da1fa58fa28030990f SHA1 (patch-.._docs_man_xm.pod.1) = 975b7570da4bf9fd9cb79539fbd36b8dfbcbd571 SHA1 (patch-.._docs_man_xmdomain.cfg.pod.5) = 5563a72e203e789a86f4166c71ddb3fcff5215c6 -SHA1 (patch-Makefile) = 8476e65d5bdf257cdf09d98b90820c82cb0ff719 +SHA1 (patch-Makefile) = 37fbcd6d2f0279d4c04c91085b0e7f5611a5b92a SHA1 (patch-blktap_drivers_Makefile) = 0906a5ec3a7450fc987b01289e2560e60966d00d SHA1 (patch-configure) = 7bf4183efb76bded94a9519bf2737fb1240ab0e7 SHA1 (patch-examples_Makefile) = 8e89fab7817785b32d79ec0cad3a2645c6981f01 @@ -58,4 +60,8 @@ SHA1 (patch-qemu-xen-traditional_hw_pt-msi.c) = 7281d62de494fbbb6508818c9f8c5cfc SHA1 (patch-qemu-xen-traditional_hw_pt-msi.h) = a33b6ed927db0204c25a9f6ff1bb8870c765f8ad SHA1 (patch-qemu-xen-traditional_i386-dm_hookstarget.mak) = 7d526e8a9a0b0daf7215c54a036f7a3306291589 SHA1 (patch-qemu-xen-traditional_xen-hooks.mak) = 7acec9c981d18e1b659efc1d8e7c5c3b90d45411 +SHA1 (patch-qemu-xen_audio_audio.c) = 95f7417cec027239e9591b8def632d9344f42e05 +SHA1 (patch-qemu-xen_fpu_softfloat-specialize.h) = 791aeac1642101cbe2b15bf7ec189765c370f1a2 +SHA1 (patch-qemu-xen_ioport.c) = 3dde5877f35396015d28eb2bb318ad2f79e6b4f8 +SHA1 (patch-qemu-xen_memory.c) = e4e39a0d02195e3b04d97af04d4aa31ff379b73e SHA1 (patch-xentrace_Makefile) = 9b53ba4a809dad7a1de34c8fa0dbe493d7256ada diff --git a/sysutils/xentools42/patches/patch-.._.._ipxe_src_Makefile.housekeeping b/sysutils/xentools42/patches/patch-.._.._ipxe_src_Makefile.housekeeping new file mode 100644 index 00000000000..29de12b219e --- /dev/null +++ b/sysutils/xentools42/patches/patch-.._.._ipxe_src_Makefile.housekeeping @@ -0,0 +1,24 @@ +$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 diff --git a/sysutils/xentools42/patches/patch-.._.._ipxe_src_arch_i386_scripts_i386.lds b/sysutils/xentools42/patches/patch-.._.._ipxe_src_arch_i386_scripts_i386.lds new file mode 100644 index 00000000000..d7fe726e3de --- /dev/null +++ b/sysutils/xentools42/patches/patch-.._.._ipxe_src_arch_i386_scripts_i386.lds @@ -0,0 +1,13 @@ +$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 ); diff --git a/sysutils/xentools42/patches/patch-.._.._ipxe_src_net_tls.c b/sysutils/xentools42/patches/patch-.._.._ipxe_src_net_tls.c index 040aa75b5d0..b63f319e09f 100644 --- a/sysutils/xentools42/patches/patch-.._.._ipxe_src_net_tls.c +++ b/sysutils/xentools42/patches/patch-.._.._ipxe_src_net_tls.c @@ -1,8 +1,16 @@ -$NetBSD: patch-.._.._ipxe_src_net_tls.c,v 1.1 2013/05/15 06:58:50 jnemeth Exp $ +$NetBSD: patch-.._.._ipxe_src_net_tls.c,v 1.2 2013/05/26 20:27:43 bouyer Exp $ ---- ../../ipxe/src/net/tls.c.orig 2013-03-25 18:53:57.000000000 +0000 -+++ ../../ipxe/src/net/tls.c -@@ -650,18 +650,22 @@ static int tls_send_client_key_exchange +--- ../../ipxe/src/net/tls.c.orig 2010-02-02 17:12:44.000000000 +0100 ++++ ../../ipxe/src/net/tls.c 2013-05-26 20:05:24.000000000 +0200 +@@ -29,6 +29,7 @@ + #include <stdarg.h> + #include <string.h> + #include <errno.h> ++#include <alloca.h> + #include <byteswap.h> + #include <gpxe/hmac.h> + #include <gpxe/md5.h> +@@ -650,18 +651,22 @@ RSA_CTX *rsa_ctx; RSA_pub_key_new ( &rsa_ctx, tls->rsa.modulus, tls->rsa.modulus_len, tls->rsa.exponent, tls->rsa.exponent_len ); @@ -34,7 +42,7 @@ $NetBSD: patch-.._.._ipxe_src_net_tls.c,v 1.1 2013/05/15 06:58:50 jnemeth Exp $ /* FIXME: Hack alert */ DBGC ( tls, "RSA encrypting plaintext, modulus, exponent:\n" ); -@@ -671,14 +675,13 @@ static int tls_send_client_key_exchange +@@ -671,14 +676,13 @@ DBGC_HD ( tls, tls->rsa.exponent, tls->rsa.exponent_len ); RSA_encrypt ( rsa_ctx, ( const uint8_t * ) &tls->pre_master_secret, sizeof ( tls->pre_master_secret ), @@ -52,7 +60,7 @@ $NetBSD: patch-.._.._ipxe_src_net_tls.c,v 1.1 2013/05/15 06:58:50 jnemeth Exp $ } /** -@@ -802,12 +805,12 @@ static int tls_new_server_hello ( struct +@@ -802,12 +806,12 @@ uint8_t session_id_len; char next[0]; } __attribute__ (( packed )) *hello_a = data; diff --git a/sysutils/xentools42/patches/patch-Makefile b/sysutils/xentools42/patches/patch-Makefile index 6653d4e691b..3664fe86e9d 100644 --- a/sysutils/xentools42/patches/patch-Makefile +++ b/sysutils/xentools42/patches/patch-Makefile @@ -1,13 +1,9 @@ -$NetBSD: patch-Makefile,v 1.1 2013/05/15 06:58:50 jnemeth Exp $ +$NetBSD: patch-Makefile,v 1.2 2013/05/26 20:27:43 bouyer Exp $ ---- Makefile.orig 2012-12-17 15:00:09.000000000 +0000 -+++ Makefile -@@ -15,28 +15,29 @@ SUBDIRS-y += examples - SUBDIRS-y += hotplug - SUBDIRS-y += xentrace - SUBDIRS-$(CONFIG_XCUTILS) += xcutils --SUBDIRS-$(CONFIG_X86) += firmware -+#XXX SUBDIRS-$(CONFIG_X86) += firmware +--- Makefile.orig 2013-04-23 18:42:55.000000000 +0200 ++++ Makefile 2013-05-26 18:33:32.000000000 +0200 +@@ -18,15 +18,16 @@ + SUBDIRS-$(CONFIG_X86) += firmware SUBDIRS-y += console SUBDIRS-y += xenmon -SUBDIRS-$(VTPM_TOOLS) += vtpm_manager @@ -26,22 +22,7 @@ $NetBSD: patch-Makefile,v 1.1 2013/05/15 06:58:50 jnemeth Exp $ SUBDIRS-$(CONFIG_NetBSD) += xenbackendd SUBDIRS-y += libfsimage SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen - SUBDIRS-$(CONFIG_Linux) += libvchan - --# do not recurse in to a dir we are about to delete --ifneq "$(MAKECMDGOALS)" "distclean" --SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-traditional-dir --SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-dir --endif -+#XXX # do not recurse in to a dir we are about to delete -+#XXX ifneq "$(MAKECMDGOALS)" "distclean" -+#XXX SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-traditional-dir -+#XXX SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-dir -+#XXX endif - - SUBDIRS-y += xenpmd - SUBDIRS-y += libxl -@@ -44,7 +45,7 @@ SUBDIRS-y += remus +@@ -44,7 +45,7 @@ SUBDIRS-$(CONFIG_X86) += xenpaging SUBDIRS-$(CONFIG_X86) += debugger/gdbsx SUBDIRS-$(CONFIG_X86) += debugger/kdd diff --git a/sysutils/xentools42/patches/patch-qemu-xen_audio_audio.c b/sysutils/xentools42/patches/patch-qemu-xen_audio_audio.c new file mode 100644 index 00000000000..4bb808fada7 --- /dev/null +++ b/sysutils/xentools42/patches/patch-qemu-xen_audio_audio.c @@ -0,0 +1,12 @@ +$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; + } diff --git a/sysutils/xentools42/patches/patch-qemu-xen_fpu_softfloat-specialize.h b/sysutils/xentools42/patches/patch-qemu-xen_fpu_softfloat-specialize.h new file mode 100644 index 00000000000..d4e72ff7b7c --- /dev/null +++ b/sysutils/xentools42/patches/patch-qemu-xen_fpu_softfloat-specialize.h @@ -0,0 +1,26 @@ +$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 diff --git a/sysutils/xentools42/patches/patch-qemu-xen_ioport.c b/sysutils/xentools42/patches/patch-qemu-xen_ioport.c new file mode 100644 index 00000000000..7393fc5e5a2 --- /dev/null +++ b/sysutils/xentools42/patches/patch-qemu-xen_ioport.c @@ -0,0 +1,12 @@ +$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; diff --git a/sysutils/xentools42/patches/patch-qemu-xen_memory.c b/sysutils/xentools42/patches/patch-qemu-xen_memory.c new file mode 100644 index 00000000000..1e0aa070d5c --- /dev/null +++ b/sysutils/xentools42/patches/patch-qemu-xen_memory.c @@ -0,0 +1,12 @@ +$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, |