1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1310507544 -7200
# Node ID 1ebc2248cc60230cd53ff94ae8f8f1e3261461a3
# Parent f1c730da41f3b22ca1a1e1b14592da4b7c078797
scripts, cc/gcc: do not fail on existing symlinks or build.log
If the user builds a toolchain over an existing one, so, without removing
CT_PREFIX_DIR, the build fails as the symlinks already exist, as does the
build.log.
This can also happen (for build.log) if the user first ran in download-
or extract-only.
Patch (with no SoB) originally from:
Phil Wilshire <phil.wilshire@overturenetworks.com>
Modified by me as it did not apply cleanly.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
diff -r f1c730da41f3 -r 1ebc2248cc60 scripts/build/cc/gcc.sh
--- a/scripts/build/cc/gcc.sh Tue Jul 12 23:21:27 2011 +0200
+++ b/scripts/build/cc/gcc.sh Tue Jul 12 23:52:24 2011 +0200
@@ -386,7 +386,7 @@
# check whether compiler has an extension
file="$( ls -1 "${core_prefix_dir}/bin/${CT_TARGET}-gcc."* 2>/dev/null || true )"
[ -z "${file}" ] || ext=".${file##*.}"
- CT_DoExecLog ALL ln -sv "${CT_TARGET}-gcc${ext}" "${core_prefix_dir}/bin/${CT_TARGET}-cc${ext}"
+ CT_DoExecLog ALL ln -sfv "${CT_TARGET}-gcc${ext}" "${core_prefix_dir}/bin/${CT_TARGET}-cc${ext}"
CT_EndStep
}
@@ -630,7 +630,7 @@
# check whether compiler has an extension
file="$( ls -1 "${CT_PREFIX_DIR}/bin/${CT_TARGET}-gcc."* 2>/dev/null || true )"
[ -z "${file}" ] || ext=".${file##*.}"
- CT_DoExecLog ALL ln -sv "${CT_TARGET}-gcc${ext}" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-cc${ext}"
+ CT_DoExecLog ALL ln -sfv "${CT_TARGET}-gcc${ext}" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-cc${ext}"
CT_EndStep
}
diff -r f1c730da41f3 -r 1ebc2248cc60 scripts/build/internals.sh
--- a/scripts/build/internals.sh Tue Jul 12 23:21:27 2011 +0200
+++ b/scripts/build/internals.sh Tue Jul 12 23:52:24 2011 +0200
@@ -86,14 +86,14 @@
for t in "${CT_TARGET}-"*; do
if [ -n "${CT_TARGET_ALIAS}" ]; then
_t=$(echo "$t" |sed -r -e 's/^'"${CT_TARGET}"'-/'"${CT_TARGET_ALIAS}"'-/;')
- CT_DoExecLog ALL ln -sv "${t}" "${_t}"
+ CT_DoExecLog ALL ln -sfv "${t}" "${_t}"
fi
if [ -n "${CT_TARGET_ALIAS_SED_EXPR}" ]; then
_t=$(echo "$t" |sed -r -e "${CT_TARGET_ALIAS_SED_EXPR}")
if [ "${_t}" = "${t}" ]; then
CT_DoLog WARN "The sed expression '${CT_TARGET_ALIAS_SED_EXPR}' has no effect on '${t}'"
else
- CT_DoExecLog ALL ln -sv "${t}" "${_t}"
+ CT_DoExecLog ALL ln -sfv "${t}" "${_t}"
fi
fi
done
diff -r f1c730da41f3 -r 1ebc2248cc60 scripts/crosstool-NG.sh.in
--- a/scripts/crosstool-NG.sh.in Tue Jul 12 23:21:27 2011 +0200
+++ b/scripts/crosstool-NG.sh.in Tue Jul 12 23:52:24 2011 +0200
@@ -604,7 +604,7 @@
# moment... Consign all ouptut to oblivion...
CT_DoLog INFO "Finishing installation (may take a few seconds)..."
exec >/dev/null 2>&1
-
+rm -f ${CT_PREFIX_DIR}/build.log.bz2
if [ "${CT_LOG_TO_FILE}" = "y" ]; then
cp "${tmp_log_file}" "${CT_PREFIX_DIR}/build.log"
if [ "${CT_LOG_FILE_COMPRESS}" = y ]; then
|
