Merge pull request #158 from ZhouBox/v2.5

[v2.5]focas:update focas2 lib and check apt-mark exits

create_neuron_deb.py

@@ -11,7 +11,7 @@ def parse_args():
     parser.add_argument("-a", "--arch", type=str, help="arch")
     parser.add_argument("-o", "--vendor", type=str, help="vendor")
     parser.add_argument("-l", "--language", type=str, default="cn",
-                          help="package language")
+                        help="package language")
     return parser.parse_args()
 
 
@@ -38,14 +38,14 @@ def parse_args():
 rules.append(mkdeb.FileMap(".gitkeep", "/opt/neuron/certs/"))
 
 rules.append(mkdeb.FileMap(package_dir + '/neuron', "/opt/neuron/", "x"))
-# rules.append(mkdeb.FileMap(
-#      package_dir + "/libfwlib32.so.1", "/opt/neuron/"))
+rules.append(mkdeb.FileMap(
+    package_dir + "/libfocas32.so.1", "/opt/neuron/"))
 rules.append(mkdeb.FileMap(
     package_dir + '/libneuron-base.so', "/opt/neuron/"))
 rules.append(mkdeb.FileMap(
     package_dir + '/liblicense.so', "/opt/neuron/"))
 rules.append(mkdeb.FileMap(
-     package_dir + "/libzlog.so.1.2", "/opt/neuron/"))
+    package_dir + "/libzlog.so.1.2", "/opt/neuron/"))
 
 mkdeb.copy_dir(package_dir + '/config', '/opt/neuron/')
 mkdeb.copy_dir(package_dir + '/plugins', '/opt/neuron/')

cross-package.sh

@@ -140,7 +140,7 @@ cp $neuron_modules_dir/build/plugins/libplugin-websocket.so \
     	$neuron_modules_dir/build/plugins/libplugin-license-server.so \
     	$package_dir/plugins/
 
-# cp $neuron_modules_dir/build/plugins/focas/libfwlib32.so.1 $package_dir/
+cp $neuron_modules_dir/build/plugins/focas/libfocas32.so.1 $package_dir/
 
 cp $neuron_modules_dir/build/plugins/schema/*.json \
 	$package_dir/plugins/schema/

deb/postinst

@@ -7,7 +7,9 @@ systemctl enable neuron
 systemctl start neuron
 (
 sleep 3
-apt-mark hold neuron
+if command -v apt-mark >/dev/null 2>&1; then  
+    apt-mark hold neuron 
+fi
 ) &
 
 if [ -e "/etc/systemd/system/neuron.ekuiper.service" ]; then

deb2rpm.sh

@@ -54,7 +54,7 @@ Requires: perl-interpreter
 sed -i '/\%description/i \
 %global privlibs libneuron-base\
 %global privlibs %{privlibs}|liblicense\
-%global privlibs %{privlibs}|libfwlib32\
+%global privlibs %{privlibs}|libfocas32\
 %global privlibs %{privlibs}|libzlog\
 %global __requires_exclude ^(%{privlibs})\\.so\
 ' $specfile