diff options
author | Kai Kang <kai.kang@windriver.com> | 2016-07-18 09:06:06 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-07-29 11:00:56 +0200 |
commit | 06e58b6f54b60585d1d6eb27b62c2627bce5f2fe (patch) | |
tree | 773afaaf14f055428677b9371b0dd4467be530f3 /meta-oe/recipes-extended/cfengine/cfengine | |
parent | 898b3977afec283c456c970a48d654c74f128d61 (diff) | |
download | meta-openembedded-contrib-06e58b6f54b60585d1d6eb27b62c2627bce5f2fe.tar.gz |
cfengine: add recipe and base policy
Add recipes of cfengine and cfengine-masterfiles which provides base
policy files.
There are 3 optional database backend: qdbm, tokyocabinet and lmdb with
descending priority. Package tokyocabinet is released as a rework of
qdbm by same upstream author, so it is choosen to be default database
backend.
See:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=452657
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/cfengine/cfengine')
-rw-r--r-- | meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch | 28 | ||||
-rw-r--r-- | meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch | 23 |
2 files changed, 51 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch b/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch new file mode 100644 index 0000000000..2295e415cd --- /dev/null +++ b/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch @@ -0,0 +1,28 @@ +Upstream-Status: Inappropriate [configuration] + +projlibdir use a hard coded lib path, this will cause error when build a 64bit +target. So change it to suitable path. + +Signed-off-by: Song.Li <Song.Li@windriver.com> +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 38e2b9c..bc6b996 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -188,7 +188,7 @@ AS_IF([test x"$enable_fhs" = xyes], [ + fi + + sbindir='${exec_prefix}/bin' # /var/cfengine/bin despite being sbin_? +- projlibdir='${exec_prefix}/lib' ++ projlibdir='${libdir}' + mandir='${exec_prefix}/share/man' + ]) + +-- +1.7.1 + diff --git a/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch b/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch new file mode 100644 index 0000000000..b9526f2843 --- /dev/null +++ b/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch @@ -0,0 +1,23 @@ +Upstream-Status: Inappropriate [configuration] + +Set the path of default configure file. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- +diff --git a/misc/init.d/cfengine3.in b/misc/init.d/cfengine3.in +index d6ae26f..1dee283 100644 +--- a/misc/init.d/cfengine3.in ++++ b/misc/init.d/cfengine3.in +@@ -101,11 +101,7 @@ if [ -z "$LOCKDIR" ]; then + fi + + # default control file +-if [ "$DEBIAN" = "1" ]; then +- DEFAULT=/etc/default/cfengine3 +-else +- DEFAULT=/etc/sysconfig/cfengine3 +-fi ++DEFAULT=/etc/default/cfengine3 + + if [ -f $DEFAULT ]; then + . $DEFAULT |