[meta-selinux][PATCH 0/4] refpolicy: Move common POLICY_* variables to refpolicy_common.inc

[meta-selinux][PATCH 0/4] refpolicy: Move common POLICY_* variables to refpolicy_common.inc

[Philip Tricca]

This is a simple clean-up patch set to move the POLICY_* variables to the
refpolicy_common.inc file. The only variable that needs to be set by the
top level refpolicy recipes now is POLICY_TYPE.

Philip Tricca (4):
  Move common POLICY_* variables to refpolicy_common.inc
  refpolicy-mcs: Use default variables from refpolicy_common.inc
  refpolicy-mls: Use default variables from refpolicy_common.inc
  refpolicy-standard: Use default variables from refpolicy_common.inc

 recipes-security/refpolicy/refpolicy-mcs_2.20130424.bb     |   10 ----------
 recipes-security/refpolicy/refpolicy-mls_2.20130424.bb     |   12 ------------
 .../refpolicy/refpolicy-standard_2.20130424.bb             |    8 --------
 recipes-security/refpolicy/refpolicy_common.inc            |   12 ++++++++++++
 4 files changed, 12 insertions(+), 30 deletions(-)

-- 
1.7.10.4

[meta-selinux][PATCH 1/4] Move common POLICY_* variables to refpolicy_common.inc

[Philip Tricca]

Use default assignment to allow variables to be overriden by recipes
that include refpolicy_common.inc

Signed-off-by: Philip Tricca <flihp@twobit.us>
---
 recipes-security/refpolicy/refpolicy_common.inc |   12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/recipes-security/refpolicy/refpolicy_common.inc b/recipes-security/refpolicy/refpolicy_common.inc
index 0ca0b9d..65d679b 100644
--- a/recipes-security/refpolicy/refpolicy_common.inc
+++ b/recipes-security/refpolicy/refpolicy_common.inc
@@ -24,6 +24,18 @@ inherit autotools pythonnative
 
 PARALLEL_MAKE = ""
 
+POLICY_NAME ?= "${POLICY_TYPE}"
+POLICY_DISTRO ?= "redhat"
+POLICY_UBAC ?= "n"
+POLICY_UNK_PERMS ?= "allow"
+POLICY_DIRECT_INITRC ?= "n"
+POLICY_MONOLITHIC ?= "n"
+POLICY_CUSTOM_BUILDOPT ?= ""
+POLICY_QUIET ?= "y"
+POLICY_MLS_SENS = "16"
+POLICY_MLS_CATS = "1024"
+POLICY_MCS_CATS = "1024"
+
 EXTRA_OEMAKE += "NAME=${POLICY_NAME} \
 	TYPE=${POLICY_TYPE} \
 	DISTRO=${POLICY_DISTRO} \
-- 
1.7.10.4

[meta-selinux][PATCH 2/4] refpolicy-mcs: Use default variables from refpolicy_common.inc

[Philip Tricca]

Signed-off-by: Philip Tricca <flihp@twobit.us>
---
 recipes-security/refpolicy/refpolicy-mcs_2.20130424.bb |   10 ----------
 1 file changed, 10 deletions(-)

diff --git a/recipes-security/refpolicy/refpolicy-mcs_2.20130424.bb b/recipes-security/refpolicy/refpolicy-mcs_2.20130424.bb
index 38b78f1..adb8e4a 100644
--- a/recipes-security/refpolicy/refpolicy-mcs_2.20130424.bb
+++ b/recipes-security/refpolicy/refpolicy-mcs_2.20130424.bb
@@ -8,16 +8,6 @@ needed (pretty much all systems) but the non-hierarchical categories are. \
 
 PR = "r0"
 
-POLICY_NAME = "mcs"
 POLICY_TYPE = "mcs"
-POLICY_DISTRO = "redhat"
-POLICY_UBAC = "n"
-POLICY_UNK_PERMS = "allow"
-POLICY_DIRECT_INITRC = "n"
-POLICY_MONOLITHIC = "n"
-POLICY_CUSTOM_BUILDOPT = ""
-POLICY_QUIET = "y"
-
-POLICY_MCS_CATS = "1024"
 
 include refpolicy_${PV}.inc
-- 
1.7.10.4

[meta-selinux][PATCH 3/4] refpolicy-mls: Use default variables from refpolicy_common.inc

[Philip Tricca]

Signed-off-by: Philip Tricca <flihp@twobit.us>
---
 recipes-security/refpolicy/refpolicy-mls_2.20130424.bb |   12 ------------
 1 file changed, 12 deletions(-)

diff --git a/recipes-security/refpolicy/refpolicy-mls_2.20130424.bb b/recipes-security/refpolicy/refpolicy-mls_2.20130424.bb
index 3541611..b20f130 100644
--- a/recipes-security/refpolicy/refpolicy-mls_2.20130424.bb
+++ b/recipes-security/refpolicy/refpolicy-mls_2.20130424.bb
@@ -7,18 +7,6 @@ such data from leaking to processes or files with lower classification. \
 
 PR = "r0"
 
-POLICY_NAME = "mls"
 POLICY_TYPE = "mls"
-POLICY_DISTRO = "redhat"
-POLICY_UBAC = "n"
-POLICY_UNK_PERMS = "allow"
-POLICY_DIRECT_INITRC = "n"
-POLICY_MONOLITHIC = "n"
-POLICY_CUSTOM_BUILDOPT = ""
-POLICY_QUIET = "y"
-
-POLICY_MLS_SENS = "16"
-POLICY_MLS_CATS = "1024"
-POLICY_MCS_CATS = "1024"
 
 include refpolicy_${PV}.inc
-- 
1.7.10.4

[meta-selinux][PATCH 4/4] refpolicy-standard: Use default variables from refpolicy_common.inc

[Philip Tricca]

Signed-off-by: Philip Tricca <flihp@twobit.us>
---
 recipes-security/refpolicy/refpolicy-standard_2.20130424.bb |    8 --------
 1 file changed, 8 deletions(-)

diff --git a/recipes-security/refpolicy/refpolicy-standard_2.20130424.bb b/recipes-security/refpolicy/refpolicy-standard_2.20130424.bb
index 1f3030a..922df42 100644
--- a/recipes-security/refpolicy/refpolicy-standard_2.20130424.bb
+++ b/recipes-security/refpolicy/refpolicy-standard_2.20130424.bb
@@ -5,14 +5,6 @@ only."
 
 PR = "r3"
 
-POLICY_NAME = "standard"
 POLICY_TYPE = "standard"
-POLICY_DISTRO = "redhat"
-POLICY_UBAC = "n"
-POLICY_UNK_PERMS = "allow"
-POLICY_DIRECT_INITRC = "n"
-POLICY_MONOLITHIC = "n"
-POLICY_CUSTOM_BUILDOPT = ""
-POLICY_QUIET = "y"
 
 include refpolicy_${PV}.inc
-- 
1.7.10.4

Re: [meta-selinux][PATCH 1/4] Move common POLICY_* variables to refpolicy_common.inc

[Joe MacDonald]

[-- Attachment #1: Type: text/plain, Size: 1464 bytes --]

[[yocto] [meta-selinux][PATCH 1/4] Move common POLICY_* variables to refpolicy_common.inc] On 13.10.30 (Wed 01:11) Philip Tricca wrote:

> Use default assignment to allow variables to be overriden by recipes
> that include refpolicy_common.inc
> 
> Signed-off-by: Philip Tricca <flihp@twobit.us>
> ---
>  recipes-security/refpolicy/refpolicy_common.inc |   12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/recipes-security/refpolicy/refpolicy_common.inc b/recipes-security/refpolicy/refpolicy_common.inc
> index 0ca0b9d..65d679b 100644
> --- a/recipes-security/refpolicy/refpolicy_common.inc
> +++ b/recipes-security/refpolicy/refpolicy_common.inc
> @@ -24,6 +24,18 @@ inherit autotools pythonnative
>  
>  PARALLEL_MAKE = ""
>  
> +POLICY_NAME ?= "${POLICY_TYPE}"
> +POLICY_DISTRO ?= "redhat"
> +POLICY_UBAC ?= "n"
> +POLICY_UNK_PERMS ?= "allow"
> +POLICY_DIRECT_INITRC ?= "n"
> +POLICY_MONOLITHIC ?= "n"
> +POLICY_CUSTOM_BUILDOPT ?= ""
> +POLICY_QUIET ?= "y"
> +POLICY_MLS_SENS = "16"
> +POLICY_MLS_CATS = "1024"
> +POLICY_MCS_CATS = "1024"

Any reason not to make these last three soft assignments as well?
They're unlikely to change and putting them here makes sense, but I can
also imagine someone wanting to use this as a base for creating a
simplified policy.

-J.

> +
>  EXTRA_OEMAKE += "NAME=${POLICY_NAME} \
>  	TYPE=${POLICY_TYPE} \
>  	DISTRO=${POLICY_DISTRO} \
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [meta-selinux][PATCH 1/4] Move common POLICY_* variables to refpolicy_common.inc

[Philip Tricca]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

On 10/30/2013 10:22 AM, Joe MacDonald wrote:
> [[yocto] [meta-selinux][PATCH 1/4] Move common POLICY_* variables
> to refpolicy_common.inc] On 13.10.30 (Wed 01:11) Philip Tricca
> wrote:
> 
>> Use default assignment to allow variables to be overriden by
>> recipes that include refpolicy_common.inc
>> 
>> Signed-off-by: Philip Tricca <flihp@twobit.us> --- 
>> recipes-security/refpolicy/refpolicy_common.inc |   12
>> ++++++++++++ 1 file changed, 12 insertions(+)
>> 
>> diff --git a/recipes-security/refpolicy/refpolicy_common.inc
>> b/recipes-security/refpolicy/refpolicy_common.inc index
>> 0ca0b9d..65d679b 100644 ---
>> a/recipes-security/refpolicy/refpolicy_common.inc +++
>> b/recipes-security/refpolicy/refpolicy_common.inc @@ -24,6 +24,18
>> @@ inherit autotools pythonnative
>> 
>> PARALLEL_MAKE = ""
>> 
>> +POLICY_NAME ?= "${POLICY_TYPE}" +POLICY_DISTRO ?= "redhat" 
>> +POLICY_UBAC ?= "n" +POLICY_UNK_PERMS ?= "allow" 
>> +POLICY_DIRECT_INITRC ?= "n" +POLICY_MONOLITHIC ?= "n" 
>> +POLICY_CUSTOM_BUILDOPT ?= "" +POLICY_QUIET ?= "y" 
>> +POLICY_MLS_SENS = "16" +POLICY_MLS_CATS = "1024" 
>> +POLICY_MCS_CATS = "1024"
> 
> Any reason not to make these last three soft assignments as well? 
> They're unlikely to change and putting them here makes sense, but I
> can also imagine someone wanting to use this as a base for creating
> a simplified policy.

Agree these should be default assignment as well. This was just an
oversight on my part. Good catch & thanks.

- - Philip

>> + EXTRA_OEMAKE += "NAME=${POLICY_NAME} \ TYPE=${POLICY_TYPE} \ 
>> DISTRO=${POLICY_DISTRO} \

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Icedove - http://www.enigmail.net/

iQIcBAEBCgAGBQJScRyPAAoJEDL3fnXC4dO6jhsP/RN8oRzJM2Hv2EYBFBQD8lB3
diOfg13xNye7shlmWUmhHppdR41eiTRQS7ozpzrZz7XsI1RFhB7Zeav9R/uRuqZa
+UkXMg0SF979Qpd1MjjFMl9itlUVFvtZsLdXQCB/OmXQB2Z/YL559UTvR/rD+RUd
qqOpRCgZrwo87O9qn4gVMktd4eG+ETyxgzaDO+BNTAmSLqO8kcxDqd3+UsBT8z/9
4P4UsAGStJNPNDpk4lUoZSZDQUtQNQjGgX3iA0mhzfO1MQ4k6zLq6cAT8Bdov8r+
4nRTHFF8WlrI6cjvjy07ffw7QrIu6Gg9m6krdXYapMYThOf7WEVU1g5uFQr4nget
VEC9Zcz6s3oRppGLDYR28scTCaNqiKyiA5CzQ3GsmhgtZVXBw0k2RBW9vNqrwdgi
rYkq523tKX7sj6WM2+leDp6GtgB6qwNqMlHT4UWMeoDdLvXc6blxZbtWhLqdEp7L
Escohx5biH7zLHrgoDHRmkvobQ4g1pP9k8MRgZIKWQ56vmPVrmvN7O3Uj9jenIk6
RcbFQhlwVhXBdRCJxCbejRRIZ1yvWFTGI/yEJ0UgHlYgE0eBFbOnyxDK/f835Ybs
pPhQCoRbetfcB1GkB9T+wxj2IP+RmXVQI7rm2SAs9IjFy3TDndKds/A9z1LJkXCa
QtMLQtTkd+o1cOTg7HLK
=QCzZ
-----END PGP SIGNATURE-----

Re: [meta-selinux][PATCH 1/4] Move common POLICY_* variables to refpolicy_common.inc

[Philip Tricca]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Hey Joe,

On 10/30/2013 10:22 AM, Joe MacDonald wrote:
> [[yocto] [meta-selinux][PATCH 1/4] Move common POLICY_* variables
> to refpolicy_common.inc] On 13.10.30 (Wed 01:11) Philip Tricca
> wrote:
> 
>> Use default assignment to allow variables to be overriden by
>> recipes that include refpolicy_common.inc
>> 
>> Signed-off-by: Philip Tricca <flihp@twobit.us> --- 
>> recipes-security/refpolicy/refpolicy_common.inc |   12
>> ++++++++++++ 1 file changed, 12 insertions(+)
>> 
>> diff --git a/recipes-security/refpolicy/refpolicy_common.inc
>> b/recipes-security/refpolicy/refpolicy_common.inc index
>> 0ca0b9d..65d679b 100644 ---
>> a/recipes-security/refpolicy/refpolicy_common.inc +++
>> b/recipes-security/refpolicy/refpolicy_common.inc @@ -24,6 +24,18
>> @@ inherit autotools pythonnative
>> 
>> PARALLEL_MAKE = ""
>> 
>> +POLICY_NAME ?= "${POLICY_TYPE}" +POLICY_DISTRO ?= "redhat" 
>> +POLICY_UBAC ?= "n" +POLICY_UNK_PERMS ?= "allow" 
>> +POLICY_DIRECT_INITRC ?= "n" +POLICY_MONOLITHIC ?= "n" 
>> +POLICY_CUSTOM_BUILDOPT ?= "" +POLICY_QUIET ?= "y" 
>> +POLICY_MLS_SENS = "16" +POLICY_MLS_CATS = "1024" 
>> +POLICY_MCS_CATS = "1024"
> 
> Any reason not to make these last three soft assignments as well? 
> They're unlikely to change and putting them here makes sense, but I
> can also imagine someone wanting to use this as a base for creating
> a simplified policy.

Would you like me to make these changes and resend?

- - Philip

>> + EXTRA_OEMAKE += "NAME=${POLICY_NAME} \ TYPE=${POLICY_TYPE} \ 
>> DISTRO=${POLICY_DISTRO} \

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Icedove - http://www.enigmail.net/

iQIcBAEBCgAGBQJSekwvAAoJEDL3fnXC4dO6e2oP/iLoGZo3LEltHEcGGslI4rwN
zkI84+zlwMPUue5Phof6oJXYCbDVTfCM4ZfHeZsoVZXwfUr5fy6hepSIVO/7RdEM
FJfAK99UqwfRYA92dEQpKn4h72RB0DcWF01k8Lxg1fWS189HFDrTJbT0IW/iOxs8
nUTX9AFtOkYdW7xhjczaLK/0aTsrq/jkjd5poUh2Os8xbM7l8r69+YlG0GycuUFu
kaMm3QiHhZxiiYSj3m+ZNEF/iBksuBA7oJqoggr8l2rQpoxXOKgoeUdnUcqnNm7D
KmvSiKNwDEcjo6dakycqeF4xbSD3msQtkimkGn4wTqfBFPcFoqkgq1gJobUw4p/4
iwDgjYQEZ/WRuoSIHqKYHkUDHElnVLwqDRsrQI0mvZITyCbkuYzgkYmCxAyIqZcG
1DpNXAgcT59EI8Qfhmm8ukaCQ9nixCQgehv7Yqsw9Ry0y2uHhqtnTHotZ3xVJVlq
5T7bPBi71wsy2VN3rmwVq3QgMClhV+TCvdQPtU7CCO28f0olAxkjKwwacsC4lQSZ
FVnQP8mWoyf7x7WVBk1cKm+MTxJpFCY0ldAt09B80/+6CPT6BCm1j3l0X4dcjvXl
cUIOU0zbOQfHyd8T9CRsAJVXUgHikZM70MnqE0QSbAKom6huacIl+ON82dqiISJf
zkdzv9hqP9k+PXv7wH4G
=JL/2
-----END PGP SIGNATURE-----

Re: [meta-selinux][PATCH 1/4] Move common POLICY_* variables to refpolicy_common.inc

[Joe MacDonald]

[-- Attachment #1: Type: text/plain, Size: 3260 bytes --]

[Re: [yocto] [meta-selinux][PATCH 1/4] Move common POLICY_* variables to refpolicy_common.inc] On 13.11.06 (Wed 09:03) Philip Tricca wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA512
> 
> Hey Joe,
> 
> On 10/30/2013 10:22 AM, Joe MacDonald wrote:
> > [[yocto] [meta-selinux][PATCH 1/4] Move common POLICY_* variables
> > to refpolicy_common.inc] On 13.10.30 (Wed 01:11) Philip Tricca
> > wrote:
> > 
> >> Use default assignment to allow variables to be overriden by
> >> recipes that include refpolicy_common.inc
> >> 
> >> Signed-off-by: Philip Tricca <flihp@twobit.us> --- 
> >> recipes-security/refpolicy/refpolicy_common.inc |   12
> >> ++++++++++++ 1 file changed, 12 insertions(+)
> >> 
> >> diff --git a/recipes-security/refpolicy/refpolicy_common.inc
> >> b/recipes-security/refpolicy/refpolicy_common.inc index
> >> 0ca0b9d..65d679b 100644 ---
> >> a/recipes-security/refpolicy/refpolicy_common.inc +++
> >> b/recipes-security/refpolicy/refpolicy_common.inc @@ -24,6 +24,18
> >> @@ inherit autotools pythonnative
> >> 
> >> PARALLEL_MAKE = ""
> >> 
> >> +POLICY_NAME ?= "${POLICY_TYPE}" +POLICY_DISTRO ?= "redhat" 
> >> +POLICY_UBAC ?= "n" +POLICY_UNK_PERMS ?= "allow" 
> >> +POLICY_DIRECT_INITRC ?= "n" +POLICY_MONOLITHIC ?= "n" 
> >> +POLICY_CUSTOM_BUILDOPT ?= "" +POLICY_QUIET ?= "y" 
> >> +POLICY_MLS_SENS = "16" +POLICY_MLS_CATS = "1024" 
> >> +POLICY_MCS_CATS = "1024"
> > 
> > Any reason not to make these last three soft assignments as well? 
> > They're unlikely to change and putting them here makes sense, but I
> > can also imagine someone wanting to use this as a base for creating
> > a simplified policy.
> 
> Would you like me to make these changes and resend?

Oops, I'm sorry, Philip, when you followed up saying it was a minor
oversight that they weren't ?= as well, I just assumed you would be
sending a new set, then got distracted with other stuff.  Looking in
context, though, obviously there's no need for a new version based on
such a minor change.  I'll do the merge right now, I've been working
with these in my tree for a week now, after all.  :-)

-J.

> 
> - - Philip
> 
> >> + EXTRA_OEMAKE += "NAME=${POLICY_NAME} \ TYPE=${POLICY_TYPE} \ 
> >> DISTRO=${POLICY_DISTRO} \
> 
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.12 (GNU/Linux)
> Comment: Using GnuPG with Icedove - http://www.enigmail.net/
> 
> iQIcBAEBCgAGBQJSekwvAAoJEDL3fnXC4dO6e2oP/iLoGZo3LEltHEcGGslI4rwN
> zkI84+zlwMPUue5Phof6oJXYCbDVTfCM4ZfHeZsoVZXwfUr5fy6hepSIVO/7RdEM
> FJfAK99UqwfRYA92dEQpKn4h72RB0DcWF01k8Lxg1fWS189HFDrTJbT0IW/iOxs8
> nUTX9AFtOkYdW7xhjczaLK/0aTsrq/jkjd5poUh2Os8xbM7l8r69+YlG0GycuUFu
> kaMm3QiHhZxiiYSj3m+ZNEF/iBksuBA7oJqoggr8l2rQpoxXOKgoeUdnUcqnNm7D
> KmvSiKNwDEcjo6dakycqeF4xbSD3msQtkimkGn4wTqfBFPcFoqkgq1gJobUw4p/4
> iwDgjYQEZ/WRuoSIHqKYHkUDHElnVLwqDRsrQI0mvZITyCbkuYzgkYmCxAyIqZcG
> 1DpNXAgcT59EI8Qfhmm8ukaCQ9nixCQgehv7Yqsw9Ry0y2uHhqtnTHotZ3xVJVlq
> 5T7bPBi71wsy2VN3rmwVq3QgMClhV+TCvdQPtU7CCO28f0olAxkjKwwacsC4lQSZ
> FVnQP8mWoyf7x7WVBk1cKm+MTxJpFCY0ldAt09B80/+6CPT6BCm1j3l0X4dcjvXl
> cUIOU0zbOQfHyd8T9CRsAJVXUgHikZM70MnqE0QSbAKom6huacIl+ON82dqiISJf
> zkdzv9hqP9k+PXv7wH4G
> =JL/2
> -----END PGP SIGNATURE-----

-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]