From b044efa0e9f874791d6045541ab9a6581738acc7 Mon Sep 17 00:00:00 2001 From: Zhang Xiao Date: Tue, 23 May 2023 23:38:36 -0700 Subject: dhcp-relay: dev subpackage conflicts with bind-dev dhcp-relay contains a bundled bind thus their development packages conflict each other. Signed-off-by: Zhang Xiao Signed-off-by: Khem Raj (cherry picked from commit 93892e8413da230e14c70d20f0d46b513fdd8787) Signed-off-by: Gyorgy Sarvari --- meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb index 2fd86bc28a..d36646c0d7 100644 --- a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb +++ b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb @@ -60,3 +60,6 @@ do_install:append () { } PARALLEL_MAKE = "" + +# dhcp-relay contains a bundled "bind", thus their dev packages conflict each other +RCONFLICTS:${PN}-dev = "bind-dev" -- cgit v1.2.3-54-g00ecf