refpolicy: split do_install to three steps & update refpolicy-minimum

PATCH In review [email protected] 2 participants 4 messages Jul 29, 2014 – Aug 28, 2014

lore

Share & tools

lore

[email protected]

author

2014-07-29 07:30 UTC #0 lore raw

cover refpolicy: split do_install to three steps & update refpolicy-minimum

From: Wenzong Fan <[email protected]>

* split do_install to three steps:
+ prepare_policy_store()
+ rebuild_policy()
+ install_misc_files()

This gets refpolicy-minimum work by re-writing the prepare_policy_store().

* update refpolicy-minimum to support compressed policy.

The following changes since commit a34718ae6ea2539545be1e49c497030f6246345c:

swig-native: repair patching error (2014-07-19 23:24:44 -0400)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib wenzong/refpolicy
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/refpolicy

Wenzong Fan (2):
refpolicy: split do_install to three steps
refpolicy / minimum: support compressed policy

 .../refpolicy/refpolicy-minimum_2.20130424.bb      |   26 +++++++++----
 recipes-security/refpolicy/refpolicy_common.inc    |   39 +++++++++++++-------
 2 files changed, 43 insertions(+), 22 deletions(-)

Signature · 1 line

1.7.9.5

[email protected]

author

2014-07-29 07:30 UTC #1 lore raw

PATCH 1/2 refpolicy: split do_install to three steps

From: Wenzong Fan <[email protected]>

Split do_install() to:
+ prepare_policy_store()
+ rebuild_policy()
+ install_misc_files()

This allows to make partial change to do_install() instead of re-write it totally from specific refpolicy bb file.

Signed-off-by Wenzong Fan <[email protected]>

---
 recipes-security/refpolicy/refpolicy_common.inc |   39 +++++++++++++++--------
 1 file changed, 25 insertions(+), 14 deletions(-)

recipes-security/refpolicy/refpolicy_common.inc +25 ~~-14~~

index 54a0168..fd205cf 100644
@@ -60,24 +60,11 @@ do_compile() {
 	oe_runmake policy
 }
 
-do_install() {
+prepare_policy_store () {
 	oe_runmake 'DESTDIR=${D}' 'prefix=${D}${prefix}' install
 
 	# Prepare to create policy store
 	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]
-[sefcontext_compile]
-path = ${STAGING_DIR_NATIVE}${sbindir_native}/sefcontext_compile
-args = \$@
-[end]
-
-policy-version = 28
-EOF
 	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

@@ -100,11 +87,29 @@ EOF
 			fi
 		done
 	fi
+}
+
+rebuild_policy () {
+	cat <<-EOF > ${D}${sysconfdir}/selinux/semanage.conf
+module-store = direct
+[setfiles]
+path = ${STAGING_DIR_NATIVE}${base_sbindir_native}/setfiles
+args = -q -c \$@ \$<
+[end]
+[sefcontext_compile]
+path = ${STAGING_DIR_NATIVE}${sbindir_native}/sefcontext_compile
+args = \$@
+[end]
+
+policy-version = 28
+EOF
 
 	# Create policy store and build the policy
 	semodule -p ${D} -s ${POLICY_NAME} -n -B
 	rm -f ${D}${sysconfdir}/selinux/semanage.conf
+}
 
+install_misc_files () {
 	cat ${WORKDIR}/customizable_types >> \
 		${D}${sysconfdir}/selinux/${POLICY_NAME}/contexts/customizable_types

@@ -121,3 +126,9 @@ EOF
 	link_path=`readlink -f ${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/policy.kern`
 	ln -sf ../../policy/`basename $link_path` ${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/policy.kern
 }
+
+do_install () {
+	prepare_policy_store
+	rebuild_policy
+	install_misc_files
+}

Signature · 1 line

1.7.9.5

[email protected]

author

2014-07-29 07:30 UTC #2 lore raw

PATCH 2/2 refpolicy / minimum: support compressed policy

In reply to [email protected]

From: Wenzong Fan <[email protected]>

Signed-off-by Wenzong Fan <[email protected]>

---
 .../refpolicy/refpolicy-minimum_2.20130424.bb      |   26 ++++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

recipes-security/refpolicy/refpolicy-minimum_2.20130424.bb +18 -8

index ae9cb43..d9539f3 100644
@@ -30,19 +30,29 @@ EXTRA_POLICY_MODULES += "mta"
 
 POLICY_MODULES_MIN = "${CORE_POLICY_MODULES} ${EXTRA_POLICY_MODULES}"
 
+# re-write the same func from refpolicy_common.inc
 prepare_policy_store () {
-	oe_runmake install \
-		DESTDIR=${D}
+	oe_runmake 'DESTDIR=${D}' 'prefix=${D}${prefix}' install
 
 	# Prepare to create policy store
 	mkdir -p ${D}${sysconfdir}/selinux/
 	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 ${POLICY_MODULES_MIN}; do
-		bzip2 -c ${D}${datadir}/selinux/${POLICY_NAME}/$i.pp > \
-			${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/modules/$i.pp
-	done
+	touch ${D}${sysconfdir}/selinux/${POLICY_NAME}/contexts/files/file_contexts.local
+	if  ${@base_contains('DISTRO_FEATURES','compressed_policy','true','false',d)}; then
+		bzip2 base.pp
+		cp base.pp.bz2 ${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/base.pp
+		for i in ${POLICY_MODULES_MIN}; do
+			bzip2 $i
+			cp ${i}.bz2 ${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/modules/`basename $i`
+		done
+	else
+		bzip2 -c ${D}${datadir}/selinux/${POLICY_NAME}/base.pp  > \
+			${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/base.pp
+		for i in ${POLICY_MODULES_MIN}; do
+			bzip2 -c ${D}${datadir}/selinux/${POLICY_NAME}/$i.pp > \
+				${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/modules/$i.pp
+		done
+	fi
 }

Signature · 1 line

1.7.9.5

Pascal Ouyang

2014-08-28 10:26 UTC #3 lore raw

In reply to [email protected]

Quoted 20 lines · 于 14-7-29 下午3:30, [email protected] 写道:

From: Wenzong Fan <[email protected]>
* split do_install to three steps:
+ prepare_policy_store()
+ rebuild_policy()
+ install_misc_files()
This gets refpolicy-minimum work by re-writing the prepare_policy_store().
* update refpolicy-minimum to support compressed policy.
The following changes since commit a34718ae6ea2539545be1e49c497030f6246345c:
   swig-native: repair patching error (2014-07-19 23:24:44 -0400)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib wenzong/refpolicy
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/refpolicy

Quoted 8 lines

Wenzong Fan (2):
refpolicy: split do_install to three steps
refpolicy / minimum: support compressed policy
  .../refpolicy/refpolicy-minimum_2.20130424.bb      |   26 +++++++++----
  recipes-security/refpolicy/refpolicy_common.inc    |   39 +++++++++++++-------
  2 files changed, 43 insertions(+), 22 deletions(-)

Merged. Thanks:)

Signature · 1 line

- Pascal