[V2 Patch 1/2] Disables OCaml tools.

[V2 Patch 1/2] Disables OCaml tools.

[Machon Gregory]

There is currently no support for OCaml in OpenEmbedded.

Signed-off-by: Machon Gregory <mbgrego@tycho.nsa.gov>
---
 recipes-extended/xen/xen.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
index 00f1823..9e35459 100644
--- a/recipes-extended/xen/xen.inc
+++ b/recipes-extended/xen/xen.inc
@@ -712,6 +712,7 @@ EXTRA_OECONF += " \
     --disable-pv-grub \
     --disable-xenstore-stubdom \
     --disable-rombios \
+    --disable-ocamltools \
     "
 
 do_configure() {
-- 
2.1.0

[V2 Patch 2/2] Enables XSM functionality in builds that contain "xsm" in the PACKAGECONFIG.

[Machon Gregory]

* Correctly identifies xenpolicy by ${PV}
* Adds a check to identify if xsm is specified in PACKAGECONFIG and if so manually sets XSM_ENABLE in Xen's .config

Signed-off-by: Machon Gregory <mbgrego@tycho.nsa.gov>
---
 recipes-extended/xen/xen.inc | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
index 9e35459..03ec935 100644
--- a/recipes-extended/xen/xen.inc
+++ b/recipes-extended/xen/xen.inc
@@ -333,7 +333,7 @@ FILES_${PN}-flask = "\
     ${sbindir}/flask-loadpolicy \
     ${sbindir}/flask-set-bool \
     ${sbindir}/flask-setenforce \
-    /boot/xenpolicy.24 \
+    /boot/xenpolicy-${PV} \
     "
 
 FILES_${PN}-gdbsx = "\
@@ -715,6 +715,15 @@ EXTRA_OECONF += " \
     --disable-ocamltools \
     "
 
+# check for XSM in package config to allow XSM_ENABLE to be set 
+python () {
+    pkgconfig = d.getVar('PACKAGECONFIG', True)
+    if ('xsm') in pkgconfig.split():
+        d.setVar('XSM_ENABLED', '1')
+    else:
+        d.setVar('XSM_ENABLED', '0')
+}
+
 do_configure() {
     # no stubs-32.h in our 64-bit sysroot - hack it into tools/include/gnu
     if ! test -f ${STAGING_DIR_TARGET}/usr/include/gnu/stubs-32.h ; then
@@ -727,6 +736,11 @@ do_configure() {
         fi
     fi
 
+    #./configure --enable-xsm does not set XSM_ENABLE must be done manually
+    if [ "${XSM_ENABLED}" = "1" ]; then
+        echo "XSM_ENABLE := y" > ${S}/.config
+    fi
+
     # do configure
     oe_runconf
 }
-- 
2.1.0

Re: [V2 Patch 1/2] Disables OCaml tools.

[Doug Goldstein]

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

On 12/16/15 11:08 AM, Machon Gregory wrote:
> There is currently no support for OCaml in OpenEmbedded.
> 
> Signed-off-by: Machon Gregory <mbgrego@tycho.nsa.gov>
> ---
>  recipes-extended/xen/xen.inc | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
> index 00f1823..9e35459 100644
> --- a/recipes-extended/xen/xen.inc
> +++ b/recipes-extended/xen/xen.inc
> @@ -712,6 +712,7 @@ EXTRA_OECONF += " \
>      --disable-pv-grub \
>      --disable-xenstore-stubdom \
>      --disable-rombios \
> +    --disable-ocamltools \
>      "
>  
>  do_configure() {
> 

Reviewed-by: Doug Goldstein <cardoe@cardoe.com>

-- 
Doug Goldstein


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 978 bytes --]

Re: [V2 Patch 2/2] Enables XSM functionality in builds that contain "xsm" in the PACKAGECONFIG.

[Doug Goldstein]

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

On 12/16/15 11:08 AM, Machon Gregory wrote:
> * Correctly identifies xenpolicy by ${PV}
> * Adds a check to identify if xsm is specified in PACKAGECONFIG and if so manually sets XSM_ENABLE in Xen's .config
> 
> Signed-off-by: Machon Gregory <mbgrego@tycho.nsa.gov>
> ---
>  recipes-extended/xen/xen.inc | 16 +++++++++++++++-
>  1 file changed, 15 insertions(+), 1 deletion(-)
> 
> diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
> index 9e35459..03ec935 100644
> --- a/recipes-extended/xen/xen.inc
> +++ b/recipes-extended/xen/xen.inc
> @@ -333,7 +333,7 @@ FILES_${PN}-flask = "\
>      ${sbindir}/flask-loadpolicy \
>      ${sbindir}/flask-set-bool \
>      ${sbindir}/flask-setenforce \
> -    /boot/xenpolicy.24 \
> +    /boot/xenpolicy-${PV} \
>      "
>  
>  FILES_${PN}-gdbsx = "\
> @@ -715,6 +715,15 @@ EXTRA_OECONF += " \
>      --disable-ocamltools \
>      "
>  
> +# check for XSM in package config to allow XSM_ENABLE to be set 
> +python () {
> +    pkgconfig = d.getVar('PACKAGECONFIG', True)
> +    if ('xsm') in pkgconfig.split():
> +        d.setVar('XSM_ENABLED', '1')
> +    else:
> +        d.setVar('XSM_ENABLED', '0')
> +}
> +
>  do_configure() {
>      # no stubs-32.h in our 64-bit sysroot - hack it into tools/include/gnu
>      if ! test -f ${STAGING_DIR_TARGET}/usr/include/gnu/stubs-32.h ; then
> @@ -727,6 +736,11 @@ do_configure() {
>          fi
>      fi
>  
> +    #./configure --enable-xsm does not set XSM_ENABLE must be done manually
> +    if [ "${XSM_ENABLED}" = "1" ]; then
> +        echo "XSM_ENABLE := y" > ${S}/.config
> +    fi
> +
>      # do configure
>      oe_runconf
>  }
> 

This should do the trick for Xen 4.5 and Xen 4.6, however for 4.7 I've
just submitted some changes to how FLASK and XSM are built and this will
break there but we'll cross that bridge then.

Reviewed-by: Doug Goldstein <cardoe@cardoe.com>

-- 
Doug Goldstein


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 978 bytes --]

Re: [V2 Patch 2/2] Enables XSM functionality in builds that contain "xsm" in the PACKAGECONFIG.

[M. Gregory]

I believe this patch will still be needed. Your patch to Xen just
enables the flask utilities to be built. The XSM framework and policy
loading code will still need to be compiled.

-Machon

On 12/22/2015 12:45 AM, Doug Goldstein wrote:
> On 12/16/15 11:08 AM, Machon Gregory wrote:
>> * Correctly identifies xenpolicy by ${PV}
>> * Adds a check to identify if xsm is specified in PACKAGECONFIG and if so manually sets XSM_ENABLE in Xen's .config
>>
>> Signed-off-by: Machon Gregory <mbgrego@tycho.nsa.gov>
>> ---
>>  recipes-extended/xen/xen.inc | 16 +++++++++++++++-
>>  1 file changed, 15 insertions(+), 1 deletion(-)
>>
>> diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
>> index 9e35459..03ec935 100644
>> --- a/recipes-extended/xen/xen.inc
>> +++ b/recipes-extended/xen/xen.inc
>> @@ -333,7 +333,7 @@ FILES_${PN}-flask = "\
>>      ${sbindir}/flask-loadpolicy \
>>      ${sbindir}/flask-set-bool \
>>      ${sbindir}/flask-setenforce \
>> -    /boot/xenpolicy.24 \
>> +    /boot/xenpolicy-${PV} \
>>      "
>>  
>>  FILES_${PN}-gdbsx = "\
>> @@ -715,6 +715,15 @@ EXTRA_OECONF += " \
>>      --disable-ocamltools \
>>      "
>>  
>> +# check for XSM in package config to allow XSM_ENABLE to be set 
>> +python () {
>> +    pkgconfig = d.getVar('PACKAGECONFIG', True)
>> +    if ('xsm') in pkgconfig.split():
>> +        d.setVar('XSM_ENABLED', '1')
>> +    else:
>> +        d.setVar('XSM_ENABLED', '0')
>> +}
>> +
>>  do_configure() {
>>      # no stubs-32.h in our 64-bit sysroot - hack it into tools/include/gnu
>>      if ! test -f ${STAGING_DIR_TARGET}/usr/include/gnu/stubs-32.h ; then
>> @@ -727,6 +736,11 @@ do_configure() {
>>          fi
>>      fi
>>  
>> +    #./configure --enable-xsm does not set XSM_ENABLE must be done manually
>> +    if [ "${XSM_ENABLED}" = "1" ]; then
>> +        echo "XSM_ENABLE := y" > ${S}/.config
>> +    fi
>> +
>>      # do configure
>>      oe_runconf
>>  }
>>
> This should do the trick for Xen 4.5 and Xen 4.6, however for 4.7 I've
> just submitted some changes to how FLASK and XSM are built and this will
> break there but we'll cross that bridge then.
>
> Reviewed-by: Doug Goldstein <cardoe@cardoe.com>
>

Re: [V2 Patch 2/2] Enables XSM functionality in builds that contain "xsm" in the PACKAGECONFIG.

[Doug Goldstein]

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

On 12/22/15 6:25 AM, M. Gregory wrote:
> I believe this patch will still be needed. Your patch to Xen just
> enables the flask utilities to be built. The XSM framework and policy
> loading code will still need to be compiled.
> 
> -Machon

I've moved the build options into Kconfig, so the patch will have to be
different. I'm waiting on Daniel's ACK on the patch you mentioned before
posting the follow on.

-- 
Doug Goldstein


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 978 bytes --]

Re: [V2 Patch 1/2] Disables OCaml tools.

[Chris Patterson]

+1, though I wonder if should be using PACKAGECONFIG?  Should
packageconfig options be only for things that are known to work?

On Mon, Dec 21, 2015 at 3:11 PM, Doug Goldstein <cardoe@cardoe.com> wrote:
> On 12/16/15 11:08 AM, Machon Gregory wrote:
>> There is currently no support for OCaml in OpenEmbedded.
>>
>> Signed-off-by: Machon Gregory <mbgrego@tycho.nsa.gov>
>> ---
>>  recipes-extended/xen/xen.inc | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
>> index 00f1823..9e35459 100644
>> --- a/recipes-extended/xen/xen.inc
>> +++ b/recipes-extended/xen/xen.inc
>> @@ -712,6 +712,7 @@ EXTRA_OECONF += " \
>>      --disable-pv-grub \
>>      --disable-xenstore-stubdom \
>>      --disable-rombios \
>> +    --disable-ocamltools \
>>      "
>>
>>  do_configure() {
>>
>
> Reviewed-by: Doug Goldstein <cardoe@cardoe.com>
>
> --
> Doug Goldstein
>
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization
>

Re: [V2 Patch 1/2] Disables OCaml tools.

[Bruce Ashfield]

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

I went ahead and merged both patches in this series (ocaml and xsm), since
going without  package config is fine for this .. and even though I didn't
see clear consensus
about the xsm patch, I grabbed it as well.

Incremental patches are appreciated if I got it wrong.

Bruce

On Wed, Dec 16, 2015 at 12:08 PM, Machon Gregory <mbgrego@tycho.nsa.gov>
wrote:

> There is currently no support for OCaml in OpenEmbedded.
>
> Signed-off-by: Machon Gregory <mbgrego@tycho.nsa.gov>
> ---
>  recipes-extended/xen/xen.inc | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
> index 00f1823..9e35459 100644
> --- a/recipes-extended/xen/xen.inc
> +++ b/recipes-extended/xen/xen.inc
> @@ -712,6 +712,7 @@ EXTRA_OECONF += " \
>      --disable-pv-grub \
>      --disable-xenstore-stubdom \
>      --disable-rombios \
> +    --disable-ocamltools \
>      "
>
>  do_configure() {
> --
> 2.1.0
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization
>



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"

[-- Attachment #2: Type: text/html, Size: 2057 bytes --]