CVS commit: pkgsrc/sysutils/xentools48

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Jul  3 14:06:41 UTC 2018

Modified Files:
        pkgsrc/sysutils/xentools48: Makefile distinfo
Added Files:
        pkgsrc/sysutils/xentools48/patches: patch-tools_libacpi_Makefile

Log Message:
xentools48: apply upstream fix for newer iasl. allow base iasl.
(netbsd-current's base iasl was broken and was fixed)


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/sysutils/xentools48/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/xentools48/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/xentools48/patches/patch-tools_libacpi_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/xentools48/Makefile
diff -u pkgsrc/sysutils/xentools48/Makefile:1.20 pkgsrc/sysutils/xentools48/Makefile:1.21
--- pkgsrc/sysutils/xentools48/Makefile:1.20    Tue Jul  3 05:03:35 2018
+++ pkgsrc/sysutils/xentools48/Makefile Tue Jul  3 14:06:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/07/03 05:03:35 adam Exp $
+# $NetBSD: Makefile,v 1.21 2018/07/03 14:06:41 maya Exp $
 #
 VERSION=       4.8.3
 VERSION_IPXE=  827dd1bfee67daa683935ce65316f7e0f057fe1c
@@ -61,9 +61,9 @@ 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)
 BUILD_DEPENDS+=        acpica-utils-[0-9]*:../../sysutils/acpica-utils
-#.endif
+.endif
 DEPENDS+=      ${PYPKGPREFIX}-curses>=0:../../devel/py-curses
 
 PKG_SYSCONFSUBDIR=     xen

Index: pkgsrc/sysutils/xentools48/distinfo
diff -u pkgsrc/sysutils/xentools48/distinfo:1.10 pkgsrc/sysutils/xentools48/distinfo:1.11
--- pkgsrc/sysutils/xentools48/distinfo:1.10    Tue Mar 13 15:15:01 2018
+++ pkgsrc/sysutils/xentools48/distinfo Tue Jul  3 14:06:41 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2018/03/13 15:15:01 bouyer Exp $
+$NetBSD: distinfo,v 1.11 2018/07/03 14:06:41 maya Exp $
 
 SHA1 (xen48/gmp-4.3.2.tar.bz2) = c011e8feaf1bb89158bd55eaabd7ef8fdd101a2c
 RMD160 (xen48/gmp-4.3.2.tar.bz2) = a8f3f41501ece290c348aeb4444bbea40bc53e71
@@ -83,6 +83,7 @@ SHA1 (patch-tools_hotplug_NetBSD_vif-bri
 SHA1 (patch-tools_hotplug_NetBSD_vif-ip) = cb8fd1150f6ac24fa853444618437f7d984b4282
 SHA1 (patch-tools_hotplug_common_Makefile) = 71059eddc2d7183b8b43aa976d9ae5f3a1fd75df
 SHA1 (patch-tools_include_xen-sys_NetBSD_gntdev.h) = ce4f7160e92d23afa029c9548cead180fe980ff4
+SHA1 (patch-tools_libacpi_Makefile) = 8a98783e8fcfcd9414176fdde24e7e08b2873c7f
 SHA1 (patch-tools_libs_call_netbsd.c) = c5e166212b0069220d9155636b41028f0f7f9e9e
 SHA1 (patch-tools_libs_call_private.h) = caeaf937ae379836c3187bee97ac0b986af53f9f
 SHA1 (patch-tools_libs_evtchn_netbsd.c) = 1abb0f128ab0702b606e22f199d297d1e9c0aae5

Added files:

Index: pkgsrc/sysutils/xentools48/patches/patch-tools_libacpi_Makefile
diff -u /dev/null pkgsrc/sysutils/xentools48/patches/patch-tools_libacpi_Makefile:1.1
--- /dev/null   Tue Jul  3 14:06:41 2018
+++ pkgsrc/sysutils/xentools48/patches/patch-tools_libacpi_Makefile     Tue Jul  3 14:06:41 2018
@@ -0,0 +1,25 @@
+$NetBSD: patch-tools_libacpi_Makefile,v 1.1 2018/07/03 14:06:41 maya Exp $
+
+Fix for newer iasl. From royger upstream.
+https://xenbits.xen.org/gitweb/?p=xen.git;a=commit;h=858dbaaeda33b05c1ac80aea0ba9a03924e09005
+
+--- tools/libacpi/Makefile.orig        2018-01-23 13:49:58.000000000 +0000
++++ tools/libacpi/Makefile
+@@ -43,7 +43,7 @@ all: $(C_SRC) $(H_SRC)
+ 
+ $(H_SRC): $(ACPI_BUILD_DIR)/%.h: %.asl iasl
+       iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $<
+-      sed -e 's/AmlCode/$*/g' $(ACPI_BUILD_DIR)/$*.hex >$@
++      sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $(ACPI_BUILD_DIR)/$*.hex >$@
+       rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex)
+  
+ $(MK_DSDT): mk_dsdt.c
+@@ -76,7 +76,7 @@ $(ACPI_BUILD_DIR)/dsdt_anycpu_arm.asl: $
+ 
+ $(C_SRC): $(ACPI_BUILD_DIR)/%.c: iasl $(ACPI_BUILD_DIR)/%.asl
+       iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $(ACPI_BUILD_DIR)/$*.asl
+-      sed -e 's/AmlCode/$*/g' $(ACPI_BUILD_DIR)/$*.hex > $@.$(TMP_SUFFIX)
++      sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $(ACPI_BUILD_DIR)/$*.hex > $@.$(TMP_SUFFIX)
+       echo "int $*_len=sizeof($*);" >> $@.$(TMP_SUFFIX)
+       mv -f $@.$(TMP_SUFFIX) $@
+       rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex)