Re: [yocto] [PATCH] samhain: add rconflict for client and server mode

[akuster808]

On 5/27/19 7:37 PM, changqing...@windriver.com wrote:
> From: Changqing Li 
>
> Signed-off-by: Changqing Li 

merged. 

thanks,
Armin
> ---
>  recipes-ids/samhain/samhain-client_4.3.2.bb | 1 +
>  recipes-ids/samhain/samhain-server_4.3.2.bb | 1 +
>  2 files changed, 2 insertions(+)
>
> 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"

-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

[yocto] [PATCH] samhain: add rconflict for client and server mode

[changqing.li]

From: Changqing Li 

Signed-off-by: Changqing Li 
---
 recipes-ids/samhain/samhain-client_4.3.2.bb | 1 +
 recipes-ids/samhain/samhain-server_4.3.2.bb | 1 +
 2 files changed, 2 insertions(+)

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"
-- 
2.7.4

-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto