commit 30322dd4cb3161ba766546bc9993ced17701b4b3
author Brian O'Connor <bocon@opennetworking.org> Mon Aug 14 19:11:29 2017 -0700
committer Thomas Vachuska <tom@opennetworking.org> Tue Aug 15 16:52:33 2017 +0000
tree 4645ff90ac317f499d5895973d8ba7eccee3610a
parent ee993b11889c7db7176e26194070627b980147cf

Fixing tar_file and proxy-stc

Change-Id: I51ee55151975ba22d168ccad58efe92d55acd9e1

bucklets/onos.bucklet

diff --git a/bucklets/onos.bucklet b/bucklets/onos.bucklet
index d6eb053..03b13a9 100644
--- a/bucklets/onos.bucklet
+++ b/bucklets/onos.bucklet
@@ -313,14 +313,19 @@
 def tar_file(
    name,
    srcs,
+   other_tars = [],
    root = None,
    out = None,
    visibility = [ 'PUBLIC' ],
    ):
 
-   cmd = ( 'mkdir -p $TMP/%(root_dir)s && '
-           'cp -R -L $SRCDIR/* $TMP/%(root_dir)s && '
-           'tar -C $TMP -zcf $OUT %(root_dir)s' ) % {
+   cmds = [ 'mkdir -p $TMP/%(root_dir)s',
+            'cp -R -L $SRCDIR/* $TMP/%(root_dir)s' ]
+   for t in other_tars:
+       cmds += [ 'tar -zxf $(location %s)' % t + ' -C $TMP/%(root_dir)s' ]
+   cmds += [ 'tar -C $TMP -zcf $OUT %(root_dir)s' ]
+
+   cmd = ' && '.join(cmds) % {
            'root_dir': root if root is not None else name
          }