Factorize os-specific parameters in build/arch-options.

18 files changed, 34 insertions, 39 deletions

diff --git a/build/arch-options/amd64 b/build/arch-options/amd64
index d72b00ec4..7b9ce9ce9 100644
--- a/build/arch-options/amd64
+++ b/build/arch-options/amd64
@@ -2,11 +2,9 @@
 # the 'amd64' architecture
 # It is sourced by the build scripts
 
-archspec="amd64;any-amd64;x86;any-x86;not-s390;not-powerpc;linux-any"
+archspec="amd64;any-amd64;x86;any-x86;not-s390;not-powerpc"
 arch_listname="amd64"
 arch_porturl="amd64"
-arch_kernel="Linux"
-arch_parttype="Linux"
 minimum_memory=56
 minimum_memory_gtk=96
 # These two options should be set if condition 'smp' is set below
diff --git a/build/arch-options/armel b/build/arch-options/armel
index 568c28228..ec1e1af5f 100644
--- a/build/arch-options/armel
+++ b/build/arch-options/armel
@@ -6,11 +6,9 @@
 # and also continue to use "arm" for arch-specific XML-files in order
 # to minimize impact on translations.
 
-archspec="arm;not-x86;not-s390;not-powerpc;linux-any"
+archspec="arm;not-x86;not-s390;not-powerpc"
 arch_listname="arm"
 arch_porturl="arm"
-arch_kernel="Linux"
-arch_parttype="Linux"
 minimum_memory=32
 # These two options should be set if condition 'smp' is set below
 smp_config_section="N/A"
diff --git a/build/arch-options/hppa b/build/arch-options/hppa
index 75acda562..baa6bfba7 100644
--- a/build/arch-options/hppa
+++ b/build/arch-options/hppa
@@ -2,11 +2,9 @@
 # the 'hppa' architecture
 # It is sourced by the build scripts
 
-archspec="hppa;not-x86;not-s390;not-powerpc;linux-any"
+archspec="hppa;not-x86;not-s390;not-powerpc"
 arch_listname="hppa"
 arch_porturl="hppa"
-arch_kernel="Linux"
-arch_parttype="Linux"
 minimum_memory=32
 # These two options should be set if condition 'smp' is set below
 smp_config_section="Processor type and features"
diff --git a/build/arch-options/hurd b/build/arch-options/hurd
new file mode 100644
index 000000000..48a4c7323
--- /dev/null
+++ b/build/arch-options/hurd
@@ -0,0 +1,6 @@
+# This file contains os specific variables for the 'hurd' os
+# It is sourced by the build scripts
+
+archspec="$archspec;hurd-any"
+arch_kernel="Hurd"
+arch_parttype="Linux"
diff --git a/build/arch-options/hurd-i386 b/build/arch-options/hurd-i386
index f9973609c..df921899f 100644
--- a/build/arch-options/hurd-i386
+++ b/build/arch-options/hurd-i386
@@ -2,11 +2,9 @@
 # the 'i386' architecture
 # It is sourced by the build scripts
 
-archspec="hurd-i386;any-i386;any-x86;not-x86;not-s390;not-powerpc;hurd-any"
+archspec="hurd-i386;any-i386;any-x86;not-x86;not-s390;not-powerpc"
 arch_listname="hurd"
 arch_porturl="hurd"
-arch_kernel="Hurd"
-arch_parttype="Linux"
 # TODO: update
 minimum_memory=44
 minimum_memory_gtk=96
diff --git a/build/arch-options/i386 b/build/arch-options/i386
index befde767e..d4aea5c6f 100644
--- a/build/arch-options/i386
+++ b/build/arch-options/i386
@@ -2,11 +2,9 @@
 # the 'i386' architecture
 # It is sourced by the build scripts
 
-archspec="i386;any-i386;x86;any-x86;not-s390;not-powerpc;linux-any"
+archspec="i386;any-i386;x86;any-x86;not-s390;not-powerpc"
 arch_listname="boot"
 arch_porturl="i386"
-arch_kernel="Linux"
-arch_parttype="Linux"
 minimum_memory=44
 minimum_memory_gtk=96
 # 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 b1b4572b9..836e7684b 100644
--- a/build/arch-options/ia64
+++ b/build/arch-options/ia64
@@ -2,11 +2,9 @@
 # the 'ia64' architecture
 # It is sourced by the build scripts
 
-archspec="ia64;not-x86;not-s390;not-powerpc;linux-any"
+archspec="ia64;not-x86;not-s390;not-powerpc"
 arch_listname="ia64"
 arch_porturl="ia64"
-arch_kernel="Linux"
-arch_parttype="Linux"
 minimum_memory=32
 # These two options should be set if condition 'smp' is set below
 smp_config_section="General setup"
diff --git a/build/arch-options/kfreebsd b/build/arch-options/kfreebsd
new file mode 100644
index 000000000..b4796d976
--- /dev/null
+++ b/build/arch-options/kfreebsd
@@ -0,0 +1,6 @@
+# This file contains os specific variables for the 'kfreebsd' os
+# It is sourced by the build scripts
+
+archspec="$archspec;kfreebsd-any"
+arch_kernel="kFreeBSD"
+arch_parttype="FreeBSD"
diff --git a/build/arch-options/kfreebsd-amd64 b/build/arch-options/kfreebsd-amd64
index a1cc34437..f448dc695 100644
--- a/build/arch-options/kfreebsd-amd64
+++ b/build/arch-options/kfreebsd-amd64
@@ -2,11 +2,9 @@
 # the 'kfreebsd-amd64' architecture
 # It is sourced by the build scripts
 
-archspec="kfreebsd-amd64;any-amd64;any-x86;not-x86;not-s390;not-powerpc;kfreebsd-any"
+archspec="kfreebsd-amd64;any-amd64;any-x86;not-x86;not-s390;not-powerpc"
 arch_listname="bsd"
 arch_porturl="kfreebsd-gnu"
-arch_kernel="kFreeBSD"
-arch_parttype="FreeBSD"
 # TODO: update
 minimum_memory=56
 minimum_memory_gtk=96
diff --git a/build/arch-options/kfreebsd-i386 b/build/arch-options/kfreebsd-i386
index 700b26335..6a83c0bad 100644
--- a/build/arch-options/kfreebsd-i386
+++ b/build/arch-options/kfreebsd-i386
@@ -2,11 +2,9 @@
 # the 'kfreebsd-i386' architecture
 # It is sourced by the build scripts
 
-archspec="kfreebsd-i386;any-i386;any-x86;not-x86;not-s390;not-powerpc;kfreebsd-any"
+archspec="kfreebsd-i386;any-i386;any-x86;not-x86;not-s390;not-powerpc"
 arch_listname="bsd"
 arch_porturl="kfreebsd-gnu"
-arch_kernel="kFreeBSD"
-arch_parttype="FreeBSD"
 # TODO: update
 minimum_memory=44
 minimum_memory_gtk=96
diff --git a/build/arch-options/linux b/build/arch-options/linux
new file mode 100644
index 000000000..93904f7af
--- /dev/null
+++ b/build/arch-options/linux
@@ -0,0 +1,6 @@
+# This file contains os specific variables for the 'linux' os
+# It is sourced by the build scripts
+
+archspec="$archspec;linux-any"
+arch_kernel="Linux"
+arch_parttype="Linux"
diff --git a/build/arch-options/mips b/build/arch-options/mips
index cfbe294a8..136f3a373 100644
--- a/build/arch-options/mips
+++ b/build/arch-options/mips
@@ -2,11 +2,9 @@
 # the 'mips' architecture
 # It is sourced by the build scripts
 
-archspec="mips;not-x86;not-s390;not-powerpc;linux-any"
+archspec="mips;not-x86;not-s390;not-powerpc"
 arch_listname="mips"
 arch_porturl="mips"
-arch_kernel="Linux"
-arch_parttype="Linux"
 minimum_memory=32
 # These two options should be set if condition 'smp' is set below
 smp_config_section="N/A"
diff --git a/build/arch-options/mipsel b/build/arch-options/mipsel
index 81a8d8381..87ea761cf 100644
--- a/build/arch-options/mipsel
+++ b/build/arch-options/mipsel
@@ -2,11 +2,9 @@
 # the 'mipsel' architecture
 # It is sourced by the build scripts
 
-archspec="mipsel;not-x86;not-s390;not-powerpc;linux-any"
+archspec="mipsel;not-x86;not-s390;not-powerpc"
 arch_listname="mips"
 arch_porturl="mips"
-arch_kernel="Linux"
-arch_parttype="Linux"
 minimum_memory=32
 # These two options should be set if condition 'smp' is set below
 smp_config_section="N/A"
diff --git a/build/arch-options/powerpc b/build/arch-options/powerpc
index f5d9865d7..57bb6cebc 100644
--- a/build/arch-options/powerpc
+++ b/build/arch-options/powerpc
@@ -2,11 +2,9 @@
 # the 'powerpc' architecture
 # It is sourced by the build scripts
 
-archspec="powerpc;not-s390;not-x86;linux-any"
+archspec="powerpc;not-s390;not-x86"
 arch_listname="powerpc"
 arch_porturl="powerpc"
-arch_kernel="Linux"
-arch_parttype="Linux"
 minimum_memory=32
 minimum_memory_gtk=128
 # 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 6f840fa06..c6cd082e2 100644
--- a/build/arch-options/s390
+++ b/build/arch-options/s390
@@ -2,11 +2,9 @@
 # the 's390' architecture
 # It is sourced by the build scripts
 
-archspec="s390;not-powerpc;not-x86;linux-any"
+archspec="s390;not-powerpc;not-x86"
 arch_listname="s390"
 arch_porturl="s390"
-arch_kernel="Linux"
-arch_parttype="Linux"
 minimum_memory=20
 # These two options should be set if condition 'smp' is set below
 smp_config_section="Processor type and features"
diff --git a/build/arch-options/sparc b/build/arch-options/sparc
index 848113b01..637ed2275 100644
--- a/build/arch-options/sparc
+++ b/build/arch-options/sparc
@@ -2,11 +2,9 @@
 # the 'sparc' architecture
 # It is sourced by the build scripts
 
-archspec="sparc;not-x86;not-s390;not-powerpc;linux-any"
+archspec="sparc;not-x86;not-s390;not-powerpc"
 arch_listname="sparc"
 arch_porturl="sparc"
-arch_kernel="Linux"
-arch_parttype="Linux"
 minimum_memory=32
 # These two options should be set if condition 'smp' is set below
 smp_config_section="General setup"
diff --git a/build/buildone.sh b/build/buildone.sh
index e4f07a60a..23fd16543 100755
--- a/build/buildone.sh
+++ b/build/buildone.sh
@@ -64,6 +64,8 @@ create_profiled () {
         return 1
     }
     . arch-options/$arch
+    os=`dpkg-architecture -a$arch -qDEB_HOST_ARCH_OS 2> /dev/null`
+    . arch-options/$os
 
     # Now we source the profiling information for the current language
     if [ -f "lang-options/${language}" ]; then
diff --git a/debian/changelog b/debian/changelog
index 83a6213f5..0716dbf9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ installation-guide (2010xxxx) UNRELEASED; urgency=low
     review from BSD people.
   * Fix "preparing", "using-d-i", "boot-new", "post-install", "howto",
     "preseed", "partitioning", and "random-bits" parts for non-Linux ports.
+  * Factorize os-specific parameters in build/arch-options.
 
   [ Joey Hess ]
   * Update USB stick documentation to reflect isohybird mini.iso files,