From: Eric Biggers <ebiggers3@gmail.com>
Date: Wed, 23 Jan 2013 00:39:35 +0000 (-0600)
Subject: mkwinpeimg: disable IA64 support
X-Git-Tag: v1.2.4~16
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=9d2f674f4cb6933347273398e74bf9fb0ff0fef2

mkwinpeimg: disable IA64 support

syslinux does not support ia64 which automatically makes ia64 a special case.
Leaving out support for now.
---

diff --git a/doc/mkwinpeimg.1.in b/doc/mkwinpeimg.1.in
index 1f2dc187..8c5d62a4 100644
--- a/doc/mkwinpeimg.1.in
+++ b/doc/mkwinpeimg.1.in
@@ -81,7 +81,9 @@ Use DIR for temporary files.  Defaults to a directory made using "mktemp -d".
 \fB\-a\fR, \fB\-\-arch\fR=\fIARCH\fR
 Use the Windows PE version from the Windows Automated Installation Kit that has
 the CPU architecture \fIARCH\fR.  Only valid with \fB\-\-waik\-dir\fR.  Possible
-values: "x86", "amd64", or "ia64".  Default is "x86".
+values: "x86" or "amd64".  Default is "x86".  Note: the WAIK also contains a
+Windows PE image for the ia64 (Itanium) architecture; however, this is not
+supported by this script.
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 Display help.
diff --git a/programs/mkwinpeimg b/programs/mkwinpeimg
index 3075c28d..2075dc20 100755
--- a/programs/mkwinpeimg
+++ b/programs/mkwinpeimg
@@ -108,7 +108,7 @@ Usage: $script_name [OPTIONS] IMAGE
                               Defaults to making one using "mktemp -d".
   -a, --arch=ARCH          Use the Windows PE version from the WAIK that has
                               the CPU architecture ARCH.  Possible values:
-                              "x86", "amd64", or "ia64".  Default is "x86".
+                              "x86" or "amd64".  Default is "x86".
   -h, --help               Display this information.
   -v, --version            Show version information.
 
@@ -183,14 +183,17 @@ process_command_line() {
 			if [ "$2" == "x86" ]; then
 				arch="X86"
 				arch_id="1"
-			elif [ "$2" == "ia64" ]; then
-				arch="IA64"
-				arch_id="2"
+			# Need to test Itanium images before making it an
+			# option.  Note: syslinux is x86 only so can't be used
+			# for the Itanium disk image.
+			#elif [ "$2" == "ia64" ]; then
+				#arch="IA64"
+				#arch_id="2"
 			elif [ "$2" == "amd64" ]; then
 				arch="AMD64"
 				arch_id="3"
 			else 
-				echo "ERROR: $2 is not a valid arch (x86/amd64/ia64)"
+				echo "ERROR: $2 is not a valid arch (x86/amd64)"
 				exit 1
 			fi
 			shift