Fixes to onos_stage to include karaf.zip
Change-Id: Iae00ae0a47150b470a7fc409260ca21824af020e
diff --git a/tools/package/BUCK b/tools/package/BUCK
index 27c0274..a452ce4 100644
--- a/tools/package/BUCK
+++ b/tools/package/BUCK
@@ -100,6 +100,6 @@
genrule(
name = 'onos-package',
out = 'onos.tar.gz',
- bash = 'cp $(location :onos-karaf) $OUT && $(exe //buck-tools:onos-stage) $OUT ' + ' '.join(sources),
+ bash = '$(exe //buck-tools:onos-stage) $OUT $(location :onos-karaf) ' + ' '.join(sources),
visibility = [ 'PUBLIC' ],
)
\ No newline at end of file
diff --git a/tools/package/onos-prep-karaf b/tools/package/onos-prep-karaf
index afda1c2..d1f561c 100755
--- a/tools/package/onos-prep-karaf
+++ b/tools/package/onos-prep-karaf
@@ -56,7 +56,7 @@
cp -r init $PREFIX
cp -r etc $PREFIX/$KARAF_DIR/etc/
-tar czf $OUT $PREFIX
+zip -q -0 -r $OUT $PREFIX
#FIXME
# Stage all builtin ONOS apps for factory install