diff options
author | Kai Kang <kai.kang@windriver.com> | 2013-06-19 13:34:57 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-19 18:03:34 +0100 |
commit | be58154bafed7dc9b37be3221a0a6390a2c77b37 (patch) | |
tree | ec286366bb1b66de7d18dc46873d9a99d78e55f0 /meta | |
parent | cc53a1af6f2c695299c90f7333de081c54be81b7 (diff) | |
download | poky-be58154bafed7dc9b37be3221a0a6390a2c77b37.tar.gz |
autogen-native: fix build failure on overloaded hosts
On some overloaded hosts, shell commands of autogen may can not
finish in 5 secs. This has caused many build failures, so increase
the timeout limit to fix this.
(From OE-Core rev: 92c7a0bec3f3c9fec04a6019aa9cee395ba5a9ab)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/autogen/autogen-native_5.17.4.bb | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/autogen/files/increase-timeout-limit.patch | 33 |
2 files changed, 35 insertions, 1 deletions
diff --git a/meta/recipes-devtools/autogen/autogen-native_5.17.4.bb b/meta/recipes-devtools/autogen/autogen-native_5.17.4.bb index e5234c2909..230c3a798c 100644 --- a/meta/recipes-devtools/autogen/autogen-native_5.17.4.bb +++ b/meta/recipes-devtools/autogen/autogen-native_5.17.4.bb | |||
@@ -9,7 +9,8 @@ LICENSE = "GPLv3" | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
10 | 10 | ||
11 | SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \ | 11 | SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \ |
12 | file://guile.patch" | 12 | file://guile.patch \ |
13 | file://increase-timeout-limit.patch" | ||
13 | 14 | ||
14 | SRC_URI[md5sum] = "09f074cba57610bf4ef1147e01c8ae90" | 15 | SRC_URI[md5sum] = "09f074cba57610bf4ef1147e01c8ae90" |
15 | SRC_URI[sha256sum] = "cd2585f4794d0e9d7f2cb0b9af4f2bd429946e718473edf1cf8c49f081ca71ed" | 16 | SRC_URI[sha256sum] = "cd2585f4794d0e9d7f2cb0b9af4f2bd429946e718473edf1cf8c49f081ca71ed" |
diff --git a/meta/recipes-devtools/autogen/files/increase-timeout-limit.patch b/meta/recipes-devtools/autogen/files/increase-timeout-limit.patch new file mode 100644 index 0000000000..3d4c1d604e --- /dev/null +++ b/meta/recipes-devtools/autogen/files/increase-timeout-limit.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | Subject: [PATCH] autogen: increase timeout limit for shell commands | ||
2 | |||
3 | On some overloaded hosts, shell commands of autogen may can not | ||
4 | finish in 5 secs. This has caused many build failures, so increase | ||
5 | the timeout limit to fix this. | ||
6 | |||
7 | Upstream-Status: Inappropriate [configuration] | ||
8 | |||
9 | Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> | ||
10 | --- | ||
11 | configure.ac | 6 +++--- | ||
12 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
13 | |||
14 | diff --git a/configure.ac b/configure.ac | ||
15 | index 0af7c18..5544f59 100644 | ||
16 | --- a/configure.ac | ||
17 | +++ b/configure.ac | ||
18 | @@ -175,9 +175,9 @@ config_end_time=`date +%s 2>/dev/null` | ||
19 | time_delta=`expr ${config_end_time} - ${config_start_time} 2>/dev/null` | ||
20 | |||
21 | if test -z "${time_delta}" | ||
22 | -then time_delta=10 | ||
23 | -elif test ${time_delta} -lt 5 | ||
24 | -then time_delta=5 ; fi | ||
25 | +then time_delta=60 | ||
26 | +elif test ${time_delta} -lt 30 | ||
27 | +then time_delta=30 ; fi | ||
28 | |||
29 | AG_TIMEOUT=${time_delta} | ||
30 | ] | ||
31 | -- | ||
32 | 1.7.9.5 | ||
33 | |||