From 1635c149a4118736e2f0b2901ae4589eea92e194 Mon Sep 17 00:00:00 2001
From: Dima Krasner <dima@dimakrasner.com>
Date: Tue, 22 Jan 2019 22:33:32 +0200
Subject: Store the uClibc .config alongside the ct-ng .config

Signed-off-by: Dima Krasner <dima@dimakrasner.com>

diff --git a/scripts/crosstool-NG.sh b/scripts/crosstool-NG.sh
index 3e888d7..89c9e60 100644
--- a/scripts/crosstool-NG.sh
+++ b/scripts/crosstool-NG.sh
@@ -616,6 +616,11 @@ if [ -z "${CT_RESTART}" ]; then
     CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/bin"
     CT_DoExecLog DEBUG ${install} -m 0755 "${CT_LIB_DIR}/scripts/toolchain-config.in" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config"
     CT_DoExecLog DEBUG ${sed} -i -e 's,@@grep@@,"'"${grep}"'",;' "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config"
+    if [ -n "$CT_LIBC_UCLIBC_CONFIG_FILE" ]
+    then
+        ${install} -m 0755 "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-libc.config"
+        bzip2 -c -9 "$CT_LIBC_UCLIBC_CONFIG_FILE" >>"${CT_PREFIX_DIR}/bin/${CT_TARGET}-libc.config"
+    fi
     bzip2 -c -9 .config >>"${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config"
 
     CT_DoStep EXTRA "Dumping internal crosstool-NG configuration"
-- 
cgit v0.10.2-6-g49f6


From 2870ffae518798e2f18c110a91a420d65a6e712b Mon Sep 17 00:00:00 2001
From: Dima Krasner <dima@dimakrasner.com>
Date: Wed, 23 Jan 2019 09:52:04 +0200
Subject: Moved uClibc configuration installation to uClibc.sh

Signed-off-by: Dima Krasner <dima@dimakrasner.com>

diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index ccadfeb..9d83c51 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -416,4 +416,8 @@ uClibc_post_cc()
     # Moreover, need to do this after the final compiler is built: on targets
     # that use elf2flt, the core compilers cannot find ld when running elf2flt.
     CT_MultilibFixupLDSO
+
+    if [ -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then
+        CT_InstallConfigurationFile "$CT_LIBC_UCLIBC_CONFIG_FILE" libc
+    fi
 }
diff --git a/scripts/crosstool-NG.sh b/scripts/crosstool-NG.sh
index 89c9e60..9804a6c 100644
--- a/scripts/crosstool-NG.sh
+++ b/scripts/crosstool-NG.sh
@@ -613,15 +613,7 @@ if [ -z "${CT_RESTART}" ]; then
     rm -f "${testc}"
 
     CT_DoLog EXTRA "Installing user-supplied crosstool-NG configuration"
-    CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/bin"
-    CT_DoExecLog DEBUG ${install} -m 0755 "${CT_LIB_DIR}/scripts/toolchain-config.in" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config"
-    CT_DoExecLog DEBUG ${sed} -i -e 's,@@grep@@,"'"${grep}"'",;' "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config"
-    if [ -n "$CT_LIBC_UCLIBC_CONFIG_FILE" ]
-    then
-        ${install} -m 0755 "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-libc.config"
-        bzip2 -c -9 "$CT_LIBC_UCLIBC_CONFIG_FILE" >>"${CT_PREFIX_DIR}/bin/${CT_TARGET}-libc.config"
-    fi
-    bzip2 -c -9 .config >>"${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config"
+    CT_InstallConfigurationFile .config ct-ng
 
     CT_DoStep EXTRA "Dumping internal crosstool-NG configuration"
     CT_DoLog EXTRA "Building a toolchain for:"
diff --git a/scripts/functions b/scripts/functions
index c97b9f4..877426b 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -2453,3 +2453,14 @@ CT_InstallCopyingInformation()
 
     shopt -u nullglob
 }
+
+CT_InstallConfigurationFile()
+{
+    local path="${1}"
+    local suffix="${2}"
+
+    CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/bin"
+    CT_DoExecLog DEBUG ${install} -m 0755 "${CT_LIB_DIR}/scripts/toolchain-config.in" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-$suffix.config"
+    CT_DoExecLog DEBUG ${sed} -i -e 's,@@grep@@,"'"${grep}"'",;' "${CT_PREFIX_DIR}/bin/${CT_TARGET}-$suffix.config"
+    bzip2 -c -9 "$1" >>"${CT_PREFIX_DIR}/bin/${CT_TARGET}-$suffix.config"
+}
-- 
cgit v0.10.2-6-g49f6


From d44a62696841c772dc1164b1055b016e0073a301 Mon Sep 17 00:00:00 2001
From: Dima Krasner <dima@dimakrasner.com>
Date: Wed, 23 Jan 2019 09:54:29 +0200
Subject: Coding style fix in uClibc.sh

Signed-off-by: Dima Krasner <dima@dimakrasner.com>

diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index 9d83c51..5ea5c58 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -418,6 +418,6 @@ uClibc_post_cc()
     CT_MultilibFixupLDSO
 
     if [ -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then
-        CT_InstallConfigurationFile "$CT_LIBC_UCLIBC_CONFIG_FILE" libc
+        CT_InstallConfigurationFile "${CT_LIBC_UCLIBC_CONFIG_FILE}" libc
     fi
 }
-- 
cgit v0.10.2-6-g49f6


From de797aa99d7b380cdef6c0146ae4cc68d10e089d Mon Sep 17 00:00:00 2001
From: Dima Krasner <dima@dimakrasner.com>
Date: Wed, 23 Jan 2019 09:56:05 +0200
Subject: Coding style fixes in functions

Signed-off-by: Dima Krasner <dima@dimakrasner.com>

diff --git a/scripts/functions b/scripts/functions
index 877426b..618298a 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -2460,7 +2460,7 @@ CT_InstallConfigurationFile()
     local suffix="${2}"
 
     CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/bin"
-    CT_DoExecLog DEBUG ${install} -m 0755 "${CT_LIB_DIR}/scripts/toolchain-config.in" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-$suffix.config"
-    CT_DoExecLog DEBUG ${sed} -i -e 's,@@grep@@,"'"${grep}"'",;' "${CT_PREFIX_DIR}/bin/${CT_TARGET}-$suffix.config"
-    bzip2 -c -9 "$1" >>"${CT_PREFIX_DIR}/bin/${CT_TARGET}-$suffix.config"
+    CT_DoExecLog DEBUG ${install} -m 0755 "${CT_LIB_DIR}/scripts/toolchain-config.in" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${suffix}.config"
+    CT_DoExecLog DEBUG ${sed} -i -e 's,@@grep@@,"'"${grep}"'",;' "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${suffix}.config"
+    bzip2 -c -9 "${path}" >>"${CT_PREFIX_DIR}/bin/${CT_TARGET}-${suffix}.config"
 }
-- 
cgit v0.10.2-6-g49f6