The kernel version should now always be the same for all architectures

14 files changed, 2 insertions, 13 deletions

diff --git a/build/arch-options/alpha b/build/arch-options/alpha
index b9e691d56..f92cf9dc8 100644
--- a/build/arch-options/alpha
+++ b/build/arch-options/alpha
@@ -3,7 +3,6 @@
 # It is sourced by the build scripts
 
 archspec="alpha;not-x86;not-s390;not-m68k;not-powerpc"
-kernelversion="2.6.26"
 arch_listname="alpha"
 minimum_memory=32
 # These two options should be set if condition 'smp' is set below
diff --git a/build/arch-options/amd64 b/build/arch-options/amd64
index 6165f3faf..0a8265eeb 100644
--- a/build/arch-options/amd64
+++ b/build/arch-options/amd64
@@ -3,7 +3,6 @@
 # It is sourced by the build scripts
 
 archspec="amd64;x86;not-s390;not-m68k;not-powerpc;not-alpha"
-kernelversion="2.6.26"
 arch_listname="amd64"
 minimum_memory=56
 minimum_memory_gtk=96
diff --git a/build/arch-options/arm b/build/arch-options/arm
index b357e91ac..29864a58c 100644
--- a/build/arch-options/arm
+++ b/build/arch-options/arm
@@ -3,7 +3,6 @@
 # It is sourced by the build scripts
 
 archspec="arm;not-x86;not-s390;not-m68k;not-powerpc;not-alpha"
-kernelversion="2.6.26"
 arch_listname="arm"
 minimum_memory=32
 # 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 bdc723c51..ee31843d6 100644
--- a/build/arch-options/hppa
+++ b/build/arch-options/hppa
@@ -3,7 +3,6 @@
 # It is sourced by the build scripts
 
 archspec="hppa;not-x86;not-s390;not-m68k;not-powerpc;not-alpha"
-kernelversion="2.6.26"
 arch_listname="hppa"
 minimum_memory=32
 # 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 5179bec0e..e6b999702 100644
--- a/build/arch-options/i386
+++ b/build/arch-options/i386
@@ -3,7 +3,6 @@
 # It is sourced by the build scripts
 
 archspec="i386;x86;not-s390;not-m68k;not-powerpc;not-alpha"
-kernelversion="2.6.26"
 arch_listname="boot"
 minimum_memory=44
 minimum_memory_gtk=96
diff --git a/build/arch-options/ia64 b/build/arch-options/ia64
index c70872663..4f2fd4a7f 100644
--- a/build/arch-options/ia64
+++ b/build/arch-options/ia64
@@ -3,7 +3,6 @@
 # It is sourced by the build scripts
 
 archspec="ia64;not-x86;not-s390;not-m68k;not-powerpc;not-alpha"
-kernelversion="2.6.26"
 arch_listname="ia64"
 minimum_memory=32
 # 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 6b3bafc08..ef12e6ff3 100644
--- a/build/arch-options/m68k
+++ b/build/arch-options/m68k
@@ -3,7 +3,6 @@
 # It is sourced by the build scripts
 
 archspec="m68k;not-x86;not-s390;not-powerpc;not-alpha"
-kernelversion="2.6.26"
 arch_listname="68k"
 minimum_memory=32
 # 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 8de384803..4ad68528f 100644
--- a/build/arch-options/mips
+++ b/build/arch-options/mips
@@ -3,7 +3,6 @@
 # It is sourced by the build scripts
 
 archspec="mips;not-x86;not-s390;not-m68k;not-powerpc;not-alpha"
-kernelversion="2.6.26"
 arch_listname="mips"
 minimum_memory=32
 # 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 3cf0f4390..9a1665963 100644
--- a/build/arch-options/mipsel
+++ b/build/arch-options/mipsel
@@ -3,7 +3,6 @@
 # It is sourced by the build scripts
 
 archspec="mipsel;not-x86;not-s390;not-m68k;not-powerpc;not-alpha"
-kernelversion="2.6.26"
 arch_listname="mips"
 minimum_memory=32
 # 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 eb451c2ab..1b749f540 100644
--- a/build/arch-options/powerpc
+++ b/build/arch-options/powerpc
@@ -3,7 +3,6 @@
 # It is sourced by the build scripts
 
 archspec="powerpc;not-s390;not-m68k;not-x86;not-alpha"
-kernelversion="2.6.26"
 arch_listname="powerpc"
 minimum_memory=32
 minimum_memory_gtk=128
diff --git a/build/arch-options/s390 b/build/arch-options/s390
index e1db1eb90..fb8caa02c 100644
--- a/build/arch-options/s390
+++ b/build/arch-options/s390
@@ -3,7 +3,6 @@
 # It is sourced by the build scripts
 
 archspec="s390;not-powerpc;not-m68k;not-x86;not-alpha"
-kernelversion="2.6.26"
 arch_listname="s390"
 minimum_memory=20
 # 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 d8a677c2d..a07ca2247 100644
--- a/build/arch-options/sparc
+++ b/build/arch-options/sparc
@@ -3,7 +3,6 @@
 # It is sourced by the build scripts
 
 archspec="sparc;not-x86;not-s390;not-m68k;not-powerpc;not-alpha"
-kernelversion="2.6.26"
 arch_listname="sparc"
 minimum_memory=32
 # These two options should be set if condition 'smp' is set below
diff --git a/build/buildone.sh b/build/buildone.sh
index 7de4b8a52..da03df754 100755
--- a/build/buildone.sh
+++ b/build/buildone.sh
@@ -81,7 +81,6 @@ create_profiled () {
     echo "<!-- arch- and lang-specific non-profilable entities -->" > $dynamic
     echo "<!ENTITY langext \".${language}\">" >> $dynamic
     echo "<!ENTITY architecture \"${arch}\">" >> $dynamic
-    echo "<!ENTITY kernelversion \"${kernelversion}\">" >> $dynamic
     echo "<!ENTITY arch-listname \"${arch_listname}\">" >> $dynamic
     echo "<!ENTITY altkernelversion \"${altkernelversion}\">" >> $dynamic
     echo "<!ENTITY smp-config-section \"${smp_config_section}\">" >> $dynamic
diff --git a/build/entities/common.ent b/build/entities/common.ent
index 406bba33b..a7d6a9b5c 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -19,6 +19,8 @@
 <!ENTITY arch-title
   "<phrase arch='amd64'>AMD64</phrase><phrase arch='alpha'>Alpha</phrase><phrase arch='arm'>ARM</phrase><phrase arch='hppa'>PA-RISC</phrase><phrase arch='i386'>Intel x86</phrase><phrase arch='ia64'>IA-64</phrase><phrase arch='m68k'>Motorola 680x0</phrase><phrase arch='mips'>Mips</phrase><phrase arch='mipsel'>Mipsel</phrase><phrase arch='powerpc'>PowerPC</phrase><phrase arch='sparc'>SPARC</phrase><phrase arch='s390'>S/390</phrase>">
 
+<!ENTITY kernelversion "2.6.26">
+
 <!-- general things from installer -->
 <!ENTITY enterkey "<keycap>Enter</keycap>">
 <!ENTITY escapekey "<keycap>Esc</keycap>">