Fixing onos buck package and lib gen script.

Change-Id: I4e30e253a84fb29bb9d174c6bcde6f7701b708cd

-#/bin/bash
+#!/bin/bash
 # -----------------------------------------------------------------------------
 # -----------------------------------------------------------------------------
 # Runs the custom version of Buck required by ONOS.
 # Runs the custom version of Buck required by ONOS.
 # -----------------------------------------------------------------------------
 # -----------------------------------------------------------------------------

 #!/bin/bash
 #!/bin/bash
 
 
-cd $(buck root 2>/dev/null)
+set -e
+cd $(onos-buck root 2>/dev/null)
+JAR=$(onos-buck build //tools/build/libgen:libgen --show-output 2>/dev/null | tail -1 | cut -d\  -f2)
 
 
-java -jar $(buck build //tools/build/libgen:libgen --show-output 2>/dev/null | tail -1 | cut -d' ' -f2) lib/deps.json lib/BUCK
+java -jar $JAR lib/deps.json lib/BUCK

@@ -100,11 +100,10 @@ staged_apps = ['$(location %s)' % a for a in APPS]
 sources = [ '$(location :onos-features)', ]
 sources = [ '$(location :onos-features)', ]
 sources += staged_repos + staged_apps
 sources += staged_repos + staged_apps
 
 
-import time
 genrule(
 genrule(
   name = 'onos-package',
   name = 'onos-package',
   out = 'onos.tar.gz',
   out = 'onos.tar.gz',
-  bash = 'echo %s >/dev/null; $(exe //buck-tools:onos-stage) $OUT $(location :onos-karaf) ' % time.time() + ' '.join(sources),
+  bash = '$(exe //buck-tools:onos-stage) $OUT $(location :onos-karaf) ' + ' '.join(sources),
   visibility = [ 'PUBLIC' ],
   visibility = [ 'PUBLIC' ],
 )
 )