Skip to content

Commit

Permalink
Problem: warranty rule in not installed
Browse files Browse the repository at this point in the history
Solution: create install.xml for mkpac

Signed-off-by: Tomas Halman <TomasHalman@eaton.com>
  • Loading branch information
Tomas Halman authored and Tomas Halman committed Jan 18, 2017
1 parent 0a7419e commit e3c5218
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 11 deletions.
7 changes: 3 additions & 4 deletions ci_deploy.sh
Expand Up @@ -4,7 +4,6 @@
# THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY #
# READ THE ZPROJECT/README.MD FOR INFORMATION ABOUT MAKING PERMANENT CHANGES. #
################################################################################
# Note: This file is customized (zip not present in our containers)

set -x
set -e
Expand All @@ -15,11 +14,11 @@ if [ "$BUILD_TYPE" == "default" ]; then
export FTY_ALERT_ENGINE_DEPLOYMENT=dist/*
# Move archives to dist
mv *.tar.gz dist
mv *.zip dist || true
mv *.zip dist
# Generate hash sums
cd dist
md5sum *.zip *.tar.gz > MD5SUMS || true
sha1sum *.zip *.tar.gz > SHA1SUMS || true
md5sum *.zip *.tar.gz > MD5SUMS
sha1sum *.zip *.tar.gz > SHA1SUMS
cd -
elif [ "$BUILD_TYPE" == "bindings" ] && [ "$BINDING" == "jni" ]; then
( cd bindings/jni && TERM=dumb PKG_CONFIG_PATH=/tmp/lib/pkgconfig ./gradlew clean bintrayUpload )
Expand Down
5 changes: 1 addition & 4 deletions configure.ac
Expand Up @@ -2,8 +2,6 @@
# THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY #
# Read the zproject/README.md for information about making permanent changes. #
################################################################################
# Note: This file is customized:
# * zip not present in our containers

# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
Expand All @@ -14,8 +12,7 @@ AC_INIT([fty-alert-engine],[1.0.0],[eatonipcopensource@eaton.com])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR(config)
AC_CONFIG_HEADERS([src/platform.h])
AM_INIT_AUTOMAKE([subdir-objects tar-ustar foreign])
# Removed: AM_INIT_AUTOMAKE([dist-zip ])
AM_INIT_AUTOMAKE([subdir-objects tar-ustar dist-zip foreign])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

# This defines PACKAGE_VERSION_... in src/platform.h
Expand Down
15 changes: 15 additions & 0 deletions install.xml
@@ -0,0 +1,15 @@
<!--
Installation model
1. by path & name
path - absolute path to the file
name - file name
2. type
* systemd-tmpfiles - install $(project.name) to /usr/lib/systemd/tmpfiles.d/
-->

<install>
<item type = "systemd-tmpfiles" />
<item path = "/var/lib/fty/fty_alert_engine" name = "warranty.rule" />
</install>
4 changes: 1 addition & 3 deletions project.xml
Expand Up @@ -37,9 +37,7 @@
<class name = "rule" private="1" selftest = "0">Rule</class>
<class name = "thresholdrulecomplex" private="1" selftest = "0">ThresholdRuleComplex</class>
<class name = "fty_alert_engine_server" state = "stable" >Actor evaluating rules</class>
<main name = "fty-alert-engine" service = "1" no_config = "1" >
<main name = "fty-alert-engine" service = "1">
Daemon evaluating rules and producing alerts
<extra type = "x-rules" path = "/var/lib/fty/fty_alert_engine" name = "warranty.rule" />
<extra type = "systemd-tmpfiles" />
</main>
</project>

0 comments on commit e3c5218

Please sign in to comment.