xentools45: fix building seabios with newer iasl.

(on xentools46, 48 we have seabios disabled)

OEM Table ID is expected to be 8 characters.

mysteriously, even upstream is broken.
bump PKGREVISION.

5 files changed, 66 insertions, 13 deletions

diff --git a/sysutils/xentools45/Makefile b/sysutils/xentools45/Makefile
index cd189c031a2..c5dd0625841 100644
--- a/sysutils/xentools45/Makefile
+++ b/sysutils/xentools45/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2018/06/27 10:44:15 maya Exp $
+# $NetBSD: Makefile,v 1.59 2018/06/28 02:26:49 maya Exp $
 
 VERSION=	4.5.5
-PKGREVISION=	10
+PKGREVISION=	11
 VERSION_IPXE=	9a93db3f0947484e30e753bbd61a10b17336e20e
 
 DISTNAME=		xen-${VERSION}
@@ -20,7 +20,7 @@ LICENSE=		gnu-gpl-v2
 
 # XXX add version check: Xen requires dev86 >= 0.16.14
 BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware
-#.if !exists(/usr/bin/iasl) # XXX broken with iasl 20171110
+#.if !exists(/usr/bin/iasl) # NetBSD ships a broken iasl
 BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils
 #.endif
 DEPENDS+=   ${PYPKGPREFIX}-curses>=0:../../devel/py-curses
diff --git a/sysutils/xentools45/distinfo b/sysutils/xentools45/distinfo
index be384985cec..b366655ff07 100644
--- a/sysutils/xentools45/distinfo
+++ b/sysutils/xentools45/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2018/01/27 19:11:41 abs Exp $
+$NetBSD: distinfo,v 1.34 2018/06/28 02:26:49 maya Exp $
 
 SHA1 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = fecadf952821e830ce1a1d19655288eef8488f88
 RMD160 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = 539bfa12db7054228250d6dd380bbf96c1a040f8
@@ -38,7 +38,7 @@ SHA1 (patch-debugger_gdbsx_Makefile) = 1e16761b20604bb5a9ee22174f0bb46005fb19c7
 SHA1 (patch-examples_Makefile) = 5fe7bb876d254cf0c4f774ed0f08dcaea5b355ff
 SHA1 (patch-firmware_etherboot_Makefile) = f55e14948b7191e533a82b8fc3575f1052f23c45
 SHA1 (patch-firmware_etherboot_patches_series) = 2fa1342c78094c6dd5d60a07c236c4a1c0599fc4
-SHA1 (patch-firmware_hvmloader_Makefile) = bc5e81ddfc5e95887c2af4bb32eced9c5748b3c6
+SHA1 (patch-firmware_hvmloader_Makefile) = 029877d4f0f5955a01512c7e79ae12d31f318da5
 SHA1 (patch-hotplug_NetBSD_Makefile) = 6f6ec768b595c332a8757437a64509c0370e52da
 SHA1 (patch-hotplug_NetBSD_block) = f7ef26d13578b00138f459f6d16662d53820458c
 SHA1 (patch-hotplug_NetBSD_vif-bridge) = ac4cc7446715330b504b8cce8cbd47c8035cf33c
@@ -73,6 +73,8 @@ SHA1 (patch-qemu-xen-traditional_hw_pt-msi.h) = e2028d255bdfaee9e7eb4ca3be2edb06
 SHA1 (patch-qemu-xen-traditional_i386-dm_hookstarget.mak) = 50c6bc068406effe94b638ffced7d8edf5729717
 SHA1 (patch-qemu-xen-traditional_xen-hooks.mak) = ccc055fdb56ee796e1464f709aa576ab8cd9c6f1
 SHA1 (patch-qemu-xen_audio_audio.c) = 8452d63fe90e38a64111d0cf425bacd565fe6d82
+SHA1 (patch-qemu-xen_hw_i386_ssdt_misc.dsl) = 309c8785a4c7d947fc31bdc513adc789b68c69ba
+SHA1 (patch-qemu-xen_hw_i386_ssdt_pcihp.dsl) = fd8768f997c9baee5e5681676e90b58e3162e2e5
 SHA1 (patch-qemu-xen_qemu-doc.texi) = 721e80d15ac30ac71df3d6c4c485b0bf70897cf9
 SHA1 (patch-qemu-xen_util_hbitmap.c) = 5a495ae2b47d1ff6dd342633b8d655582f21dffe
 SHA1 (patch-qemu-xen_xen-hvm.c) = 11d4deb5de577e8beb2d1c6c3ca886e3d7563f8a
diff --git a/sysutils/xentools45/patches/patch-firmware_hvmloader_Makefile b/sysutils/xentools45/patches/patch-firmware_hvmloader_Makefile
index cda57d3e510..796e932553f 100644
--- a/sysutils/xentools45/patches/patch-firmware_hvmloader_Makefile
+++ b/sysutils/xentools45/patches/patch-firmware_hvmloader_Makefile
@@ -1,13 +1,33 @@
-$NetBSD: patch-firmware_hvmloader_Makefile,v 1.1 2015/01/20 16:42:13 bouyer Exp $
+$NetBSD: patch-firmware_hvmloader_Makefile,v 1.2 2018/06/28 02:26:49 maya Exp $
 
---- firmware/hvmloader/Makefile.orig	2015-01-12 17:53:24.000000000 +0100
-+++ firmware/hvmloader/Makefile	2015-01-19 13:16:37.000000000 +0100
-@@ -26,7 +26,7 @@
- # The HVM loader is started in 32-bit mode at the address below:
- LOADADDR = 0x100000
+Fix for newer iasl. From royger upstream.
+https://xenbits.xen.org/gitweb/?p=xen.git;a=commit;h=858dbaaeda33b05c1ac80aea0ba9a03924e09005
+
+--- firmware/hvmloader/acpi/Makefile.orig	2016-09-20 05:59:24.000000000 +0000
++++ firmware/hvmloader/acpi/Makefile
+@@ -21,14 +21,14 @@ include $(XEN_ROOT)/tools/firmware/Rules
+ C_SRC = build.c dsdt_anycpu.c dsdt_15cpu.c static_tables.c dsdt_anycpu_qemu_xen.c
+ OBJS  = $(patsubst %.c,%.o,$(C_SRC))
  
 -CFLAGS += $(CFLAGS_xeninclude)
 +CFLAGS += $(CFLAGS_xeninclude) $(EXTRA_CFLAGS)
  
- OBJS  = hvmloader.o mp_tables.o util.o smbios.o 
- OBJS += smp.o cacheattr.o xenbus.o
+ vpath iasl $(PATH)
+ all: acpi.a
+ 
+ ssdt_s3.h ssdt_s4.h ssdt_pm.h ssdt_tpm.h: %.h: %.asl iasl
+ 	iasl -vs -p $* -tc $<
+-	sed -e 's/AmlCode/$*/g' $*.hex >$@
++	sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $*.hex >$@
+ 	rm -f $*.hex $*.aml
+ 
+ mk_dsdt: mk_dsdt.c
+@@ -45,7 +45,7 @@ dsdt_%cpu.asl: dsdt.asl mk_dsdt
+ 
+ $(filter dsdt_%.c,$(C_SRC)): %.c: iasl %.asl
+ 	iasl -vs -p $* -tc $*.asl
+-	sed -e 's/AmlCode/$*/g' $*.hex >$@
++	sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $*.hex >$@
+ 	echo "int $*_len=sizeof($*);" >>$@
+ 	rm -f $*.aml $*.hex
+ 
diff --git a/sysutils/xentools45/patches/patch-qemu-xen_hw_i386_ssdt_misc.dsl b/sysutils/xentools45/patches/patch-qemu-xen_hw_i386_ssdt_misc.dsl
new file mode 100644
index 00000000000..11ba0bacd0c
--- /dev/null
+++ b/sysutils/xentools45/patches/patch-qemu-xen_hw_i386_ssdt_misc.dsl
@@ -0,0 +1,16 @@
+$NetBSD: patch-qemu-xen_hw_i386_ssdt_misc.dsl,v 1.1 2018/06/28 02:26:49 maya Exp $
+
+Fix seabios build with newer iasl.
+Length was previously truncated to 8 characters.
+
+--- qemu-xen/hw/i386/ssdt-misc.dsl.orig	2016-07-27 17:50:05.000000000 +0000
++++ qemu-xen/hw/i386/ssdt-misc.dsl
+@@ -15,7 +15,7 @@
+ 
+ ACPI_EXTRACT_ALL_CODE ssdp_misc_aml
+ 
+-DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSUSP", 0x1)
++DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSU", 0x1)
+ {
+ 
+ /****************************************************************
diff --git a/sysutils/xentools45/patches/patch-qemu-xen_hw_i386_ssdt_pcihp.dsl b/sysutils/xentools45/patches/patch-qemu-xen_hw_i386_ssdt_pcihp.dsl
new file mode 100644
index 00000000000..0ce7cc0c61e
--- /dev/null
+++ b/sysutils/xentools45/patches/patch-qemu-xen_hw_i386_ssdt_pcihp.dsl
@@ -0,0 +1,15 @@
+$NetBSD: patch-qemu-xen_hw_i386_ssdt_pcihp.dsl,v 1.1 2018/06/28 02:26:49 maya Exp $
+
+Fix seabios build with newer iasl.
+
+--- qemu-xen/hw/i386/ssdt-pcihp.dsl.orig	2016-07-27 17:50:05.000000000 +0000
++++ qemu-xen/hw/i386/ssdt-pcihp.dsl
+@@ -15,7 +15,7 @@
+ 
+ ACPI_EXTRACT_ALL_CODE ssdp_pcihp_aml
+ 
+-DefinitionBlock ("ssdt-pcihp.aml", "SSDT", 0x01, "BXPC", "BXSSDTPCIHP", 0x1)
++DefinitionBlock ("ssdt-pcihp.aml", "SSDT", 0x01, "BXPC", "BXSSDTPC", 0x1)
+ {
+ 
+ /****************************************************************