Re: [Xen-devel] [PATCH v2 2/6] xen: flask: Pass output directory as a parameter to mkflask.sh

[Wei Liu <wei.liu2@xxxxxxxxxx>]

On Tue, May 19, 2015 at 02:44:34PM +0100, Ian Campbell wrote:
> When called from the tools side in a later patch we will want to
> direct its output to the appropriate place.
> 
> Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>

> ---
>  xen/xsm/flask/Makefile          |    2 +-
>  xen/xsm/flask/policy/mkflask.sh |    9 ++++++---
>  2 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile
> index 1256512..12fc3a9 100644
> --- a/xen/xsm/flask/Makefile
> +++ b/xen/xsm/flask/Makefile
> @@ -22,7 +22,7 @@ ALL_H_FILES = $(FLASK_H_FILES) $(AV_H_FILES)
>  $(obj-y) ss/built_in.o: $(ALL_H_FILES)
>  
>  $(FLASK_H_FILES): $(FLASK_H_DEPEND)
> -     $(CONFIG_SHELL) policy/mkflask.sh $(AWK) $(FLASK_H_DEPEND)
> +     $(CONFIG_SHELL) policy/mkflask.sh $(AWK) include $(FLASK_H_DEPEND)
>  
>  $(AV_H_FILES): $(AV_H_DEPEND)
>       $(CONFIG_SHELL) policy/mkaccess_vector.sh $(AWK) $(AV_H_DEPEND)
> diff --git a/xen/xsm/flask/policy/mkflask.sh b/xen/xsm/flask/policy/mkflask.sh
> index e8d8fb5..9e24020 100644
> --- a/xen/xsm/flask/policy/mkflask.sh
> +++ b/xen/xsm/flask/policy/mkflask.sh
> @@ -8,10 +8,13 @@ set -e
>  awk=$1
>  shift 1
>  
> +output_dir=$1
> +shift 1
> +
>  # output file
> -output_file="include/flask.h"
> -debug_file="include/class_to_string.h"
> -debug_file2="include/initial_sid_to_string.h"
> +output_file="$output_dir/flask.h"
> +debug_file="$output_dir/class_to_string.h"
> +debug_file2="$output_dir/initial_sid_to_string.h"
>  
>  cat $* | $awk "
>  BEGIN        {
> -- 
> 1.7.10.4

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel