Replace kernel package name and version with &kernelpackage; and &kernelversion;

5 files changed, 8 insertions, 3 deletions

diff --git a/build/arch-options/hurd b/build/arch-options/hurd
index 48a4c7323..fc6f977fd 100644
--- a/build/arch-options/hurd
+++ b/build/arch-options/hurd
@@ -4,3 +4,5 @@
 archspec="$archspec;hurd-any"
 arch_kernel="Hurd"
 arch_parttype="Linux"
+kernelversion="1.3.99"
+kernelpackage="gnumach"
diff --git a/build/arch-options/kfreebsd b/build/arch-options/kfreebsd
index b4796d976..c3cc4c813 100644
--- a/build/arch-options/kfreebsd
+++ b/build/arch-options/kfreebsd
@@ -4,3 +4,5 @@
 archspec="$archspec;kfreebsd-any"
 arch_kernel="kFreeBSD"
 arch_parttype="FreeBSD"
+kernelversion="8"
+kernelpackage="kfreebsd-image"
diff --git a/build/arch-options/linux b/build/arch-options/linux
index 93904f7af..024a9f2f4 100644
--- a/build/arch-options/linux
+++ b/build/arch-options/linux
@@ -4,3 +4,5 @@
 archspec="$archspec;linux-any"
 arch_kernel="Linux"
 arch_parttype="Linux"
+kernelversion="2.6.32"
+kernelpackage="linux-image"
diff --git a/build/buildone.sh b/build/buildone.sh
index 23fd16543..0193a4508 100755
--- a/build/buildone.sh
+++ b/build/buildone.sh
@@ -87,7 +87,8 @@ create_profiled () {
     echo "<!ENTITY arch-listname \"${arch_listname}\">" >> $dynamic
     echo "<!ENTITY arch-porturl \"${arch_porturl}\">" >> $dynamic
     echo "<!ENTITY arch-parttype \"${arch_parttype}\">" >> $dynamic
-    echo "<!ENTITY altkernelversion \"${altkernelversion}\">" >> $dynamic
+    echo "<!ENTITY kernelversion \"${kernelversion}\">" >> $dynamic
+    echo "<!ENTITY kernelpackage \"${kernelpackage}\">" >> $dynamic
     echo "<!ENTITY smp-config-section \"${smp_config_section}\">" >> $dynamic
     echo "<!ENTITY smp-config-option \"${smp_config_option}\">" >> $dynamic
     echo "<!ENTITY minimum-memory \"${minimum_memory}&notation-megabytes;\">" >> $dynamic
diff --git a/build/entities/common.ent b/build/entities/common.ent
index 4836e06b5..9cefbbe9b 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -19,8 +19,6 @@
 <!ENTITY arch-title
   "<phrase arch='any-amd64'>AMD64</phrase><phrase arch='arm'>ARM</phrase><phrase arch='hppa'>PA-RISC</phrase><phrase arch='any-i386'>Intel x86</phrase><phrase arch='ia64'>IA-64</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.32">
-
 <!-- general things from installer -->
 <!ENTITY enterkey "<keycap>Enter</keycap>">
 <!ENTITY escapekey "<keycap>Esc</keycap>">