Re: [Xen-devel] [PATCH 5/8] Allow the user's config to live outside of git

[Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>]

On Thu, 9 Apr 2015, George Dunlap wrote:
> Move the default config to "defconfig" and add config to .gitignore.
> If config doesn't exist, then copy defconfig to it in common_init.
> 
> Signed-off-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>

Acked-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>

but you also need to update the files copied by mkdeb and mkrpm


> CC: Stefano Stabellini <stefano.stabellini@xxxxxxxxxx>
> ---
>  .gitignore          |  1 +
>  config => defconfig |  0
>  raise               | 13 ++++++++-----
>  3 files changed, 9 insertions(+), 5 deletions(-)
>  rename config => defconfig (100%)
> 
> diff --git a/.gitignore b/.gitignore
> index 47e9874..35a46c6 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -28,6 +28,7 @@ cscope.in.out
>  cscope.out
>  cscope.po.out
>  .config
> +config
>  
>  xen-dir
>  xen-dir-remote
> diff --git a/config b/defconfig
> similarity index 100%
> rename from config
> rename to defconfig
> diff --git a/raise b/raise
> index 142956d..ae435d9 100755
> --- a/raise
> +++ b/raise
> @@ -1,10 +1,5 @@
>  #!/usr/bin/env bash
>  
> -# Include your defaults
> -if [[ -e "./config" ]] ; then
> -    . ./config
> -fi
> -
>  # To use this as a library, set RAISIN_PATH appropriately
>  [[ -z "$RAISIN_PATH" ]] && RAISIN_PATH="$PWD/lib"
>  
> @@ -14,6 +9,14 @@ fi
>  . ${RAISIN_PATH}/git-checkout.sh
>  . ${RAISIN_PATH}/build.sh
>  
> +# Include your defaults
> +if [[ ! -e "./config" ]] ; then
> +   echo "No config file found, copying default config"
> +   cp defconfig config
> +fi
> +
> +. ./config
> +
>  # Set up basic functionality
>  common_init
>  
> -- 
> 1.9.1
> 

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