Merge pull request #10 from foglamp/1.6.0RC

1.6.0RC to master

Description

@@ -0,0 +1 @@
+OutOfBound notification rule plugin package for FogLAMP.

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2019 Dianomic Systems
+   Copyright 2019 Dianomic Systems Inc
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Package

@@ -0,0 +1,26 @@
+# A set of variables that define how we package this repository
+#
+plugin_name=outofbound
+plugin_type=rule
+plugin_install_dirname=OutOfBound
+
+# Now build up the runtime requirements list. This has 3 components
+#   1. Generic packages we depend on in all architectures and package managers
+#   2. Architecture specific packages we depend on
+#   3. Package manager specific packages we depend on
+requirements="foglamp,foglamp-service-notification"
+
+case "$arch" in
+	x86_64)
+		;;
+	armhf)
+		;;
+	aarch64)
+		;;
+esac
+case "$package_manager" in
+	deb)
+		;;
+	rpm)
+		;;
+esac

README.rst

@@ -148,15 +148,18 @@ Finally, run the ``make_deb`` command:
 .. code-block:: console
 
    $ ./make_deb
-   The package root directory is   : /home/ubuntu/source/foglamp-rule-outofbound
-   The FogLAMP required version    : >=1.4
-   The package will be built in    : /home/ubuntu/source/foglamp-rule-outofbound/packages/build
-   The architecture is set as      : x86_64
-   The package name is             : foglamp-rule-outofbound-1.0.0-x86_64
+   The package root directory is                : /home/ubuntu/source/foglamp-rule-outofbound
+   The FogLAMP required version                 : >=1.5
+   The Service notification required version    : >=1.5.2
+   The package will be built in                 : /home/ubuntu/source/foglamp-rule-outofbound/packages/build
+   The architecture is set as                   : x86_64
+   The package name is                          : foglamp-rule-outofbound-1.5.2-x86_64
+
+   ....
 
    Populating the package and updating version file...Done.
    Building the new package...
-   dpkg-deb: building package 'foglamp-rule-outofbound' in 'foglamp-rule-outofbound-1.0.0-x86_64.deb'.
+   dpkg-deb: building package 'foglamp-rule-outofbound' in 'foglamp-rule-outofbound-1.5.2-x86_64.deb'.
    Building Complete.
    $
 

VERSION

@@ -1 +1 @@
-1.5.2
+1.6.0

foglamp.version

@@ -1 +1 @@
-foglamp_version>=1.5
+foglamp_version>=1.6

make_deb

@@ -71,6 +71,9 @@ if [ "$(dpkg --print-architecture)" == "armhf" ]; then
 elif [ "$(dpkg --print-architecture)" == "amd64" ]; then
   echo "Building on amd64 architecture..."
   architecture="x86_64"
+elif [ "$(dpkg --print-architecture)" == "arm64" ]; then
+  echo "Building on arm64 architecture..."
+  architecture="arm64"
 else
   echo "The host architecture is not supported for this plugin!!"
   exit 1
@@ -80,17 +83,20 @@ fi
 plugin_version=`cat ${GIT_ROOT}/VERSION`
 # Get FogLAMP version dependency from foglamp_version file
 foglamp_version=`cat ${GIT_ROOT}/foglamp.version | tr -d ' ' | grep 'foglamp_version' | head -1 | sed -e 's/\(.*\)version\(.*\)/\2/g'`
+# Get service notification version dependency from service_notification.version file
+service_notification_version=`cat ${GIT_ROOT}/service_notification.version | tr -d ' ' | grep 'service_notification_version' | head -1 | sed -e 's/\(.*\)version\(.*\)/\2/g'`
 BUILD_ROOT="${GIT_ROOT}/packages/build"
 
 # Final package name
 package_name="foglamp-${plugin_type}-${plugin_name}-${plugin_version}-${architecture}"
 
 # Print the summary of findings
-echo "The package root directory is   : ${GIT_ROOT}"
-echo "The FogLAMP required version    : ${foglamp_version}"
-echo "The package will be built in    : ${BUILD_ROOT}"
-echo "The architecture is set as      : ${architecture}"
-echo "The package name is             : ${package_name}"
+echo "The package root directory is                : ${GIT_ROOT}"
+echo "The FogLAMP required version                 : ${foglamp_version}"
+echo "The Service notification required version    : ${service_notification_version}"
+echo "The package will be built in                 : ${BUILD_ROOT}"
+echo "The architecture is set as                   : ${architecture}"
+echo "The package name is                          : ${package_name}"
 echo
 
 # Create the package directory. If a directory with the same name exists,
@@ -138,6 +144,7 @@ cp -R ${GIT_ROOT}/packages/Debian/common/* .
 cp -R ${GIT_ROOT}/packages/Debian/${architecture}/* .
 sed -i "s/Version: 1.0.0/Version: ${plugin_version}/g" DEBIAN/control
 sed -i "s/Depends: foglamp/Depends: foglamp (${foglamp_version})/g" DEBIAN/control
+sed -i "s/foglamp-service-notification/foglamp-service-notification (${service_notification_version})/g" DEBIAN/control
 
 mkdir -p usr/local/foglamp
 cd usr/local/foglamp

packages/Debian/arm64/DEBIAN/control

@@ -0,0 +1,10 @@
+Package: foglamp-rule-outofbound
+Version: 1.0.0
+Section: devel
+Priority: optional
+Architecture: arm64
+Depends: foglamp,foglamp-service-notification
+Conflicts:
+Maintainer: Dianomic Systems, Inc. <[email protected]>
+Homepage: http://www.dianomic.com
+Description: FogLAMP C++ OutOfBound rule plugin

packages/Debian/armhf/DEBIAN/control

@@ -3,7 +3,7 @@ Version: 1.0.0
 Section: devel
 Priority: optional
 Architecture: armhf
-Depends: foglamp
+Depends: foglamp,foglamp-service-notification
 Conflicts:
 Maintainer: Dianomic Systems, Inc. <[email protected]>
 Homepage: http://www.dianomic.com

packages/Debian/x86_64/DEBIAN/control

@@ -3,7 +3,7 @@ Version: 1.0.0
 Section: devel
 Priority: optional
 Architecture: amd64
-Depends: foglamp
+Depends: foglamp,foglamp-service-notification
 Conflicts:
 Maintainer: Dianomic Systems, Inc. <[email protected]>
 Homepage: http://www.dianomic.com

service_notification.version

@@ -0,0 +1 @@
+service_notification_version>=1.6.0