12 files changed, 32 insertions, 11 deletions
diff --git a/build/arch-options/alpha b/build/arch-options/alpha
index 760ec38e5..51c5a3fbf 100644
--- a/build/arch-options/alpha
+++ b/build/arch-options/alpha
@@ -2,7 +2,7 @@
 # the 'alpha' architecture
 # It is sourced by the build scripts
 
-archspec="alpha;not-i386;not-s390;not-m68k;not-powerpc"
+archspec="alpha;not-x86;not-s390;not-m68k;not-powerpc"
 kernelversion="2.6.16"
 arch_listname="alpha"
 # These two options should be set if condition 'smp' is set below
diff --git a/build/arch-options/amd64 b/build/arch-options/amd64
new file mode 100644
index 000000000..525c930da
--- /dev/null
+++ b/build/arch-options/amd64
@@ -0,0 +1,21 @@
+# This file contains architecture specific variables for
+# the 'amd64' architecture
+# It is sourced by the build scripts
+
+archspec="amd64;x86;not-s390;not-m68k;not-powerpc;not-alpha"
+kernelversion="2.6.16"
+arch_listname="amd64"
+# These two options should be set if condition 'smp' is set below
+smp_config_section="Processor type and features"
+smp_config_option="Symmetric multi-processing support"
+
+# Options below are assembled into one variable 'condition'
+# in the build scripts
+kernelpackage="common-kpkg"
+fdisk="fdisk.txt;cfdisk.txt"
+network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot"
+boot="bootable-disk;bootable-usb"
+other="supports-pcmcia;supports-serial-console;rescue-needs-root-disk;workaround-bug-99926"
+smp="supports-smp-sometimes"
+goodies="supports-lang-chooser"
+status="checked"
diff --git a/build/arch-options/arm b/build/arch-options/arm
index 3f19744b9..b249ff39f 100644
--- a/build/arch-options/arm
+++ b/build/arch-options/arm
@@ -2,7 +2,7 @@
 # the 'arm' architecture
 # It is sourced by the build scripts
 
-archspec="arm;not-i386;not-s390;not-m68k;not-powerpc;not-alpha"
+archspec="arm;not-x86;not-s390;not-m68k;not-powerpc;not-alpha"
 kernelversion="2.6.16"
 arch_listname="arm"
 # These two options should be set if condition 'smp' is set below
diff --git a/build/arch-options/hppa b/build/arch-options/hppa
index d5d9d6c04..baeda6a3b 100644
--- a/build/arch-options/hppa
+++ b/build/arch-options/hppa
@@ -2,7 +2,7 @@
 # the 'hppa' architecture
 # It is sourced by the build scripts
 
-archspec="hppa;not-i386;not-s390;not-m68k;not-powerpc;not-alpha"
+archspec="hppa;not-x86;not-s390;not-m68k;not-powerpc;not-alpha"
 kernelversion="2.6.16"
 arch_listname="hppa"
 # These two options should be set if condition 'smp' is set below
diff --git a/build/arch-options/i386 b/build/arch-options/i386
index f38051c6d..c92f4047d 100644
--- a/build/arch-options/i386
+++ b/build/arch-options/i386
@@ -2,7 +2,7 @@
 # the 'i386' architecture
 # It is sourced by the build scripts
 
-archspec="i386;not-s390;not-m68k;not-powerpc;not-alpha"
+archspec="i386;x86;not-s390;not-m68k;not-powerpc;not-alpha"
 kernelversion="2.6.16"
 arch_listname="boot"
 # These two options should be set if condition 'smp' is set below
diff --git a/build/arch-options/ia64 b/build/arch-options/ia64
index 6c89cab3c..8f86ad8d1 100644
--- a/build/arch-options/ia64
+++ b/build/arch-options/ia64
@@ -2,7 +2,7 @@
 # the 'ia64' architecture
 # It is sourced by the build scripts
 
-archspec="ia64;not-i386;not-s390;not-m68k;not-powerpc;not-alpha"
+archspec="ia64;not-x86;not-s390;not-m68k;not-powerpc;not-alpha"
 kernelversion="2.6.16"
 arch_listname="ia64"
 # These two options should be set if condition 'smp' is set below
diff --git a/build/arch-options/m68k b/build/arch-options/m68k
index e97b8d087..7396bbb6b 100644
--- a/build/arch-options/m68k
+++ b/build/arch-options/m68k
@@ -2,7 +2,7 @@
 # the 'm68k' architecture
 # It is sourced by the build scripts
 
-archspec="m68k;not-i386;not-s390;not-powerpc;not-alpha"
+archspec="m68k;not-x86;not-s390;not-powerpc;not-alpha"
 kernelversion="2.4.27"
 arch_listname="68k"
 # These two options should be set if condition 'smp' is set below
diff --git a/build/arch-options/mips b/build/arch-options/mips
index 2cef322c5..bd6ba9586 100644
--- a/build/arch-options/mips
+++ b/build/arch-options/mips
@@ -2,7 +2,7 @@
 # the 'mips' architecture
 # It is sourced by the build scripts
 
-archspec="mips;not-i386;not-s390;not-m68k;not-powerpc;not-alpha"
+archspec="mips;not-x86;not-s390;not-m68k;not-powerpc;not-alpha"
 kernelversion="2.6.16"
 arch_listname="mips"
 # These two options should be set if condition 'smp' is set below
diff --git a/build/arch-options/mipsel b/build/arch-options/mipsel
index 36ed4b4f3..61bdea1f4 100644
--- a/build/arch-options/mipsel
+++ b/build/arch-options/mipsel
@@ -2,7 +2,7 @@
 # the 'mipsel' architecture
 # It is sourced by the build scripts
 
-archspec="mipsel;not-i386;not-s390;not-m68k;not-powerpc;not-alpha"
+archspec="mipsel;not-x86;not-s390;not-m68k;not-powerpc;not-alpha"
 kernelversion="2.6.16"
 arch_listname="mips"
 # These two options should be set if condition 'smp' is set below
diff --git a/build/arch-options/powerpc b/build/arch-options/powerpc
index 478d7ba05..1d970d18f 100644
--- a/build/arch-options/powerpc
+++ b/build/arch-options/powerpc
@@ -2,7 +2,7 @@
 # the 'powerpc' architecture
 # It is sourced by the build scripts
 
-archspec="powerpc;not-s390;not-m68k;not-i386;not-alpha"
+archspec="powerpc;not-s390;not-m68k;not-x86;not-alpha"
 kernelversion="2.6.16"
 arch_listname="powerpc"
 # These two options should be set if condition 'smp' is set below
diff --git a/build/arch-options/s390 b/build/arch-options/s390
index 7b140dfca..7a3483e48 100644
--- a/build/arch-options/s390
+++ b/build/arch-options/s390
@@ -2,7 +2,7 @@
 # the 's390' architecture
 # It is sourced by the build scripts
 
-archspec="s390;not-powerpc;not-m68k;not-i386;not-alpha"
+archspec="s390;not-powerpc;not-m68k;not-x86;not-alpha"
 kernelversion="2.6.16"
 arch_listname="s390"
 # These two options should be set if condition 'smp' is set below
diff --git a/build/arch-options/sparc b/build/arch-options/sparc
index 18313677c..8244e8fa5 100644
--- a/build/arch-options/sparc
+++ b/build/arch-options/sparc
@@ -2,7 +2,7 @@
 # the 'sparc' architecture
 # It is sourced by the build scripts
 
-archspec="sparc;not-i386;not-s390;not-m68k;not-powerpc;not-alpha"
+archspec="sparc;not-x86;not-s390;not-m68k;not-powerpc;not-alpha"
 kernelversion="2.6.16"
 arch_listname="sparc"
 # These two options should be set if condition 'smp' is set below