From 8565def18b6825e2b6692a780a14c6a0ead838ae Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Fri, 11 Jun 2021 11:27:16 +0200 Subject: [PATCH] sys-apps/semodule-utils: apply tmp flatcar changes Signed-off-by: Mathieu Tortuyaux --- .../sys-apps/semodule-utils/semodule-utils-3.1.ebuild | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.1.ebuild index 21cea74be5..2002f71e94 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.1.ebuild @@ -30,7 +30,12 @@ SLOT="0" DEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=" -RDEPEND="${DEPEND}" +# flatcar changes: add a weak blocker on policycoreutils-2.4 +# to prevent file collisions +# policycoreutils-2.4 and semodule-utils provide the same files +RDEPEND="${DEPEND} + !=sys-apps/policycoreutils-2.4-r2 +" src_prepare() { default