diff mbox

[OSSTEST,v2] support XSM/FLASK via Kconfig

Message ID 1452057924-17029-1-git-send-email-cardoe@cardoe.com (mailing list archive)
State New, archived
Headers show

Commit Message

Doug Goldstein Jan. 6, 2016, 5:25 a.m. UTC
In antcipation of XSM and FLASK migrating to Kconfig add support for
building them via Kconfig or the existing mechanism.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
Still untested but visually looks correct.

Changes since v2:
- Support Xen versions prior to Kconfig being integrated
---
 ts-xen-build | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Ian Campbell Jan. 6, 2016, 10:25 a.m. UTC | #1
On Tue, 2016-01-05 at 23:25 -0600, Doug Goldstein wrote:
> In antcipation of XSM and FLASK migrating to Kconfig add support for
> building them via Kconfig or the existing mechanism.
> 
> Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
> ---
> Still untested but visually looks correct.
> 
> Changes since v2:
> - Support Xen versions prior to Kconfig being integrated

Do we not need the gate on the first hunk as well? 

A non-Kconfig aware would ignore the xen/.config but osstest will collect
it later on and that might confuse folks reading the logs.

Such a Xen also won't have a .gitignore entry for xen/.config, so various
git commands might show this tree as dirty. I don't think osstest would
rely on such though, so maybe this doesn't really matter. I don't think
xen/scripts/scmversion adds -dirty in this case either.

> ---
>  ts-xen-build | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/ts-xen-build b/ts-xen-build
> index 80b1faa..8dde146 100755
> --- a/ts-xen-build
> +++ b/ts-xen-build
> @@ -55,6 +55,8 @@ sub checkout () {
>  	echo >>.config KERNELS=''
>  END
>                 (nonempty($r{enable_xsm}) ? <<END : '').
> +	echo >>xen/.config CONFIG_XSM='${build_xsm}'
> +	echo >>xen/.config CONFIG_FLASK='${build_xsm}'
>  	echo >>.config XSM_ENABLE='${build_xsm}'
>  END
>                 (nonempty($r{tree_qemu}) ? <<END : '').
> @@ -126,6 +128,9 @@ END
>  END
>  #/;
>      buildcmd_stamped_logged(9000, 'build', '',<<END,'');
> +            if test -f xen/Kconfig; then
> +                $make_prefix make -C xen olddefconfig
> +            fi
>              $make_prefix make $makeflags @ARGV
>  END
>
Doug Goldstein Jan. 6, 2016, 5:21 p.m. UTC | #2
On 1/6/16 4:25 AM, Ian Campbell wrote:
> On Tue, 2016-01-05 at 23:25 -0600, Doug Goldstein wrote:
>> In antcipation of XSM and FLASK migrating to Kconfig add support for
>> building them via Kconfig or the existing mechanism.
>>
>> Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
>> ---
>> Still untested but visually looks correct.
>>
>> Changes since v2:
>> - Support Xen versions prior to Kconfig being integrated
> 
> Do we not need the gate on the first hunk as well? 
> 
> A non-Kconfig aware would ignore the xen/.config but osstest will collect
> it later on and that might confuse folks reading the logs.
> 
> Such a Xen also won't have a .gitignore entry for xen/.config, so various
> git commands might show this tree as dirty. I don't think osstest would
> rely on such though, so maybe this doesn't really matter. I don't think
> xen/scripts/scmversion adds -dirty in this case either.

Yeah you are correct. That would be better. I'll send another update.

> 
>> ---
>>  ts-xen-build | 5 +++++
>>  1 file changed, 5 insertions(+)
>>
>> diff --git a/ts-xen-build b/ts-xen-build
>> index 80b1faa..8dde146 100755
>> --- a/ts-xen-build
>> +++ b/ts-xen-build
>> @@ -55,6 +55,8 @@ sub checkout () {
>>  	echo >>.config KERNELS=''
>>  END
>>                 (nonempty($r{enable_xsm}) ? <<END : '').
>> +	echo >>xen/.config CONFIG_XSM='${build_xsm}'
>> +	echo >>xen/.config CONFIG_FLASK='${build_xsm}'
>>  	echo >>.config XSM_ENABLE='${build_xsm}'
>>  END
>>                 (nonempty($r{tree_qemu}) ? <<END : '').
>> @@ -126,6 +128,9 @@ END
>>  END
>>  #/;
>>      buildcmd_stamped_logged(9000, 'build', '',<<END,'');
>> +            if test -f xen/Kconfig; then
>> +                $make_prefix make -C xen olddefconfig
>> +            fi
>>              $make_prefix make $makeflags @ARGV
>>  END
>>
diff mbox

Patch

diff --git a/ts-xen-build b/ts-xen-build
index 80b1faa..8dde146 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -55,6 +55,8 @@  sub checkout () {
 	echo >>.config KERNELS=''
 END
                (nonempty($r{enable_xsm}) ? <<END : '').
+	echo >>xen/.config CONFIG_XSM='${build_xsm}'
+	echo >>xen/.config CONFIG_FLASK='${build_xsm}'
 	echo >>.config XSM_ENABLE='${build_xsm}'
 END
                (nonempty($r{tree_qemu}) ? <<END : '').
@@ -126,6 +128,9 @@  END
 END
 #/;
     buildcmd_stamped_logged(9000, 'build', '',<<END,'');
+            if test -f xen/Kconfig; then
+                $make_prefix make -C xen olddefconfig
+            fi
             $make_prefix make $makeflags @ARGV
 END