From d4647b05dd110e0e92264ba45d8a5a60d50c7187 Mon Sep 17 00:00:00 2001 From: hans Date: Sun, 18 Jan 2009 13:55:31 +0000 Subject: [PATCH] Use sed, awk and hexdump from tools to make this work on Solaris. Ok by apb. --- sys/arch/x86/acpi/Makefile.wakecode.inc | 8 ++++++-- sys/arch/x86/acpi/genwakecode.sh | 10 +++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/sys/arch/x86/acpi/Makefile.wakecode.inc b/sys/arch/x86/acpi/Makefile.wakecode.inc index 7510a47be4f6..641088215e94 100644 --- a/sys/arch/x86/acpi/Makefile.wakecode.inc +++ b/sys/arch/x86/acpi/Makefile.wakecode.inc @@ -1,8 +1,12 @@ -# $NetBSD: Makefile.wakecode.inc,v 1.3 2007/12/11 13:56:50 lukem Exp $ +# $NetBSD: Makefile.wakecode.inc,v 1.4 2009/01/18 13:55:31 hans Exp $ # FreeBSD: src/sys/i386/acpica/Makefile,v 1.3 2002/05/01 21:54:07 peter Exp ACPI_WAKECODE_S= ${S}/arch/${MACHINE}/acpi/acpi_wakecode.S ACPI_GENWAKECODE= ${S}/arch/x86/acpi/genwakecode.sh +ACPI_GENCMD= AWK=${TOOL_AWK:Q} \ + HEXDUMP=${TOOL_HEXDUMP:Q} \ + SED=${TOOL_SED:Q} \ + ${HOST_SH} acpi_wakecode.h: ${ACPI_WAKECODE_S} ${ACPI_GENWAKECODE} ${_MKTARGET_CREATE} @@ -10,7 +14,7 @@ acpi_wakecode.h: ${ACPI_WAKECODE_S} ${ACPI_GENWAKECODE} ${LD} -M -Map acpi_wakecode.bin.map -z defs -nostdlib \ --oformat binary -e wakeup_16 -Ttext 0 \ -o acpi_wakecode.bin acpi_wakecode.o - ${HOST_SH} ${ACPI_GENWAKECODE} > acpi_wakecode.h + ${ACPI_GENCMD} ${ACPI_GENWAKECODE} > acpi_wakecode.h rm -f acpi_wakecode.bin acpi_wakecode.o acpi_wakecode.bin.map acpi_wakeup.o acpi_wakeup.d: acpi_wakecode.h diff --git a/sys/arch/x86/acpi/genwakecode.sh b/sys/arch/x86/acpi/genwakecode.sh index 107de9942c05..7025dc309328 100644 --- a/sys/arch/x86/acpi/genwakecode.sh +++ b/sys/arch/x86/acpi/genwakecode.sh @@ -1,12 +1,16 @@ #!/bin/sh -# $NetBSD: genwakecode.sh,v 1.2 2007/12/09 20:32:18 jmcneill Exp $ +# $NetBSD: genwakecode.sh,v 1.3 2009/01/18 13:55:31 hans Exp $ + +AWK=${AWK:=awk} +HEXDUMP=${HEXDUMP:=hexdump} +SED=${SED:=sed} P='/WAKEUP_/ { printf("#define\t%s%s\t%s\n", $2, length($2) < 16 ? "\t" : "", $1); }' -awk "$P" < acpi_wakecode.bin.map +${AWK} "$P" < acpi_wakecode.bin.map echo echo 'static const unsigned char wakecode[] = {'; -hexdump -v -e '"\t" 8/1 "0x%02x, " "\n"' < acpi_wakecode.bin | sed 's/0x /0x00/g' +${HEXDUMP} -v -e '"\t" 8/1 "0x%02x, " "\n"' < acpi_wakecode.bin | ${SED} 's/0x /0x00/g' echo '};' exit 0