Date: Tue, 22 May 2018 15:53:27 +0000 (UTC) From: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= <royger@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470624 - in head/sysutils/xen-tools: . files Message-ID: <201805221553.w4MFrSDd083246@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: royger (src committer) Date: Tue May 22 15:53:27 2018 New Revision: 470624 URL: https://svnweb.freebsd.org/changeset/ports/470624 Log: 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 Added: head/sysutils/xen-tools/files/0001-Backport-of-commit-858dba.patch (contents, props changed) Modified: head/sysutils/xen-tools/Makefile Modified: head/sysutils/xen-tools/Makefile ============================================================================== --- head/sysutils/xen-tools/Makefile Tue May 22 15:48:12 2018 (r470623) +++ head/sysutils/xen-tools/Makefile Tue May 22 15:53:27 2018 (r470624) @@ -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 Added: head/sysutils/xen-tools/files/0001-Backport-of-commit-858dba.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/xen-tools/files/0001-Backport-of-commit-858dba.patch Tue May 22 15:53:27 2018 (r470624) @@ -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 +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805221553.w4MFrSDd083246>