diff options
| author | Simon Rettberg | 2013-05-14 16:41:56 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-05-14 16:41:56 +0200 |
| commit | 113ce521770232a6d99cdb07dd55d8879214c213 (patch) | |
| tree | c1233152bfb18b8bd427cf3a1178900bfd768d8c /remote/modules/kernel/kernel.build | |
| parent | ultrastracke 2 (diff) | |
| parent | ultrastracke update (diff) | |
| download | tm-scripts-113ce521770232a6d99cdb07dd55d8879214c213.tar.gz tm-scripts-113ce521770232a6d99cdb07dd55d8879214c213.tar.xz tm-scripts-113ce521770232a6d99cdb07dd55d8879214c213.zip | |
Merge branch 'master' of openslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/kernel/kernel.build')
| -rw-r--r-- | remote/modules/kernel/kernel.build | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/remote/modules/kernel/kernel.build b/remote/modules/kernel/kernel.build index 1d8e41a7..63b0a336 100644 --- a/remote/modules/kernel/kernel.build +++ b/remote/modules/kernel/kernel.build @@ -45,11 +45,12 @@ build() { make oldconfig || perror "make oldconfig failed" fi pinfo "Kompaliere kernel... (this will take some time)" - if gcc --version | grep "4\.7"; then + if gcc --version | grep "4\.7" && which distcc; then pinfo "USING DISTCC" make CC="distcc gcc-4.7" -j16 || perror "make failed" else - make || perror "make failed" + # explicitly state number of cores here, as MAKEFLAGS seems to be overridden + make "-j$CPU_CORES" || perror "make failed" fi # install modules to build directory @@ -115,7 +116,7 @@ patch_aufs() { git checkout origin/aufs$NEEDED_BRANCH pinfo "Starting to patch..." tar c include/linux/aufs_type.h Documentation fs | tar x -C ../ksrc - cd ../ksrc + cd ../ksrc || perror "cd nicht geklappt: ../ksrc" patch -p1 < ../aufs3-standalone/aufs3-kbuild.patch || perror "aufs3-standalone/aufs3-kbuild.patch failed" patch -p1 < ../aufs3-standalone/aufs3-base.patch || perror "aufs3-standalone/aufs3-base.patch failed" patch -p1 < ../aufs3-standalone/aufs3-proc_map.patch || perror "aufs3-standalone/aufs3-proc_map.patch failed" |