CaROS/meta-selinux
3
0
Fork 0
mirror of git://git.yoctoproject.org/meta-selinux synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

refpolicy: Skip HLL module processing for monolithic policy builds

Browse Source 
Avoid processing and copying high-level language (.pp) modules during do_install
when MONOLITHIC=y is set. This prevents build failures due to missing files in
/usr/share/selinux/targeted, which are not generated in monolithic mode.

Fixes error:
  cp: cannot stat '/usr/share/selinux/targeted/*.*': No such file or directory

Signed-off-by: Sasi Kumar Maddineni <quic_sasikuma@quicinc.com>
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
This commit is contained in:
Sasi Kumar Maddineni 2025-10-21 08:55:35 +05:30 committed by Yi Zhao
parent 91bf293772
commit b7822f7772
2 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
recipes-security/refpolicy/refpolicy-minimum_git.bb
View File

@ -78,20 +78,22 @@ prepare_policy_store() {
HLL_TYPE=$(echo ${POL_SRC}/base.* | awk -F . '{if (NF>1) {print $NF}}') HLL_TYPE=$(echo ${POL_SRC}/base.* | awk -F . '{if (NF>1) {print $NF}}')
HLL_BIN=${STAGING_DIR_NATIVE}${prefix}/libexec/selinux/hll/${HLL_TYPE} HLL_BIN=${STAGING_DIR_NATIVE}${prefix}/libexec/selinux/hll/${HLL_TYPE}
for i in base ${POLICY_MODULES_MIN}; do if [ "${POLICY_MONOLITHIC}" != "y" ]; then
MOD_FILE=${POL_SRC}/${i}.${HLL_TYPE} for i in base ${POLICY_MODULES_MIN}; do
MOD_DIR=${POL_ACTIVE_MODS}/${i} MOD_FILE=${POL_SRC}/${i}.${HLL_TYPE}
mkdir -p ${MOD_DIR} MOD_DIR=${POL_ACTIVE_MODS}/${i}
echo -n "${HLL_TYPE}" > ${MOD_DIR}/lang_ext mkdir -p ${MOD_DIR}
echo -n "${HLL_TYPE}" > ${MOD_DIR}/lang_ext
if ! bzip2 -t ${MOD_FILE} >/dev/null 2>&1; then if ! bzip2 -t ${MOD_FILE} >/dev/null 2>&1; then
${HLL_BIN} ${MOD_FILE} | bzip2 --stdout > ${MOD_DIR}/cil ${HLL_BIN} ${MOD_FILE} | bzip2 --stdout > ${MOD_DIR}/cil
bzip2 -f ${MOD_FILE} && mv -f ${MOD_FILE}.bz2 ${MOD_FILE} bzip2 -f ${MOD_FILE} && mv -f ${MOD_FILE}.bz2 ${MOD_FILE}
else else
bunzip2 --stdout ${MOD_FILE} | \ bunzip2 --stdout ${MOD_FILE} | \
${HLL_BIN} | \ ${HLL_BIN} | \
bzip2 --stdout > ${MOD_DIR}/cil bzip2 --stdout > ${MOD_DIR}/cil
fi fi
cp ${MOD_FILE} ${MOD_DIR}/hll cp ${MOD_FILE} ${MOD_DIR}/hll
done done
fi
} }

33
recipes-security/refpolicy/refpolicy_common.inc
View File

@ -173,22 +173,23 @@ prepare_policy_store() {
# Get hll type from suffix on base policy module # Get hll type from suffix on base policy module
HLL_TYPE=$(echo ${POL_SRC}/base.* | awk -F . '{if (NF>1) {print $NF}}') HLL_TYPE=$(echo ${POL_SRC}/base.* | awk -F . '{if (NF>1) {print $NF}}')
HLL_BIN=${STAGING_DIR_NATIVE}${prefix}/libexec/selinux/hll/${HLL_TYPE} HLL_BIN=${STAGING_DIR_NATIVE}${prefix}/libexec/selinux/hll/${HLL_TYPE}
if [ "${POLICY_MONOLITHIC}" != "y" ]; then
for i in ${POL_SRC}/*.${HLL_TYPE}; do for i in ${POL_SRC}/*.${HLL_TYPE}; do
MOD_NAME=$(basename $i | sed "s/\.${HLL_TYPE}$//") MOD_NAME=$(basename $i | sed "s/\.${HLL_TYPE}$//")
MOD_DIR=${POL_ACTIVE_MODS}/${MOD_NAME} MOD_DIR=${POL_ACTIVE_MODS}/${MOD_NAME}
mkdir -p ${MOD_DIR} mkdir -p ${MOD_DIR}
echo -n "${HLL_TYPE}" > ${MOD_DIR}/lang_ext echo -n "${HLL_TYPE}" > ${MOD_DIR}/lang_ext
if ! bzip2 -t $i >/dev/null 2>&1; then if ! bzip2 -t $i >/dev/null 2>&1; then
${HLL_BIN} $i | bzip2 --stdout > ${MOD_DIR}/cil ${HLL_BIN} $i | bzip2 --stdout > ${MOD_DIR}/cil
bzip2 -f $i && mv -f $i.bz2 $i bzip2 -f $i && mv -f $i.bz2 $i
else else
bunzip2 --stdout $i | \ bunzip2 --stdout $i | \
${HLL_BIN} | \ ${HLL_BIN} | \
bzip2 --stdout > ${MOD_DIR}/cil bzip2 --stdout > ${MOD_DIR}/cil
fi fi
cp $i ${MOD_DIR}/hll cp $i ${MOD_DIR}/hll
done done
fi
} }
rebuild_policy() { rebuild_policy() {