Merge lp:~dooferlad/linaro-android-build-tools/ramdisk_default_0 into lp:linaro-android-build-tools

Proposed by James Tunnicliffe
Status: Merged
Approved by: Paul Sokolovsky
Approved revision: 502
Merged at revision: 502
Proposed branch: lp:~dooferlad/linaro-android-build-tools/ramdisk_default_0
Merge into: lp:linaro-android-build-tools
Diff against target: 14 lines (+4/-0)
1 file modified
node/build (+4/-0)
To merge this branch: bzr merge lp:~dooferlad/linaro-android-build-tools/ramdisk_default_0
Reviewer Review Type Date Requested Status
Paul Sokolovsky Approve
Review via email: mp+121185@code.launchpad.net

Description of the change

Size of ramdisk defaults to 0.

To post a comment you must log in.
Revision history for this message
Paul Sokolovsky (pfalcon) wrote :

Looks good, as discussed in the mail.

review: Approve
Revision history for this message
Paul Sokolovsky (pfalcon) wrote :

Merged this.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'node/build'
--- node/build 2012-04-24 08:37:51 +0000
+++ node/build 2012-08-24 13:51:18 +0000
@@ -63,6 +63,10 @@
6363
64ramdisk_size=$(get_ramdisk_size $2)64ramdisk_size=$(get_ramdisk_size $2)
6565
66if [ -z "$ramdisk_size" ]; then
67 ramdisk_size=0
68fi
69
66# Put build/* on a ramdisk to speed up build70# Put build/* on a ramdisk to speed up build
67if [ -z "$ramdisk_size" -o "$ramdisk_size" != "0" ]; then71if [ -z "$ramdisk_size" -o "$ramdisk_size" != "0" ]; then
68 mem_total=`cat /proc/meminfo | grep MemTotal | sed -s 's/[^0-9]*\([0-9]*\) kB/\1/'`72 mem_total=`cat /proc/meminfo | grep MemTotal | sed -s 's/[^0-9]*\([0-9]*\) kB/\1/'`

Subscribers

People subscribed via source and target branches