APPLIED: [F, G, H][PATCH] UBUNTU: [Packaging] Force the target updateconfigs to consider do_enforce_all

[Tim Gardner]

Applied to [focal,groovy]/linux-master-next. Thanks.

I had to change the annotation slightly for focal:

-CONFIG_INTEL_IOMMU_SVM                          policy<{'amd64': 'y', 
'i386': 'y'}>
+CONFIG_INTEL_IOMMU_SVM                          policy<{'amd64': 'y', 
'i386': '-'}>

-rtg

On 3/15/21 2:28 PM, Marcelo Henrique Cerri wrote:
> Ignore:yes
> 
> The binary build calls the target config-prepare-check-generic to
> ensure the config is valid before compiling the kernel. This target
> however is using the flag do_enforce_all to control if all the
> annotations should be enforced on now.
> 
> However, during development the target updateconfigs is used instead
> to verify the config options are matching the annotations file, but
> this target currently always assumes only annotations explicitly
> marked should be enforced.
> 
> Update kernelconfig and the maintainer make file to pass the
> do_enforce_all when running the target updateconfigs.
> 
> Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri at canonical.com>
> ---
>   debian/rules.d/1-maintainer.mk   | 2 +-
>   debian/scripts/misc/kernelconfig | 5 +++--
>   2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
> index fabdf0888fce..5944ca526703 100644
> --- a/debian/rules.d/1-maintainer.mk
> +++ b/debian/rules.d/1-maintainer.mk
> @@ -45,7 +45,7 @@ printdebian:
>   
>   updateconfigs defaultconfigs editconfigs genconfigs dumpconfigs:
>   	dh_testdir;
> -	$(SHELL) $(DROOT)/scripts/misc/kernelconfig $@
> +	$(SHELL) $(DROOT)/scripts/misc/kernelconfig $@ "$(do_enforce_all)"
>   	rm -rf build
>   
>   updateportsconfigs defaultportsconfigs editportsconfigs genportsconfigs askconfigs:
> diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig
> index dfb24e5be7c2..f95396e28f28 100755
> --- a/debian/scripts/misc/kernelconfig
> +++ b/debian/scripts/misc/kernelconfig
> @@ -11,7 +11,8 @@ if [ ! -f MAINTAINERS ] || [ ! -f Makefile ]; then
>   	exit 1
>   fi
>   
> -mode=${1:?"Usage: $0 [oldconfig|editconfig]"}
> +mode=${1:?"Usage: $0 (oldconfig|editconfig) [do_enforce_all]"}
> +do_enforce_all=${2:-0}
>   yes=0
>   case "$mode" in
>       update*configs)  mode='syncconfig' ;;
> @@ -186,7 +187,7 @@ for arch in $archs; do
>   		if [ -f $archconfdir/$config ]; then
>   			fullconf="$tmpdir/CONFIGS/$arch-$config"
>   			[ ! -f "$fullconf" ] && continue
> -			"$bindir/../config-check" "$fullconf" "$arch" "$flavour" "$confdir" "0" "0" || let "fail=$fail+1"
> +			"$bindir/../config-check" "$fullconf" "$arch" "$flavour" "$confdir" "0" "$do_enforce_all" || let "fail=$fail+1"
>   		fi
>   	done
>   done
> 

-- 
-----------
Tim Gardner
Canonical, Inc