Patchwork [2/2] UBUNTU: config -- allow locally specified configuration overrides

login
register
mail settings
Submitter Andy Whitcroft
Date March 17, 2010, 5:01 p.m.
Message ID <1268845277-24204-3-git-send-email-apw@canonical.com>
Download mbox | patch
Permalink /patch/47956/
State Accepted
Delegated to: Andy Whitcroft
Headers show

Comments

Andy Whitcroft - March 17, 2010, 5:01 p.m.
When updating configuration you often want to bulk update specific options
in every configuration.  For new options this is trivial as you can simply
add them to config.common.<family>.  For existing options you need to
either remove the options globally and then add them, or add them to
every flavour file.  This is particularly problematic for mainline builds.

Add support for a new $(DEBIAN)/config/OVERRIDES file which if present is
appended to the built configs before processing, providing an absolute
override for all configurations.  This is not expected to be present in
the normal case.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 debian/scripts/misc/kernelconfig |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
Stefan Bader - March 17, 2010, 5:12 p.m.
Seems safe,

Andy Whitcroft wrote:
> When updating configuration you often want to bulk update specific options
> in every configuration.  For new options this is trivial as you can simply
> add them to config.common.<family>.  For existing options you need to
> either remove the options globally and then add them, or add them to
> every flavour file.  This is particularly problematic for mainline builds.
> 
> Add support for a new $(DEBIAN)/config/OVERRIDES file which if present is
> appended to the built configs before processing, providing an absolute
> override for all configurations.  This is not expected to be present in
> the normal case.
> 
> Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  debian/scripts/misc/kernelconfig |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig
> index 936680c..71c0f5e 100755
> --- a/debian/scripts/misc/kernelconfig
> +++ b/debian/scripts/misc/kernelconfig
> @@ -73,6 +73,9 @@ for arch in $archs; do
>  				cat $archconfdir/config.common.$arch >> "$fullconf"
>  			fi
>  			cat "$archconfdir/$config" >>"$fullconf"
> +			if [ -f $confdir/OVERRIDES ]; then
> +				cat $confdir/OVERRIDES >> "$fullconf"
> +			fi
>  			;;
>  		esac
>  	done
Colin King - March 18, 2010, 1:45 p.m.
OK, seems fine to me.

On Wed, 2010-03-17 at 17:01 +0000, Andy Whitcroft wrote:
> When updating configuration you often want to bulk update specific options
> in every configuration.  For new options this is trivial as you can simply
> add them to config.common.<family>.  For existing options you need to
> either remove the options globally and then add them, or add them to
> every flavour file.  This is particularly problematic for mainline builds.
> 
> Add support for a new $(DEBIAN)/config/OVERRIDES file which if present is
> appended to the built configs before processing, providing an absolute
> override for all configurations.  This is not expected to be present in
> the normal case.
> 
> Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Colin King <colin.king@canonical.com>
> ---
>  debian/scripts/misc/kernelconfig |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig
> index 936680c..71c0f5e 100755
> --- a/debian/scripts/misc/kernelconfig
> +++ b/debian/scripts/misc/kernelconfig
> @@ -73,6 +73,9 @@ for arch in $archs; do
>  				cat $archconfdir/config.common.$arch >> "$fullconf"
>  			fi
>  			cat "$archconfdir/$config" >>"$fullconf"
> +			if [ -f $confdir/OVERRIDES ]; then
> +				cat $confdir/OVERRIDES >> "$fullconf"
> +			fi
>  			;;
>  		esac
>  	done
> -- 
> 1.7.0
> 
>

Patch

diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig
index 936680c..71c0f5e 100755
--- a/debian/scripts/misc/kernelconfig
+++ b/debian/scripts/misc/kernelconfig
@@ -73,6 +73,9 @@  for arch in $archs; do
 				cat $archconfdir/config.common.$arch >> "$fullconf"
 			fi
 			cat "$archconfdir/$config" >>"$fullconf"
+			if [ -f $confdir/OVERRIDES ]; then
+				cat $confdir/OVERRIDES >> "$fullconf"
+			fi
 			;;
 		esac
 	done