From 1f02601df9ce38b672979e88fdeb2d555b8539fa Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Tue, 11 Sep 2018 21:48:02 +0000 Subject: [PATCH 1/2] [make file] add document for KEEP_SLAVE_ON with stretch builds Signed-off-by: Ying Xie --- Makefile.work | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile.work b/Makefile.work index 43a2a3669f0c..23eb05f94e34 100644 --- a/Makefile.work +++ b/Makefile.work @@ -14,6 +14,14 @@ # * USERNAME: Desired username -- default at rules/config # * PASSWORD: Desired password -- default at rules/config # * KEEP_SLAVE_ON: Keeps slave container up after building-process concludes. +# * Please note that with current stretch build structure, +# * user of KEEP_SLAVE_ON feature will have to be concious +# * about which docker to stay on. +# * - If user desire to stay on stretch docker, please issue +# * make KEEP_SLAVE_ON=yes stretch +# * - If user desire to stay on jessie docker, please issue +# * (a susccessful "make stretch" may needed before following) +# * make NOSTRETCH=1 KEEP_SLAVE_ON=yes # * SOURCE_FOLDER: host path to be mount as /var/$(USER)/src, only effective when KEEP_SLAVE_ON=yes # * SONIC_BUILD_JOBS: Specifying number of concurrent build job(s) to run # * KERNEL_PROCURE_METHOD: Specifying method of obtaining kernel Debian package: download or build From d41ba8604cfbc91df1dca57e50c2d2a08e6054f1 Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Tue, 11 Sep 2018 19:09:00 -0700 Subject: [PATCH 2/2] Update Makefile.work --- Makefile.work | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile.work b/Makefile.work index 23eb05f94e34..fff349dc759a 100644 --- a/Makefile.work +++ b/Makefile.work @@ -13,14 +13,16 @@ # * SONIC_ENABLE_SYNCD_RPC: Enables rpc-based syncd builds. # * USERNAME: Desired username -- default at rules/config # * PASSWORD: Desired password -- default at rules/config -# * KEEP_SLAVE_ON: Keeps slave container up after building-process concludes. -# * Please note that with current stretch build structure, -# * user of KEEP_SLAVE_ON feature will have to be concious -# * about which docker to stay on. -# * - If user desire to stay on stretch docker, please issue +# * KEEP_SLAVE_ON: Keeps slave container up and active after building process concludes. +# * Note that rm=true is still set, so once user quits from the docker +# * session, the docker will be removed. +# * Please note that with current Stretch build structure, +# * user of KEEP_SLAVE_ON feature will have to be conscious +# * about which docker to stay inside after build is done. +# * - If user desires to stay inside Stretch docker, please issue # * make KEEP_SLAVE_ON=yes stretch -# * - If user desire to stay on jessie docker, please issue -# * (a susccessful "make stretch" may needed before following) +# * - If user desires to stay inside Jessie docker, please issue +# * (a successful "make stretch" may be needed before the following command) # * make NOSTRETCH=1 KEEP_SLAVE_ON=yes # * SOURCE_FOLDER: host path to be mount as /var/$(USER)/src, only effective when KEEP_SLAVE_ON=yes # * SONIC_BUILD_JOBS: Specifying number of concurrent build job(s) to run