4 files changed, 16 insertions, 6 deletions
diff --git a/scripts/build/arch/m68k.sh b/scripts/build/arch/m68k.sh
new file mode 100644
index 0000000..bf26d1b
--- /dev/null
+++ b/scripts/build/arch/m68k.sh
@@ -0,0 +1,5 @@
+# Compute M68k-specific values
+
+CT_DoArchTupleValues() {
+    :
+}
diff --git a/scripts/build/binutils/elf2flt.sh b/scripts/build/binutils/elf2flt.sh
index b3947a9..aa7f0e0 100644
--- a/scripts/build/binutils/elf2flt.sh
+++ b/scripts/build/binutils/elf2flt.sh
@@ -3,6 +3,13 @@
 # Copyright 2007 Yann E. MORIN
 # Licensed under the GPL v2. See COPYING in the root of this package
 
+# Default: do nothing
+do_elf2flt_get()     { :; }
+do_elf2flt_extract() { :; }
+do_elf2flt()         { :; }
+
+if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then
+
 # Download elf2flt
 do_elf2flt_get() {
     CT_GetCVS "elf2flt-cvs-${CT_ELF2FLT_VERSION}"           \
@@ -20,7 +27,6 @@ do_elf2flt_extract() {
 
 # Build elf2flt
 do_elf2flt() {
-    [ -z ${CT_KERNEL_UCLINUX_BINFMT_FLAT} ] && return 0
     mkdir -p "${CT_BUILD_DIR}/build-elf2flt"
     cd "${CT_BUILD_DIR}/build-elf2flt"
 
@@ -67,3 +73,5 @@ do_elf2flt() {
 
     CT_EndStep
 }
+
+fi # CT_ARCH_BINFMT_FLAT
diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh
index 626086e..777c104 100644
--- a/scripts/build/kernel/linux.sh
+++ b/scripts/build/kernel/linux.sh
@@ -48,11 +48,6 @@ do_kernel_install() {
     mkdir -p "${CT_BUILD_DIR}/build-kernel-headers"
     cd "${CT_BUILD_DIR}/build-kernel-headers"
 
-    # Only starting with 2.6.18 does headers_install is usable. We only
-    # have 2.6 version available, so only test for sublevel.
-    k_sublevel=$(awk '/^SUBLEVEL =/ { print $3 }' "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}/Makefile")
-    [ ${k_sublevel} -ge 18 ] || CT_Abort "Kernel version >= 2.6.18 is needed to install kernel headers."
-
     V_OPT="V=${CT_KERNEL_LINUX_VERBOSE_LEVEL}"
 
     CT_DoLog EXTRA "Installing kernel headers"
diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index ff490de..6ec9393 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -499,6 +499,7 @@ if [ -z "${CT_RESTART}" ]; then
         do_cloog_get
         do_mpc_get
         do_binutils_get
+        do_elf2flt_get
         do_cc_get
         do_libc_get
         do_tools_get
@@ -527,6 +528,7 @@ if [ -z "${CT_RESTART}" ]; then
         do_cloog_extract
         do_mpc_extract
         do_binutils_extract
+        do_elf2flt_extract
         do_cc_extract
         do_libc_extract
         do_tools_extract