commit 0a8417e90df7f3ec1b9f25cef72258ed4a8a9f4f
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Mon Mar 05 20:27:54 2018 -0800
committer Thomas Vachuska <tom@opennetworking.org> Tue Mar 06 17:16:41 2018 +0000
tree 62f354d05d907371dc30881bbd560b4954b3b165
parent 5a15fe6683d106eb2988ef0d1f520b3fcb599f70

Workaround for feature group failing during built.

 based on workaround mentioned in
   https://github.com/facebook/buck/issues/469

Change-Id: Ibed05bf14b548320d91b3b39cb9abc21b06e44ca

tools/build/onos-buck

diff --git a/tools/build/onos-buck b/tools/build/onos-buck
index 07ffd9c..7dab646 100755
--- a/tools/build/onos-buck
+++ b/tools/build/onos-buck
@@ -122,9 +122,9 @@
 fi
 
 # HACK: Clean-up frequent problem-causers from buck-out
-rm -fr \
-    $ONOS_ROOT/buck-out/bin/lib/.netty \
-    $ONOS_ROOT/buck-out/bin/lib/.KRYO
+#rm -fr \
+#    $ONOS_ROOT/buck-out/bin/lib/.netty \
+#    $ONOS_ROOT/buck-out/bin/lib/.KRYO
 
 # Finally, run the Buck command...
 $BUCK "$@"

tools/build/onos-package

diff --git a/tools/build/onos-package b/tools/build/onos-package
index 67c507b..9d3a747 100755
--- a/tools/build/onos-package
+++ b/tools/build/onos-package
@@ -4,4 +4,4 @@
 # -----------------------------------------------------------------------------
 
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
-cd $ONOS_ROOT && onos-buck build onos --show-output && onos-check-bits
+cd $ONOS_ROOT && onos-buck build onos --deep --show-output && onos-check-bits