From 8c0725155db1a7c14cb3ea1b281a21c3a92af88e Mon Sep 17 00:00:00 2001 From: Xin Ouyang Date: Mon, 7 Jan 2013 17:25:34 +0800 Subject: refpolicy: change hard-coded paches - /etc -> ${sysconfdir} - /usr/share -> ${datadir} Signed-off-by: Xin Ouyang --- recipes-security/refpolicy/refpolicy_common.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/recipes-security/refpolicy/refpolicy_common.inc b/recipes-security/refpolicy/refpolicy_common.inc index 9c3d050..bbbbfc3 100644 --- a/recipes-security/refpolicy/refpolicy_common.inc +++ b/recipes-security/refpolicy/refpolicy_common.inc @@ -44,26 +44,26 @@ do_install() { DESTDIR=${D} # Prepare to create policy store - mkdir -p ${D}/etc/selinux/ - cat <<-EOF > ${D}/etc/selinux/semanage.conf + mkdir -p ${D}${sysconfdir}/selinux/ + cat <<-EOF > ${D}${sysconfdir}/selinux/semanage.conf module-store = direct [setfiles] path = ${STAGING_DIR_NATIVE}${base_sbindir_native}/setfiles args = -q -c \$@ \$< [end] EOF - mkdir -p ${D}/etc/selinux/${POLICY_NAME}/policy - mkdir -p ${D}/etc/selinux/${POLICY_NAME}/modules/active/modules - mkdir -p ${D}/etc/selinux/${POLICY_NAME}/contexts/files - bzip2 -c ${D}/usr/share/selinux/${POLICY_NAME}/base.pp > \ - ${D}/etc/selinux/${POLICY_NAME}/modules/active/base.pp - for i in ${D}/usr/share/selinux/${POLICY_NAME}/*.pp; do + mkdir -p ${D}${sysconfdir}/selinux/${POLICY_NAME}/policy + mkdir -p ${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/modules + mkdir -p ${D}${sysconfdir}/selinux/${POLICY_NAME}/contexts/files + bzip2 -c ${D}${datadir}/selinux/${POLICY_NAME}/base.pp > \ + ${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/base.pp + for i in ${D}${datadir}/selinux/${POLICY_NAME}/*.pp; do if [ "`basename $i`" != "base.pp" ]; then - bzip2 -c $i > ${D}/etc/selinux/${POLICY_NAME}/modules/active/modules/`basename $i`; + bzip2 -c $i > ${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/modules/`basename $i`; fi done # Create policy store and build the policy semodule -p ${D} -s ${POLICY_NAME} -n -B - rm -f ${D}/etc/selinux/semanage.conf + rm -f ${D}${sysconfdir}/selinux/semanage.conf } -- cgit v1.2.3-54-g00ecf