Fix glibc and uClibc downloading and extracting.

Although we no longer need the kernel config file, we now need to specify the kernel source directory when installing headers.
Re-order components downloading to match build order.
Fix the saveSample.sh script in case the referenced files are the same as the destination files.

3 files changed, 15 insertions, 3 deletions

diff --git a/scripts/build/kernel_linux.sh b/scripts/build/kernel_linux.sh
index 985cd86..617740b 100644
--- a/scripts/build/kernel_linux.sh
+++ b/scripts/build/kernel_linux.sh
@@ -102,13 +102,17 @@ do_kernel_install() {
     esac
 
     CT_DoLog EXTRA "Installing kernel headers"
-    make ARCH=${CT_KERNEL_ARCH}                     \
+    make -C "${CT_SRC_DIR}/${CT_KERNEL_FILE}"       \
+         O="`pwd`"                                  \
+         ARCH=${CT_KERNEL_ARCH}                     \
          INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr"   \
          ${V_OPT}                                   \
          headers_install                            2>&1 |CT_DoLog DEBUG
 
     CT_DoLog EXTRA "Checking installed headers"
-    make ARCH=${CT_KERNEL_ARCH}                     \
+    make -C "${CT_SRC_DIR}/${CT_KERNEL_FILE}"       \
+         O="`pwd`"                                  \
+         ARCH=${CT_KERNEL_ARCH}                     \
          INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr"   \
          ${V_OPT}                                   \
          headers_check                              2>&1 |CT_DoLog DEBUG
diff --git a/scripts/build/libc_glibc.sh b/scripts/build/libc_glibc.sh
index 8b3a6d0..4100ca0 100644
--- a/scripts/build/libc_glibc.sh
+++ b/scripts/build/libc_glibc.sh
@@ -3,7 +3,7 @@
 # Licensed under the GPL v2. See COPYING in the root of this package
 
 # Download glibc
-do_libc_download() {
+do_libc_get() {
     # Ah! Not all GNU folks seem stupid. All glibc releases are in the same
     # directory. Good. Alas, there is no snapshot there. I'll deal with them
     # later on... :-/
@@ -15,6 +15,8 @@ do_libc_download() {
         CT_GetFile "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" ftp://ftp.gnu.org/gnu/glibc
     done
     [ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && CT_GetFile "${CT_LIBC}-ports-${CT_LIBC_VERSION}" ftp://ftp.gnu.org/gnu/glibc
+
+    return 0
 }
 
 # Extract glibc
@@ -27,6 +29,8 @@ do_libc_extract() {
         CT_ExtractAndPatch "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}"
     done
     [ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && CT_ExtractAndPatch "${CT_LIBC}-ports-${CT_LIBC_VERSION}"
+
+    return 0
 }
 
 # There is nothing to do for glibc check config
diff --git a/scripts/build/libc_uClibc.sh b/scripts/build/libc_uClibc.sh
index 5b1504c..0981ce9 100644
--- a/scripts/build/libc_uClibc.sh
+++ b/scripts/build/libc_uClibc.sh
@@ -13,6 +13,8 @@ do_libc_get() {
     CT_GetFile "${CT_LIBC_FILE}" ${libc_src}
     # uClibc locales
     [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_GetFile "uClibc-locale-030818" ${libc_src}
+
+    return 0
 }
 
 # Extract uClibc
@@ -20,6 +22,8 @@ do_libc_extract() {
     CT_ExtractAndPatch "${CT_LIBC_FILE}"
     # uClibc locales
     [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_ExtractAndPatch "uClibc-locale-030818"
+
+    return 0
 }
 
 # Check that uClibc has been previously configured