[PATCH Wily] UBUNTU: [Debian] config-check and prepare using ${DEBIAN}/config/annotations

[Stefan Bader]

On 06.10.2015 18:33, tim.gardner at canonical.com wrote:
> From: Tim Gardner <tim.gardner at canonical.com>
> 
> Annotations are unique to the derivative. Therefore, use annotations
> found in the derivative config directory.
> 
> Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
> ---
>  debian/rules.d/0-common-vars.mk  | 2 +-
>  debian/scripts/misc/kernelconfig | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
> index fa9660c..95cdc79 100644
> --- a/debian/rules.d/0-common-vars.mk
> +++ b/debian/rules.d/0-common-vars.mk
> @@ -111,7 +111,7 @@ abidir		:= $(CURDIR)/$(DEBIAN)/abi/$(release)-$(revision)/$(arch)
>  prev_abidir	:= $(CURDIR)/$(DEBIAN)/abi/$(release)-$(prev_revision)/$(arch)
>  commonconfdir	:= $(CURDIR)/$(DEBIAN)/config
>  archconfdir	:= $(CURDIR)/$(DEBIAN)/config/$(arch)
> -sharedconfdir	:= $(CURDIR)/debian.master/config
> +sharedconfdir	:= $(CURDIR)/$(DEBIAN)/config
>  builddir	:= $(CURDIR)/debian/build
>  stampdir	:= $(CURDIR)/debian/stamps

Hm, the above sounds sensible... but why changing the config-check call if
sharedconfdir is now correct?

>  
> diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig
> index ba8f317..f7fcd53 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
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20151006/c65a8ae4/attachment.sig>