Make test tools available in installed ONOS

Part of ONOS-6597
onos-app, onos-netcfg

Change-Id: Ic58156700e357c9564e9bd9fe1173310ec6f0502
diff --git a/tools/package/BUCK b/tools/package/BUCK
index 4c63cc7..4e8ab7e 100644
--- a/tools/package/BUCK
+++ b/tools/package/BUCK
@@ -20,7 +20,7 @@
 
 genrule(
   name = 'onos-karaf',
-  srcs = glob(['bin/*', 'etc/*', 'init/*']),
+  srcs = glob(['bin/*', 'etc/*', 'init/*', 'runtime/bin/*']),
   bash = '$(location :onos-prep-karaf) $OUT $(location %s) %s $(location %s)'\
             % (KARAF, ONOS_VERSION, BRANDING),
   out = 'karaf.zip',
@@ -41,7 +41,7 @@
 
 genrule(
   name = 'onos-package',
-  srcs = glob(['bin/*', 'etc/*', 'init/*', 'config/*']),
+  srcs = glob(['bin/*', 'etc/*', 'init/*', 'config/*', 'runtime/bin/*']),
   out = 'onos.tar.gz',
   bash = '$(exe //buck-tools:onos-stage) $OUT ' + ONOS_VERSION + ' $(location :onos-karaf) ' + ' '.join(sources),
   visibility = [ 'PUBLIC' ],