acpi: restructure genwakecode.sh

genwakecode.sh used some obscure hexdump/sed magic to embed a binary
into source.  The specific usage of sed breaks in at least the UTF-8
locale.  Rework the script to use hexdump and sed in a less obscure
way.

diff --git a/sys/platform/pc32/acpica5/genwakecode.sh b/sys/platform/pc32/acpica5/genwakecode.sh
index 970e5d7..0e4499e 100644 (file)
--- a/sys/platform/pc32/acpica5/genwakecode.sh
+++ b/sys/platform/pc32/acpica5/genwakecode.sh
@@ -4,15 +4,8 @@
 #
 echo "/* generated from `pwd`/acpi_wakecode.o */"
 echo 'static char wakecode[] = {';
-hexdump -Cv acpi_wakecode.bin | \
-    sed -e 's/^[0-9a-f][0-9a-f]*//' -e 's/\|.*$//' | \
-    while read line
-    do
-       for code in ${line}
-       do
-           echo -n "0x${code},";
-       done
-    done
+hexdump -bv acpi_wakecode.bin | \
+    sed -e 's/^[0-9a-f][0-9a-f]*//' -e 's/\([[:digit:]]\{1,\}\) */0\1,/g'
 echo '};'
 
 nm -n acpi_wakecode.o | while read offset dummy what

diff --git a/sys/platform/pc64/acpica5/genwakecode.sh b/sys/platform/pc64/acpica5/genwakecode.sh
index 970e5d7..0e4499e 100644 (file)
--- a/sys/platform/pc64/acpica5/genwakecode.sh
+++ b/sys/platform/pc64/acpica5/genwakecode.sh
@@ -4,15 +4,8 @@
 #
 echo "/* generated from `pwd`/acpi_wakecode.o */"
 echo 'static char wakecode[] = {';
-hexdump -Cv acpi_wakecode.bin | \
-    sed -e 's/^[0-9a-f][0-9a-f]*//' -e 's/\|.*$//' | \
-    while read line
-    do
-       for code in ${line}
-       do
-           echo -n "0x${code},";
-       done
-    done
+hexdump -bv acpi_wakecode.bin | \
+    sed -e 's/^[0-9a-f][0-9a-f]*//' -e 's/\([[:digit:]]\{1,\}\) */0\1,/g'
 echo '};'
 
 nm -n acpi_wakecode.o | while read offset dummy what