diff options
| author | Roger Pau Monné <royger@FreeBSD.org> | 2018-05-22 15:53:27 +0000 |
|---|---|---|
| committer | Roger Pau Monné <royger@FreeBSD.org> | 2018-05-22 15:53:27 +0000 |
| commit | 9de9fae97fb90a40686326590c677bc3982fee18 (patch) | |
| tree | 1cb5fcd7ad3258f7cab51e856320014eae31b83b /sysutils/xen-tools | |
| parent | c7ed0f1a9ef6bc4352afcff35c3ea8c4502a2961 (diff) | |
| download | ports-9de9fae97fb90a40686326590c677bc3982fee18.tar.gz ports-9de9fae97fb90a40686326590c677bc3982fee18.zip | |
xen-tools: fix build with newer iasl
The added patch fixes the build on HEAD that contains a newer version
of iasl.
Sponsored by: Citrix Systems R&D
Notes
Notes:
svn path=/head/; revision=470624
Diffstat (limited to 'sysutils/xen-tools')
| -rw-r--r-- | sysutils/xen-tools/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/xen-tools/files/0001-Backport-of-commit-858dba.patch | 35 |
2 files changed, 37 insertions, 1 deletions
diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-tools/Makefile index 54eb03012dee..d936bd59fe7c 100644 --- a/sysutils/xen-tools/Makefile +++ b/sysutils/xen-tools/Makefile @@ -49,7 +49,8 @@ EXTRA_PATCHES= ${FILESDIR}/var_paths.patch:-p1 \ ${FILESDIR}/0001-libs-xenstore-set-correct-FreeBSD-device.patch:-p1 \ ${FILESDIR}/kdd.patch:-p1 \ ${FILESDIR}/0001-xenstored-apply-a-write-transaction-rate-limit.patch:-p1 \ - ${FILESDIR}/0002-xenstored-Log-when-the-write-transaction-rate-limit-.patch:-p1 + ${FILESDIR}/0002-xenstored-Log-when-the-write-transaction-rate-limit-.patch:-p1 \ + ${FILESDIR}/0001-Backport-of-commit-858dba.patch:-p1 CONFIGURE_ARGS+= --with-extra-qemuu-configure-args="${QEMU_ARGS}" \ --with-system-seabios=${LOCALBASE}/share/seabios/bios.bin diff --git a/sysutils/xen-tools/files/0001-Backport-of-commit-858dba.patch b/sysutils/xen-tools/files/0001-Backport-of-commit-858dba.patch new file mode 100644 index 000000000000..72c5b234b261 --- /dev/null +++ b/sysutils/xen-tools/files/0001-Backport-of-commit-858dba.patch @@ -0,0 +1,35 @@ +From 2ff6287610fa44eec9f30630d87166ad1fc0e452 Mon Sep 17 00:00:00 2001 +From: Roger Pau Monne <roger.pau@citrix.com> +Date: Tue, 22 May 2018 17:47:37 +0200 +Subject: [PATCH] Backport of commit 858dba + +This is required in order to build Xen with newer iasl found in HEAD. +--- + tools/firmware/hvmloader/acpi/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/firmware/hvmloader/acpi/Makefile b/tools/firmware/hvmloader/acpi/Makefile +index d3e882ac69..29f93e6a8c 100644 +--- a/tools/firmware/hvmloader/acpi/Makefile ++++ b/tools/firmware/hvmloader/acpi/Makefile +@@ -27,7 +27,7 @@ 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 +@@ -44,7 +44,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 + +-- +2.17.0 + |