diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-05 07:58:08 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-05 07:58:08 +0100 |
| commit | 8abe85c5a6920e3cea42c75193d22669285b84c7 (patch) | |
| tree | 6985f1e5342581bccc8820424228195604dab923 /mk | |
| parent | b43e909de4cbeb1393db9116296b4683d0ae25d7 (diff) | |
| parent | c5ad4bdcdb9f3e0591e8943fe8b5302b76637b71 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 3 | ||||
| -rw-r--r-- | mk/vars.mk | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mk/build.mk b/mk/build.mk index 400125694..77b70a3f8 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -12,12 +12,12 @@ CONFIG_CONFIG_IN = Config.in CONFIG = config DEFCONFIG= ADK_DEBUG=n \ ADK_STATIC=n \ + ADK_WGET_TIMEOUT=180 \ ADK_MAKE_PARALLEL=y \ ADK_MAKE_JOBS=4 \ ADK_LEAVE_ETC_ALONE=n \ ADK_SIMPLE_NETWORK_CONFIG=n \ ADK_USE_CCACHE=n \ - ADK_TOOLCHAIN_GDB=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_E2FSCK_STATIC=n \ ADK_PACKAGE_KEXECINIT=n \ @@ -36,6 +36,7 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_URLGRABBER=n \ ADK_PACKAGE_LIBSSP=n \ ADK_PACKAGE_OPENAFS=n \ + ADK_PACKAGE_OPENJDK7=n \ ADK_PKG_XORG=n \ ADK_PKG_MPDBOX=n \ ADK_PKG_DEVELOPMENT=n \ diff --git a/mk/vars.mk b/mk/vars.mk index 796274bb9..349c1ebb6 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -218,7 +218,7 @@ QUIET:= else QUIET:= --quiet endif -FETCH_CMD?= wget --timeout=40 -t 3 $(QUIET) +FETCH_CMD?= wget --timeout=$(ADK_WGET_TIMEOUT) -t 3 $(QUIET) ifeq ($(ADK_HOST_CYGWIN),y) EXEEXT:= .exe |