From 9e3a91b57d933e3a8f0c8f53142356f7f6b6c2cb Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Fri, 4 Jun 2021 17:09:53 +0200 Subject: [PATCH] eclass/selinux: fix POLICY_PATCH applying need to open a bug upstream - current discussions on IRC --- .../portage-stable/eclass/selinux-policy-2.eclass | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/selinux-policy-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/selinux-policy-2.eclass index 5def86fbef..8f69847a9f 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/selinux-policy-2.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/selinux-policy-2.eclass @@ -179,11 +179,12 @@ selinux-policy-2_src_prepare() { # Apply the additional patches refered to by the module ebuild. # But first some magic to differentiate between bash arrays and strings - if [[ "$(declare -p POLICY_PATCH 2>/dev/null 2>&1)" == "declare -a"* ]]; then - [[ -n ${POLICY_PATCH[*]} ]] && eapply -d "${S}/refpolicy/policy/modules" "${POLICY_PATCH[@]}" - else - [[ -n ${POLICY_PATCH} ]] && eapply -d "${S}/refpolicy/policy/modules" ${POLICY_PATCH} - fi + cd "${S}/refpolicy/policy/modules" + for POLPATCH in ${POLICY_PATCH[@]}; + do + einfo "Installing ${POLPATCH}" + eapply -p0 "${POLPATCH}" + done # Collect only those files needed for this particular module for i in ${MODS}; do