From 41c652c6ef13147fcc7bbc87a5a40b49ce747b97 Mon Sep 17 00:00:00 2001
From: Thomas Vachuska <tom@opennetworking.org>
Date: Wed, 27 Jun 2018 16:01:36 -0700
Subject: [PATCH] Adding APPS as sources to the Bazel package build rule.

Change-Id: I9444d255d0ec2d6680ab8fd98567ed44d9a0c53f
---
 BUILD                       |  5 ++---
 drivers/default/BUILD       | 18 ++++++++++++++----
 tools/package/onos_stage.py |  2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/BUILD b/BUILD
index 4011342559..4e8af2158e 100644
--- a/BUILD
+++ b/BUILD
@@ -1,5 +1,5 @@
 load("//tools/build/bazel:generate_workspace.bzl", "ONOS_VERSION")
-load(":modules.bzl", "APPS", "CORE")
+load(":modules.bzl", "APPS", "CORE", )
 
 filegroup(
     name = "onos",
@@ -37,13 +37,12 @@ genrule(
 )
 
 # Generates the principal onos.tar.gz bundle
-# FIXME: Need to include OAR files as dependencies and feature bundles as well
 genrule(
     name = "onos-package",
     srcs = [
         "//tools/package/features:onos-features",
         ":onos-karaf",
-    ],
+    ] + APPS,
     outs = ["onos.tar.gz"],
     cmd = "$(location tools/package/onos_stage.py) $(location onos.tar.gz) %s $(location :onos-karaf) $(SRCS)" % ONOS_VERSION,
     output_to_bindir = True,
diff --git a/drivers/default/BUILD b/drivers/default/BUILD
index b6099752d8..e5649d257d 100644
--- a/drivers/default/BUILD
+++ b/drivers/default/BUILD
@@ -4,14 +4,24 @@ COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + [
     "//core/store/serializers:onos-core-serializers",
 ]
 
-TEST_DEPS = TEST_ADAPTERS + [
-    "//core/api:onos-api-tests",
+BUNDLES = [
+    ":onos-drivers-default",
+    "@openflowj//jar",
+    "//protocols/openflow/api:onos-protocols-openflow-api",
 ]
 
 osgi_jar_with_tests(
-    #resources_root = 'src/main/resources',
     resources = glob(["src/main/resources/**"]),
-    test_deps = TEST_DEPS,
+    test_deps = TEST_ADAPTERS,
     visibility = ["//visibility:public"],
     deps = COMPILE_DEPS,
 )
+
+onos_app(
+    app_name = "org.onosproject.drivers",
+    category = "Drivers",
+    description = "Suite of default drivers.",
+    included_bundles = BUNDLES,
+    title = "Default Drivers",
+    url = "http://onosproject.org",
+)
\ No newline at end of file
diff --git a/tools/package/onos_stage.py b/tools/package/onos_stage.py
index 8991dfa55c..9221b12e32 100755
--- a/tools/package/onos_stage.py
+++ b/tools/package/onos_stage.py
@@ -25,7 +25,7 @@ def addFile(tar, dest, file, file_size):
 
 def addString(tar, dest, string):
     if dest not in written_files:
-        print dest, string
+        # print dest, string
         info = TarInfo(dest)
         info.size = len(string)
         info.mtime = now