aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2019-05-28 10:37:55 +0800
committerArmin Kuster <akuster808@gmail.com>2019-06-10 07:37:58 -0700
commit74dfe37b0914101ca35688e68d3d8a953ef52583 (patch)
tree5559c4f612553ffe69a697af5b6c74ee60f133bd
parentea6b13b28aa6f51735bdd77a4bf00c6cef463cca (diff)
downloadmeta-security-74dfe37b0914101ca35688e68d3d8a953ef52583.tar.gz
meta-security-74dfe37b0914101ca35688e68d3d8a953ef52583.tar.bz2
meta-security-74dfe37b0914101ca35688e68d3d8a953ef52583.zip
samhain: add rconflict for client and server mode
Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--recipes-ids/samhain/samhain-client_4.3.2.bb1
-rw-r--r--recipes-ids/samhain/samhain-server_4.3.2.bb1
2 files changed, 2 insertions, 0 deletions
diff --git a/recipes-ids/samhain/samhain-client_4.3.2.bb b/recipes-ids/samhain/samhain-client_4.3.2.bb
index 812408e..0f53a8c 100644
--- a/recipes-ids/samhain/samhain-client_4.3.2.bb
+++ b/recipes-ids/samhain/samhain-client_4.3.2.bb
@@ -9,3 +9,4 @@ EXTRA_OECONF += " \
"
RDEPENDS_${PN} = "acl zlib attr bash"
+RCONFLICTS_${PN} = "samhain-standalone"
diff --git a/recipes-ids/samhain/samhain-server_4.3.2.bb b/recipes-ids/samhain/samhain-server_4.3.2.bb
index 9341d44..d304912 100644
--- a/recipes-ids/samhain/samhain-server_4.3.2.bb
+++ b/recipes-ids/samhain/samhain-server_4.3.2.bb
@@ -18,3 +18,4 @@ do_install_append() {
}
RDEPENDS_${PN} += "gmp bash perl"
+RCONFLICTS_${PN} = "samhain-standalone"