[Applied][Precise][PATCH] UBUNTU: use right enforce for the right branch

Leann Ogasawara leann.ogasawara at canonical.com
Mon Mar 12 18:00:08 UTC 2012


Applied to Precise master-next.

Andy and Tim, with this change $sharedconfdir there doesn't appear to be
used anywhere else.  Am I missing something or can we remove it
completely?

Thanks,
Leann

On Mon, 2012-03-12 at 18:53 +0800, Bryan Wu wrote:
> When running config-check, it always open debian.master/enforce file
> instead of debian.ti-omap4/enforce even on ti-omap4 branch.
> 
> This patch fix this issue and tested on Marvell armadaxp branch.
> 
> Signed-off-by: Bryan Wu <bryan.wu at canonical.com>
> ---
>  debian/rules.d/4-checks.mk       |    2 +-
>  debian/scripts/misc/kernelconfig |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk
> index c4df2fa..1a7aade 100644
> --- a/debian/rules.d/4-checks.mk
> +++ b/debian/rules.d/4-checks.mk
> @@ -20,5 +20,5 @@ checks-%: module-check-% abi-check-%
>  # Check the config against the known options list.
>  config-prepare-check-%: $(stampdir)/stamp-prepare-tree-%
>  	@perl -f $(DROOT)/scripts/config-check \
> -		$(builddir)/build-$*/.config "$(arch)" "$*" "$(sharedconfdir)" "$(skipconfig)"
> +		$(builddir)/build-$*/.config "$(arch)" "$*" "$(commonconfdir)" "$(skipconfig)"
>  
> diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig
> index 8812b61..ea4a60e 100755
> --- a/debian/scripts/misc/kernelconfig
> +++ b/debian/scripts/misc/kernelconfig
> @@ -157,7 +157,7 @@ for arch in $archs; do
>  		flavour="${config##*.}"
>  		if [ -f $archconfdir/$config ]; then
>  			fullconf="$tmpdir/CONFIGS/$arch-$config"
> -			"$bindir/../config-check" "$fullconf" "$arch" "$flavour" "$sharedconfdir" "0" || let "fail=$fail+1"
> +			"$bindir/../config-check" "$fullconf" "$arch" "$flavour" "$confdir" "0" || let "fail=$fail+1"
>  		fi
>  	done
>  done
> -- 
> 1.7.9.1
> 
> 






More information about the kernel-team mailing list