File tree 4 files changed +23
-1
lines changed
4 files changed +23
-1
lines changed Original file line number Diff line number Diff line change 27
27
# * make NOSTRETCH=1 KEEP_SLAVE_ON=yes <any jessie target>
28
28
# * SOURCE_FOLDER: host path to be mount as /var/$(USER)/src, only effective when KEEP_SLAVE_ON=yes
29
29
# * SONIC_BUILD_JOBS: Specifying number of concurrent build job(s) to run
30
+ # * VS_PREPARE_MEM: Prepare memory in VS build (drop cache and compact).
31
+ # * Default: yes
32
+ # * Values: yes, no
30
33
# * KERNEL_PROCURE_METHOD: Specifying method of obtaining kernel Debian package: download or build
31
34
#
32
35
###############################################################################
@@ -114,6 +117,7 @@ SONIC_BUILD_INSTRUCTION := make \
114
117
PASSWORD=$(PASSWORD) \
115
118
USERNAME=$(USERNAME) \
116
119
SONIC_BUILD_JOBS=$(SONIC_BUILD_JOBS) \
120
+ VS_PREPARE_MEM=$(VS_PREPARE_MEM) \
117
121
KERNEL_PROCURE_METHOD=$(KERNEL_PROCURE_METHOD) \
118
122
HTTP_PROXY=$(http_proxy) \
119
123
HTTPS_PROXY=$(https_proxy) \
Original file line number Diff line number Diff line change 1
- #! /bin/sh -ex
1
+ #! /bin/bash -ex
2
2
3
3
# Copyright (C) 2014 Curt Brune <[email protected] >
4
4
#
@@ -47,6 +47,15 @@ prepare_installer_disk()
47
47
create_disk
48
48
prepare_installer_disk
49
49
50
+ echo " Prepare memory for KVM build: $vs_build_prepare_mem "
51
+ free -m
52
+ if [[ " $vs_build_prepare_mem " == " yes" ]]; then
53
+ # Force o.s. to drop cache and compact memory so that KVM can get 2G memory
54
+ sudo bash -c ' echo 1 > /proc/sys/vm/drop_caches'
55
+ sudo bash -c ' echo 1 > /proc/sys/vm/compact_memory'
56
+ free -m
57
+ fi
58
+
50
59
/usr/bin/kvm -m $MEM \
51
60
-name " onie" \
52
61
-boot " order=cd,once=d" -cdrom " $ONIE_RECOVERY_ISO " \
Original file line number Diff line number Diff line change @@ -84,3 +84,6 @@ DEFAULT_KERNEL_PROCURE_METHOD = build
84
84
# group during installation.
85
85
FRR_USER_UID = 1000
86
86
FRR_USER_GID = 1000
87
+
88
+ # Default VS build memory preparation
89
+ DEFAULT_VS_PREPARE_MEM = yes
Original file line number Diff line number Diff line change @@ -109,6 +109,10 @@ ifeq ($(SONIC_BUILD_JOBS),)
109
109
override SONIC_BUILD_JOBS := $(SONIC_CONFIG_BUILD_JOBS )
110
110
endif
111
111
112
+ ifeq ($(VS_PREPARE_MEM ) ,)
113
+ override VS_PREPARE_MEM := $(DEFAULT_VS_PREPARE_MEM )
114
+ endif
115
+
112
116
ifeq ($(KERNEL_PROCURE_METHOD ) ,)
113
117
override KERNEL_PROCURE_METHOD := $(DEFAULT_KERNEL_PROCURE_METHOD )
114
118
endif
@@ -155,6 +159,7 @@ $(info "SONIC_DEBUGGING_ON" : "$(SONIC_DEBUGGING_ON)")
155
159
$(info "SONIC_PROFILING_ON" : "$(SONIC_PROFILING_ON ) ")
156
160
$(info "KERNEL_PROCURE_METHOD" : "$(KERNEL_PROCURE_METHOD ) ")
157
161
$(info "BUILD_TIMESTAMP" : "$(BUILD_TIMESTAMP ) ")
162
+ $(info "VS_PREPARE_MEM" : "$(VS_PREPARE_MEM ) ")
158
163
$(info )
159
164
160
165
# ##############################################################################
@@ -163,6 +168,7 @@ $(info )
163
168
# ##############################################################################
164
169
165
170
export kernel_procure_method =$(KERNEL_PROCURE_METHOD )
171
+ export vs_build_prepare_mem =$(VS_PREPARE_MEM )
166
172
167
173
# ##############################################################################
168
174
# # Local targets
You can’t perform that action at this time.
0 commit comments