commit 335e9ae37d6cddc6d82fba55a7d40bc68fad1522
author Thomas Vachuska <tom@opennetworking.org> Fri Apr 20 22:26:19 2018 -0700
committer Thomas Vachuska <tom@opennetworking.org> Sat Apr 21 05:36:10 2018 +0000
tree f663343e62aa33d0f174c13fff9947365e9af30c
parent 4b055d3a250b7e299ca50823c46216586472fec9

Patching Apache Karaf with a shell console fix to avoid thread leak.

Change-Id: I27e8fbaf443391a51b40c35639a39a5f38aecf31

tools/package/BUCK

diff --git a/tools/package/BUCK b/tools/package/BUCK
index 05fefcb..a317983 100644
--- a/tools/package/BUCK
+++ b/tools/package/BUCK
@@ -1,5 +1,6 @@
 KARAF = '//lib:apache-karaf'
 BRANDING = '//tools/package/branding:onos-tools-package-branding'
+PATCHES = '//lib:apache-karaf-patches'
 
 FEATURES = [
   '//features:onos-thirdparty-base',
@@ -21,8 +22,8 @@
 genrule(
   name = 'onos-karaf',
   srcs = glob(['bin/*', 'etc/*', 'init/*', 'runtime/bin/*']),
-  bash = '$(location :onos-prep-karaf) $OUT $(location %s) %s $(location %s)'\
-            % (KARAF, ONOS_VERSION, BRANDING),
+  bash = '$(location :onos-prep-karaf) $OUT $(location %s) %s $(location %s) $(location %s)'\
+            % (KARAF, ONOS_VERSION, BRANDING, PATCHES),
   out = 'karaf.zip',
 )
 

tools/package/onos-prep-karaf

diff --git a/tools/package/onos-prep-karaf b/tools/package/onos-prep-karaf
index 718630c..a466858 100755
--- a/tools/package/onos-prep-karaf
+++ b/tools/package/onos-prep-karaf
@@ -9,6 +9,7 @@
 KARAF_TAR=$2
 ONOS_VERSION=$3
 BRANDING=$4
+KARAF_PATCHES=$5
 #FIXME karaf version
 KARAF_VERSION="3.0.8"
 ONOS_SECURITY_MODE="false"
@@ -21,6 +22,8 @@
 # rename path name to match what was distributed with vicci
 mv "$(ls -d apache*)" "apache-karaf-$KARAF_VERSION" || true
 
+tar xf $KARAF_PATCHES
+
 # Unroll the Apache Karaf bits, prune them and make ONOS top-level directories.
 KARAF_DIR=$(ls -d apache*)
 rm -rf $KARAF_DIR/demos